10077 files changed, 17494 insertions, 29403 deletions

diff --git a/CHANGES b/CHANGES
index 047435bcc6ea..172c3793f535 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,35 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20141126:
+AUTHOR: mat@FreeBSD.org
+
+  The way Perl modules are installed has changed.  Before, we had
+
+    site_perl :           lib/perl5/site_perl/5.18
+    site_perl/perl_arch : lib/perl5/site_perl/5.18/mach
+    perl_man3 :           lib/perl5/5.18/man/man3
+
+  Now we have :
+
+    site_perl : lib/perl5/site_perl
+    site_arch : lib/perl5/site_perl/mach/5.18
+    perl_man3 : lib/perl5/site_perl/man/man3
+
+  Modules without any .so will be installed at the same place regardless of the
+  Perl version, minimizing the upgrade when the major Perl version is changed.
+  It uses a version dependent directory for modules with compiled bits.
+
+  As PERL_ARCH is no longer needed in plists, it has been removed from
+  PLIST_SUB.
+
+  The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now
+  always removed, as is perllocal.pod.
+
+  The old site_perl and site_perl/arch directories have been kept in the
+  default Perl @INC for all Perl ports, and will be phased out as these old
+  Perl versions expire.
+
 20141122:
 AUTHOR: crees@FreeBSD.org
 
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index de32dce67450..2534e9d3f3b3 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -1,4 +1,5 @@
 # $FreeBSD$
+# ex:ts=4
 #
 # Provide support to use perl5
 #
@@ -8,7 +9,7 @@
 #				  installed from a port, but without the version number.
 #				  Use this if you need to replace "#!" lines in scripts.
 # PERL_VERSION	- Full version of perl5 (see below for current value).
-# 
+#
 # PERL_VER	- Short version of perl5 (major.minor without patchlevel)
 #
 # PERL_LEVEL	- Perl version as an integer of the form MNNNPP, where
@@ -26,9 +27,7 @@
 # SITE_ARCH		- Directory name where arch site specific perl packages go.
 #				  This value is added to PLIST_SUB.
 # USE_PERL5		- If set, this port uses perl5 in one or more of the extract,
-#				  patch, build, install or run phases.  The fixpacklist is
-#				  needed in some cases, when a .packlist is created, it may
-#				  reference ${STAGEDIR}
+#				  patch, build, install or run phases.
 #				  It can also have configure, modbuild and modbuildtiny when
 #				  the port needs to run Makefile.PL, Build.PL and a
 #				  Module::Build::Tiny flavor of Build.PL.
@@ -96,10 +95,12 @@ PERL_PORT?=	perl5.16
 PERL_PORT?=	perl5.14
 .endif
 
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
-SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}
+SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
 SITE_ARCH?=	${LOCALBASE}/${SITE_ARCH_REL}
+SITE_MAN3_REL?=	${SITE_PERL_REL}/man/man3
+SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 PERL5=		${LOCALBASE}/bin/perl${PERL_VERSION}
 PERL=		${LOCALBASE}/bin/perl
@@ -158,10 +159,9 @@ _INCLUDE_USES_PERL5_POST_MK=	yes
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 			PERL_VER=${PERL_VER} \
-			PERL_ARCH=${PERL_ARCH} \
-			PERL5_MAN3=lib/perl5/${PERL_VER}/man/man3 \
-			SITE_ARCH=${SITE_ARCH_REL} \
-			SITE_PERL=${SITE_PERL_REL}
+			PERL5_MAN3=${SITE_MAN3_REL} \
+			SITE_PERL=${SITE_PERL_REL} \
+			SITE_ARCH=${SITE_ARCH_REL}
 
 # handle perl5 specific manpages
 .for sect in 3
@@ -169,13 +169,13 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 _MANPAGES+=	${P5MAN${sect}:S%^%${PREFIX}/lib/perl5/${PERL_VER}/man/man${sect}/%}
 .endif
 .endfor
-MANDIRS+=	${PREFIX}/lib/perl5/${PERL_VER}
+MANDIRS+=	${SITE_PERL}/man
 
 .if ${_USE_PERL5:Mmodbuild} || ${_USE_PERL5:Mmodbuildtiny}
 _USE_PERL5+=	configure
 ALL_TARGET?=	# empty
-CONFIGURE_ARGS+=--install_path lib="${PREFIX}/${SITE_PERL_REL}" \
-				--install_path arch="${PREFIX}/${SITE_ARCH_REL}" \
+CONFIGURE_ARGS+=--install_path lib="${SITE_PERL}" \
+				--install_path arch="${SITE_ARCH}" \
 				--install_path script="${PREFIX}/bin" \
 				--install_path bin="${PREFIX}/bin" \
 				--install_path libdoc="${MAN3PREFIX}/man/man3" \
@@ -194,10 +194,12 @@ CONFIGURE_ARGS+=--create_packlist 0
 .if ${PORTNAME} != Module-Build-Tiny
 BUILD_DEPENDS+=	p5-Module-Build-Tiny>=0.039:${PORTSDIR}/devel/p5-Module-Build-Tiny
 .endif
-CONFIGURE_ARGS+=--create_packlist 1
+CONFIGURE_ARGS+=--create_packlist 0
 .endif
 .elif ${_USE_PERL5:Mconfigure}
-CONFIGURE_ARGS+=INSTALLDIRS="site"
+# NO_PACKLIST doesn't do anything before 5.20, but starting at
+# 5.20, it doesn't generate it, so we don't have to remove it.
+CONFIGURE_ARGS+=INSTALLDIRS="site" NO_PACKLIST=1
 .endif # modbuild
 
 .if ${_USE_PERL5:Mconfigure}
@@ -231,14 +233,14 @@ RUN_DEPENDS+=		${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
 CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
 CONFIGURE_SCRIPT?=	Makefile.PL
-MAN3PREFIX?=		${PREFIX}/lib/perl5/${PERL_VER}
+MAN3PREFIX?=		${SITE_PERL}
 .undef HAS_CONFIGURE
 
 .if !target(do-configure)
 do-configure:
 	@if [ -f ${SCRIPTDIR}/configure ]; then \
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
-		  ${SCRIPTDIR}/configure; \
+		${SCRIPTDIR}/configure; \
 	fi
 	@cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} \
@@ -264,16 +266,30 @@ do-install:
 .endif # ! USES=gmake
 .endif # modbuild
 
-.if ${USE_PERL5:Mconfigure} || ${USE_PERL5:Mmodbuildtiny} || ${USE_PERL5:Mfixpacklist}
-fix-packlist::
-	@if [ -d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto ] ; then ${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \; ; fi
-.endif
+# In all those, don't use - before the command so that the user does
+# not wonder what has been ignored by this message "*** Error code 1 (ignored)"
+fix-perl-things:
+# Remove .packlist that can have been generated during installation,
+# and cleanup the directories they're in.
+	@(if [ -d ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto ] ; then \
+			find ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto -name .packlist | while read f ; do \
+					${RM} $${f} ; \
+					${RMDIR} -p $${f%/*} 2>/dev/null || : ; \
+			done \
+	fi) || :
 
 # Starting with perl 5.20, the empty bootstrap files are not installed any more
 # by ExtUtils::MakeMaker.  As we don't need them anyway, remove them.
 # Module::Build continues to install them, so remove the files unconditionally.
-fix-perl-bs:
-	-@${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
+	@${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete || :
+
+# Some ports use their own way of building perl modules and generate
+# perllocal.pod, remove it here so that those ports don't include it
+# by mistake in their plists.  It is sometime compressed, so use a
+# shell glob for the removal.  Also, remove the directories that
+# contain it to not leave orphans directories around.
+	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || :
+	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || :
 
 .if !target(regression-test)
 TEST_ARGS+=	${MAKE_ARGS}
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index baa5fcc5bad2..27cba39e4112 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -23,7 +23,7 @@ FPC_DEFAULT?=		2.6.4
 GCC_DEFAULT?=		4.8
 LUA_DEFAULT?=		5.2
 MYSQL_DEFAULT?=		5.5
-PERL5_DEFAULT?=		5.16
+PERL5_DEFAULT?=		5.18
 PGSQL_DEFAULT?=		9.2
 PHP_DEFAULT?=		5.4
 PYTHON_DEFAULT?=	2.7
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 4e4baa9f68e8..0b315d1cf845 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -5959,25 +5959,25 @@ _STAGE_SEQ=		stage-message stage-dir run-depends lib-depends apply-slist pre-ins
 				pre-su-install
 .if defined(NEED_ROOT)
 _STAGE_SUSEQ=	create-users-groups do-install \
-				kmod-post-install \
+				kmod-post-install fix-perl-things \
 				webplugin-post-install post-install post-install-script \
 				move-uniquefiles patch-lafiles post-stage compress-man \
 				install-rc-script install-ldconfig-file install-license \
 				install-desktop-entries add-plist-info add-plist-docs \
 				add-plist-examples add-plist-data add-plist-post \
-				move-uniquefiles-plist fix-packlist fix-perl-bs
+				move-uniquefiles-plist
 .if defined(DEVELOPER)
 _STAGE_SUSEQ+=	stage-qa
 .endif
 .else
 _STAGE_SEQ+=	create-users-groups do-install \
-				kmod-post-install \
+				kmod-post-install fix-perl-things \
 				webplugin-post-install post-install post-install-script \
 				move-uniquefiles patch-lafiles post-stage compress-man \
 				install-rc-script install-ldconfig-file install-license \
 				install-desktop-entries add-plist-info add-plist-docs \
 				add-plist-examples add-plist-data add-plist-post \
-				move-uniquefiles-plist fix-packlist fix-perl-bs
+				move-uniquefiles-plist fix-perl-things
 .if defined(DEVELOPER)
 _STAGE_SEQ+=	stage-qa
 .endif
diff --git a/UPDATING b/UPDATING
index 77d9c356939b..1a11e6966d1b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,47 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20141126:
+  AFFECTS: users of lang/perl5.*
+  AUTHOR: mat@FreeBSD.org
+
+  The directories where Perl modules are installed has changed.  All
+  affected ports' PORTREVISION have been bumped, so upgrading should
+  be as painless as possible.  The old directories have been kept in
+  the default Perl @INC to make it even more painless.
+
+  The default Perl has been switched to lang/perl5.18.  These examples
+  are for switching from lang/perl5.16, if you are running a different
+  version, replace lang/perl5.16 with the origin of the Perl you have
+  installed.
+
+  Binary package users:
+
+    # pkg upgrade -f
+
+  Portupgrade users:
+    0) Fix pkgdb.db (for safety):
+        pkgdb -Ff
+
+    1) Reinstall new version of Perl (5.18):
+        portupgrade -o lang/perl5.18 -f lang/perl5.16
+
+    2) Reinstall everything that depends on Perl:
+        portupgrade -fr lang/perl5.18
+
+  Portmaster users:
+        portmaster -o lang/perl5.18 lang/perl5.16
+
+        Conservative:
+        portmaster p5-
+
+        Comprehensive (but perhaps overkill):
+        portmaster -r perl5-
+
+  Note: If the "perl5-" glob matches more than one port you will need to specify
+        the name of the installed Perl package explicitly.  You can get its name
+        by running: pkg info perl5
+
 20141125:
   AFFECTS: users of EFL libraries
   AUTHOR: gblach@FreeBSD.org
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 45c5d96dfb2f..e3f04b66a49a 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dpkg
 PORTVERSION=	1.17.20
+PORTREVISION=	1
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	dpkg_${PORTVERSION}
diff --git a/archivers/p5-Archive-Any-Lite/Makefile b/archivers/p5-Archive-Any-Lite/Makefile
index 327abd86314f..54e3288fc45f 100644
--- a/archivers/p5-Archive-Any-Lite/Makefile
+++ b/archivers/p5-Archive-Any-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Any-Lite
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Any-Lite/pkg-plist b/archivers/p5-Archive-Any-Lite/pkg-plist
index dcaf9c0cbc85..e9bed4ace746 100644
--- a/archivers/p5-Archive-Any-Lite/pkg-plist
+++ b/archivers/p5-Archive-Any-Lite/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Archive/Any/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Any/Lite/.packlist
 %%PERL5_MAN3%%/Archive::Any::Lite.3.gz
diff --git a/archivers/p5-Archive-Any-Plugin-Rar/Makefile b/archivers/p5-Archive-Any-Plugin-Rar/Makefile
index 54207b161861..a60b9c122d1d 100644
--- a/archivers/p5-Archive-Any-Plugin-Rar/Makefile
+++ b/archivers/p5-Archive-Any-Plugin-Rar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Any-Plugin-Rar
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Any-Plugin-Rar/pkg-plist b/archivers/p5-Archive-Any-Plugin-Rar/pkg-plist
index c5d57c5cb948..006bd5107126 100644
--- a/archivers/p5-Archive-Any-Plugin-Rar/pkg-plist
+++ b/archivers/p5-Archive-Any-Plugin-Rar/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Archive/Any/Plugin/Rar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Any/Plugin/Rar/.packlist
 %%PERL5_MAN3%%/Archive::Any::Plugin::Rar.3.gz
diff --git a/archivers/p5-Archive-Any/Makefile b/archivers/p5-Archive-Any/Makefile
index 242514ef17f7..f62de3f4c066 100644
--- a/archivers/p5-Archive-Any/Makefile
+++ b/archivers/p5-Archive-Any/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Any
 PORTVERSION=	0.09.41
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Any/pkg-plist b/archivers/p5-Archive-Any/pkg-plist
index 31a2fd47aee8..85c04813afdd 100644
--- a/archivers/p5-Archive-Any/pkg-plist
+++ b/archivers/p5-Archive-Any/pkg-plist
@@ -4,7 +4,6 @@
 %%SITE_PERL%%/Archive/Any/Plugin/Zip.pm
 %%SITE_PERL%%/Archive/Any/Tar.pm
 %%SITE_PERL%%/Archive/Any/Zip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Any/.packlist
 %%PERL5_MAN3%%/Archive::Any.3.gz
 %%PERL5_MAN3%%/Archive::Any::Plugin.3.gz
 %%PERL5_MAN3%%/Archive::Any::Plugin::Tar.3.gz
diff --git a/archivers/p5-Archive-Extract-Libarchive/Makefile b/archivers/p5-Archive-Extract-Libarchive/Makefile
index cb490433d789..241295487af7 100644
--- a/archivers/p5-Archive-Extract-Libarchive/Makefile
+++ b/archivers/p5-Archive-Extract-Libarchive/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Archive-Extract-Libarchive
 PORTVERSION=	0.38
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Extract-Libarchive/pkg-plist b/archivers/p5-Archive-Extract-Libarchive/pkg-plist
index 9ca69f3a9dd7..ad3b17357812 100644
--- a/archivers/p5-Archive-Extract-Libarchive/pkg-plist
+++ b/archivers/p5-Archive-Extract-Libarchive/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Archive/Extract/Libarchive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Extract/Libarchive/Libarchive.so
+%%SITE_ARCH%%/Archive/Extract/Libarchive.pm
+%%SITE_ARCH%%/auto/Archive/Extract/Libarchive/Libarchive.so
 %%PERL5_MAN3%%/Archive::Extract::Libarchive.3.gz
diff --git a/archivers/p5-Archive-Extract/Makefile b/archivers/p5-Archive-Extract/Makefile
index 4f46b6b8fa6d..c2885a99e580 100644
--- a/archivers/p5-Archive-Extract/Makefile
+++ b/archivers/p5-Archive-Extract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Extract
 PORTVERSION=	0.72
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Extract/pkg-plist b/archivers/p5-Archive-Extract/pkg-plist
index 200dd765ab50..0c2e36909c9d 100644
--- a/archivers/p5-Archive-Extract/pkg-plist
+++ b/archivers/p5-Archive-Extract/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Archive/Extract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Extract/.packlist
 %%PERL5_MAN3%%/Archive::Extract.3.gz
diff --git a/archivers/p5-Archive-Peek/Makefile b/archivers/p5-Archive-Peek/Makefile
index b418a8a5eb80..50e50b5aa203 100644
--- a/archivers/p5-Archive-Peek/Makefile
+++ b/archivers/p5-Archive-Peek/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Peek
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Peek/pkg-plist b/archivers/p5-Archive-Peek/pkg-plist
index 8eedcb242e05..6030d4d91742 100644
--- a/archivers/p5-Archive-Peek/pkg-plist
+++ b/archivers/p5-Archive-Peek/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Archive/Peek/Zip.pm
 %%SITE_PERL%%/Archive/Peek/Tar.pm
 %%SITE_PERL%%/Archive/Peek.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Peek/.packlist
 %%PERL5_MAN3%%/Archive::Peek.3.gz
diff --git a/archivers/p5-Archive-Rar/Makefile b/archivers/p5-Archive-Rar/Makefile
index b497ba0c4564..0a635ea1f345 100644
--- a/archivers/p5-Archive-Rar/Makefile
+++ b/archivers/p5-Archive-Rar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Rar
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Rar/pkg-plist b/archivers/p5-Archive-Rar/pkg-plist
index 8525048aa3c1..5fcbca58f202 100644
--- a/archivers/p5-Archive-Rar/pkg-plist
+++ b/archivers/p5-Archive-Rar/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Archive/Rar.pm
 %%SITE_PERL%%/Archive/Rar/Passthrough.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Rar/.packlist
 %%PERL5_MAN3%%/Archive::Rar.3.gz
 %%PERL5_MAN3%%/Archive::Rar::Passthrough.3.gz
diff --git a/archivers/p5-Archive-SimpleExtractor/Makefile b/archivers/p5-Archive-SimpleExtractor/Makefile
index 7a7b74b20671..909c136f8f17 100644
--- a/archivers/p5-Archive-SimpleExtractor/Makefile
+++ b/archivers/p5-Archive-SimpleExtractor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-SimpleExtractor
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-SimpleExtractor/pkg-plist b/archivers/p5-Archive-SimpleExtractor/pkg-plist
index 7dfb06e57640..56b0372e9a92 100644
--- a/archivers/p5-Archive-SimpleExtractor/pkg-plist
+++ b/archivers/p5-Archive-SimpleExtractor/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Archive/SimpleExtractor/Tar.pm
 %%SITE_PERL%%/Archive/SimpleExtractor/Rar.pm
 %%SITE_PERL%%/Archive/SimpleExtractor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/SimpleExtractor/.packlist
 %%PERL5_MAN3%%/Archive::SimpleExtractor.3.gz
 %%PERL5_MAN3%%/Archive::SimpleExtractor::Rar.3.gz
 %%PERL5_MAN3%%/Archive::SimpleExtractor::Tar.3.gz
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index 49f8ef10cc89..bf635c2eb650 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Tar
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/archivers/p5-Archive-Tar/pkg-plist b/archivers/p5-Archive-Tar/pkg-plist
index 6cdce651522b..958ba3ec9652 100644
--- a/archivers/p5-Archive-Tar/pkg-plist
+++ b/archivers/p5-Archive-Tar/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/Archive/Tar.pm
 %%SITE_PERL%%/Archive/Tar/Constant.pm
 %%SITE_PERL%%/Archive/Tar/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Tar/.packlist
 %%PERL5_MAN3%%/Archive::Tar.3.gz
 %%PERL5_MAN3%%/Archive::Tar::File.3.gz
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index 3073c11788c5..c8f736be2874 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Archive-Zip
 PORTVERSION=	1.39
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Archive-Zip/pkg-plist b/archivers/p5-Archive-Zip/pkg-plist
index f62840d4e5ee..22fba5d92954 100644
--- a/archivers/p5-Archive-Zip/pkg-plist
+++ b/archivers/p5-Archive-Zip/pkg-plist
@@ -16,4 +16,3 @@ bin/crc32
 %%SITE_PERL%%/Archive/Zip/StringMember.pm
 %%SITE_PERL%%/Archive/Zip/Tree.pm
 %%SITE_PERL%%/Archive/Zip/ZipFileMember.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Zip/.packlist
diff --git a/archivers/p5-Compress-Bzip2/Makefile b/archivers/p5-Compress-Bzip2/Makefile
index 8db11d97878a..725b1a25f244 100644
--- a/archivers/p5-Compress-Bzip2/Makefile
+++ b/archivers/p5-Compress-Bzip2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-Bzip2
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Compress-Bzip2/pkg-plist b/archivers/p5-Compress-Bzip2/pkg-plist
index 02fb9ada6cdc..4d41223a3eb2 100644
--- a/archivers/p5-Compress-Bzip2/pkg-plist
+++ b/archivers/p5-Compress-Bzip2/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/Bzip2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Bzip2/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Bzip2/Bzip2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Bzip2/.packlist
+%%SITE_ARCH%%/Compress/Bzip2.pm
+%%SITE_ARCH%%/auto/Compress/Bzip2/autosplit.ix
+%%SITE_ARCH%%/auto/Compress/Bzip2/Bzip2.so
 %%PERL5_MAN3%%/Compress::Bzip2.3.gz
diff --git a/archivers/p5-Compress-LZ4/Makefile b/archivers/p5-Compress-LZ4/Makefile
index 810eab93b542..db0370ecddf6 100644
--- a/archivers/p5-Compress-LZ4/Makefile
+++ b/archivers/p5-Compress-LZ4/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Compress-LZ4
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -16,6 +17,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Compress/LZ4/LZ4.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Compress/LZ4/LZ4.so
 
 .include <bsd.port.mk>
diff --git a/archivers/p5-Compress-LZ4/pkg-plist b/archivers/p5-Compress-LZ4/pkg-plist
index 52b9c30dd3b3..b9f65ae21991 100644
--- a/archivers/p5-Compress-LZ4/pkg-plist
+++ b/archivers/p5-Compress-LZ4/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Compress::LZ4.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/LZ4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZ4/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZ4/LZ4.so
+%%SITE_ARCH%%/Compress/LZ4.pm
+%%SITE_ARCH%%/auto/Compress/LZ4/LZ4.so
diff --git a/archivers/p5-Compress-LZF/Makefile b/archivers/p5-Compress-LZF/Makefile
index d474298b58b8..8bec2b7b5df8 100644
--- a/archivers/p5-Compress-LZF/Makefile
+++ b/archivers/p5-Compress-LZF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-LZF
 PORTVERSION=	3.70
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Compress-LZF/pkg-plist b/archivers/p5-Compress-LZF/pkg-plist
index f545c081547c..1b4285c3757f 100644
--- a/archivers/p5-Compress-LZF/pkg-plist
+++ b/archivers/p5-Compress-LZF/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/LZF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZF/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZF/LZF.so
+%%SITE_ARCH%%/Compress/LZF.pm
+%%SITE_ARCH%%/auto/Compress/LZF/LZF.so
 %%PERL5_MAN3%%/Compress::LZF.3.gz
diff --git a/archivers/p5-Compress-LZO/Makefile b/archivers/p5-Compress-LZO/Makefile
index 967c39401276..cb989e9bdfef 100644
--- a/archivers/p5-Compress-LZO/Makefile
+++ b/archivers/p5-Compress-LZO/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Compress-LZO
 PORTVERSION=	1.08
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Compress-LZO/pkg-plist b/archivers/p5-Compress-LZO/pkg-plist
index 8e02bc412990..f8b0432ce7ee 100644
--- a/archivers/p5-Compress-LZO/pkg-plist
+++ b/archivers/p5-Compress-LZO/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Compress::LZO.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/LZO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZO/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZO/LZO.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZO/autosplit.ix
+%%SITE_ARCH%%/Compress/LZO.pm
+%%SITE_ARCH%%/auto/Compress/LZO/LZO.so
+%%SITE_ARCH%%/auto/Compress/LZO/autosplit.ix
diff --git a/archivers/p5-Compress-LZW/Makefile b/archivers/p5-Compress-LZW/Makefile
index eecc519ed93e..8190e019e4ca 100644
--- a/archivers/p5-Compress-LZW/Makefile
+++ b/archivers/p5-Compress-LZW/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-LZW
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Compress-LZW/pkg-plist b/archivers/p5-Compress-LZW/pkg-plist
index 502134aa21bd..b8c82fc93e7e 100644
--- a/archivers/p5-Compress-LZW/pkg-plist
+++ b/archivers/p5-Compress-LZW/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Compress/LZW.pm
 %%SITE_PERL%%/Compress/LZW/Compressor.pm
 %%SITE_PERL%%/Compress/LZW/Decompressor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LZW/.packlist
diff --git a/archivers/p5-Compress-Raw-Bzip2/Makefile b/archivers/p5-Compress-Raw-Bzip2/Makefile
index e1d83d36f39a..be42f8bbdc39 100644
--- a/archivers/p5-Compress-Raw-Bzip2/Makefile
+++ b/archivers/p5-Compress-Raw-Bzip2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-Raw-Bzip2
 PORTVERSION=	2.066
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/archivers/p5-Compress-Raw-Bzip2/pkg-plist b/archivers/p5-Compress-Raw-Bzip2/pkg-plist
index 6e93673eddea..bc1b6aefdc5c 100644
--- a/archivers/p5-Compress-Raw-Bzip2/pkg-plist
+++ b/archivers/p5-Compress-Raw-Bzip2/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/Raw/Bzip2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Raw/Bzip2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Raw/Bzip2/Bzip2.so
+%%SITE_ARCH%%/Compress/Raw/Bzip2.pm
+%%SITE_ARCH%%/auto/Compress/Raw/Bzip2/Bzip2.so
 %%PERL5_MAN3%%/Compress::Raw::Bzip2.3.gz
diff --git a/archivers/p5-Compress-Raw-Lzma/Makefile b/archivers/p5-Compress-Raw-Lzma/Makefile
index 4c0f6a40dc6e..f228f13fcd2a 100644
--- a/archivers/p5-Compress-Raw-Lzma/Makefile
+++ b/archivers/p5-Compress-Raw-Lzma/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-Raw-Lzma
 PORTVERSION=	2.066
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/archivers/p5-Compress-Raw-Lzma/pkg-plist b/archivers/p5-Compress-Raw-Lzma/pkg-plist
index f02663d5c529..21542c2d4dea 100644
--- a/archivers/p5-Compress-Raw-Lzma/pkg-plist
+++ b/archivers/p5-Compress-Raw-Lzma/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/Raw/Lzma.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Raw/Lzma/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Raw/Lzma/Lzma.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Raw/Lzma/autosplit.ix
+%%SITE_ARCH%%/Compress/Raw/Lzma.pm
+%%SITE_ARCH%%/auto/Compress/Raw/Lzma/Lzma.so
+%%SITE_ARCH%%/auto/Compress/Raw/Lzma/autosplit.ix
 %%PERL5_MAN3%%/Compress::Raw::Lzma.3.gz
diff --git a/archivers/p5-Compress-Raw-Zlib/Makefile b/archivers/p5-Compress-Raw-Zlib/Makefile
index 1988dcf4c0de..c8e36f7bb297 100644
--- a/archivers/p5-Compress-Raw-Zlib/Makefile
+++ b/archivers/p5-Compress-Raw-Zlib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-Raw-Zlib
 PORTVERSION=	2.066
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/archivers/p5-Compress-Raw-Zlib/pkg-plist b/archivers/p5-Compress-Raw-Zlib/pkg-plist
index d4ba1dae30ab..747bd3845f41 100644
--- a/archivers/p5-Compress-Raw-Zlib/pkg-plist
+++ b/archivers/p5-Compress-Raw-Zlib/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/Raw/Zlib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Raw/Zlib/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Raw/Zlib/Zlib.so
+%%SITE_ARCH%%/Compress/Raw/Zlib.pm
+%%SITE_ARCH%%/auto/Compress/Raw/Zlib/Zlib.so
 %%PERL5_MAN3%%/Compress::Raw::Zlib.3.gz
diff --git a/archivers/p5-Compress-Snappy/Makefile b/archivers/p5-Compress-Snappy/Makefile
index 1d977f3ca5e8..64c69e51a933 100644
--- a/archivers/p5-Compress-Snappy/Makefile
+++ b/archivers/p5-Compress-Snappy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-Snappy
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Compress-Snappy/pkg-plist b/archivers/p5-Compress-Snappy/pkg-plist
index b3aed3601f5c..ea1c55deb9c6 100644
--- a/archivers/p5-Compress-Snappy/pkg-plist
+++ b/archivers/p5-Compress-Snappy/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Compress/Snappy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Snappy/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Snappy/Snappy.so
+%%SITE_ARCH%%/Compress/Snappy.pm
+%%SITE_ARCH%%/auto/Compress/Snappy/Snappy.so
 %%PERL5_MAN3%%/Compress::Snappy.3.gz
diff --git a/archivers/p5-IO-Compress-Lzf/Makefile b/archivers/p5-IO-Compress-Lzf/Makefile
index 90889f9e6ea5..be0641514e79 100644
--- a/archivers/p5-IO-Compress-Lzf/Makefile
+++ b/archivers/p5-IO-Compress-Lzf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Compress-Lzf
 PORTVERSION=	2.066
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/archivers/p5-IO-Compress-Lzf/pkg-plist b/archivers/p5-IO-Compress-Lzf/pkg-plist
index 982cb50db01b..46810e26a642 100644
--- a/archivers/p5-IO-Compress-Lzf/pkg-plist
+++ b/archivers/p5-IO-Compress-Lzf/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/IO/Compress/Lzf.pm
 %%SITE_PERL%%/IO/Uncompress/Adapter/Lzf.pm
 %%SITE_PERL%%/IO/Uncompress/UnLzf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Lzf/.packlist
 %%PERL5_MAN3%%/IO::Compress::Lzf.3.gz
 %%PERL5_MAN3%%/IO::Uncompress::UnLzf.3.gz
diff --git a/archivers/p5-IO-Compress-Lzma/Makefile b/archivers/p5-IO-Compress-Lzma/Makefile
index f01ee609b537..1b0b8864da2f 100644
--- a/archivers/p5-IO-Compress-Lzma/Makefile
+++ b/archivers/p5-IO-Compress-Lzma/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Compress-Lzma
 PORTVERSION=	2.066
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/archivers/p5-IO-Compress-Lzma/pkg-plist b/archivers/p5-IO-Compress-Lzma/pkg-plist
index 6f7d0871dc3b..512bba7cbaea 100644
--- a/archivers/p5-IO-Compress-Lzma/pkg-plist
+++ b/archivers/p5-IO-Compress-Lzma/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/IO/Uncompress/UnXz.pm
 %%SITE_PERL%%/IO/Uncompress/Adapter/UnLzma.pm
 %%SITE_PERL%%/IO/Uncompress/Adapter/UnXz.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Lzma/.packlist
 %%PERL5_MAN3%%/IO::Compress::Lzma.3.gz
 %%PERL5_MAN3%%/IO::Compress::Xz.3.gz
 %%PERL5_MAN3%%/IO::Uncompress::UnLzma.3.gz
diff --git a/archivers/p5-IO-Compress-Lzop/Makefile b/archivers/p5-IO-Compress-Lzop/Makefile
index 5e08f12cb13e..c1fe4324dc26 100644
--- a/archivers/p5-IO-Compress-Lzop/Makefile
+++ b/archivers/p5-IO-Compress-Lzop/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Compress-Lzop
 PORTVERSION=	2.066
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/archivers/p5-IO-Compress-Lzop/pkg-plist b/archivers/p5-IO-Compress-Lzop/pkg-plist
index 626c516d22c5..9b0c4f04070e 100644
--- a/archivers/p5-IO-Compress-Lzop/pkg-plist
+++ b/archivers/p5-IO-Compress-Lzop/pkg-plist
@@ -3,6 +3,5 @@
 %%SITE_PERL%%/IO/Compress/Lzop/Constants.pm
 %%SITE_PERL%%/IO/Uncompress/Adapter/LZO.pm
 %%SITE_PERL%%/IO/Uncompress/UnLzop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Lzop/.packlist
 %%PERL5_MAN3%%/IO::Compress::Lzop.3.gz
 %%PERL5_MAN3%%/IO::Uncompress::UnLzop.3.gz
diff --git a/archivers/p5-IO-Compress/Makefile b/archivers/p5-IO-Compress/Makefile
index ef245ff9db99..703ad7ab5812 100644
--- a/archivers/p5-IO-Compress/Makefile
+++ b/archivers/p5-IO-Compress/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Compress
 PORTVERSION=	2.066
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/archivers/p5-IO-Compress/pkg-plist b/archivers/p5-IO-Compress/pkg-plist
index cd08b79132aa..b4c2775f1ad5 100644
--- a/archivers/p5-IO-Compress/pkg-plist
+++ b/archivers/p5-IO-Compress/pkg-plist
@@ -27,7 +27,6 @@
 %%SITE_PERL%%/IO/Uncompress/Inflate.pm
 %%SITE_PERL%%/IO/Uncompress/RawInflate.pm
 %%SITE_PERL%%/IO/Uncompress/Unzip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/.packlist
 %%PERL5_MAN3%%/Compress::Zlib.3.gz
 %%PERL5_MAN3%%/File::GlobMapper.3.gz
 %%PERL5_MAN3%%/IO::Compress::Base.3.gz
diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile
index bc1382aa167b..a005b417bdb0 100644
--- a/archivers/p5-IO-Zlib/Makefile
+++ b/archivers/p5-IO-Zlib/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	IO-Zlib
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	IO
diff --git a/archivers/p5-IO-Zlib/pkg-plist b/archivers/p5-IO-Zlib/pkg-plist
index 0c97557d91c9..5a06d9a3ac7d 100644
--- a/archivers/p5-IO-Zlib/pkg-plist
+++ b/archivers/p5-IO-Zlib/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Zlib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Zlib/.packlist
 %%PERL5_MAN3%%/IO::Zlib.3.gz
diff --git a/archivers/p5-Mac-Macbinary/Makefile b/archivers/p5-Mac-Macbinary/Makefile
index 63f6df4df97a..1283dd241500 100644
--- a/archivers/p5-Mac-Macbinary/Makefile
+++ b/archivers/p5-Mac-Macbinary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mac-Macbinary
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-Mac-Macbinary/pkg-plist b/archivers/p5-Mac-Macbinary/pkg-plist
index 570f964b13de..e83ae39607d2 100644
--- a/archivers/p5-Mac-Macbinary/pkg-plist
+++ b/archivers/p5-Mac-Macbinary/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Mac::Macbinary.3.gz
 %%SITE_PERL%%/Mac/Macbinary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/Macbinary/.packlist
diff --git a/archivers/p5-POE-Filter-Bzip2/Makefile b/archivers/p5-POE-Filter-Bzip2/Makefile
index 443c57c8c87c..311e0e08adc9 100644
--- a/archivers/p5-POE-Filter-Bzip2/Makefile
+++ b/archivers/p5-POE-Filter-Bzip2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-Bzip2
 PORTVERSION=	1.5.8
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-POE-Filter-Bzip2/pkg-plist b/archivers/p5-POE-Filter-Bzip2/pkg-plist
index cbb222db7069..144b5cc5a923 100644
--- a/archivers/p5-POE-Filter-Bzip2/pkg-plist
+++ b/archivers/p5-POE-Filter-Bzip2/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Bzip2/.packlist
 %%SITE_PERL%%/POE/Filter/Bzip2.pm
 %%PERL5_MAN3%%/POE::Filter::Bzip2.3.gz
diff --git a/archivers/p5-POE-Filter-LZF/Makefile b/archivers/p5-POE-Filter-LZF/Makefile
index d5275e75808e..1a4d9a7089f7 100644
--- a/archivers/p5-POE-Filter-LZF/Makefile
+++ b/archivers/p5-POE-Filter-LZF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-LZF
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/archivers/p5-POE-Filter-LZF/pkg-plist b/archivers/p5-POE-Filter-LZF/pkg-plist
index 7c325807bd52..35d5b334a4dc 100644
--- a/archivers/p5-POE-Filter-LZF/pkg-plist
+++ b/archivers/p5-POE-Filter-LZF/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/LZF/.packlist
 %%SITE_PERL%%/POE/Filter/LZF.pm
 %%PERL5_MAN3%%/POE::Filter::LZF.3.gz
diff --git a/archivers/p5-POE-Filter-LZO/Makefile b/archivers/p5-POE-Filter-LZO/Makefile
index cdb9a3221ab1..6ec95d320264 100644
--- a/archivers/p5-POE-Filter-LZO/Makefile
+++ b/archivers/p5-POE-Filter-LZO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-LZO
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/archivers/p5-POE-Filter-LZO/pkg-plist b/archivers/p5-POE-Filter-LZO/pkg-plist
index a70231c4f99f..8edd240ffc48 100644
--- a/archivers/p5-POE-Filter-LZO/pkg-plist
+++ b/archivers/p5-POE-Filter-LZO/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/LZO/.packlist
 %%SITE_PERL%%/POE/Filter/LZO.pm
 %%PERL5_MAN3%%/POE::Filter::LZO.3.gz
diff --git a/archivers/p5-POE-Filter-LZW/Makefile b/archivers/p5-POE-Filter-LZW/Makefile
index 7d109fa6c7ce..a54a35a581cd 100644
--- a/archivers/p5-POE-Filter-LZW/Makefile
+++ b/archivers/p5-POE-Filter-LZW/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-LZW
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-POE-Filter-LZW/pkg-plist b/archivers/p5-POE-Filter-LZW/pkg-plist
index dac4e9c524a2..14a43d2bd8e0 100644
--- a/archivers/p5-POE-Filter-LZW/pkg-plist
+++ b/archivers/p5-POE-Filter-LZW/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/LZW/.packlist
 %%SITE_PERL%%/POE/Filter/LZW.pm
 %%PERL5_MAN3%%/POE::Filter::LZW.3.gz
diff --git a/archivers/p5-POE-Filter-Zlib/Makefile b/archivers/p5-POE-Filter-Zlib/Makefile
index ef02f432912b..e01c76fccd38 100644
--- a/archivers/p5-POE-Filter-Zlib/Makefile
+++ b/archivers/p5-POE-Filter-Zlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Filter-Zlib
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-POE-Filter-Zlib/pkg-plist b/archivers/p5-POE-Filter-Zlib/pkg-plist
index d76e8ca28867..f7c9aecddbe5 100644
--- a/archivers/p5-POE-Filter-Zlib/pkg-plist
+++ b/archivers/p5-POE-Filter-Zlib/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Zlib/.packlist
 %%SITE_PERL%%/POE/Filter/Zlib.pm
 %%SITE_PERL%%/POE/Filter/Zlib/Stream.pm
 %%PERL5_MAN3%%/POE::Filter::Zlib.3.gz
diff --git a/archivers/p5-PerlIO-gzip/Makefile b/archivers/p5-PerlIO-gzip/Makefile
index fa175edbac48..b230da13969c 100644
--- a/archivers/p5-PerlIO-gzip/Makefile
+++ b/archivers/p5-PerlIO-gzip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-gzip
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-PerlIO-gzip/pkg-plist b/archivers/p5-PerlIO-gzip/pkg-plist
index 412b739785b5..cc347fcaea3d 100644
--- a/archivers/p5-PerlIO-gzip/pkg-plist
+++ b/archivers/p5-PerlIO-gzip/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/PerlIO::gzip.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/gzip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/gzip/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/gzip/gzip.so
+%%SITE_ARCH%%/PerlIO/gzip.pm
+%%SITE_ARCH%%/auto/PerlIO/gzip/gzip.so
diff --git a/archivers/p5-PerlIO-via-Bzip2/Makefile b/archivers/p5-PerlIO-via-Bzip2/Makefile
index 5756708e0a0b..cd9f8438485e 100644
--- a/archivers/p5-PerlIO-via-Bzip2/Makefile
+++ b/archivers/p5-PerlIO-via-Bzip2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-via-Bzip2
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/archivers/p5-PerlIO-via-Bzip2/pkg-plist b/archivers/p5-PerlIO-via-Bzip2/pkg-plist
index 0b15f306200a..ec74a915b1da 100644
--- a/archivers/p5-PerlIO-via-Bzip2/pkg-plist
+++ b/archivers/p5-PerlIO-via-Bzip2/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/PerlIO::via::Bzip2.3.gz
 %%SITE_PERL%%/PerlIO/via/Bzip2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/Bzip2/.packlist
diff --git a/astro/p5-Astro-ADS/Makefile b/astro/p5-Astro-ADS/Makefile
index 4bb82f6e2ac8..811064323583 100644
--- a/astro/p5-Astro-ADS/Makefile
+++ b/astro/p5-Astro-ADS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-ADS
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Astro
diff --git a/astro/p5-Astro-ADS/pkg-plist b/astro/p5-Astro-ADS/pkg-plist
index 95661addc647..66e8f753e695 100644
--- a/astro/p5-Astro-ADS/pkg-plist
+++ b/astro/p5-Astro-ADS/pkg-plist
@@ -3,7 +3,6 @@ bin/adsquery
 %%SITE_PERL%%/Astro/ADS/Query.pm
 %%SITE_PERL%%/Astro/ADS/Result.pm
 %%SITE_PERL%%/Astro/ADS/Result/Paper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/ADS/.packlist
 %%PERL5_MAN3%%/Astro::ADS.3.gz
 %%PERL5_MAN3%%/Astro::ADS::Query.3.gz
 %%PERL5_MAN3%%/Astro::ADS::Result.3.gz
diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index e8d4d585393e..50dd09c4f84c 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-Catalog
 PORTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-Constants/Makefile b/astro/p5-Astro-Constants/Makefile
index 6653f7c6ff30..30d2720eec03 100644
--- a/astro/p5-Astro-Constants/Makefile
+++ b/astro/p5-Astro-Constants/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-Constants
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	astro perl5 science
 MASTER_SITES=	CPAN/Astro
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-Constants/pkg-plist b/astro/p5-Astro-Constants/pkg-plist
index d7252da4354f..a8a837a0ad50 100644
--- a/astro/p5-Astro-Constants/pkg-plist
+++ b/astro/p5-Astro-Constants/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Astro/Constants.pm
 %%SITE_PERL%%/Astro/Constants/CGS.pm
 %%SITE_PERL%%/Astro/Constants/MKS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Constants/.packlist
 %%PERL5_MAN3%%/Astro::Constants.3.gz
diff --git a/astro/p5-Astro-Coords/Makefile b/astro/p5-Astro-Coords/Makefile
index 65648593334f..cd73a5c80d4f 100644
--- a/astro/p5-Astro-Coords/Makefile
+++ b/astro/p5-Astro-Coords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-Coords
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-DSS/Makefile b/astro/p5-Astro-DSS/Makefile
index ca9d946a214f..8c1aab2c4548 100644
--- a/astro/p5-Astro-DSS/Makefile
+++ b/astro/p5-Astro-DSS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-DSS
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Astro
diff --git a/astro/p5-Astro-DSS/pkg-plist b/astro/p5-Astro-DSS/pkg-plist
index bac23bc592eb..babd66629d13 100644
--- a/astro/p5-Astro-DSS/pkg-plist
+++ b/astro/p5-Astro-DSS/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Astro/DSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/DSS/.packlist
 %%PERL5_MAN3%%/Astro::DSS.3.gz
diff --git a/astro/p5-Astro-FITS-CFITSIO/Makefile b/astro/p5-Astro-FITS-CFITSIO/Makefile
index 31bb11d33fbe..0d273fa8de12 100644
--- a/astro/p5-Astro-FITS-CFITSIO/Makefile
+++ b/astro/p5-Astro-FITS-CFITSIO/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Astro-FITS-CFITSIO
 PORTVERSION=	1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-FITS-CFITSIO/pkg-plist b/astro/p5-Astro-FITS-CFITSIO/pkg-plist
index d105d666aa1d..a007497078cc 100644
--- a/astro/p5-Astro-FITS-CFITSIO/pkg-plist
+++ b/astro/p5-Astro-FITS-CFITSIO/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Astro/FITS/CFITSIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/CFITSIO/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/CFITSIO/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/CFITSIO/CFITSIO.so
+%%SITE_ARCH%%/Astro/FITS/CFITSIO.pm
+%%SITE_ARCH%%/auto/Astro/FITS/CFITSIO/autosplit.ix
+%%SITE_ARCH%%/auto/Astro/FITS/CFITSIO/CFITSIO.so
 %%PERL5_MAN3%%/Astro::FITS::CFITSIO.3.gz
diff --git a/astro/p5-Astro-FITS-Header/Makefile b/astro/p5-Astro-FITS-Header/Makefile
index 088e000b6315..a3338c6a040a 100644
--- a/astro/p5-Astro-FITS-Header/Makefile
+++ b/astro/p5-Astro-FITS-Header/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-FITS-Header
 PORTVERSION=	3.07
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-Flux/Makefile b/astro/p5-Astro-Flux/Makefile
index d7774e7cf406..ec2a2bda68dc 100644
--- a/astro/p5-Astro-Flux/Makefile
+++ b/astro/p5-Astro-Flux/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-Flux
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-Flux/pkg-plist b/astro/p5-Astro-Flux/pkg-plist
index 42c6a9dde824..6cda74333f85 100644
--- a/astro/p5-Astro-Flux/pkg-plist
+++ b/astro/p5-Astro-Flux/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Astro/Flux.pm
 %%SITE_PERL%%/Astro/FluxColor.pm
 %%SITE_PERL%%/Astro/Fluxes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Flux/.packlist
 %%PERL5_MAN3%%/Astro::Flux.3.gz
 %%PERL5_MAN3%%/Astro::FluxColor.3.gz
 %%PERL5_MAN3%%/Astro::Fluxes.3.gz
diff --git a/astro/p5-Astro-Hipparcos/Makefile b/astro/p5-Astro-Hipparcos/Makefile
index 0e49f2538053..c7080b4b69d6 100644
--- a/astro/p5-Astro-Hipparcos/Makefile
+++ b/astro/p5-Astro-Hipparcos/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-Hipparcos
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-Hipparcos/pkg-plist b/astro/p5-Astro-Hipparcos/pkg-plist
index d12cbac062c0..6be6fe78f89a 100644
--- a/astro/p5-Astro-Hipparcos/pkg-plist
+++ b/astro/p5-Astro-Hipparcos/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Astro/Hipparcos/Record.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Astro/Hipparcos.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Hipparcos/Hipparcos.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Hipparcos/.packlist
+%%SITE_ARCH%%/Astro/Hipparcos/Record.pod
+%%SITE_ARCH%%/Astro/Hipparcos.pm
+%%SITE_ARCH%%/auto/Astro/Hipparcos/Hipparcos.so
 %%PERL5_MAN3%%/Astro::Hipparcos.3.gz
 %%PERL5_MAN3%%/Astro::Hipparcos::Record.3.gz
diff --git a/astro/p5-Astro-MoonPhase/Makefile b/astro/p5-Astro-MoonPhase/Makefile
index efeb330dc32b..66b18c9ed306 100644
--- a/astro/p5-Astro-MoonPhase/Makefile
+++ b/astro/p5-Astro-MoonPhase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-MoonPhase
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-MoonPhase/pkg-plist b/astro/p5-Astro-MoonPhase/pkg-plist
index 3c11efadd289..83ce07ce2c83 100644
--- a/astro/p5-Astro-MoonPhase/pkg-plist
+++ b/astro/p5-Astro-MoonPhase/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Astro/MoonPhase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/MoonPhase/.packlist
 %%PERL5_MAN3%%/Astro::MoonPhase.3.gz
diff --git a/astro/p5-Astro-PAL/Makefile b/astro/p5-Astro-PAL/Makefile
index 94e885537d3a..f0aa8992f9e6 100644
--- a/astro/p5-Astro-PAL/Makefile
+++ b/astro/p5-Astro-PAL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-PAL
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-PAL/pkg-plist b/astro/p5-Astro-PAL/pkg-plist
index e9a2e7160b45..aad5b15e524a 100644
--- a/astro/p5-Astro-PAL/pkg-plist
+++ b/astro/p5-Astro-PAL/pkg-plist
@@ -1,5 +1,5 @@
 bin/stime
-%%SITE_PERL%%/%%PERL_ARCH%%/Astro/PAL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/PAL/PAL.so
+%%SITE_ARCH%%/Astro/PAL.pm
+%%SITE_ARCH%%/auto/Astro/PAL/PAL.so
 %%PERL5_MAN3%%/Astro::PAL.3.gz
 man/man1/stime.1.gz
diff --git a/astro/p5-Astro-SIMBAD-Client/Makefile b/astro/p5-Astro-SIMBAD-Client/Makefile
index 2a65f99dcf03..ccea26ed4fbb 100644
--- a/astro/p5-Astro-SIMBAD-Client/Makefile
+++ b/astro/p5-Astro-SIMBAD-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-SIMBAD-Client
 PORTVERSION=	0.031
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/astro/p5-Astro-SIMBAD-Client/pkg-plist b/astro/p5-Astro-SIMBAD-Client/pkg-plist
index f0647eb1cfb2..7875dd16a856 100644
--- a/astro/p5-Astro-SIMBAD-Client/pkg-plist
+++ b/astro/p5-Astro-SIMBAD-Client/pkg-plist
@@ -1,6 +1,5 @@
 bin/simbadc
 %%SITE_PERL%%/Astro/SIMBAD/Client.pm
 %%SITE_PERL%%/Astro/SIMBAD/Client/WSQueryInterfaceService.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD/Client/.packlist
 %%PERL5_MAN3%%/Astro::SIMBAD::Client.3.gz
 man/man1/simbadc.1.gz
diff --git a/astro/p5-Astro-SIMBAD/Makefile b/astro/p5-Astro-SIMBAD/Makefile
index a8aadfed9be3..5220342b1173 100644
--- a/astro/p5-Astro-SIMBAD/Makefile
+++ b/astro/p5-Astro-SIMBAD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-SIMBAD
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Astro
diff --git a/astro/p5-Astro-SIMBAD/pkg-plist b/astro/p5-Astro-SIMBAD/pkg-plist
index 2b3af627bc4a..300e6deb5dc3 100644
--- a/astro/p5-Astro-SIMBAD/pkg-plist
+++ b/astro/p5-Astro-SIMBAD/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Astro/SIMBAD/Query.pm
 %%SITE_PERL%%/Astro/SIMBAD/Result.pm
 %%SITE_PERL%%/Astro/SIMBAD/Result/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD/.packlist
 %%PERL5_MAN3%%/Astro::SIMBAD.3.gz
 %%PERL5_MAN3%%/Astro::SIMBAD::Query.3.gz
 %%PERL5_MAN3%%/Astro::SIMBAD::Result.3.gz
diff --git a/astro/p5-Astro-SpaceTrack/Makefile b/astro/p5-Astro-SpaceTrack/Makefile
index 24827c7708a9..28c178a54a39 100644
--- a/astro/p5-Astro-SpaceTrack/Makefile
+++ b/astro/p5-Astro-SpaceTrack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-SpaceTrack
 PORTVERSION=	0.086
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/astro/p5-Astro-SpaceTrack/pkg-plist b/astro/p5-Astro-SpaceTrack/pkg-plist
index 12edf8305bb7..3e913ea04dae 100644
--- a/astro/p5-Astro-SpaceTrack/pkg-plist
+++ b/astro/p5-Astro-SpaceTrack/pkg-plist
@@ -1,7 +1,6 @@
 bin/SpaceTrack
 %%SITE_PERL%%/Astro/SpaceTrack.pm
 %%SITE_PERL%%/Astro/SpaceTrack/BulkData.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SpaceTrack/.packlist
 %%PERL5_MAN3%%/Astro::SpaceTrack.3.gz
 %%PERL5_MAN3%%/Astro::SpaceTrack::BulkData.3.gz
 man/man1/SpaceTrack.1.gz
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index c13414bed806..8bf6514dbc17 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-SunTime
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Astro
diff --git a/astro/p5-Astro-SunTime/pkg-plist b/astro/p5-Astro-SunTime/pkg-plist
index 36760d99235c..e30bdd0e6133 100644
--- a/astro/p5-Astro-SunTime/pkg-plist
+++ b/astro/p5-Astro-SunTime/pkg-plist
@@ -1,2 +1 @@
 %%SITE_PERL%%/Astro/SunTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime/.packlist
diff --git a/astro/p5-Astro-Sunrise/Makefile b/astro/p5-Astro-Sunrise/Makefile
index fa9a464139a4..a839a3b63cce 100644
--- a/astro/p5-Astro-Sunrise/Makefile
+++ b/astro/p5-Astro-Sunrise/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-Sunrise
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-Sunrise/pkg-plist b/astro/p5-Astro-Sunrise/pkg-plist
index 95bd17625e9d..fcc0f464f93a 100644
--- a/astro/p5-Astro-Sunrise/pkg-plist
+++ b/astro/p5-Astro-Sunrise/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Sunrise/.packlist
 %%SITE_PERL%%/Astro/Sunrise.pm
 %%PERL5_MAN3%%/Astro::Sunrise.3.gz
diff --git a/astro/p5-Astro-Telescope/Makefile b/astro/p5-Astro-Telescope/Makefile
index 96a2b5f0317d..68dd3be0badc 100644
--- a/astro/p5-Astro-Telescope/Makefile
+++ b/astro/p5-Astro-Telescope/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-Telescope
 PORTVERSION=	0.71
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-WaveBand/Makefile b/astro/p5-Astro-WaveBand/Makefile
index 98b739d3c13e..9626a5ae5e9a 100644
--- a/astro/p5-Astro-WaveBand/Makefile
+++ b/astro/p5-Astro-WaveBand/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-WaveBand
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile
index bcdbfa7ee675..6a188f856b96 100644
--- a/astro/p5-Astro-satpass/Makefile
+++ b/astro/p5-Astro-satpass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Astro-satpass
 PORTVERSION=	0.065
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/astro/p5-Astro-satpass/pkg-plist b/astro/p5-Astro-satpass/pkg-plist
index 7cca310fdd09..a0c0a2ae746c 100644
--- a/astro/p5-Astro-satpass/pkg-plist
+++ b/astro/p5-Astro-satpass/pkg-plist
@@ -19,5 +19,4 @@ bin/satpass
 %%SITE_PERL%%/Astro/Coord/ECI/TLE/Iridium.pm
 %%SITE_PERL%%/Astro/Coord/ECI/TLE/Set.pm
 %%SITE_PERL%%/Astro/Coord/ECI/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Coord/ECI/.packlist
 man/man1/satpass.1.gz
diff --git a/astro/p5-Astro/Makefile b/astro/p5-Astro/Makefile
index 7fc43e182e2b..6f0ef7c4cd73 100644
--- a/astro/p5-Astro/Makefile
+++ b/astro/p5-Astro/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Astro
 PORTVERSION=	0.77
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro/pkg-plist b/astro/p5-Astro/pkg-plist
index ad1f6ee6f84e..69c33ff110da 100644
--- a/astro/p5-Astro/pkg-plist
+++ b/astro/p5-Astro/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Astro/Coord.pm
 %%SITE_PERL%%/Astro/Misc.pm
 %%SITE_PERL%%/Astro/Time.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/.packlist
 %%PERL5_MAN3%%/Astro::Coord.3.gz
 %%PERL5_MAN3%%/Astro::Misc.3.gz
 %%PERL5_MAN3%%/Astro::Time.3.gz
diff --git a/astro/p5-GPS-Babel/Makefile b/astro/p5-GPS-Babel/Makefile
index 8f972cb9fb77..18862c0f3414 100644
--- a/astro/p5-GPS-Babel/Makefile
+++ b/astro/p5-GPS-Babel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GPS-Babel
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	astro perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-GPS-Babel/pkg-plist b/astro/p5-GPS-Babel/pkg-plist
index 3e6d98a0348f..93daf2503da3 100644
--- a/astro/p5-GPS-Babel/pkg-plist
+++ b/astro/p5-GPS-Babel/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GPS::Babel.3.gz
 %%SITE_PERL%%/GPS/Babel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/Babel/.packlist
diff --git a/astro/p5-GPS-OID/Makefile b/astro/p5-GPS-OID/Makefile
index 86a85682ab4b..237914407997 100644
--- a/astro/p5-GPS-OID/Makefile
+++ b/astro/p5-GPS-OID/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GPS-OID
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-GPS-OID/pkg-plist b/astro/p5-GPS-OID/pkg-plist
index c9d87c6fccff..be3fd883f8b7 100644
--- a/astro/p5-GPS-OID/pkg-plist
+++ b/astro/p5-GPS-OID/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GPS::OID.3.gz
 %%SITE_PERL%%/GPS/OID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/OID/.packlist
diff --git a/astro/p5-GPS/Makefile b/astro/p5-GPS/Makefile
index 6f2446ac51dd..35ec72bb6d42 100644
--- a/astro/p5-GPS/Makefile
+++ b/astro/p5-GPS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GPS
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	astro perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-GPS/pkg-plist b/astro/p5-GPS/pkg-plist
index 4d965952a2fe..251f6d8edfde 100644
--- a/astro/p5-GPS/pkg-plist
+++ b/astro/p5-GPS/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/GPS/NMEA.pm
 %%SITE_PERL%%/GPS/NMEA/Handler.pm
 %%SITE_PERL%%/GPS/Serial.pm
-%%SITE_PERL%%/mach/auto/GPS/Garmin/.packlist
 %%PERL5_MAN3%%/GPS::Serial.3.gz
 %%PERL5_MAN3%%/GPS::NMEA.3.gz
 %%PERL5_MAN3%%/GPS::NMEA::Handler.3.gz
diff --git a/astro/p5-Geo-METAR/Makefile b/astro/p5-Geo-METAR/Makefile
index 3c00694e5041..2b15d558e0ec 100644
--- a/astro/p5-Geo-METAR/Makefile
+++ b/astro/p5-Geo-METAR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-METAR
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	astro geography perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Geo
diff --git a/astro/p5-Geo-METAR/pkg-plist b/astro/p5-Geo-METAR/pkg-plist
index 5e5c8cc76841..34435ad7db2a 100644
--- a/astro/p5-Geo-METAR/pkg-plist
+++ b/astro/p5-Geo-METAR/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Geo::METAR.3.gz
 %%SITE_PERL%%/Geo/METAR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR/.packlist
diff --git a/astro/p5-Misc-Quality/Makefile b/astro/p5-Misc-Quality/Makefile
index ce724e148994..c48a38c4492c 100644
--- a/astro/p5-Misc-Quality/Makefile
+++ b/astro/p5-Misc-Quality/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Misc-Quality
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AALLAN
diff --git a/astro/p5-Misc-Quality/pkg-plist b/astro/p5-Misc-Quality/pkg-plist
index 4a0183b77123..0a48cafc6d5c 100644
--- a/astro/p5-Misc-Quality/pkg-plist
+++ b/astro/p5-Misc-Quality/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Misc/Quality.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Misc/Quality/.packlist
 %%PERL5_MAN3%%/Misc::Quality.3.gz
diff --git a/astro/p5-Starlink-AST/Makefile b/astro/p5-Starlink-AST/Makefile
index d853ff20f6d0..e4bbf22fe712 100644
--- a/astro/p5-Starlink-AST/Makefile
+++ b/astro/p5-Starlink-AST/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Starlink-AST
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TJENNESS
@@ -20,7 +21,6 @@ USES=		perl5
 USE_PERL5=	modbuild
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Starlink/AST/AST.so
-	${RM} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Starlink/AST/AST.bs
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Starlink/AST/AST.so
 
 .include <bsd.port.mk>
diff --git a/astro/p5-Starlink-AST/pkg-plist b/astro/p5-Starlink-AST/pkg-plist
index ca086a43cbcc..a645e03113ec 100644
--- a/astro/p5-Starlink-AST/pkg-plist
+++ b/astro/p5-Starlink-AST/pkg-plist
@@ -2,8 +2,8 @@
 %%PERL5_MAN3%%/Starlink::AST::PGPLOT.3.gz
 %%PERL5_MAN3%%/Starlink::AST::Tk.3.gz
 %%PERL5_MAN3%%/Starlink::AST::PLplot.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Starlink/AST/AST.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST/Tk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST/PGPLOT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST/PLplot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST.pm
+%%SITE_ARCH%%/auto/Starlink/AST/AST.so
+%%SITE_ARCH%%/Starlink/AST/Tk.pm
+%%SITE_ARCH%%/Starlink/AST/PGPLOT.pm
+%%SITE_ARCH%%/Starlink/AST/PLplot.pm
+%%SITE_ARCH%%/Starlink/AST.pm
diff --git a/astro/p5-Weather-Underground/Makefile b/astro/p5-Weather-Underground/Makefile
index 679578208dbe..e0794d79e5fc 100644
--- a/astro/p5-Weather-Underground/Makefile
+++ b/astro/p5-Weather-Underground/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Weather-Underground
 PORTVERSION=	3.03
+PORTREVISION=	1
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Weather-Underground/pkg-plist b/astro/p5-Weather-Underground/pkg-plist
index 6720dcecb59b..0cbd65335d78 100644
--- a/astro/p5-Weather-Underground/pkg-plist
+++ b/astro/p5-Weather-Underground/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Weather/Underground.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Weather/Underground/.packlist
 %%PERL5_MAN3%%/Weather::Underground.3.gz
diff --git a/astro/p5-ZConf-Weather/Makefile b/astro/p5-ZConf-Weather/Makefile
index 5fd35e37f761..12d1bb2d742d 100644
--- a/astro/p5-ZConf-Weather/Makefile
+++ b/astro/p5-ZConf-Weather/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ZConf-Weather
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/astro/p5-ZConf-Weather/pkg-plist b/astro/p5-ZConf-Weather/pkg-plist
index 651d6a938f34..434520e75e36 100644
--- a/astro/p5-ZConf-Weather/pkg-plist
+++ b/astro/p5-ZConf-Weather/pkg-plist
@@ -1,4 +1,3 @@
 bin/zcweather
 %%SITE_PERL%%/ZConf/Weather.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Weather/.packlist
 %%PERL5_MAN3%%/ZConf::Weather.3.gz
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index 0ae41653de40..98d38b411b1a 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnupod
 PORTVERSION=	0.99.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://www.blinkenlights.ch/gnupod-dist/stable/
@@ -42,5 +42,10 @@ post-install:
 gnupod.texi fdl.texi version.texi ipod.svg
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
+	# It tries to guess where it should install it's Perl modules, gets it
+	# wrong, and put them in BSDPAN, so move stuff at the right place.
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${MV} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN/GNUpod ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN 2>/dev/null || :
 
 .include <bsd.port.mk>
diff --git a/audio/gnupod/pkg-plist b/audio/gnupod/pkg-plist
index fddbb52f9428..e10ffe5982fc 100644
--- a/audio/gnupod/pkg-plist
+++ b/audio/gnupod/pkg-plist
@@ -10,15 +10,15 @@ bin/gnupod_otgsync.pl
 bin/gnupod_search.pl
 bin/mktunes.pl
 bin/tunes2pod.pl
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/ArtworkDB.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/FileMagic.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/FooBar.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/Hash58.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/Mktunes.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/iTunesDB.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/QTfile.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/SysInfo.pm.gz
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/XMLhelper.pm.gz
+%%SITE_PERL%%/GNUpod/ArtworkDB.pm
+%%SITE_PERL%%/GNUpod/FileMagic.pm
+%%SITE_PERL%%/GNUpod/FooBar.pm
+%%SITE_PERL%%/GNUpod/Hash58.pm
+%%SITE_PERL%%/GNUpod/Mktunes.pm
+%%SITE_PERL%%/GNUpod/iTunesDB.pm
+%%SITE_PERL%%/GNUpod/QTfile.pm
+%%SITE_PERL%%/GNUpod/SysInfo.pm
+%%SITE_PERL%%/GNUpod/XMLhelper.pm
 man/man1/gnupod_INIT.pl.1.gz
 man/man1/gnupod_addsong.pl.1.gz
 man/man1/gnupod_check.pl.1.gz
diff --git a/audio/libmp3-archive-perl/Makefile b/audio/libmp3-archive-perl/Makefile
index c899ef9091fb..5f43638e39a5 100644
--- a/audio/libmp3-archive-perl/Makefile
+++ b/audio/libmp3-archive-perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmp3-archive-perl
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	http://erislabs.net/ianb/projects/${PORTNAME}/ \
 		LOCAL/sunpoet
diff --git a/audio/libmp3-archive-perl/pkg-plist b/audio/libmp3-archive-perl/pkg-plist
index 5d4bd0b5cdf2..8716a8746ca5 100644
--- a/audio/libmp3-archive-perl/pkg-plist
+++ b/audio/libmp3-archive-perl/pkg-plist
@@ -2,7 +2,6 @@ etc/mp3archiverc
 %%SITE_PERL%%/MP3/Archive.pm
 %%SITE_PERL%%/MP3/Archive/Config.pm
 %%SITE_PERL%%/MP3/Archive/Format.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Archive/.packlist
 %%PERL5_MAN3%%/MP3::Archive.3.gz
 %%PERL5_MAN3%%/MP3::Archive::Config.3.gz
 %%PERL5_MAN3%%/MP3::Archive::Format.3.gz
diff --git a/audio/mp3-archive-tools/Makefile b/audio/mp3-archive-tools/Makefile
index aa629fb8cf66..e2046e3ef901 100644
--- a/audio/mp3-archive-tools/Makefile
+++ b/audio/mp3-archive-tools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mp3-archive-tools
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://erislabs.net/ianb/projects/${PORTNAME}/ \
 		LOCAL/sunpoet
diff --git a/audio/mp3-archive-tools/pkg-plist b/audio/mp3-archive-tools/pkg-plist
index 01ee110569bb..461c765600df 100644
--- a/audio/mp3-archive-tools/pkg-plist
+++ b/audio/mp3-archive-tools/pkg-plist
@@ -6,7 +6,6 @@ bin/movemusic
 bin/mp3id
 bin/pmv
 bin/update-music-symlinks
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mp3-archive-tools/.packlist
 man/man1/cddbtofilename.1.gz
 man/man1/filenametoid3.1.gz
 man/man1/freedbtofilename.1.gz
diff --git a/audio/mp3lint/Makefile b/audio/mp3lint/Makefile
index 0ba1b534041f..32c2b2541147 100644
--- a/audio/mp3lint/Makefile
+++ b/audio/mp3lint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mp3lint
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	http://erislabs.net/ianb/projects/${PORTNAME}/ \
 		LOCAL/sunpoet
diff --git a/audio/mp3lint/pkg-plist b/audio/mp3lint/pkg-plist
index d32bb3efe18a..e742bd1c4bba 100644
--- a/audio/mp3lint/pkg-plist
+++ b/audio/mp3lint/pkg-plist
@@ -17,7 +17,6 @@ etc/mp3lintrc
 %%SITE_PERL%%/MP3/Archive/Lint/Tools/Mp3info.pm
 %%SITE_PERL%%/MP3/Archive/Lint/Tools/Ogg.pm
 %%SITE_PERL%%/MP3/Archive/Lint/Tools/Wav.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mp3lint/.packlist
 %%PERL5_MAN3%%/mp3lint-tools.3.gz
 man/man1/mp3lint.1.gz
 man/man1/mp3lintskip.1.gz
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 8c0a07455976..86d0698414b7 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Audio-CD
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-CD/pkg-plist b/audio/p5-Audio-CD/pkg-plist
index 296dfd63234d..6ab3d02eb54d 100644
--- a/audio/p5-Audio-CD/pkg-plist
+++ b/audio/p5-Audio-CD/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Audio::CD.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/CD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/CD.so
+%%SITE_ARCH%%/Audio/CD.pm
+%%SITE_ARCH%%/auto/Audio/CD/CD.so
diff --git a/audio/p5-Audio-Ecasound/Makefile b/audio/p5-Audio-Ecasound/Makefile
index 309dd394c0da..83e42ff2e229 100644
--- a/audio/p5-Audio-Ecasound/Makefile
+++ b/audio/p5-Audio-Ecasound/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Audio-Ecasound
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-Ecasound/pkg-plist b/audio/p5-Audio-Ecasound/pkg-plist
index f33774362b24..3500436497d1 100644
--- a/audio/p5-Audio-Ecasound/pkg-plist
+++ b/audio/p5-Audio-Ecasound/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Ecasound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Ecasound/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Ecasound/Ecasound.so
+%%SITE_ARCH%%/Audio/Ecasound.pm
+%%SITE_ARCH%%/auto/Audio/Ecasound/Ecasound.so
 %%PERL5_MAN3%%/Audio::Ecasound.3.gz
diff --git a/audio/p5-Audio-FLAC-Header/Makefile b/audio/p5-Audio-FLAC-Header/Makefile
index 1b01a3eb99b7..19785f1a2822 100644
--- a/audio/p5-Audio-FLAC-Header/Makefile
+++ b/audio/p5-Audio-FLAC-Header/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Audio-FLAC-Header
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-FLAC-Header/pkg-plist b/audio/p5-Audio-FLAC-Header/pkg-plist
index 8b81810cae4a..25ae1c2ad32d 100644
--- a/audio/p5-Audio-FLAC-Header/pkg-plist
+++ b/audio/p5-Audio-FLAC-Header/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/FLAC/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/FLAC/Header/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/FLAC/Header/Header.so
+%%SITE_ARCH%%/Audio/FLAC/Header.pm
+%%SITE_ARCH%%/auto/Audio/FLAC/Header/Header.so
 %%PERL5_MAN3%%/Audio::FLAC::Header.3.gz
diff --git a/audio/p5-Audio-MPD-Common/Makefile b/audio/p5-Audio-MPD-Common/Makefile
index 6e41cf038c7c..bef9f21d4ce0 100644
--- a/audio/p5-Audio-MPD-Common/Makefile
+++ b/audio/p5-Audio-MPD-Common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-MPD-Common
 PORTVERSION=	1.120881
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-MPD/Makefile b/audio/p5-Audio-MPD/Makefile
index 8d4f3739a35c..091342e9f5dd 100644
--- a/audio/p5-Audio-MPD/Makefile
+++ b/audio/p5-Audio-MPD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-MPD
 PORTVERSION=	1.120610
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-Mixer/Makefile b/audio/p5-Audio-Mixer/Makefile
index 0abda04e9519..91688536d476 100644
--- a/audio/p5-Audio-Mixer/Makefile
+++ b/audio/p5-Audio-Mixer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-Mixer
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-Mixer/pkg-plist b/audio/p5-Audio-Mixer/pkg-plist
index 02568959ff60..211a3c374486 100644
--- a/audio/p5-Audio-Mixer/pkg-plist
+++ b/audio/p5-Audio-Mixer/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/volume.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Mixer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Mixer/Mixer.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Mixer/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Mixer/.packlist
+%%SITE_ARCH%%/Audio/volume.pl
+%%SITE_ARCH%%/Audio/Mixer.pm
+%%SITE_ARCH%%/auto/Audio/Mixer/Mixer.so
+%%SITE_ARCH%%/auto/Audio/Mixer/autosplit.ix
 %%PERL5_MAN3%%/Audio::Mixer.3.gz
diff --git a/audio/p5-Audio-Musepack/Makefile b/audio/p5-Audio-Musepack/Makefile
index d84ef3de1a76..d9f47e50c8f5 100644
--- a/audio/p5-Audio-Musepack/Makefile
+++ b/audio/p5-Audio-Musepack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-Musepack
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-Musepack/pkg-plist b/audio/p5-Audio-Musepack/pkg-plist
index c816a1ae9151..8c0dabb63fae 100644
--- a/audio/p5-Audio-Musepack/pkg-plist
+++ b/audio/p5-Audio-Musepack/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/Audio/APE.pm
 %%SITE_PERL%%/Audio/APETags.pm
 %%SITE_PERL%%/Audio/Musepack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Musepack/.packlist
diff --git a/audio/p5-Audio-Scan/Makefile b/audio/p5-Audio-Scan/Makefile
index 4743dc974f08..00ff952c61f0 100644
--- a/audio/p5-Audio-Scan/Makefile
+++ b/audio/p5-Audio-Scan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-Scan
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AGRUNDMA
diff --git a/audio/p5-Audio-Scan/pkg-plist b/audio/p5-Audio-Scan/pkg-plist
index 4a8b71489a98..c1c85e9886a1 100644
--- a/audio/p5-Audio-Scan/pkg-plist
+++ b/audio/p5-Audio-Scan/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Audio::Scan.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Scan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/Scan.so
+%%SITE_ARCH%%/Audio/Scan.pm
+%%SITE_ARCH%%/auto/Audio/Scan/Scan.so
diff --git a/audio/p5-Audio-Scrobbler/Makefile b/audio/p5-Audio-Scrobbler/Makefile
index eeb69c25dff3..cfec54cfda51 100644
--- a/audio/p5-Audio-Scrobbler/Makefile
+++ b/audio/p5-Audio-Scrobbler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Audio-Scrobbler
 PORTVERSION=	0.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-Scrobbler/pkg-plist b/audio/p5-Audio-Scrobbler/pkg-plist
index 3afbe9bbbb2b..7ab954c0ffee 100644
--- a/audio/p5-Audio-Scrobbler/pkg-plist
+++ b/audio/p5-Audio-Scrobbler/pkg-plist
@@ -1,5 +1,4 @@
 bin/scrobbler-helper
 %%PERL5_MAN3%%/Audio::Scrobbler.3.gz
 %%SITE_PERL%%/Audio/Scrobbler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scrobbler/.packlist
 man/man1/scrobbler-helper.1.gz
diff --git a/audio/p5-Audio-WMA/Makefile b/audio/p5-Audio-WMA/Makefile
index 0dd8396c53a1..f840ecc0074f 100644
--- a/audio/p5-Audio-WMA/Makefile
+++ b/audio/p5-Audio-WMA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-WMA
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-WMA/pkg-plist b/audio/p5-Audio-WMA/pkg-plist
index a38b534607bd..3a8b321bf9ce 100644
--- a/audio/p5-Audio-WMA/pkg-plist
+++ b/audio/p5-Audio-WMA/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Audio::WMA.3.gz
 %%SITE_PERL%%/Audio/WMA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/WMA/.packlist
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index 3cf5effa9905..cbe70946a8b9 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-Wav
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio-Wav/pkg-plist b/audio/p5-Audio-Wav/pkg-plist
index 790c8527ca03..b89d13983dc4 100644
--- a/audio/p5-Audio-Wav/pkg-plist
+++ b/audio/p5-Audio-Wav/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Audio/Wav/Tools.pm
 %%SITE_PERL%%/Audio/Wav/Write.pm
 %%SITE_PERL%%/Audio/Wav/Write/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Wav/.packlist
diff --git a/audio/p5-Audio/Makefile b/audio/p5-Audio/Makefile
index 336804721cca..29a60851b909 100644
--- a/audio/p5-Audio/Makefile
+++ b/audio/p5-Audio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Audio
 PORTVERSION=	1.029
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Audio/pkg-plist b/audio/p5-Audio/pkg-plist
index 81c6445d0d08..9e1aca32d7af 100644
--- a/audio/p5-Audio/pkg-plist
+++ b/audio/p5-Audio/pkg-plist
@@ -2,33 +2,32 @@ bin/dial
 bin/morse
 bin/pplay
 bin/tkscope
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Audio.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Audio.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Audio.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Audio_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.0.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.1.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.2.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.3.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.4.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.5.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.6.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.7.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.8.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.9.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.pound.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data/touchtone.star.au
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Play.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Play/freebsd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Scope.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Data/Data.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Data/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Data/solve_polynomial.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Play/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Play/freebsd/freebsd.so
+%%SITE_ARCH%%/Audio/Audio.h
+%%SITE_ARCH%%/Audio/Audio.m
+%%SITE_ARCH%%/Audio/Audio.t
+%%SITE_ARCH%%/Audio/Audio_f.h
+%%SITE_ARCH%%/Audio/Data.pm
+%%SITE_ARCH%%/Audio/Data/touchtone.0.au
+%%SITE_ARCH%%/Audio/Data/touchtone.1.au
+%%SITE_ARCH%%/Audio/Data/touchtone.2.au
+%%SITE_ARCH%%/Audio/Data/touchtone.3.au
+%%SITE_ARCH%%/Audio/Data/touchtone.4.au
+%%SITE_ARCH%%/Audio/Data/touchtone.5.au
+%%SITE_ARCH%%/Audio/Data/touchtone.6.au
+%%SITE_ARCH%%/Audio/Data/touchtone.7.au
+%%SITE_ARCH%%/Audio/Data/touchtone.8.au
+%%SITE_ARCH%%/Audio/Data/touchtone.9.au
+%%SITE_ARCH%%/Audio/Data/touchtone.pound.au
+%%SITE_ARCH%%/Audio/Data/touchtone.star.au
+%%SITE_ARCH%%/Audio/Filter.pm
+%%SITE_ARCH%%/Audio/Play.pm
+%%SITE_ARCH%%/Audio/Play/freebsd.pm
+%%SITE_ARCH%%/Audio/typemap
+%%SITE_ARCH%%/Tk/Scope.pm
+%%SITE_ARCH%%/auto/Audio/Data/Data.so
+%%SITE_ARCH%%/auto/Audio/Data/autosplit.ix
+%%SITE_ARCH%%/auto/Audio/Data/solve_polynomial.al
+%%SITE_ARCH%%/auto/Audio/Play/autosplit.ix
+%%SITE_ARCH%%/auto/Audio/Play/freebsd/freebsd.so
 %%PERL5_MAN3%%/Audio::Play.3.gz
 %%PERL5_MAN3%%/Audio::Data.3.gz
diff --git a/audio/p5-CDDB-File/Makefile b/audio/p5-CDDB-File/Makefile
index 0c7da1e336f7..8e2aa2f33f42 100644
--- a/audio/p5-CDDB-File/Makefile
+++ b/audio/p5-CDDB-File/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CDDB-File
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-CDDB-File/pkg-plist b/audio/p5-CDDB-File/pkg-plist
index e65d14968323..009d012b5093 100644
--- a/audio/p5-CDDB-File/pkg-plist
+++ b/audio/p5-CDDB-File/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/CDDB::File.3.gz
 %%SITE_PERL%%/CDDB/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB/File/.packlist
diff --git a/audio/p5-CDDB/Makefile b/audio/p5-CDDB/Makefile
index c62ce1e3e858..72e821220046 100644
--- a/audio/p5-CDDB/Makefile
+++ b/audio/p5-CDDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CDDB
 PORTVERSION=	1.222
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-CDDB/pkg-plist b/audio/p5-CDDB/pkg-plist
index 81ea0197cb12..2efaf348f33b 100644
--- a/audio/p5-CDDB/pkg-plist
+++ b/audio/p5-CDDB/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/CDDB.3.gz
 %%SITE_PERL%%/CDDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB/.packlist
diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
index 39ecf512d427..8c8ca19d61cf 100644
--- a/audio/p5-CDDB_get/Makefile
+++ b/audio/p5-CDDB_get/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CDDB_get
 PORTVERSION=	2.28
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
diff --git a/audio/p5-CDDB_get/pkg-plist b/audio/p5-CDDB_get/pkg-plist
index 0e57f914a739..0ff8cdd55532 100644
--- a/audio/p5-CDDB_get/pkg-plist
+++ b/audio/p5-CDDB_get/pkg-plist
@@ -5,4 +5,3 @@ bin/cddb.pl
 %%SITE_PERL%%/auto/CDDB_cache/autosplit.ix
 %%SITE_PERL%%/auto/CDDB_get/autosplit.ix
 %%SITE_PERL%%/cddb.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB_get/.packlist
diff --git a/audio/p5-Filesys-Virtual-DAAP/Makefile b/audio/p5-Filesys-Virtual-DAAP/Makefile
index de150f2d18bd..b74c3681c893 100644
--- a/audio/p5-Filesys-Virtual-DAAP/Makefile
+++ b/audio/p5-Filesys-Virtual-DAAP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Filesys-Virtual-DAAP
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MIDI/Makefile b/audio/p5-MIDI/Makefile
index 65ff3d63c3be..7a3d04d63693 100644
--- a/audio/p5-MIDI/Makefile
+++ b/audio/p5-MIDI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIDI
 PORTVERSION=	0.83
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MIDI/pkg-plist b/audio/p5-MIDI/pkg-plist
index e5aeb60601e3..7ec0187e82fb 100644
--- a/audio/p5-MIDI/pkg-plist
+++ b/audio/p5-MIDI/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/MIDI/Score.pm
 %%SITE_PERL%%/MIDI/Simple.pm
 %%SITE_PERL%%/MIDI/Track.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIDI-Perl/.packlist
diff --git a/audio/p5-MP3-Find/Makefile b/audio/p5-MP3-Find/Makefile
index 298d117826bc..84a618dbd1ab 100644
--- a/audio/p5-MP3-Find/Makefile
+++ b/audio/p5-MP3-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MP3-Find
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MP3-Find/pkg-plist b/audio/p5-MP3-Find/pkg-plist
index 01bf1e5ed082..d52d275056bd 100644
--- a/audio/p5-MP3-Find/pkg-plist
+++ b/audio/p5-MP3-Find/pkg-plist
@@ -5,7 +5,6 @@ bin/mp3find
 %%SITE_PERL%%/MP3/Find/DB.pm
 %%SITE_PERL%%/MP3/Find/Filesystem.pm
 %%SITE_PERL%%/MP3/Find/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Find/.packlist
 %%PERL5_MAN3%%/MP3::Find.3.gz
 %%PERL5_MAN3%%/MP3::Find::Base.3.gz
 %%PERL5_MAN3%%/MP3::Find::DB.3.gz
diff --git a/audio/p5-MP3-ID3v1Tag/Makefile b/audio/p5-MP3-ID3v1Tag/Makefile
index 0187598246c6..f6ab89100c31 100644
--- a/audio/p5-MP3-ID3v1Tag/Makefile
+++ b/audio/p5-MP3-ID3v1Tag/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MP3-ID3v1Tag
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MP3-ID3v1Tag/pkg-plist b/audio/p5-MP3-ID3v1Tag/pkg-plist
index 12cc349010f9..eca1758e4c0a 100644
--- a/audio/p5-MP3-ID3v1Tag/pkg-plist
+++ b/audio/p5-MP3-ID3v1Tag/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MP3::ID3v1Tag.3.gz
 %%SITE_PERL%%/MP3/ID3v1Tag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag/.packlist
diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
index 00bfba3ea190..c5321cc46017 100644
--- a/audio/p5-MP3-Info/Makefile
+++ b/audio/p5-MP3-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MP3-Info
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MP3-Info/pkg-plist b/audio/p5-MP3-Info/pkg-plist
index ac4804f190ca..59a82933067f 100644
--- a/audio/p5-MP3-Info/pkg-plist
+++ b/audio/p5-MP3-Info/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MP3::Info.3.gz
 %%SITE_PERL%%/MP3/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Info/.packlist
diff --git a/audio/p5-MP3-Tag-Utils/Makefile b/audio/p5-MP3-Tag-Utils/Makefile
index 8cbcb51b46e9..4f67eb976dd1 100644
--- a/audio/p5-MP3-Tag-Utils/Makefile
+++ b/audio/p5-MP3-Tag-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MP3-Tag-Utils
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/audio/p5-MP3-Tag-Utils/pkg-plist b/audio/p5-MP3-Tag-Utils/pkg-plist
index 348add5bc41e..5028a7f95777 100644
--- a/audio/p5-MP3-Tag-Utils/pkg-plist
+++ b/audio/p5-MP3-Tag-Utils/pkg-plist
@@ -2,5 +2,4 @@ bin/mp3rename
 bin/mp3show
 bin/mp3tag
 %%SITE_PERL%%/MP3/Tag/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/Utils/.packlist
 %%PERL5_MAN3%%/MP3::Tag::Utils.3.gz
diff --git a/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
index 7984c4dbd022..f29252ce5744 100644
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MP3-Tag
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MP3-Tag/pkg-plist b/audio/p5-MP3-Tag/pkg-plist
index e8120ef3ced2..ae70f24c8109 100644
--- a/audio/p5-MP3-Tag/pkg-plist
+++ b/audio/p5-MP3-Tag/pkg-plist
@@ -22,7 +22,6 @@ bin/mp3info2
 %%SITE_PERL%%/Normalize/Text/Music_Fields/D_Shostakovich.comp
 %%SITE_PERL%%/Normalize/Text/Music_Fields.pm
 %%SITE_PERL%%/Encode/transliterate_win1251.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist
 %%PERL5_MAN3%%/MP3::Tag.3.gz
 %%PERL5_MAN3%%/MP3::Tag::CDDB_File.3.gz
 %%PERL5_MAN3%%/MP3::Tag::Cue.3.gz
diff --git a/audio/p5-MPEG-ID3v2Tag/Makefile b/audio/p5-MPEG-ID3v2Tag/Makefile
index 8d6b9d9222d2..3f85ff97bad1 100644
--- a/audio/p5-MPEG-ID3v2Tag/Makefile
+++ b/audio/p5-MPEG-ID3v2Tag/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MPEG-ID3v2Tag
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MPEG-ID3v2Tag/pkg-plist b/audio/p5-MPEG-ID3v2Tag/pkg-plist
index e6188a52d4da..a124033633af 100644
--- a/audio/p5-MPEG-ID3v2Tag/pkg-plist
+++ b/audio/p5-MPEG-ID3v2Tag/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MPEG::ID3v2Tag.3.gz
 %%SITE_PERL%%/MPEG/ID3v2Tag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MPEG/ID3v2Tag/.packlist
diff --git a/audio/p5-Music-Audioscrobbler-MPD/Makefile b/audio/p5-Music-Audioscrobbler-MPD/Makefile
index 94a7ef619f2b..29ee9e947b8c 100644
--- a/audio/p5-Music-Audioscrobbler-MPD/Makefile
+++ b/audio/p5-Music-Audioscrobbler-MPD/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Music-Audioscrobbler-MPD
 PORTVERSION=	0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Music-Audioscrobbler-MPD/pkg-plist b/audio/p5-Music-Audioscrobbler-MPD/pkg-plist
index 0a516a280b09..d51f8be04509 100644
--- a/audio/p5-Music-Audioscrobbler-MPD/pkg-plist
+++ b/audio/p5-Music-Audioscrobbler-MPD/pkg-plist
@@ -1,5 +1,4 @@
 bin/musicmpdscrobble
 %%SITE_PERL%%/Music/Audioscrobbler/MPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Music/Audioscrobbler/MPD/.packlist
 %%PERL5_MAN3%%/Music::Audioscrobbler::MPD.3.gz
 man/man1/musicmpdscrobble.1.gz
diff --git a/audio/p5-Music-Audioscrobbler-Submit/Makefile b/audio/p5-Music-Audioscrobbler-Submit/Makefile
index a199af311960..e6a7b47dc494 100644
--- a/audio/p5-Music-Audioscrobbler-Submit/Makefile
+++ b/audio/p5-Music-Audioscrobbler-Submit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Music-Audioscrobbler-Submit
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Music-Audioscrobbler-Submit/pkg-plist b/audio/p5-Music-Audioscrobbler-Submit/pkg-plist
index 97114b299313..667fecd8a818 100644
--- a/audio/p5-Music-Audioscrobbler-Submit/pkg-plist
+++ b/audio/p5-Music-Audioscrobbler-Submit/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Music/Audioscrobbler/Submit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Music/Audioscrobbler/Submit/.packlist
 %%PERL5_MAN3%%/Music::Audioscrobbler::Submit.3.gz
diff --git a/audio/p5-MusicBrainz-DiscID/Makefile b/audio/p5-MusicBrainz-DiscID/Makefile
index 8b0ae566407d..93719113b135 100644
--- a/audio/p5-MusicBrainz-DiscID/Makefile
+++ b/audio/p5-MusicBrainz-DiscID/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MusicBrainz-DiscID
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-MusicBrainz-DiscID/pkg-plist b/audio/p5-MusicBrainz-DiscID/pkg-plist
index a4028b3ead3e..15aeba71417a 100644
--- a/audio/p5-MusicBrainz-DiscID/pkg-plist
+++ b/audio/p5-MusicBrainz-DiscID/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/DiscID/DiscID.so
-%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/DiscID.pm
+%%SITE_ARCH%%/auto/MusicBrainz/DiscID/DiscID.so
+%%SITE_ARCH%%/MusicBrainz/DiscID.pm
 %%PERL5_MAN3%%/MusicBrainz::DiscID.3.gz
diff --git a/audio/p5-Net-DAAP-Client/Makefile b/audio/p5-Net-DAAP-Client/Makefile
index 74316eddf64b..f1b94f7740a6 100644
--- a/audio/p5-Net-DAAP-Client/Makefile
+++ b/audio/p5-Net-DAAP-Client/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-DAAP-Client
 PORTVERSION=	0.42
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Net-DAAP-DMAP/Makefile b/audio/p5-Net-DAAP-DMAP/Makefile
index 45651fecbbb1..622c610f4c5b 100644
--- a/audio/p5-Net-DAAP-DMAP/Makefile
+++ b/audio/p5-Net-DAAP-DMAP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-DAAP-DMAP
 PORTVERSION=	1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Net-DAAP-DMAP/pkg-plist b/audio/p5-Net-DAAP-DMAP/pkg-plist
index 461a4b9cbbd1..bba468330194 100644
--- a/audio/p5-Net-DAAP-DMAP/pkg-plist
+++ b/audio/p5-Net-DAAP-DMAP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/DAAP/DMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DAAP/DMAP/.packlist
 %%PERL5_MAN3%%/Net::DAAP::DMAP.3.gz
diff --git a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile
index 3850d3f53cf1..66cd97e01988 100644
--- a/audio/p5-Net-FreeDB/Makefile
+++ b/audio/p5-Net-FreeDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-FreeDB
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Net-FreeDB/pkg-plist b/audio/p5-Net-FreeDB/pkg-plist
index 0e16d5165c1e..e23f62834a2a 100644
--- a/audio/p5-Net-FreeDB/pkg-plist
+++ b/audio/p5-Net-FreeDB/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/FreeDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FreeDB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FreeDB/FreeDB.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FreeDB/autosplit.ix
+%%SITE_ARCH%%/Net/FreeDB.pm
+%%SITE_ARCH%%/auto/Net/FreeDB/FreeDB.so
+%%SITE_ARCH%%/auto/Net/FreeDB/autosplit.ix
 %%PERL5_MAN3%%/Net::FreeDB.3.gz
diff --git a/audio/p5-Net-LibLO/Makefile b/audio/p5-Net-LibLO/Makefile
index e7d30f74af44..a14a096bf532 100644
--- a/audio/p5-Net-LibLO/Makefile
+++ b/audio/p5-Net-LibLO/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Net-LibLO
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Net-LibLO/pkg-plist b/audio/p5-Net-LibLO/pkg-plist
index 4f8ae7a07e71..2021bc9dd3ef 100644
--- a/audio/p5-Net-LibLO/pkg-plist
+++ b/audio/p5-Net-LibLO/pkg-plist
@@ -1,9 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibLO/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/LibLO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/LibLO/Address.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/LibLO/Bundle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/LibLO/Message.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibLO/LibLO.so
+%%SITE_ARCH%%/Net/LibLO.pm
+%%SITE_ARCH%%/Net/LibLO/Address.pm
+%%SITE_ARCH%%/Net/LibLO/Bundle.pm
+%%SITE_ARCH%%/Net/LibLO/Message.pm
+%%SITE_ARCH%%/auto/Net/LibLO/LibLO.so
 %%PERL5_MAN3%%/Net::LibLO.3.gz
 %%PERL5_MAN3%%/Net::LibLO::Address.3.gz
 %%PERL5_MAN3%%/Net::LibLO::Bundle.3.gz
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
index 374f25f3e403..fa0315d6e685 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Ogg-Vorbis-Header-PurePerl
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=Ogg
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist b/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist
index 7ab3151324bf..06346d7ddd35 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Ogg/Vorbis/Header/PurePerl.pm
 %%SITE_PERL%%/Ogg/Vorbis/Header/ogginfo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header/PurePerl/.packlist
 %%PERL5_MAN3%%/Ogg::Vorbis::Header::PurePerl.3.gz
diff --git a/audio/p5-Ogg-Vorbis-Header/Makefile b/audio/p5-Ogg-Vorbis-Header/Makefile
index 807eb64c373e..0e42c624aa9f 100644
--- a/audio/p5-Ogg-Vorbis-Header/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Ogg-Vorbis-Header
 PORTVERSION=	0.03
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-Ogg-Vorbis-Header/pkg-plist b/audio/p5-Ogg-Vorbis-Header/pkg-plist
index 271a905f2c01..abb87fae0c21 100644
--- a/audio/p5-Ogg-Vorbis-Header/pkg-plist
+++ b/audio/p5-Ogg-Vorbis-Header/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Ogg/Vorbis/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header/Header.so
+%%SITE_ARCH%%/Ogg/Vorbis/Header.pm
+%%SITE_ARCH%%/auto/Ogg/Vorbis/Header/Header.so
 %%PERL5_MAN3%%/Ogg::Vorbis::Header.3.gz
diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile
index 346648e8e752..74a4bcdd7f10 100644
--- a/audio/p5-Shout/Makefile
+++ b/audio/p5-Shout/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Shout
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	http://downloads.us.xiph.org/releases/libshout/
 PKGNAMEPREFIX=	p5-
@@ -30,7 +30,7 @@ post-configure:
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Shout/Shout.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Shout/Shout.so
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/example*.pl ${STAGEDIR}${DOCSDIR}
 
diff --git a/audio/p5-Shout/pkg-plist b/audio/p5-Shout/pkg-plist
index 48048c513c6d..9a6c4c2ec3a6 100644
--- a/audio/p5-Shout/pkg-plist
+++ b/audio/p5-Shout/pkg-plist
@@ -1,9 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Shout.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout/Shout.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/example2.pl
+%%SITE_ARCH%%/Shout.pm
+%%SITE_ARCH%%/auto/Shout/Shout.so
+%%SITE_ARCH%%/auto/Shout/autosplit.ix
+%%SITE_ARCH%%/example.pl
+%%SITE_ARCH%%/example2.pl
 %%PERL5_MAN3%%/Shout.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/example.pl
 %%PORTDOCS%%%%DOCSDIR%%/example2.pl
diff --git a/audio/p5-Test-Corpus-Audio-MPD/Makefile b/audio/p5-Test-Corpus-Audio-MPD/Makefile
index 8df128a8de1f..ccda9d1882b3 100644
--- a/audio/p5-Test-Corpus-Audio-MPD/Makefile
+++ b/audio/p5-Test-Corpus-Audio-MPD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Corpus-Audio-MPD
 PORTVERSION=	1.120990
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index ef49d17a562e..6cdf6b957274 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	0.05
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FOOF
diff --git a/audio/p5-libvorbis/pkg-plist b/audio/p5-libvorbis/pkg-plist
index 4ceaf168a71a..13901733df82 100644
--- a/audio/p5-libvorbis/pkg-plist
+++ b/audio/p5-libvorbis/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Ogg::Vorbis.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Ogg/Vorbis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/autosplit.ix
+%%SITE_ARCH%%/Ogg/Vorbis.pm
+%%SITE_ARCH%%/auto/Ogg/Vorbis/Vorbis.so
+%%SITE_ARCH%%/auto/Ogg/Vorbis/autosplit.ix
diff --git a/audio/p5-tagged/Makefile b/audio/p5-tagged/Makefile
index 5866124ee18d..4bde064bd996 100644
--- a/audio/p5-tagged/Makefile
+++ b/audio/p5-tagged/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tagged
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN/MP3 \
 		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/p5-tagged/pkg-plist b/audio/p5-tagged/pkg-plist
index 6c7cf29ae476..84fd0e4890a7 100644
--- a/audio/p5-tagged/pkg-plist
+++ b/audio/p5-tagged/pkg-plist
@@ -7,4 +7,3 @@
 %%SITE_PERL%%/MP3/Tag/File.pm
 %%SITE_PERL%%/MP3/Tag/ID3v1.pm
 %%SITE_PERL%%/MP3/Tag/ID3v2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist
diff --git a/audio/p5-xmms2/Makefile b/audio/p5-xmms2/Makefile
index 61d4737fa014..d159513fdd29 100644
--- a/audio/p5-xmms2/Makefile
+++ b/audio/p5-xmms2/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexander Botero-Lowry <alexbl@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 PKGNAMEPREFIX=	p5-
 
diff --git a/audio/p5-xmms2/pkg-plist b/audio/p5-xmms2/pkg-plist
index 2fae424b4a93..a828b9858916 100644
--- a/audio/p5-xmms2/pkg-plist
+++ b/audio/p5-xmms2/pkg-plist
@@ -1,9 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Collection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Glib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Sync.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient/XMMSClient.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Collection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Playlist.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Result.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient.pod
+%%SITE_ARCH%%/Audio/XMMSClient.pm
+%%SITE_ARCH%%/Audio/XMMSClient/Collection.pm
+%%SITE_ARCH%%/Audio/XMMSClient/Glib.pm
+%%SITE_ARCH%%/Audio/XMMSClient/Sync.pm
+%%SITE_ARCH%%/auto/Audio/XMMSClient/XMMSClient.so
+%%SITE_ARCH%%/Audio/XMMSClient/Collection.pod
+%%SITE_ARCH%%/Audio/XMMSClient/Playlist.pod
+%%SITE_ARCH%%/Audio/XMMSClient/Result.pod
+%%SITE_ARCH%%/Audio/XMMSClient.pod
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index f4f7920f2af4..be8b4ce124bd 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squeezeboxserver
 PORTVERSION=	7.5.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.slimdevices.com/SqueezeboxServer_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-noCPAN
diff --git a/benchmarks/p5-Benchmark-Forking/Makefile b/benchmarks/p5-Benchmark-Forking/Makefile
index 993ec8ab0338..c80efac3dd7a 100644
--- a/benchmarks/p5-Benchmark-Forking/Makefile
+++ b/benchmarks/p5-Benchmark-Forking/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Benchmark-Forking
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	benchmarks perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Benchmark
diff --git a/benchmarks/p5-Benchmark-Forking/pkg-plist b/benchmarks/p5-Benchmark-Forking/pkg-plist
index 74d5c57fbd1e..649a87b551db 100644
--- a/benchmarks/p5-Benchmark-Forking/pkg-plist
+++ b/benchmarks/p5-Benchmark-Forking/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark/Forking/.packlist
 %%SITE_PERL%%/Benchmark/Forking.pm
 %%PERL5_MAN3%%/Benchmark::Forking.3.gz
diff --git a/benchmarks/p5-Benchmark-Stopwatch/Makefile b/benchmarks/p5-Benchmark-Stopwatch/Makefile
index ede49411a18e..4ddb96ecb84d 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/Makefile
+++ b/benchmarks/p5-Benchmark-Stopwatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Benchmark-Stopwatch
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	benchmarks perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Benchmark
diff --git a/benchmarks/p5-Benchmark-Stopwatch/pkg-plist b/benchmarks/p5-Benchmark-Stopwatch/pkg-plist
index e2c7f86d1d0e..d6030a9eb1f1 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/pkg-plist
+++ b/benchmarks/p5-Benchmark-Stopwatch/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Benchmark::Stopwatch.3.gz
 %%SITE_PERL%%/Benchmark/Stopwatch.pm
 %%SITE_PERL%%/Benchmark/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark/Stopwatch/.packlist
diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile
index 2b4b08201a56..c2811aba4af0 100644
--- a/biology/p5-AcePerl/Makefile
+++ b/biology/p5-AcePerl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	AcePerl
 PORTVERSION=	1.92
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Ace
diff --git a/biology/p5-AcePerl/pkg-plist b/biology/p5-AcePerl/pkg-plist
index 3ac0b3ad9024..8b3ea9e627b5 100644
--- a/biology/p5-AcePerl/pkg-plist
+++ b/biology/p5-AcePerl/pkg-plist
@@ -1,113 +1,112 @@
 bin/ace.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/AceSubs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/GeneSubs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/SearchSubs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/SiteDefs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/TreeSubs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Freesubs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Fk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/anchored_arrow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/arrow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/box.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/crossbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/dot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/ex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/graded_segments.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/group.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/line.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/primers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/segments.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/span.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/toomany.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/transcript.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/triangle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/GlyphFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Panel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Track.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Local.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Model.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Object/Wormbase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/RPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Feature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/FeatureList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/GappedAlignment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Gene.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Homol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Multi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Transcript.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ace/SocketServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GFF/Filehandle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Freesubs/Freesubs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asAce.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asHTML.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asTable.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asXML.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_default_makeHTML.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_insert.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_special_dump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_to_ace_date.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_xmlNumber.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/add_row.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/add_tree.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asAce.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asDNA.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asGif.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asHTML.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asPeptide.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asString.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asTable.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asXML.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/comment.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/commit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/date_style.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/debug.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/delete.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/escapeXML.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/isComment.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/kill.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/replace.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/rollback.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/tags.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/timestamp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/RPC/RPC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence/Feature/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_register_iterator.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_restore_iterator.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_save_iterator.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_unregister_iterator.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/auto_save.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/class_count.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/classes.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/date.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/date_style.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/datetime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/debug.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/fetch_many.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/find.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/freeprotect.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/grep.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/layout.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/parse.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/parse_file.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/parse_longtext.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/pick.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/ping.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/put.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/split.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/status.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/timestamps.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/title.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/version.al
+%%SITE_ARCH%%/Ace.pm
+%%SITE_ARCH%%/Ace/Browser/AceSubs.pm
+%%SITE_ARCH%%/Ace/Browser/GeneSubs.pm
+%%SITE_ARCH%%/Ace/Browser/SearchSubs.pm
+%%SITE_ARCH%%/Ace/Browser/SiteDefs.pm
+%%SITE_ARCH%%/Ace/Browser/TreeSubs.pm
+%%SITE_ARCH%%/Ace/Freesubs.pm
+%%SITE_ARCH%%/Ace/Graphics/Fk.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/anchored_arrow.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/arrow.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/box.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/crossbox.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/dot.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/ex.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/graded_segments.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/group.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/line.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/primers.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/segments.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/span.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/toomany.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/transcript.pm
+%%SITE_ARCH%%/Ace/Graphics/Glyph/triangle.pm
+%%SITE_ARCH%%/Ace/Graphics/GlyphFactory.pm
+%%SITE_ARCH%%/Ace/Graphics/Panel.pm
+%%SITE_ARCH%%/Ace/Graphics/Track.pm
+%%SITE_ARCH%%/Ace/Iterator.pm
+%%SITE_ARCH%%/Ace/Local.pm
+%%SITE_ARCH%%/Ace/Model.pm
+%%SITE_ARCH%%/Ace/Object.pm
+%%SITE_ARCH%%/Ace/Object/Wormbase.pm
+%%SITE_ARCH%%/Ace/RPC.pm
+%%SITE_ARCH%%/Ace/Sequence.pm
+%%SITE_ARCH%%/Ace/Sequence/Feature.pm
+%%SITE_ARCH%%/Ace/Sequence/FeatureList.pm
+%%SITE_ARCH%%/Ace/Sequence/GappedAlignment.pm
+%%SITE_ARCH%%/Ace/Sequence/Gene.pm
+%%SITE_ARCH%%/Ace/Sequence/Homol.pm
+%%SITE_ARCH%%/Ace/Sequence/Multi.pm
+%%SITE_ARCH%%/Ace/Sequence/Transcript.pm
+%%SITE_ARCH%%/Ace/SocketServer.pm
+%%SITE_ARCH%%/GFF/Filehandle.pm
+%%SITE_ARCH%%/auto/Ace/Freesubs/Freesubs.so
+%%SITE_ARCH%%/auto/Ace/Object/_asAce.al
+%%SITE_ARCH%%/auto/Ace/Object/_asHTML.al
+%%SITE_ARCH%%/auto/Ace/Object/_asTable.al
+%%SITE_ARCH%%/auto/Ace/Object/_asXML.al
+%%SITE_ARCH%%/auto/Ace/Object/_default_makeHTML.al
+%%SITE_ARCH%%/auto/Ace/Object/_insert.al
+%%SITE_ARCH%%/auto/Ace/Object/_special_dump.al
+%%SITE_ARCH%%/auto/Ace/Object/_to_ace_date.al
+%%SITE_ARCH%%/auto/Ace/Object/_xmlNumber.al
+%%SITE_ARCH%%/auto/Ace/Object/add_row.al
+%%SITE_ARCH%%/auto/Ace/Object/add_tree.al
+%%SITE_ARCH%%/auto/Ace/Object/asAce.al
+%%SITE_ARCH%%/auto/Ace/Object/asDNA.al
+%%SITE_ARCH%%/auto/Ace/Object/asGif.al
+%%SITE_ARCH%%/auto/Ace/Object/asHTML.al
+%%SITE_ARCH%%/auto/Ace/Object/asPeptide.al
+%%SITE_ARCH%%/auto/Ace/Object/asString.al
+%%SITE_ARCH%%/auto/Ace/Object/asTable.al
+%%SITE_ARCH%%/auto/Ace/Object/asXML.al
+%%SITE_ARCH%%/auto/Ace/Object/autosplit.ix
+%%SITE_ARCH%%/auto/Ace/Object/comment.al
+%%SITE_ARCH%%/auto/Ace/Object/commit.al
+%%SITE_ARCH%%/auto/Ace/Object/date_style.al
+%%SITE_ARCH%%/auto/Ace/Object/debug.al
+%%SITE_ARCH%%/auto/Ace/Object/delete.al
+%%SITE_ARCH%%/auto/Ace/Object/escapeXML.al
+%%SITE_ARCH%%/auto/Ace/Object/isComment.al
+%%SITE_ARCH%%/auto/Ace/Object/kill.al
+%%SITE_ARCH%%/auto/Ace/Object/replace.al
+%%SITE_ARCH%%/auto/Ace/Object/rollback.al
+%%SITE_ARCH%%/auto/Ace/Object/tags.al
+%%SITE_ARCH%%/auto/Ace/Object/timestamp.al
+%%SITE_ARCH%%/auto/Ace/RPC/RPC.so
+%%SITE_ARCH%%/auto/Ace/Sequence/Feature/autosplit.ix
+%%SITE_ARCH%%/auto/Ace/Sequence/autosplit.ix
+%%SITE_ARCH%%/auto/Ace/_register_iterator.al
+%%SITE_ARCH%%/auto/Ace/_restore_iterator.al
+%%SITE_ARCH%%/auto/Ace/_save_iterator.al
+%%SITE_ARCH%%/auto/Ace/_unregister_iterator.al
+%%SITE_ARCH%%/auto/Ace/auto_save.al
+%%SITE_ARCH%%/auto/Ace/autosplit.ix
+%%SITE_ARCH%%/auto/Ace/class_count.al
+%%SITE_ARCH%%/auto/Ace/classes.al
+%%SITE_ARCH%%/auto/Ace/date.al
+%%SITE_ARCH%%/auto/Ace/date_style.al
+%%SITE_ARCH%%/auto/Ace/datetime.al
+%%SITE_ARCH%%/auto/Ace/debug.al
+%%SITE_ARCH%%/auto/Ace/fetch_many.al
+%%SITE_ARCH%%/auto/Ace/find.al
+%%SITE_ARCH%%/auto/Ace/freeprotect.al
+%%SITE_ARCH%%/auto/Ace/grep.al
+%%SITE_ARCH%%/auto/Ace/layout.al
+%%SITE_ARCH%%/auto/Ace/new.al
+%%SITE_ARCH%%/auto/Ace/parse.al
+%%SITE_ARCH%%/auto/Ace/parse_file.al
+%%SITE_ARCH%%/auto/Ace/parse_longtext.al
+%%SITE_ARCH%%/auto/Ace/pick.al
+%%SITE_ARCH%%/auto/Ace/ping.al
+%%SITE_ARCH%%/auto/Ace/put.al
+%%SITE_ARCH%%/auto/Ace/split.al
+%%SITE_ARCH%%/auto/Ace/status.al
+%%SITE_ARCH%%/auto/Ace/timestamps.al
+%%SITE_ARCH%%/auto/Ace/title.al
+%%SITE_ARCH%%/auto/Ace/version.al
 %%PERL5_MAN3%%/Ace.3.gz
 %%PERL5_MAN3%%/Ace::Browser::AceSubs.3.gz
 %%PERL5_MAN3%%/Ace::Browser::SearchSubs.3.gz
diff --git a/biology/p5-Bio-ASN1-EntrezGene/Makefile b/biology/p5-Bio-ASN1-EntrezGene/Makefile
index e9a3ff4706b9..3128b0bf287b 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/Makefile
+++ b/biology/p5-Bio-ASN1-EntrezGene/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bio-ASN1-EntrezGene
 PORTVERSION=	1.091
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-ASN1-EntrezGene/pkg-plist b/biology/p5-Bio-ASN1-EntrezGene/pkg-plist
index 4014f2c6c051..93ec702b33f3 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/pkg-plist
+++ b/biology/p5-Bio-ASN1-EntrezGene/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Bio/ASN1/EntrezGene/Indexer.pm
 %%SITE_PERL%%/Bio/ASN1/Sequence.pm
 %%SITE_PERL%%/Bio/ASN1/Sequence/Indexer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/ASN1/EntrezGene/.packlist
 %%PERL5_MAN3%%/Bio::ASN1::EntrezGene.3.gz
 %%PERL5_MAN3%%/Bio::ASN1::EntrezGene::Indexer.3.gz
 %%PERL5_MAN3%%/Bio::ASN1::Sequence.3.gz
diff --git a/biology/p5-Bio-Das-Lite/Makefile b/biology/p5-Bio-Das-Lite/Makefile
index 2eee0e238e50..73b80589b8f6 100644
--- a/biology/p5-Bio-Das-Lite/Makefile
+++ b/biology/p5-Bio-Das-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bio-Das-Lite
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-Das/Makefile b/biology/p5-Bio-Das/Makefile
index 1d4072d3d466..75777ff55cae 100644
--- a/biology/p5-Bio-Das/Makefile
+++ b/biology/p5-Bio-Das/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Bio-Das
 PORTVERSION=	1.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-Das/pkg-plist b/biology/p5-Bio-Das/pkg-plist
index a67510c448d1..964ca2c88bff 100644
--- a/biology/p5-Bio-Das/pkg-plist
+++ b/biology/p5-Bio-Das/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Das/.packlist
 %%SITE_PERL%%/Bio/Das.pm
 %%SITE_PERL%%/Bio/Das/DSN.pm
 %%SITE_PERL%%/Bio/Das/Request.pm
diff --git a/biology/p5-Bio-GFF3/Makefile b/biology/p5-Bio-GFF3/Makefile
index e601a9aa03f7..42e857150553 100644
--- a/biology/p5-Bio-GFF3/Makefile
+++ b/biology/p5-Bio-GFF3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Bio-GFF3
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-GFF3/pkg-plist b/biology/p5-Bio-GFF3/pkg-plist
index b8448e9b489d..5aac13a355e5 100644
--- a/biology/p5-Bio-GFF3/pkg-plist
+++ b/biology/p5-Bio-GFF3/pkg-plist
@@ -4,7 +4,6 @@ bin/gff3_from_fasta
 %%SITE_PERL%%/Bio/GFF3/LowLevel/Parser/1_0_backcompat.pm
 %%SITE_PERL%%/Bio/GFF3/Transform/FromFasta.pm
 %%SITE_PERL%%/Bio/GFF3/Transform/SyncDirectives.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/GFF3/.packlist
 %%PERL5_MAN3%%/Bio::GFF3::LowLevel.3.gz
 %%PERL5_MAN3%%/Bio::GFF3::LowLevel::Parser.3.gz
 %%PERL5_MAN3%%/Bio::GFF3::LowLevel::Parser::1_0_backcompat.3.gz
diff --git a/biology/p5-Bio-Glite/Makefile b/biology/p5-Bio-Glite/Makefile
index 72cc005a3ff8..d8c4e60be310 100644
--- a/biology/p5-Bio-Glite/Makefile
+++ b/biology/p5-Bio-Glite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Bio-Glite
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-Glite/pkg-plist b/biology/p5-Bio-Glite/pkg-plist
index e3d6145ee56c..259cb4ffa6f3 100644
--- a/biology/p5-Bio-Glite/pkg-plist
+++ b/biology/p5-Bio-Glite/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Glite/.packlist
 %%SITE_PERL%%/Bio/Glite.pm
 %%PERL5_MAN3%%/Bio::Glite.3.gz
diff --git a/biology/p5-Bio-Graphics/Makefile b/biology/p5-Bio-Graphics/Makefile
index 956a14bca537..2a11c4d43576 100644
--- a/biology/p5-Bio-Graphics/Makefile
+++ b/biology/p5-Bio-Graphics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bio-Graphics
 PORTVERSION=	2.38
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-MAGETAB/Makefile b/biology/p5-Bio-MAGETAB/Makefile
index d71995b281d1..6fc139d50a68 100644
--- a/biology/p5-Bio-MAGETAB/Makefile
+++ b/biology/p5-Bio-MAGETAB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bio-MAGETAB
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-MAGETAB/pkg-plist b/biology/p5-Bio-MAGETAB/pkg-plist
index dc6cee706cc3..14895b84aeb0 100644
--- a/biology/p5-Bio-MAGETAB/pkg-plist
+++ b/biology/p5-Bio-MAGETAB/pkg-plist
@@ -2,7 +2,6 @@ bin/deploy_magetab_db.pl
 bin/fix_ae_magetab.pl
 bin/read_magetab.pl
 bin/unload_magetab_namespace.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/MAGETAB/.packlist
 %%SITE_PERL%%/Bio/MAGETAB/Util/Reader/DataMatrix.pm
 %%SITE_PERL%%/Bio/MAGETAB/Util/Reader/TagValueFile.pm
 %%SITE_PERL%%/Bio/MAGETAB/Util/Reader/Tabfile.pm
diff --git a/biology/p5-Bio-NEXUS/Makefile b/biology/p5-Bio-NEXUS/Makefile
index e0939852cde2..8cc58db52931 100644
--- a/biology/p5-Bio-NEXUS/Makefile
+++ b/biology/p5-Bio-NEXUS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bio-NEXUS
 PORTVERSION=	0.78
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-NEXUS/pkg-plist b/biology/p5-Bio-NEXUS/pkg-plist
index 76b687a4ebb3..933493e67e5a 100644
--- a/biology/p5-Bio-NEXUS/pkg-plist
+++ b/biology/p5-Bio-NEXUS/pkg-plist
@@ -29,7 +29,6 @@ bin/nextool.pl
 %%SITE_PERL%%/Bio/NEXUS/Util/Exceptions.pm
 %%SITE_PERL%%/Bio/NEXUS/Util/Logger.pm
 %%SITE_PERL%%/Bio/NEXUS/WeightSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/NEXUS/.packlist
 %%PERL5_MAN3%%/Bio::NEXUS.3.gz
 %%PERL5_MAN3%%/Bio::NEXUS::AssumptionsBlock.3.gz
 %%PERL5_MAN3%%/Bio::NEXUS::Block.3.gz
diff --git a/biology/p5-Bio-Phylo/Makefile b/biology/p5-Bio-Phylo/Makefile
index 6e07cfade123..81cf4f7f3494 100644
--- a/biology/p5-Bio-Phylo/Makefile
+++ b/biology/p5-Bio-Phylo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bio-Phylo
 PORTVERSION=	0.56
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-Phylo/pkg-plist b/biology/p5-Bio-Phylo/pkg-plist
index c353f68e831c..671eb4ae3bd5 100644
--- a/biology/p5-Bio-Phylo/pkg-plist
+++ b/biology/p5-Bio-Phylo/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Phylo/.packlist
 %%SITE_PERL%%/Bio/Phylo.pm
 %%SITE_PERL%%/Bio/Phylo/EvolutionaryModels.pm
 %%SITE_PERL%%/Bio/Phylo/Factory.pm
diff --git a/biology/p5-Bio-SCF/Makefile b/biology/p5-Bio-SCF/Makefile
index fb055f5a202b..7a6d05896f77 100644
--- a/biology/p5-Bio-SCF/Makefile
+++ b/biology/p5-Bio-SCF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bio-SCF
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-Bio-SCF/pkg-plist b/biology/p5-Bio-SCF/pkg-plist
index 34287acfedd0..25370a67bab4 100644
--- a/biology/p5-Bio-SCF/pkg-plist
+++ b/biology/p5-Bio-SCF/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Bio/SCF/Arrays.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Bio/SCF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/SCF/SCF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/SCF/.packlist
+%%SITE_ARCH%%/Bio/SCF/Arrays.pm
+%%SITE_ARCH%%/Bio/SCF.pm
+%%SITE_ARCH%%/auto/Bio/SCF/SCF.so
 %%PERL5_MAN3%%/Bio::SCF.3.gz
diff --git a/biology/p5-bioperl-run/Makefile b/biology/p5-bioperl-run/Makefile
index f5f14b13fdb4..bfae420c62d1 100644
--- a/biology/p5-bioperl-run/Makefile
+++ b/biology/p5-bioperl-run/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bioperl-run
 PORTVERSION=	1.6.901
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 PKGNAMEPREFIX=	p5-
 
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index 7f2a9ff819ee..6eda916ff372 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bioperl
 PORTVERSION=	1.6.924
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CJFIELDS
diff --git a/biology/velvet/Makefile b/biology/velvet/Makefile
index 200cf9f0a3cc..f49cdca0428b 100644
--- a/biology/velvet/Makefile
+++ b/biology/velvet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	velvet
 PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	http://www.ebi.ac.uk/~zerbino/velvet/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/cad/p5-GDS2/Makefile b/cad/p5-GDS2/Makefile
index 0b15a11b7b43..3f580a1bb011 100644
--- a/cad/p5-GDS2/Makefile
+++ b/cad/p5-GDS2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	GDS2
 PORTVERSION=	3.29
+PORTREVISION=	1
 CATEGORIES=	cad perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,11 +18,9 @@ RUN_DEPENDS=	p5-Tk>=804.027:${PORTSDIR}/x11-toolkits/p5-Tk \
 USES=		perl5 shebangfix
 USE_PERL5=	configure
 SHEBANG_FILES=	Examples/*
-PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDS2/.packlist \
-		%%SITE_PERL%%/GDS2.pm \
+PLIST_FILES=	%%SITE_PERL%%/GDS2.pm \
 		${PROGRAMS:S,^,bin/,} \
 		%%PERL5_MAN3%%/GDS2.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDS2
 
 PROGRAMS=	gds2dump gdsdump2gds modgds2 gdslayers testgds2 \
 		gdspath4topath0 testgdt
diff --git a/cad/p5-Verilog-Perl/Makefile b/cad/p5-Verilog-Perl/Makefile
index 2d119981ccda..2d7115e4b5d5 100644
--- a/cad/p5-Verilog-Perl/Makefile
+++ b/cad/p5-Verilog-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Verilog-Perl
 PORTVERSION=	3.404
+PORTREVISION=	1
 CATEGORIES=	cad perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -22,7 +23,7 @@ CONFIGURE_ENV=	CXX=${CXX}\
 .include <bsd.port.pre.mk>
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Verilog/Parser/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Verilog/Parser/*.so
 
 regression-test: build
 	make test -C ${WRKSRC}
diff --git a/cad/p5-Verilog-Perl/pkg-plist b/cad/p5-Verilog-Perl/pkg-plist
index 7aed586e8439..6bb05857ad83 100644
--- a/cad/p5-Verilog-Perl/pkg-plist
+++ b/cad/p5-Verilog-Perl/pkg-plist
@@ -24,30 +24,29 @@ bin/vsplitmodule
 %%PERL5_MAN3%%/Verilog::SigParser.3.gz
 %%PERL5_MAN3%%/Verilog::Std.3.gz
 %%PERL5_MAN3%%/Verilog::Verilog-Perl.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/EditFiles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Getopt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Language.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Cell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/ContAssign.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Defparam.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Interface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Logger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/ModPort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Module.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Pin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Port.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Subclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Preproc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/SigParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Std.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Verilog-Perl.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Verilog/Language/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Verilog/Parser/Parser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Verilog/Preproc/Preproc.so
+%%SITE_ARCH%%/Verilog/EditFiles.pm
+%%SITE_ARCH%%/Verilog/Getopt.pm
+%%SITE_ARCH%%/Verilog/Language.pm
+%%SITE_ARCH%%/Verilog/Netlist.pm
+%%SITE_ARCH%%/Verilog/Netlist/Cell.pm
+%%SITE_ARCH%%/Verilog/Netlist/ContAssign.pm
+%%SITE_ARCH%%/Verilog/Netlist/Defparam.pm
+%%SITE_ARCH%%/Verilog/Netlist/File.pm
+%%SITE_ARCH%%/Verilog/Netlist/Interface.pm
+%%SITE_ARCH%%/Verilog/Netlist/Logger.pm
+%%SITE_ARCH%%/Verilog/Netlist/ModPort.pm
+%%SITE_ARCH%%/Verilog/Netlist/Module.pm
+%%SITE_ARCH%%/Verilog/Netlist/Net.pm
+%%SITE_ARCH%%/Verilog/Netlist/Pin.pm
+%%SITE_ARCH%%/Verilog/Netlist/Port.pm
+%%SITE_ARCH%%/Verilog/Netlist/Subclass.pm
+%%SITE_ARCH%%/Verilog/Parser.pm
+%%SITE_ARCH%%/Verilog/Preproc.pm
+%%SITE_ARCH%%/Verilog/SigParser.pm
+%%SITE_ARCH%%/Verilog/Std.pm
+%%SITE_ARCH%%/Verilog/Verilog-Perl.pod
+%%SITE_ARCH%%/auto/Verilog/Parser/Parser.so
+%%SITE_ARCH%%/auto/Verilog/Preproc/Preproc.so
 man/man1/vhier.1.gz
 man/man1/vpassert.1.gz
 man/man1/vppreproc.1.gz
diff --git a/chinese/oicq/Makefile b/chinese/oicq/Makefile
index 2339e24c9335..df6facb7b795 100644
--- a/chinese/oicq/Makefile
+++ b/chinese/oicq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	oicq
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	chinese net
 MASTER_SITES=	SF/perl-${PORTNAME}/perl-${PORTNAME}/Net-OICQ-${PORTVERSION}
 DISTNAME=	Net-OICQ-${PORTVERSION}
diff --git a/chinese/oicq/pkg-plist b/chinese/oicq/pkg-plist
index de7d3db2d765..5da9c6e49aaf 100644
--- a/chinese/oicq/pkg-plist
+++ b/chinese/oicq/pkg-plist
@@ -6,4 +6,3 @@ bin/qq-demo1
 %%SITE_PERL%%/Net/OICQ/Event.pm
 %%SITE_PERL%%/Net/OICQ/ServerEvent.pm
 %%SITE_PERL%%/Net/OICQ/TextConsole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ/.packlist
diff --git a/chinese/p5-Date-Chinese/Makefile b/chinese/p5-Date-Chinese/Makefile
index 332a8341b679..78b1b63ddc4a 100644
--- a/chinese/p5-Date-Chinese/Makefile
+++ b/chinese/p5-Date-Chinese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Chinese
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RBOW
diff --git a/chinese/p5-Date-Chinese/pkg-plist b/chinese/p5-Date-Chinese/pkg-plist
index 2ad48f651be1..e2b9c62db65d 100644
--- a/chinese/p5-Date-Chinese/pkg-plist
+++ b/chinese/p5-Date-Chinese/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::Chinese.3.gz
 %%SITE_PERL%%/Date/Chinese.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese/.packlist
diff --git a/chinese/p5-Encode-CNMap/Makefile b/chinese/p5-Encode-CNMap/Makefile
index 905c617f2b6b..416c5196d07c 100644
--- a/chinese/p5-Encode-CNMap/Makefile
+++ b/chinese/p5-Encode-CNMap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-CNMap
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Encode-CNMap/pkg-plist b/chinese/p5-Encode-CNMap/pkg-plist
index f10f3a36fbe7..be85dd3c4789 100644
--- a/chinese/p5-Encode-CNMap/pkg-plist
+++ b/chinese/p5-Encode-CNMap/pkg-plist
@@ -1,11 +1,10 @@
 bin/cnmap
 bin/cnmapdir
 bin/cnmapwx
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap/cnmapwx.wdr
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap/cnmapwx_wdr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap/CNMap.so
+%%SITE_ARCH%%/Encode/CNMap.pm
+%%SITE_ARCH%%/Encode/CNMap/cnmapwx.wdr
+%%SITE_ARCH%%/Encode/CNMap/cnmapwx_wdr.pl
+%%SITE_ARCH%%/auto/Encode/CNMap/CNMap.so
 man/man1/cnmap.1.gz
 man/man1/cnmapdir.1.gz
 man/man1/cnmapwx.1.gz
diff --git a/chinese/p5-Encode-HanConvert/Makefile b/chinese/p5-Encode-HanConvert/Makefile
index 6d0aa5f1ec4d..97a935a71796 100644
--- a/chinese/p5-Encode-HanConvert/Makefile
+++ b/chinese/p5-Encode-HanConvert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-HanConvert
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index f1b14bd1b959..d8de4effe832 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -2,8 +2,7 @@ bin/b2g.pl
 bin/g2b.pl
 man/man1/b2g.pl.1.gz
 man/man1/g2b.pl.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm-orig
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/HanConvert.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/.packlist
+%%SITE_ARCH%%/Encode/HanConvert.pm
+%%SITE_ARCH%%/Encode/HanConvert/Perl.pm
+%%SITE_ARCH%%/Encode/HanConvert/Perl.pm-orig
+%%SITE_ARCH%%/auto/Encode/HanConvert/HanConvert.so
diff --git a/chinese/p5-Encode-HanExtra/Makefile b/chinese/p5-Encode-HanExtra/Makefile
index 02d7162fd3d7..271cecc31631 100644
--- a/chinese/p5-Encode-HanExtra/Makefile
+++ b/chinese/p5-Encode-HanExtra/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-HanExtra
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Encode-HanExtra/pkg-plist b/chinese/p5-Encode-HanExtra/pkg-plist
index 58cbebdee063..ab64280b9254 100644
--- a/chinese/p5-Encode-HanExtra/pkg-plist
+++ b/chinese/p5-Encode-HanExtra/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/Encode::HanExtra.3.gz
 %%PERL5_MAN3%%/Encode::TW::Unisys::SOSI1.3.gz
 %%PERL5_MAN3%%/Encode::TW::Unisys::SOSI2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanExtra.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/HanExtra.so
+%%SITE_ARCH%%/Encode/HanExtra.pm
+%%SITE_ARCH%%/Encode/TW/Unisys/SOSI1.pm
+%%SITE_ARCH%%/Encode/TW/Unisys/SOSI2.pm
+%%SITE_ARCH%%/auto/Encode/HanExtra/HanExtra.so
diff --git a/chinese/p5-Lingua-Han-PinYin/Makefile b/chinese/p5-Lingua-Han-PinYin/Makefile
index 75e183002ee7..46d4c88c3c84 100644
--- a/chinese/p5-Lingua-Han-PinYin/Makefile
+++ b/chinese/p5-Lingua-Han-PinYin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Han-PinYin
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-Han-PinYin/pkg-plist b/chinese/p5-Lingua-Han-PinYin/pkg-plist
index 0a20bf92c1d5..0ca99bf86611 100644
--- a/chinese/p5-Lingua-Han-PinYin/pkg-plist
+++ b/chinese/p5-Lingua-Han-PinYin/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Lingua::Han::PinYin.3.gz
 %%SITE_PERL%%/Lingua/Han/PinYin.pm
 %%SITE_PERL%%/Lingua/Han/PinYin/Mandarin.dat
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/PinYin/.packlist
diff --git a/chinese/p5-Lingua-Han-Utils/Makefile b/chinese/p5-Lingua-Han-Utils/Makefile
index acee801f42ae..27fe783743ce 100644
--- a/chinese/p5-Lingua-Han-Utils/Makefile
+++ b/chinese/p5-Lingua-Han-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Han-Utils
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-Han-Utils/pkg-plist b/chinese/p5-Lingua-Han-Utils/pkg-plist
index a7d8db3d75ce..9c895460e5ee 100644
--- a/chinese/p5-Lingua-Han-Utils/pkg-plist
+++ b/chinese/p5-Lingua-Han-Utils/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::Han::Utils.3.gz
 %%SITE_PERL%%/Lingua/Han/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/Utils/.packlist
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
index 71684ce9b2a3..21c51e425955 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-BPMFConvert
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist b/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
index cf0c95c79513..4480e318c8f8 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::BPMFConvert.3.gz
 %%SITE_PERL%%/Lingua/ZH/BPMFConvert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/BPMFConvert/.packlist
diff --git a/chinese/p5-Lingua-ZH-HanDetect/Makefile b/chinese/p5-Lingua-ZH-HanDetect/Makefile
index 5cf467cb1608..1a3558c7ede3 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/Makefile
+++ b/chinese/p5-Lingua-ZH-HanDetect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-HanDetect
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-HanDetect/pkg-plist b/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
index b4f1565e6efa..a12eeaa6e350 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
+++ b/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/ZH/HanDetect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/HanDetect/.packlist
 %%PERL5_MAN3%%/Lingua::ZH::HanDetect.3.gz
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index fa331e9495d3..e131bb481c64 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Keywords
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Keywords/pkg-plist b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
index c8f873995783..736f9e5404bf 100644
--- a/chinese/p5-Lingua-ZH-Keywords/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Keywords.3.gz
 %%SITE_PERL%%/Lingua/ZH/Keywords.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords/.packlist
diff --git a/chinese/p5-Lingua-ZH-Numbers/Makefile b/chinese/p5-Lingua-ZH-Numbers/Makefile
index b620b1b662e1..9faf4638d118 100644
--- a/chinese/p5-Lingua-ZH-Numbers/Makefile
+++ b/chinese/p5-Lingua-ZH-Numbers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Numbers
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Numbers/pkg-plist b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
index dce9e9ef7ff1..f9f60296949f 100644
--- a/chinese/p5-Lingua-ZH-Numbers/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Lingua::ZH::Numbers::Currency.3.gz
 %%SITE_PERL%%/Lingua/ZH/Numbers.pm
 %%SITE_PERL%%/Lingua/ZH/Numbers/Currency.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers/.packlist
diff --git a/chinese/p5-Lingua-ZH-Segment/Makefile b/chinese/p5-Lingua-ZH-Segment/Makefile
index 57cf0caa73e8..5b640bda69d5 100644
--- a/chinese/p5-Lingua-ZH-Segment/Makefile
+++ b/chinese/p5-Lingua-ZH-Segment/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Segment
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Lingua
diff --git a/chinese/p5-Lingua-ZH-Segment/pkg-plist b/chinese/p5-Lingua-ZH-Segment/pkg-plist
index ad15da83981e..da613ed665bd 100644
--- a/chinese/p5-Lingua-ZH-Segment/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Segment/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Segment.3.gz
 %%SITE_PERL%%/Lingua/ZH/Segment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Segment/.packlist
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index d879bd15c96c..1a15dd921f22 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Summarize
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Summarize/pkg-plist b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
index 59370aa1e32d..acfd9510d308 100644
--- a/chinese/p5-Lingua-ZH-Summarize/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Summarize.3.gz
 %%SITE_PERL%%/Lingua/ZH/Summarize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize/.packlist
diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile
index 8023a11f8633..b7aa156d49fe 100644
--- a/chinese/p5-Lingua-ZH-TaBE/Makefile
+++ b/chinese/p5-Lingua-ZH-TaBE/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-TaBE
 PORTVERSION=	0.07
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-TaBE/pkg-plist b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
index 361c9d1beecf..17f0da3b6c88 100644
--- a/chinese/p5-Lingua-ZH-TaBE/pkg-plist
+++ b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Lingua::ZH::TaBE.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH/TaBE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/TaBE.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/.packlist
+%%SITE_ARCH%%/Lingua/ZH/TaBE.pm
+%%SITE_ARCH%%/auto/Lingua/ZH/TaBE/TaBE.so
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 0cda9ad2acaf..5562e977b82a 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Toke
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Toke/pkg-plist b/chinese/p5-Lingua-ZH-Toke/pkg-plist
index 0769bbe8dde6..ed005a56ca8c 100644
--- a/chinese/p5-Lingua-ZH-Toke/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Toke/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Toke.3.gz
 %%SITE_PERL%%/Lingua/ZH/Toke.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke/.packlist
diff --git a/chinese/p5-Lingua-ZH-WordSegmenter/Makefile b/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
index 3ac1d4841f53..63009e8eb860 100644
--- a/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
+++ b/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-WordSegmenter
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist b/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
index 1d3db312e339..dd611bb34b3d 100644
--- a/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
+++ b/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/ZH/WordSegmenter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/WordSegmenter/.packlist
 %%PERL5_MAN3%%/Lingua::ZH::WordSegmenter.3.gz
diff --git a/chinese/p5-Lingua-ZH-Wrap/Makefile b/chinese/p5-Lingua-ZH-Wrap/Makefile
index ca9dc52b7958..785c28e77e89 100644
--- a/chinese/p5-Lingua-ZH-Wrap/Makefile
+++ b/chinese/p5-Lingua-ZH-Wrap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Wrap
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Wrap/pkg-plist b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
index 52e4fcd7d17a..da8fb1122f4b 100644
--- a/chinese/p5-Lingua-ZH-Wrap/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Wrap.3.gz
 %%SITE_PERL%%/Lingua/ZH/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap/.packlist
diff --git a/chinese/p5-Text-Greeking-zh_TW/Makefile b/chinese/p5-Text-Greeking-zh_TW/Makefile
index ffb267bc2b2e..061833bc0837 100644
--- a/chinese/p5-Text-Greeking-zh_TW/Makefile
+++ b/chinese/p5-Text-Greeking-zh_TW/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Greeking-zh_TW
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	chinese textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Text-Greeking-zh_TW/pkg-plist b/chinese/p5-Text-Greeking-zh_TW/pkg-plist
index fc43b1559ba1..bf1d703962d6 100644
--- a/chinese/p5-Text-Greeking-zh_TW/pkg-plist
+++ b/chinese/p5-Text-Greeking-zh_TW/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Text::Greeking::zh_TW.3.gz
 %%SITE_PERL%%/Text/Greeking/zh_TW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking/zh_TW/.packlist
diff --git a/chinese/p5-cconv/Makefile b/chinese/p5-cconv/Makefile
index d6664493ac10..8b2874d2ee99 100644
--- a/chinese/p5-cconv/Makefile
+++ b/chinese/p5-cconv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cconv
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	chinese converters perl5
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-cconv/pkg-plist b/chinese/p5-cconv/pkg-plist
index 4f797e3c5601..39349f3ae2c2 100644
--- a/chinese/p5-cconv/pkg-plist
+++ b/chinese/p5-cconv/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/cconv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cconv/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cconv/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cconv/cconv.so
+%%SITE_ARCH%%/cconv.pm
+%%SITE_ARCH%%/auto/cconv/autosplit.ix
+%%SITE_ARCH%%/auto/cconv/cconv.so
 %%PERL5_MAN3%%/cconv.3.gz
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index 99a2db9e2e4b..c26c86f3a3ab 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gscmxx
 PORTVERSION=	0.4.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
diff --git a/comms/gscmxx/pkg-plist b/comms/gscmxx/pkg-plist
index cc1ddcaf9b90..2b0265d65830 100644
--- a/comms/gscmxx/pkg-plist
+++ b/comms/gscmxx/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/SCMxx.pm
 %%SITE_PERL%%/SCMxx/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/gscmxx/.packlist
 bin/gscmxx
 share/pixmaps/gscmxx/phonebook_30.xpm
 share/pixmaps/gscmxx/preferences_30.xpm
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 12f143a8bab3..14dc5c9e0734 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hamlib
 PORTVERSION=	1.2.15.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
@@ -16,6 +16,7 @@ BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
 USES=		perl5 libtool:keepla pkgconfig pathfix python tcl
+USE_PERL5=	build run
 USE_GNOME=	libxml2
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
@@ -49,8 +50,4 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-post-stage:
-	${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod*
-
 .include <bsd.port.mk>
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index 1aa00f13e14d..929453b099ce 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -148,10 +148,9 @@ libdata/pkgconfig/hamlib.pc
 sbin/rpc.rigd
 sbin/rpc.rotd
 share/aclocal/hamlib.m4
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Hamlib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/perltest.pl
+%%SITE_ARCH%%/auto/Hamlib/Hamlib.so
+%%SITE_ARCH%%/Hamlib.pm
+%%SITE_ARCH%%/perltest.pl
 %%PYTHON_SITELIBDIR%%/_Hamlib.so
 %%PYTHON_SITELIBDIR%%/_Hamlib.la
 %%PYTHON_SITELIBDIR%%/_Hamlib.a
diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index 6d3c7904b1d2..95c963416a53 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	o2sms
 PORTVERSION=	3.36
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN \
 		http://www.mackers.com/projects/o2sms/releases/
diff --git a/comms/o2sms/pkg-plist b/comms/o2sms/pkg-plist
index f9830366aaf0..4dbf9a685d4b 100644
--- a/comms/o2sms/pkg-plist
+++ b/comms/o2sms/pkg-plist
@@ -3,7 +3,6 @@ bin/meteorsms
 bin/o2sms
 bin/threesms
 bin/vodasms
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/o2sms/.packlist
 %%SITE_PERL%%/WWW/SMS/IE/aftsms.action
 %%SITE_PERL%%/WWW/SMS/IE/aftsms.pm
 %%SITE_PERL%%/WWW/SMS/IE/iesms.pm
diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
index 68328e4c1654..85ab20d22653 100644
--- a/comms/owfs/Makefile
+++ b/comms/owfs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	owfs
 PORTVERSION=	2.9p8
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
 
@@ -53,7 +54,7 @@ OWCAPI_CONFIGURE_ENABLE=	owcapi
 
 OWPERL_CONFIGURE_ENABLE=	owperl
 OWPERL_USES=			perl5
-OWPERL_USE=			perl5=build,run,fixpacklist
+OWPERL_USE=			perl5=build,run
 
 # Broken/untested
 OWPHP_CONFIGURE_ENABLE=		owphp
@@ -127,8 +128,7 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so
 .endif
 .if ${PORT_OPTIONS:MOWPERL}
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod*
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/OW/OW.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/owfs/pkg-plist b/comms/owfs/pkg-plist
index fbc2fd57b35b..990dd7d48b11 100644
--- a/comms/owfs/pkg-plist
+++ b/comms/owfs/pkg-plist
@@ -11,16 +11,14 @@
 %%OWNETLIB%%lib/libownet-2.9.so.8.0.0
 %%OWNETLIB%%lib/libownet.so
 %%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
-%%OWNETPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OWNet/.packlist
 %%OWNETPERL%%%%SITE_PERL%%/OWNet.pm
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet-0.3-py2.7.egg-info
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.py
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyc
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.py
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyc
-%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OW.pm
-%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/.packlist
-%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/OW.so
+%%OWPERL%%%%SITE_ARCH%%/OW.pm
+%%OWPERL%%%%SITE_ARCH%%/auto/OW/OW.so
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p8-py2.7.egg-info
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
diff --git a/comms/p5-Cisco-UCS/Makefile b/comms/p5-Cisco-UCS/Makefile
index 6fe1912a7f73..2372340afb4e 100644
--- a/comms/p5-Cisco-UCS/Makefile
+++ b/comms/p5-Cisco-UCS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cisco-UCS
 PORTVERSION=	0.30
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
diff --git a/comms/p5-Cisco-UCS/pkg-plist b/comms/p5-Cisco-UCS/pkg-plist
index 9a95605364a5..e25f693405be 100644
--- a/comms/p5-Cisco-UCS/pkg-plist
+++ b/comms/p5-Cisco-UCS/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/Cisco/UCS/Interconnect.pm
 %%SITE_PERL%%/Cisco/UCS/MgmtEntity.pm
 %%SITE_PERL%%/Cisco/UCS/ServiceProfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/UCS/.packlist
 %%PERL5_MAN3%%/Cisco::UCS.3.gz
 %%PERL5_MAN3%%/Cisco::UCS::Blade.3.gz
 %%PERL5_MAN3%%/Cisco::UCS::Chassis.3.gz
diff --git a/comms/p5-Device-Gsm/Makefile b/comms/p5-Device-Gsm/Makefile
index d8fce3c23a94..16a152d7205a 100644
--- a/comms/p5-Device-Gsm/Makefile
+++ b/comms/p5-Device-Gsm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Device-Gsm
 PORTVERSION=	1.60
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-Device-Gsm/pkg-plist b/comms/p5-Device-Gsm/pkg-plist
index 23b073c91976..38a0a31a54aa 100644
--- a/comms/p5-Device-Gsm/pkg-plist
+++ b/comms/p5-Device-Gsm/pkg-plist
@@ -18,7 +18,6 @@
 %%SITE_PERL%%/Device/Gsm/Networks.pm
 %%SITE_PERL%%/Device/Gsm/Charset.pm
 %%SITE_PERL%%/Device/Gsm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Gsm/.packlist
 %%PERL5_MAN3%%/Device::Gsm::Sms.3.gz
 %%PERL5_MAN3%%/Device::Gsm::Pdu.3.gz
 %%PERL5_MAN3%%/Device::Gsm.3.gz
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index 70eb5180ad9f..b3b508c51a4a 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Device-Modem
 PORTVERSION=	1.57
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-Device-Modem/pkg-plist b/comms/p5-Device-Modem/pkg-plist
index ed54140e88d4..42158fb9a351 100644
--- a/comms/p5-Device-Modem/pkg-plist
+++ b/comms/p5-Device-Modem/pkg-plist
@@ -10,7 +10,6 @@
 %%SITE_PERL%%/Device/Modem/Log/Syslog.pm
 %%SITE_PERL%%/Device/Modem/Protocol/Xmodem.pm
 %%SITE_PERL%%/Device/Modem/UsRobotics.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Modem/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/active.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caller-id.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dial.pl
diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile
index 08cfca4ebae7..08f1a4844dd9 100644
--- a/comms/p5-Device-SerialPort/Makefile
+++ b/comms/p5-Device-SerialPort/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Device-SerialPort
 PORTVERSION=	1.040000
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index 5cdb60d6c915..9f36b8a182f3 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -1,6 +1,5 @@
 bin/modemtest
 %%PERL5_MAN3%%/Device::SerialPort.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/SerialPort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
+%%SITE_ARCH%%/Device/SerialPort.pm
+%%SITE_ARCH%%/auto/Device/SerialPort/SerialPort.so
 man/man1/modemtest.1.gz
diff --git a/comms/p5-Fax-Hylafax-Client/Makefile b/comms/p5-Fax-Hylafax-Client/Makefile
index ab43f57dbab4..6ecd680f8bcc 100644
--- a/comms/p5-Fax-Hylafax-Client/Makefile
+++ b/comms/p5-Fax-Hylafax-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Fax-Hylafax-Client
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-Fax-Hylafax-Client/pkg-plist b/comms/p5-Fax-Hylafax-Client/pkg-plist
index b034fba7789f..c1759756f3b2 100644
--- a/comms/p5-Fax-Hylafax-Client/pkg-plist
+++ b/comms/p5-Fax-Hylafax-Client/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Fax::Hylafax::Client.3.gz
 %%SITE_PERL%%/Fax/Hylafax/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client/.packlist
diff --git a/comms/p5-Nexmo-SMS/Makefile b/comms/p5-Nexmo-SMS/Makefile
index 532d798227bd..9e7980eee866 100644
--- a/comms/p5-Nexmo-SMS/Makefile
+++ b/comms/p5-Nexmo-SMS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nexmo-SMS
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RENEEB
diff --git a/comms/p5-Nexmo-SMS/pkg-plist b/comms/p5-Nexmo-SMS/pkg-plist
index cd48701ea5eb..50186f9e6374 100644
--- a/comms/p5-Nexmo-SMS/pkg-plist
+++ b/comms/p5-Nexmo-SMS/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Nexmo/SMS/Response/Message.pm
 %%SITE_PERL%%/Nexmo/SMS/TextMessage.pm
 %%SITE_PERL%%/Nexmo/SMS/WAPPushMessage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nexmo/SMS/.packlist
 %%PERL5_MAN3%%/Nexmo::SMS.3.gz
 %%PERL5_MAN3%%/Nexmo::SMS::BinaryMessage.3.gz
 %%PERL5_MAN3%%/Nexmo::SMS::GetBalance.3.gz
diff --git a/comms/p5-SMS-SMS77/Makefile b/comms/p5-SMS-SMS77/Makefile
index 7264ff471981..81fc95f8ddda 100644
--- a/comms/p5-SMS-SMS77/Makefile
+++ b/comms/p5-SMS-SMS77/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-SMS77
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	comms net perl5
 MASTER_SITES=	http://www.w3r3wolf.de/files/sms77/
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-SMS77/pkg-plist b/comms/p5-SMS-SMS77/pkg-plist
index 392217631cc3..d4961ba059c8 100644
--- a/comms/p5-SMS-SMS77/pkg-plist
+++ b/comms/p5-SMS-SMS77/pkg-plist
@@ -2,6 +2,5 @@ bin/sms77send
 man/man1/sms77send.1.gz
 %%SITE_PERL%%/SMS/SMS77.pm
 %%SITE_PERL%%/SMS/SMS77/Message.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/SMS77/.packlist
 %%PERL5_MAN3%%/SMS::SMS77.3.gz
 %%PERL5_MAN3%%/SMS::SMS77::Message.3.gz
diff --git a/comms/p5-SMS-Send-DeviceGsm/Makefile b/comms/p5-SMS-Send-DeviceGsm/Makefile
index b83adf804c4e..dddefb125637 100644
--- a/comms/p5-SMS-Send-DeviceGsm/Makefile
+++ b/comms/p5-SMS-Send-DeviceGsm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-DeviceGsm
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send-DeviceGsm/pkg-plist b/comms/p5-SMS-Send-DeviceGsm/pkg-plist
index 8c7550ff2a76..0631cac1de95 100644
--- a/comms/p5-SMS-Send-DeviceGsm/pkg-plist
+++ b/comms/p5-SMS-Send-DeviceGsm/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/DeviceGsm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/DeviceGsm/.packlist
 %%PERL5_MAN3%%/SMS::Send::DeviceGsm.3.gz
diff --git a/comms/p5-SMS-Send-NexmoUnicode/Makefile b/comms/p5-SMS-Send-NexmoUnicode/Makefile
index 6c81c1fd2e2c..cce0a0b15eb7 100644
--- a/comms/p5-SMS-Send-NexmoUnicode/Makefile
+++ b/comms/p5-SMS-Send-NexmoUnicode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-NexmoUnicode
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JNLIN
diff --git a/comms/p5-SMS-Send-NexmoUnicode/pkg-plist b/comms/p5-SMS-Send-NexmoUnicode/pkg-plist
index bc2651a33cf0..6e85b9b90598 100644
--- a/comms/p5-SMS-Send-NexmoUnicode/pkg-plist
+++ b/comms/p5-SMS-Send-NexmoUnicode/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/NexmoUnicode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/NexmoUnicode/.packlist
 %%PERL5_MAN3%%/SMS::Send::NexmoUnicode.3.gz
diff --git a/comms/p5-SMS-Send-TW-HiAir/Makefile b/comms/p5-SMS-Send-TW-HiAir/Makefile
index 71faf20df161..1b89e73397ca 100644
--- a/comms/p5-SMS-Send-TW-HiAir/Makefile
+++ b/comms/p5-SMS-Send-TW-HiAir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-TW-HiAir
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send-TW-HiAir/pkg-plist b/comms/p5-SMS-Send-TW-HiAir/pkg-plist
index 06df73377cce..1515f3fe6a3e 100644
--- a/comms/p5-SMS-Send-TW-HiAir/pkg-plist
+++ b/comms/p5-SMS-Send-TW-HiAir/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/TW/HiAir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/HiAir/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::HiAir.3.gz
diff --git a/comms/p5-SMS-Send-TW-PChome/Makefile b/comms/p5-SMS-Send-TW-PChome/Makefile
index 37743b5070d5..358ef3c92785 100644
--- a/comms/p5-SMS-Send-TW-PChome/Makefile
+++ b/comms/p5-SMS-Send-TW-PChome/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-TW-PChome
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	 p5-
diff --git a/comms/p5-SMS-Send-TW-PChome/pkg-plist b/comms/p5-SMS-Send-TW-PChome/pkg-plist
index 0232f2670190..fd07c583aacb 100644
--- a/comms/p5-SMS-Send-TW-PChome/pkg-plist
+++ b/comms/p5-SMS-Send-TW-PChome/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/TW/PChome.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/PChome/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::PChome.3.gz
diff --git a/comms/p5-SMS-Send-TW-Qma/Makefile b/comms/p5-SMS-Send-TW-Qma/Makefile
index dfed4800886c..9a15cd044827 100644
--- a/comms/p5-SMS-Send-TW-Qma/Makefile
+++ b/comms/p5-SMS-Send-TW-Qma/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-TW-Qma
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send-TW-Qma/pkg-plist b/comms/p5-SMS-Send-TW-Qma/pkg-plist
index 991ffd2c001d..bb6366675dd7 100644
--- a/comms/p5-SMS-Send-TW-Qma/pkg-plist
+++ b/comms/p5-SMS-Send-TW-Qma/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/TW/Qma.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/Qma/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::Qma.3.gz
diff --git a/comms/p5-SMS-Send-TW-ShareSMS/Makefile b/comms/p5-SMS-Send-TW-ShareSMS/Makefile
index 9982a5065d83..ea0996264323 100644
--- a/comms/p5-SMS-Send-TW-ShareSMS/Makefile
+++ b/comms/p5-SMS-Send-TW-ShareSMS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-TW-ShareSMS
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist b/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist
index e8ed5e2c0829..19b829f4a552 100644
--- a/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist
+++ b/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/TW/ShareSMS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/ShareSMS/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::ShareSMS.3.gz
diff --git a/comms/p5-SMS-Send-TW-Socket2Air/Makefile b/comms/p5-SMS-Send-TW-Socket2Air/Makefile
index a41c7ee0f323..537d36850211 100644
--- a/comms/p5-SMS-Send-TW-Socket2Air/Makefile
+++ b/comms/p5-SMS-Send-TW-Socket2Air/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-TW-Socket2Air
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist b/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist
index ff3773a2f241..20c05b0acad0 100644
--- a/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist
+++ b/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/TW/Socket2Air.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/Socket2Air/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::Socket2Air.3.gz
diff --git a/comms/p5-SMS-Send-TW-chtsns/Makefile b/comms/p5-SMS-Send-TW-chtsns/Makefile
index bdeb0f2ddeed..d6608191b721 100644
--- a/comms/p5-SMS-Send-TW-chtsns/Makefile
+++ b/comms/p5-SMS-Send-TW-chtsns/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-TW-chtsns
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send-TW-chtsns/pkg-plist b/comms/p5-SMS-Send-TW-chtsns/pkg-plist
index 84bc4a94db6e..7f9fd7625082 100644
--- a/comms/p5-SMS-Send-TW-chtsns/pkg-plist
+++ b/comms/p5-SMS-Send-TW-chtsns/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/TW/chtsns.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/chtsns/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::chtsns.3.gz
diff --git a/comms/p5-SMS-Send-TW-emome/Makefile b/comms/p5-SMS-Send-TW-emome/Makefile
index a3028b90a6d7..f244c59bf314 100644
--- a/comms/p5-SMS-Send-TW-emome/Makefile
+++ b/comms/p5-SMS-Send-TW-emome/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send-TW-emome
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send-TW-emome/pkg-plist b/comms/p5-SMS-Send-TW-emome/pkg-plist
index f1d068810cdd..e9b815b577ea 100644
--- a/comms/p5-SMS-Send-TW-emome/pkg-plist
+++ b/comms/p5-SMS-Send-TW-emome/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SMS/Send/TW/emome.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/emome/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::emome.3.gz
diff --git a/comms/p5-SMS-Send/Makefile b/comms/p5-SMS-Send/Makefile
index f60bf5b966b3..4f4682401278 100644
--- a/comms/p5-SMS-Send/Makefile
+++ b/comms/p5-SMS-Send/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SMS-Send
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/comms/p5-SMS-Send/pkg-plist b/comms/p5-SMS-Send/pkg-plist
index 7b152357a20c..c514432a9ded 100644
--- a/comms/p5-SMS-Send/pkg-plist
+++ b/comms/p5-SMS-Send/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/SMS/Send/AU/Test.pm
 %%SITE_PERL%%/SMS/Send/Driver.pm
 %%SITE_PERL%%/SMS/Send/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/.packlist
 %%PERL5_MAN3%%/SMS::Send.3.gz
 %%PERL5_MAN3%%/SMS::Send::AU::Test.3.gz
 %%PERL5_MAN3%%/SMS::Send::Driver.3.gz
diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index 18a19a3cc83c..5ba88865d24e 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Boulder
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Boulder/pkg-plist b/converters/p5-Boulder/pkg-plist
index 68fd854d4bd9..75c2ed172fea 100644
--- a/converters/p5-Boulder/pkg-plist
+++ b/converters/p5-Boulder/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Boulder/.packlist
 %%SITE_PERL%%/Stone/Cursor.pm
 %%SITE_PERL%%/Stone/GB_Sequence.pm
 %%SITE_PERL%%/Boulder/Swissprot.pm
diff --git a/converters/p5-Convert-ASCII-Armour/Makefile b/converters/p5-Convert-ASCII-Armour/Makefile
index a577b9169dd7..3a7830b8f740 100644
--- a/converters/p5-Convert-ASCII-Armour/Makefile
+++ b/converters/p5-Convert-ASCII-Armour/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Convert-ASCII-Armour
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-ASCII-Armour/pkg-plist b/converters/p5-Convert-ASCII-Armour/pkg-plist
index 3aec97946811..8ba258d4ac21 100644
--- a/converters/p5-Convert-ASCII-Armour/pkg-plist
+++ b/converters/p5-Convert-ASCII-Armour/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Convert::ASCII::Armour.3.gz
 %%SITE_PERL%%/Convert/ASCII/Armor.pm
 %%SITE_PERL%%/Convert/ASCII/Armour.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
diff --git a/converters/p5-Convert-ASN1/Makefile b/converters/p5-Convert-ASN1/Makefile
index 8beb70fdb690..e4a67ae6a8b4 100644
--- a/converters/p5-Convert-ASN1/Makefile
+++ b/converters/p5-Convert-ASN1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-ASN1
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-ASN1/pkg-plist b/converters/p5-Convert-ASN1/pkg-plist
index 0627cb513b97..46f0796a01f0 100644
--- a/converters/p5-Convert-ASN1/pkg-plist
+++ b/converters/p5-Convert-ASN1/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Convert/ASN1/_decode.pm
 %%SITE_PERL%%/Convert/ASN1/_encode.pm
 %%SITE_PERL%%/Convert/ASN1/parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1/.packlist
diff --git a/converters/p5-Convert-BER/Makefile b/converters/p5-Convert-BER/Makefile
index 18e575fb0df7..748d3162df7c 100644
--- a/converters/p5-Convert-BER/Makefile
+++ b/converters/p5-Convert-BER/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-BER
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-BER/pkg-plist b/converters/p5-Convert-BER/pkg-plist
index 2bcbc1548393..53f21bb32ee7 100644
--- a/converters/p5-Convert-BER/pkg-plist
+++ b/converters/p5-Convert-BER/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Convert::BER.3.gz
 %%SITE_PERL%%/Convert/BER.pm
 %%SITE_PERL%%/Convert/BER.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BER/.packlist
diff --git a/converters/p5-Convert-Bencode/Makefile b/converters/p5-Convert-Bencode/Makefile
index f83afcccc32b..9a5fb02f90f0 100644
--- a/converters/p5-Convert-Bencode/Makefile
+++ b/converters/p5-Convert-Bencode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Convert-Bencode
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-Bencode/pkg-plist b/converters/p5-Convert-Bencode/pkg-plist
index b6473502d707..88ab606029c2 100644
--- a/converters/p5-Convert-Bencode/pkg-plist
+++ b/converters/p5-Convert-Bencode/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Convert/Bencode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode/.packlist
 %%PERL5_MAN3%%/Convert::Bencode.3.gz
diff --git a/converters/p5-Convert-Bencode_XS/Makefile b/converters/p5-Convert-Bencode_XS/Makefile
index 0d85ed8b8197..417051278fb2 100644
--- a/converters/p5-Convert-Bencode_XS/Makefile
+++ b/converters/p5-Convert-Bencode_XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-Bencode_XS
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-Bencode_XS/pkg-plist b/converters/p5-Convert-Bencode_XS/pkg-plist
index 728eb8dd95fc..e387139246a2 100644
--- a/converters/p5-Convert-Bencode_XS/pkg-plist
+++ b/converters/p5-Convert-Bencode_XS/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Convert::Bencode_XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/Bencode_XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode_XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode_XS/Bencode_XS.so
+%%SITE_ARCH%%/Convert/Bencode_XS.pm
+%%SITE_ARCH%%/auto/Convert/Bencode_XS/Bencode_XS.so
 %%EXAMPLESDIR%%/bench_decode.pl
 %%EXAMPLESDIR%%/bench_encode.pl
diff --git a/converters/p5-Convert-BinHex/Makefile b/converters/p5-Convert-BinHex/Makefile
index 098f80198265..7d09994306d5 100644
--- a/converters/p5-Convert-BinHex/Makefile
+++ b/converters/p5-Convert-BinHex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-BinHex
 PORTVERSION=	1.123
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-BinHex/pkg-plist b/converters/p5-Convert-BinHex/pkg-plist
index ce97e5a1fac4..48b9aec048ad 100644
--- a/converters/p5-Convert-BinHex/pkg-plist
+++ b/converters/p5-Convert-BinHex/pkg-plist
@@ -2,6 +2,5 @@ bin/binhex.pl
 bin/debinhex.pl
 %%PERL5_MAN3%%/Convert::BinHex.3.gz
 %%SITE_PERL%%/Convert/BinHex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BinHex/.packlist
 man/man1/binhex.pl.1.gz
 man/man1/debinhex.pl.1.gz
diff --git a/converters/p5-Convert-Binary-C/Makefile b/converters/p5-Convert-Binary-C/Makefile
index 4081add03006..30e060a81241 100644
--- a/converters/p5-Convert-Binary-C/Makefile
+++ b/converters/p5-Convert-Binary-C/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-Binary-C
 PORTVERSION=	0.76
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-Binary-C/pkg-plist b/converters/p5-Convert-Binary-C/pkg-plist
index 864974d9af79..7e3945a193e2 100644
--- a/converters/p5-Convert-Binary-C/pkg-plist
+++ b/converters/p5-Convert-Binary-C/pkg-plist
@@ -1,8 +1,7 @@
 bin/ccconfig
 %%PERL5_MAN3%%/Convert::Binary::C.3.gz
 %%PERL5_MAN3%%/Convert::Binary::C::Cached.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C/Cached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C/C.so
+%%SITE_ARCH%%/Convert/Binary/C.pm
+%%SITE_ARCH%%/Convert/Binary/C/Cached.pm
+%%SITE_ARCH%%/auto/Convert/Binary/C/C.so
 man/man1/ccconfig.1.gz
diff --git a/converters/p5-Convert-IBM390/Makefile b/converters/p5-Convert-IBM390/Makefile
index abed2e4759e8..8d1d64159fe1 100644
--- a/converters/p5-Convert-IBM390/Makefile
+++ b/converters/p5-Convert-IBM390/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-IBM390
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-IBM390/pkg-plist b/converters/p5-Convert-IBM390/pkg-plist
index f77b003a0bb5..dc106b5324f2 100644
--- a/converters/p5-Convert-IBM390/pkg-plist
+++ b/converters/p5-Convert-IBM390/pkg-plist
@@ -23,31 +23,30 @@
 %%PERL5_MAN3%%/Convert::IBM390::CP01147.3.gz
 %%PERL5_MAN3%%/Convert::IBM390::CP01148.3.gz
 %%PERL5_MAN3%%/Convert::IBM390::CP01149.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00037.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00273.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00275.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00277.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00278.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00280.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00281.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00282.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00284.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00285.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00297.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00500.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00871.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01047.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01140.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01141.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01142.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01143.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01144.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01145.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01146.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01147.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01148.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP01149.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390/IBM390.so
+%%SITE_ARCH%%/Convert/IBM390.pm
+%%SITE_ARCH%%/Convert/IBM390.pod
+%%SITE_ARCH%%/Convert/IBM390/CP00037.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00273.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00275.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00277.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00278.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00280.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00281.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00282.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00284.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00285.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00297.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00500.pm
+%%SITE_ARCH%%/Convert/IBM390/CP00871.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01047.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01140.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01141.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01142.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01143.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01144.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01145.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01146.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01147.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01148.pm
+%%SITE_ARCH%%/Convert/IBM390/CP01149.pm
+%%SITE_ARCH%%/auto/Convert/IBM390/IBM390.so
diff --git a/converters/p5-Convert-Morse/Makefile b/converters/p5-Convert-Morse/Makefile
index f9a1ad78591f..f9bc4b277f3d 100644
--- a/converters/p5-Convert-Morse/Makefile
+++ b/converters/p5-Convert-Morse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-Morse
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-Morse/pkg-plist b/converters/p5-Convert-Morse/pkg-plist
index 06716b40091b..305cde138021 100644
--- a/converters/p5-Convert-Morse/pkg-plist
+++ b/converters/p5-Convert-Morse/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Convert::Morse.3.gz
 %%SITE_PERL%%/Convert/Morse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist
diff --git a/converters/p5-Convert-NLS_DATE_FORMAT/Makefile b/converters/p5-Convert-NLS_DATE_FORMAT/Makefile
index d61688590eaa..4250e0b2681b 100644
--- a/converters/p5-Convert-NLS_DATE_FORMAT/Makefile
+++ b/converters/p5-Convert-NLS_DATE_FORMAT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-NLS_DATE_FORMAT
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KOLIBRIE
diff --git a/converters/p5-Convert-NLS_DATE_FORMAT/pkg-plist b/converters/p5-Convert-NLS_DATE_FORMAT/pkg-plist
index c790fa318e2e..18d2c85ead19 100644
--- a/converters/p5-Convert-NLS_DATE_FORMAT/pkg-plist
+++ b/converters/p5-Convert-NLS_DATE_FORMAT/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Convert/NLS_DATE_FORMAT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/NLS_DATE_FORMAT/.packlist
 %%PERL5_MAN3%%/Convert::NLS_DATE_FORMAT.3.gz
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index bba18b2607ea..ae510cb1d11a 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-PEM
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-PEM/pkg-plist b/converters/p5-Convert-PEM/pkg-plist
index b466159b1aef..3e3323b8e0f5 100644
--- a/converters/p5-Convert-PEM/pkg-plist
+++ b/converters/p5-Convert-PEM/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Convert::PEM::CBC.3.gz
 %%SITE_PERL%%/Convert/PEM.pm
 %%SITE_PERL%%/Convert/PEM/CBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/PEM/.packlist
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index 7895fce92da8..88a403687285 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Convert-Recode
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-Recode/pkg-plist b/converters/p5-Convert-Recode/pkg-plist
index 010828ed1522..9ed8064190f0 100644
--- a/converters/p5-Convert-Recode/pkg-plist
+++ b/converters/p5-Convert-Recode/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Convert/Recode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Recode/.packlist
 %%PERL5_MAN3%%/Convert::Recode.3.gz
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 8c3c6865ccad..a863eec14731 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-TNEF
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-TNEF/pkg-plist b/converters/p5-Convert-TNEF/pkg-plist
index dbaebcd85c59..be19521e007c 100644
--- a/converters/p5-Convert-TNEF/pkg-plist
+++ b/converters/p5-Convert-TNEF/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Convert::TNEF.3.gz
 %%SITE_PERL%%/Convert/TNEF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF/.packlist
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index 152d9a838423..9415a4982b09 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-UU
 PORTVERSION=	0.52.01
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Convert-UU/pkg-plist b/converters/p5-Convert-UU/pkg-plist
index d7443df6197f..d08e03d069ac 100644
--- a/converters/p5-Convert-UU/pkg-plist
+++ b/converters/p5-Convert-UU/pkg-plist
@@ -4,4 +4,3 @@ man/man1/puudecode.1.gz
 man/man1/puuencode.1.gz
 %%PERL5_MAN3%%/Convert::UU.3.gz
 %%SITE_PERL%%/Convert/UU.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UU/.packlist
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index 4152f03e637a..d023dffb2a93 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-UUlib
 PORTVERSION=	1.40
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
diff --git a/converters/p5-Convert-UUlib/pkg-plist b/converters/p5-Convert-UUlib/pkg-plist
index d423ed24c2e7..0644af17cb18 100644
--- a/converters/p5-Convert-UUlib/pkg-plist
+++ b/converters/p5-Convert-UUlib/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Convert::UUlib.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Convert/UUlib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/UUlib.so
+%%SITE_ARCH%%/Convert/UUlib.pm
+%%SITE_ARCH%%/auto/Convert/UUlib/UUlib.so
diff --git a/converters/p5-Cpanel-JSON-XS/Makefile b/converters/p5-Cpanel-JSON-XS/Makefile
index 3381fbc13476..71c8584ae3ed 100644
--- a/converters/p5-Cpanel-JSON-XS/Makefile
+++ b/converters/p5-Cpanel-JSON-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cpanel-JSON-XS
 PORTVERSION=	3.0106
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RURBAN
diff --git a/converters/p5-Cpanel-JSON-XS/pkg-plist b/converters/p5-Cpanel-JSON-XS/pkg-plist
index b0717c1e760e..1b30bb2eeb6d 100644
--- a/converters/p5-Cpanel-JSON-XS/pkg-plist
+++ b/converters/p5-Cpanel-JSON-XS/pkg-plist
@@ -1,8 +1,7 @@
 bin/cpanel_json_xs
-%%SITE_PERL%%/%%PERL_ARCH%%/Cpanel/JSON/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cpanel/JSON/XS/Boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cpanel/JSON/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cpanel/JSON/XS/XS.so
+%%SITE_ARCH%%/Cpanel/JSON/XS.pm
+%%SITE_ARCH%%/Cpanel/JSON/XS/Boolean.pm
+%%SITE_ARCH%%/auto/Cpanel/JSON/XS/XS.so
 %%PERL5_MAN3%%/Cpanel::JSON::XS.3.gz
 %%PERL5_MAN3%%/Cpanel::JSON::XS::Boolean.3.gz
 man/man1/cpanel_json_xs.1.gz
diff --git a/converters/p5-Cstools/Makefile b/converters/p5-Cstools/Makefile
index 2054b9c146ec..a8fc6d7f21d6 100644
--- a/converters/p5-Cstools/Makefile
+++ b/converters/p5-Cstools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cstools
 PORTVERSION=	3.42
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	http://www.adelton.com/perl/Cstools/ \
 		CPAN
diff --git a/converters/p5-Cstools/pkg-plist b/converters/p5-Cstools/pkg-plist
index f4a5d125ae65..99320a9a6c89 100644
--- a/converters/p5-Cstools/pkg-plist
+++ b/converters/p5-Cstools/pkg-plist
@@ -25,7 +25,6 @@ bin/dbfcstocs
 %%SITE_PERL%%/Cz/Cstocs/enc/vga.enc
 %%SITE_PERL%%/Cz/Sort.pm
 %%SITE_PERL%%/Cz/Time.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz/.packlist
 man/man1/cssort.1.gz
 man/man1/cstocs.1.gz
 man/man1/dbfcstocs.1.gz
diff --git a/converters/p5-Data-AMF/Makefile b/converters/p5-Data-AMF/Makefile
index f19e43f9f482..509278972208 100644
--- a/converters/p5-Data-AMF/Makefile
+++ b/converters/p5-Data-AMF/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-AMF
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Data-AMF/pkg-plist b/converters/p5-Data-AMF/pkg-plist
index a0ecb787ec11..6e8a46dc4c23 100644
--- a/converters/p5-Data-AMF/pkg-plist
+++ b/converters/p5-Data-AMF/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/AMF/.packlist
 %%SITE_PERL%%/Data/AMF.pm
 %%SITE_PERL%%/Data/AMF/Formatter.pm
 %%SITE_PERL%%/Data/AMF/Formatter/AMF0.pm
diff --git a/converters/p5-Encode-Detect-CJK/Makefile b/converters/p5-Encode-Detect-CJK/Makefile
index c5fa013e1b12..f43077424afc 100644
--- a/converters/p5-Encode-Detect-CJK/Makefile
+++ b/converters/p5-Encode-Detect-CJK/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-Detect-CJK
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Encode-Detect-CJK/pkg-plist b/converters/p5-Encode-Detect-CJK/pkg-plist
index 9c1278be750c..2a38e7464473 100644
--- a/converters/p5-Encode-Detect-CJK/pkg-plist
+++ b/converters/p5-Encode-Detect-CJK/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Encode/Detect/CJK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Detect/CJK/.packlist
 %%PERL5_MAN3%%/Encode::Detect::CJK.3.gz
diff --git a/converters/p5-Encode-Detect/Makefile b/converters/p5-Encode-Detect/Makefile
index 022633286803..a90570fe6983 100644
--- a/converters/p5-Encode-Detect/Makefile
+++ b/converters/p5-Encode-Detect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-Detect
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Encode
diff --git a/converters/p5-Encode-Detect/pkg-plist b/converters/p5-Encode-Detect/pkg-plist
index 45971025beef..0ebb8f451ea9 100644
--- a/converters/p5-Encode-Detect/pkg-plist
+++ b/converters/p5-Encode-Detect/pkg-plist
@@ -1,5 +1,5 @@
 %%PERL5_MAN3%%/Encode::Detect.3.gz
 %%PERL5_MAN3%%/Encode::Detect::Detector.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Detect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Detect/Detector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Detect/Detector/Detector.so
+%%SITE_ARCH%%/Encode/Detect.pm
+%%SITE_ARCH%%/Encode/Detect/Detector.pm
+%%SITE_ARCH%%/auto/Encode/Detect/Detector/Detector.so
diff --git a/converters/p5-Encode-DoubleEncodedUTF8/Makefile b/converters/p5-Encode-DoubleEncodedUTF8/Makefile
index 2080df172d62..13fa03417e10 100644
--- a/converters/p5-Encode-DoubleEncodedUTF8/Makefile
+++ b/converters/p5-Encode-DoubleEncodedUTF8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-DoubleEncodedUTF8
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Encode
diff --git a/converters/p5-Encode-DoubleEncodedUTF8/pkg-plist b/converters/p5-Encode-DoubleEncodedUTF8/pkg-plist
index f8c6d91a213d..d0be3cbe86a9 100644
--- a/converters/p5-Encode-DoubleEncodedUTF8/pkg-plist
+++ b/converters/p5-Encode-DoubleEncodedUTF8/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Encode/DoubleEncodedUTF8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/DoubleEncodedUTF8/.packlist
 %%PERL5_MAN3%%/Encode::DoubleEncodedUTF8.3.gz
diff --git a/converters/p5-Encode-IMAPUTF7/Makefile b/converters/p5-Encode-IMAPUTF7/Makefile
index 6f72a9418791..d1bddae0f01b 100644
--- a/converters/p5-Encode-IMAPUTF7/Makefile
+++ b/converters/p5-Encode-IMAPUTF7/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-IMAPUTF7
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Encode-IMAPUTF7/pkg-plist b/converters/p5-Encode-IMAPUTF7/pkg-plist
index da13bc2bc259..47f7e85b0024 100644
--- a/converters/p5-Encode-IMAPUTF7/pkg-plist
+++ b/converters/p5-Encode-IMAPUTF7/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Encode::IMAPUTF7.3.gz
 %%SITE_PERL%%/Encode/IMAPUTF7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/IMAPUTF7/.packlist
diff --git a/converters/p5-Encode-JIS2K/Makefile b/converters/p5-Encode-JIS2K/Makefile
index 31f1294fa4bf..463fb66aeeca 100644
--- a/converters/p5-Encode-JIS2K/Makefile
+++ b/converters/p5-Encode-JIS2K/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-JIS2K
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Encode-JIS2K/pkg-plist b/converters/p5-Encode-JIS2K/pkg-plist
index 14877f5bc172..f58d752131b0 100644
--- a/converters/p5-Encode-JIS2K/pkg-plist
+++ b/converters/p5-Encode-JIS2K/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JIS2K/JIS2K.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JIS2K/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JIS2K.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JIS2K/2022JP3.pm
+%%SITE_ARCH%%/auto/Encode/JIS2K/JIS2K.so
+%%SITE_ARCH%%/Encode/JIS2K.pm
+%%SITE_ARCH%%/Encode/JIS2K/2022JP3.pm
diff --git a/converters/p5-Encode-Locale/Makefile b/converters/p5-Encode-Locale/Makefile
index 5aee3ef5e3f8..e005ae6621df 100644
--- a/converters/p5-Encode-Locale/Makefile
+++ b/converters/p5-Encode-Locale/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-Locale
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Encode-Locale/pkg-plist b/converters/p5-Encode-Locale/pkg-plist
index 6db29d370797..bf6f8ab1d71a 100644
--- a/converters/p5-Encode-Locale/pkg-plist
+++ b/converters/p5-Encode-Locale/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Encode::Locale.3.gz
 %%SITE_PERL%%/Encode/Locale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Locale/.packlist
diff --git a/converters/p5-Encode-Punycode/Makefile b/converters/p5-Encode-Punycode/Makefile
index 91767edd1844..0c8fde6cddf4 100644
--- a/converters/p5-Encode-Punycode/Makefile
+++ b/converters/p5-Encode-Punycode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-Punycode
 PORTVERSION=	1.001
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Encode-compat/Makefile b/converters/p5-Encode-compat/Makefile
index 2e4e2c228d5c..c23b3b06c223 100644
--- a/converters/p5-Encode-compat/Makefile
+++ b/converters/p5-Encode-compat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-compat
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Encode-compat/pkg-plist b/converters/p5-Encode-compat/pkg-plist
index 702d43fe215d..956799ee423e 100644
--- a/converters/p5-Encode-compat/pkg-plist
+++ b/converters/p5-Encode-compat/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/compat/.packlist
 %%SITE_PERL%%/Encode/compat.pm
 %%SITE_PERL%%/Encode/compat/5006001.pm
 %%SITE_PERL%%/Encode/compat/common.pm
diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile
index 6146ec81f5c3..3abba9fcb2de 100644
--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode
 PORTVERSION=	2.55
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DANKOGAI
diff --git a/converters/p5-Encode/pkg-plist b/converters/p5-Encode/pkg-plist
index 147caf3fedef..a0c80149a412 100644
--- a/converters/p5-Encode/pkg-plist
+++ b/converters/p5-Encode/pkg-plist
@@ -16,47 +16,46 @@
 %%PERL5_MAN3%%/Encode::Supported.3.gz
 %%PERL5_MAN3%%/Encode::Unicode::UTF7.3.gz
 %%PERL5_MAN3%%/encoding.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Byte.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CJKConstants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN/HZ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Changes.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/ConfigLocal_PM.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/EBCDIC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Encoder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/GSM0338.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Guess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/H2Z.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/JIS7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/KR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/KR/2022_KR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header/ISO_2022_JP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Name.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Makefile_PL.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/PerlIO.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/README.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Supported.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Symbol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Unicode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Unicode/UTF7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/_PM.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/_T.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/encode.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte/Byte.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN/CN.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC/EBCDIC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Encode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/JP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR/KR.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol/Symbol.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW/TW.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode/Unicode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/encoding.pm
+%%SITE_ARCH%%/Encode.pm
+%%SITE_ARCH%%/Encode/Alias.pm
+%%SITE_ARCH%%/Encode/Byte.pm
+%%SITE_ARCH%%/Encode/CJKConstants.pm
+%%SITE_ARCH%%/Encode/CN.pm
+%%SITE_ARCH%%/Encode/CN/HZ.pm
+%%SITE_ARCH%%/Encode/Changes.e2x
+%%SITE_ARCH%%/Encode/Config.pm
+%%SITE_ARCH%%/Encode/ConfigLocal_PM.e2x
+%%SITE_ARCH%%/Encode/EBCDIC.pm
+%%SITE_ARCH%%/Encode/Encoder.pm
+%%SITE_ARCH%%/Encode/Encoding.pm
+%%SITE_ARCH%%/Encode/GSM0338.pm
+%%SITE_ARCH%%/Encode/Guess.pm
+%%SITE_ARCH%%/Encode/JP.pm
+%%SITE_ARCH%%/Encode/JP/H2Z.pm
+%%SITE_ARCH%%/Encode/JP/JIS7.pm
+%%SITE_ARCH%%/Encode/KR.pm
+%%SITE_ARCH%%/Encode/KR/2022_KR.pm
+%%SITE_ARCH%%/Encode/MIME/Header.pm
+%%SITE_ARCH%%/Encode/MIME/Header/ISO_2022_JP.pm
+%%SITE_ARCH%%/Encode/MIME/Name.pm
+%%SITE_ARCH%%/Encode/Makefile_PL.e2x
+%%SITE_ARCH%%/Encode/PerlIO.pod
+%%SITE_ARCH%%/Encode/README.e2x
+%%SITE_ARCH%%/Encode/Supported.pod
+%%SITE_ARCH%%/Encode/Symbol.pm
+%%SITE_ARCH%%/Encode/TW.pm
+%%SITE_ARCH%%/Encode/Unicode.pm
+%%SITE_ARCH%%/Encode/Unicode/UTF7.pm
+%%SITE_ARCH%%/Encode/_PM.e2x
+%%SITE_ARCH%%/Encode/_T.e2x
+%%SITE_ARCH%%/Encode/encode.h
+%%SITE_ARCH%%/auto/Encode/Byte/Byte.so
+%%SITE_ARCH%%/auto/Encode/CN/CN.so
+%%SITE_ARCH%%/auto/Encode/EBCDIC/EBCDIC.so
+%%SITE_ARCH%%/auto/Encode/Encode.so
+%%SITE_ARCH%%/auto/Encode/JP/JP.so
+%%SITE_ARCH%%/auto/Encode/KR/KR.so
+%%SITE_ARCH%%/auto/Encode/Symbol/Symbol.so
+%%SITE_ARCH%%/auto/Encode/TW/TW.so
+%%SITE_ARCH%%/auto/Encode/Unicode/Unicode.so
+%%SITE_ARCH%%/encoding.pm
diff --git a/converters/p5-Encoding-BER/Makefile b/converters/p5-Encoding-BER/Makefile
index 919746bfcb2b..63d0fb2d753b 100644
--- a/converters/p5-Encoding-BER/Makefile
+++ b/converters/p5-Encoding-BER/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encoding-BER
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JAW
diff --git a/converters/p5-Encoding-BER/pkg-plist b/converters/p5-Encoding-BER/pkg-plist
index 6d6d21110b8b..eb0321570b05 100644
--- a/converters/p5-Encoding-BER/pkg-plist
+++ b/converters/p5-Encoding-BER/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Encoding/BER/DER.pm
 %%SITE_PERL%%/Encoding/BER/Dumper.pm
 %%SITE_PERL%%/Encoding/BER/SNMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encoding/BER/.packlist
diff --git a/converters/p5-Encoding-FixLatin/Makefile b/converters/p5-Encoding-FixLatin/Makefile
index c4f755d7385f..80ff97016165 100644
--- a/converters/p5-Encoding-FixLatin/Makefile
+++ b/converters/p5-Encoding-FixLatin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encoding-FixLatin
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GRANTM
diff --git a/converters/p5-Encoding-FixLatin/pkg-plist b/converters/p5-Encoding-FixLatin/pkg-plist
index 7987966a12e3..3c7577da2618 100644
--- a/converters/p5-Encoding-FixLatin/pkg-plist
+++ b/converters/p5-Encoding-FixLatin/pkg-plist
@@ -1,5 +1,4 @@
 bin/fix_latin
 man/man1/fix_latin.1.gz
 %%SITE_PERL%%/Encoding/FixLatin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encoding/FixLatin/.packlist
 %%PERL5_MAN3%%/Encoding::FixLatin.3.gz
diff --git a/converters/p5-Format-Human-Bytes/Makefile b/converters/p5-Format-Human-Bytes/Makefile
index 67822ed2e316..f609375ab162 100644
--- a/converters/p5-Format-Human-Bytes/Makefile
+++ b/converters/p5-Format-Human-Bytes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Format-Human-Bytes
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Format-Human-Bytes/pkg-plist b/converters/p5-Format-Human-Bytes/pkg-plist
index 2737a8c8eba6..b956f9c75819 100644
--- a/converters/p5-Format-Human-Bytes/pkg-plist
+++ b/converters/p5-Format-Human-Bytes/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Format::Human::Bytes.3.gz
 %%SITE_PERL%%/Format/Human/Bytes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Format/Human/Bytes/.packlist
diff --git a/converters/p5-JSON-Any/Makefile b/converters/p5-JSON-Any/Makefile
index f1bc2e8a5780..18923e966784 100644
--- a/converters/p5-JSON-Any/Makefile
+++ b/converters/p5-JSON-Any/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-Any
 PORTVERSION=	1.38
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON-Any/pkg-plist b/converters/p5-JSON-Any/pkg-plist
index 447ebfea73de..42e69751c79a 100644
--- a/converters/p5-JSON-Any/pkg-plist
+++ b/converters/p5-JSON-Any/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/JSON::Any.3.gz
 %%SITE_PERL%%/JSON/Any.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Any/.packlist
diff --git a/converters/p5-JSON-DWIW/Makefile b/converters/p5-JSON-DWIW/Makefile
index e50ce92d1de5..01d30486d53e 100644
--- a/converters/p5-JSON-DWIW/Makefile
+++ b/converters/p5-JSON-DWIW/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-DWIW
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON-DWIW/pkg-plist b/converters/p5-JSON-DWIW/pkg-plist
index ed7470b0ca2d..8d102b9aac1d 100644
--- a/converters/p5-JSON-DWIW/pkg-plist
+++ b/converters/p5-JSON-DWIW/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/JSON::DWIW.3.gz
 %%PERL5_MAN3%%/JSON::DWIW::Boolean.3.gz
 %%PERL5_MAN3%%/JSON::DWIW::Changes.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW/Boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW/Changes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/DWIW/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/DWIW/DWIW.so
+%%SITE_ARCH%%/JSON/DWIW.pm
+%%SITE_ARCH%%/JSON/DWIW/Boolean.pm
+%%SITE_ARCH%%/JSON/DWIW/Changes.pm
+%%SITE_ARCH%%/auto/JSON/DWIW/DWIW.so
diff --git a/converters/p5-JSON-MaybeXS/Makefile b/converters/p5-JSON-MaybeXS/Makefile
index f2fd148ed361..f768e7b59db8 100644
--- a/converters/p5-JSON-MaybeXS/Makefile
+++ b/converters/p5-JSON-MaybeXS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-MaybeXS
 PORTVERSION=	1.003002
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON-MaybeXS/pkg-plist b/converters/p5-JSON-MaybeXS/pkg-plist
index bd412d261c15..1b1c052a79f2 100644
--- a/converters/p5-JSON-MaybeXS/pkg-plist
+++ b/converters/p5-JSON-MaybeXS/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/JSON/MaybeXS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/MaybeXS/.packlist
 %%PERL5_MAN3%%/JSON::MaybeXS.3.gz
diff --git a/converters/p5-JSON-PP/Makefile b/converters/p5-JSON-PP/Makefile
index 396f24e6cd99..fd5ada05829c 100644
--- a/converters/p5-JSON-PP/Makefile
+++ b/converters/p5-JSON-PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-PP
 PORTVERSION=	2.27300
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAKAMAKA
diff --git a/converters/p5-JSON-PP/pkg-plist b/converters/p5-JSON-PP/pkg-plist
index df54e4ccf206..763b49f4a817 100644
--- a/converters/p5-JSON-PP/pkg-plist
+++ b/converters/p5-JSON-PP/pkg-plist
@@ -1,7 +1,6 @@
 bin/p5json_pp
 %%SITE_PERL%%/JSON/PP.pm
 %%SITE_PERL%%/JSON/PP/Boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/PP/.packlist
 %%PERL5_MAN3%%/JSON::PP.3.gz
 %%PERL5_MAN3%%/JSON::PP::Boolean.3.gz
 man/man1/p5json_pp.1.gz
diff --git a/converters/p5-JSON-Tiny/Makefile b/converters/p5-JSON-Tiny/Makefile
index 7d4a565e6fd3..dc959c4c617b 100644
--- a/converters/p5-JSON-Tiny/Makefile
+++ b/converters/p5-JSON-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-Tiny
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON-Tiny/pkg-plist b/converters/p5-JSON-Tiny/pkg-plist
index 68b3650a510d..d5dbbd53ae30 100644
--- a/converters/p5-JSON-Tiny/pkg-plist
+++ b/converters/p5-JSON-Tiny/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/JSON/Tiny.pm
 %%SITE_PERL%%/JSON/Tiny.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Tiny/.packlist
 %%PERL5_MAN3%%/JSON::Tiny.3.gz
diff --git a/converters/p5-JSON-XS-VersionOneAndTwo/Makefile b/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
index 04ded90d3658..c2b11dc4cde2 100644
--- a/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
+++ b/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-XS-VersionOneAndTwo
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON-XS-VersionOneAndTwo/pkg-plist b/converters/p5-JSON-XS-VersionOneAndTwo/pkg-plist
index d14495715594..6ae2379eb45a 100644
--- a/converters/p5-JSON-XS-VersionOneAndTwo/pkg-plist
+++ b/converters/p5-JSON-XS-VersionOneAndTwo/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/XS/VersionOneAndTwo/.packlist
 %%SITE_PERL%%/JSON/XS/VersionOneAndTwo.pm
 %%PERL5_MAN3%%/JSON::XS::VersionOneAndTwo.3.gz
diff --git a/converters/p5-JSON-XS/Makefile b/converters/p5-JSON-XS/Makefile
index dd8a321212d7..9186cc836539 100644
--- a/converters/p5-JSON-XS/Makefile
+++ b/converters/p5-JSON-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-XS
 PORTVERSION=	3.01
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON-XS/pkg-plist b/converters/p5-JSON-XS/pkg-plist
index 30dda188b404..0c6474a5dad6 100644
--- a/converters/p5-JSON-XS/pkg-plist
+++ b/converters/p5-JSON-XS/pkg-plist
@@ -1,8 +1,7 @@
 bin/json_xs
-%%SITE_PERL%%/%%PERL_ARCH%%/JSON/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/JSON/XS/Boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/XS/XS.so
+%%SITE_ARCH%%/JSON/XS.pm
+%%SITE_ARCH%%/JSON/XS/Boolean.pm
+%%SITE_ARCH%%/auto/JSON/XS/XS.so
 %%PERL5_MAN3%%/JSON::XS.3.gz
 %%PERL5_MAN3%%/JSON::XS::Boolean.3.gz
 man/man1/json_xs.1.gz
diff --git a/converters/p5-JSON/Makefile b/converters/p5-JSON/Makefile
index 15a5fe580eca..3aa0f4c1e68f 100644
--- a/converters/p5-JSON/Makefile
+++ b/converters/p5-JSON/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	JSON
 PORTVERSION=	2.90
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON/pkg-plist b/converters/p5-JSON/pkg-plist
index 5bd5ae6fbba7..a24380da9037 100644
--- a/converters/p5-JSON/pkg-plist
+++ b/converters/p5-JSON/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/.packlist
 %%SITE_PERL%%/JSON.pm
 %%SITE_PERL%%/JSON/backportPP.pm
 %%SITE_PERL%%/JSON/backportPP/Boolean.pm
diff --git a/converters/p5-JSON1/Makefile b/converters/p5-JSON1/Makefile
index 436e2b7489a0..867e89eba75c 100644
--- a/converters/p5-JSON1/Makefile
+++ b/converters/p5-JSON1/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	JSON
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-JSON1/pkg-plist b/converters/p5-JSON1/pkg-plist
index 822e4ed9ab15..899ec802bdc2 100644
--- a/converters/p5-JSON1/pkg-plist
+++ b/converters/p5-JSON1/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/JSON/Parser.pm
 %%SITE_PERL%%/JSONRPC.pm
 %%SITE_PERL%%/JSONRPC/Transport/HTTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/.packlist
 %%PERL5_MAN3%%/Apache::JSONRPC.3.gz
 %%PERL5_MAN3%%/JSON.3.gz
 %%PERL5_MAN3%%/JSON::Converter.3.gz
diff --git a/converters/p5-MIME-Base32/Makefile b/converters/p5-MIME-Base32/Makefile
index 6a8162a96d26..202b9c83715d 100644
--- a/converters/p5-MIME-Base32/Makefile
+++ b/converters/p5-MIME-Base32/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Base32
 PORTVERSION=	1.02a
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-MIME-Base32/pkg-plist b/converters/p5-MIME-Base32/pkg-plist
index 22f1dfcfaa9f..9d2e8cd12eec 100644
--- a/converters/p5-MIME-Base32/pkg-plist
+++ b/converters/p5-MIME-Base32/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MIME/Base32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base32/.packlist
 %%PERL5_MAN3%%/MIME::Base32.3.gz
diff --git a/converters/p5-MIME-Base64-URLSafe/Makefile b/converters/p5-MIME-Base64-URLSafe/Makefile
index e8ab26c686ea..d2765d30ce0d 100644
--- a/converters/p5-MIME-Base64-URLSafe/Makefile
+++ b/converters/p5-MIME-Base64-URLSafe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Base64-URLSafe
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-MIME-Base64-URLSafe/pkg-plist b/converters/p5-MIME-Base64-URLSafe/pkg-plist
index f15e5336a764..c16fafa357d7 100644
--- a/converters/p5-MIME-Base64-URLSafe/pkg-plist
+++ b/converters/p5-MIME-Base64-URLSafe/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MIME/Base64/URLSafe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64/URLSafe/.packlist
 %%PERL5_MAN3%%/MIME::Base64::URLSafe.3.gz
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index bf9949b5c69d..02a9f9e9739b 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Base64
 PORTVERSION=	3.14
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-MIME-Base64/pkg-plist b/converters/p5-MIME-Base64/pkg-plist
index 5d48cdbdd1d7..d08af54a4c5f 100644
--- a/converters/p5-MIME-Base64/pkg-plist
+++ b/converters/p5-MIME-Base64/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/MIME::Base64.3.gz
 %%PERL5_MAN3%%/MIME::QuotedPrint.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Base64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/QuotedPrint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64/Base64.so
+%%SITE_ARCH%%/MIME/Base64.pm
+%%SITE_ARCH%%/MIME/QuotedPrint.pm
+%%SITE_ARCH%%/auto/MIME/Base64/Base64.so
diff --git a/converters/p5-Net-IDN-Nameprep/Makefile b/converters/p5-Net-IDN-Nameprep/Makefile
index aba778c9ba99..f9b9ad2cadf9 100644
--- a/converters/p5-Net-IDN-Nameprep/Makefile
+++ b/converters/p5-Net-IDN-Nameprep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IDN-Nameprep
 PORTVERSION=	1.101
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Number-Nary/Makefile b/converters/p5-Number-Nary/Makefile
index 5a38fda0dbed..8fd488957547 100644
--- a/converters/p5-Number-Nary/Makefile
+++ b/converters/p5-Number-Nary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Nary
 PORTVERSION=	1.100311
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Number-Nary/pkg-plist b/converters/p5-Number-Nary/pkg-plist
index b12724521594..b52795544b6c 100644
--- a/converters/p5-Number-Nary/pkg-plist
+++ b/converters/p5-Number-Nary/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Number/Nary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Nary/.packlist
 %%PERL5_MAN3%%/Number::Nary.3.gz
diff --git a/converters/p5-Number-RecordLocator/Makefile b/converters/p5-Number-RecordLocator/Makefile
index 38fb4a4e6b16..d87888a391af 100644
--- a/converters/p5-Number-RecordLocator/Makefile
+++ b/converters/p5-Number-RecordLocator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-RecordLocator
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Number-RecordLocator/pkg-plist b/converters/p5-Number-RecordLocator/pkg-plist
index 4c03146af0bb..f550a8dbe760 100644
--- a/converters/p5-Number-RecordLocator/pkg-plist
+++ b/converters/p5-Number-RecordLocator/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Number/RecordLocator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/RecordLocator/.packlist
 %%PERL5_MAN3%%/Number::RecordLocator.3.gz
diff --git a/converters/p5-PerlIO-via-Unidecode/Makefile b/converters/p5-PerlIO-via-Unidecode/Makefile
index be22ec8eef7f..e502dcc63dc0 100644
--- a/converters/p5-PerlIO-via-Unidecode/Makefile
+++ b/converters/p5-PerlIO-via-Unidecode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-via-Unidecode
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-PerlIO-via-Unidecode/pkg-plist b/converters/p5-PerlIO-via-Unidecode/pkg-plist
index d5e74bfe3cc2..083fa4606de3 100644
--- a/converters/p5-PerlIO-via-Unidecode/pkg-plist
+++ b/converters/p5-PerlIO-via-Unidecode/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/PerlIO::via::Unidecode.3.gz
 %%SITE_PERL%%/PerlIO/via/Unidecode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/Unidecode/.packlist
diff --git a/converters/p5-Sereal-Decoder/Makefile b/converters/p5-Sereal-Decoder/Makefile
index 9e070fe5cea2..b9947dcbc044 100644
--- a/converters/p5-Sereal-Decoder/Makefile
+++ b/converters/p5-Sereal-Decoder/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Sereal-Decoder
 PORTVERSION=	3.003
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:YVES
@@ -20,6 +21,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Sereal/Decoder/Decoder.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sereal/Decoder/Decoder.so
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Sereal-Decoder/pkg-plist b/converters/p5-Sereal-Decoder/pkg-plist
index 2debb3b0a751..5c32b6dc8adf 100644
--- a/converters/p5-Sereal-Decoder/pkg-plist
+++ b/converters/p5-Sereal-Decoder/pkg-plist
@@ -1,7 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sereal/Decoder/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sereal/Decoder/Decoder.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Sereal/Decoder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sereal/Decoder/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sereal/Performance.pm
+%%SITE_ARCH%%/auto/Sereal/Decoder/Decoder.so
+%%SITE_ARCH%%/Sereal/Decoder.pm
+%%SITE_ARCH%%/Sereal/Decoder/Constants.pm
+%%SITE_ARCH%%/Sereal/Performance.pm
 %%PERL5_MAN3%%/Sereal::Decoder.3.gz
 %%PERL5_MAN3%%/Sereal::Performance.3.gz
diff --git a/converters/p5-Sereal-Encoder/Makefile b/converters/p5-Sereal-Encoder/Makefile
index a0f5d3eb613b..57a692d2c98a 100644
--- a/converters/p5-Sereal-Encoder/Makefile
+++ b/converters/p5-Sereal-Encoder/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Sereal-Encoder
 PORTVERSION=	3.003
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:YVES
@@ -22,6 +23,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Sereal/Encoder/Encoder.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sereal/Encoder/Encoder.so
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Sereal-Encoder/pkg-plist b/converters/p5-Sereal-Encoder/pkg-plist
index 22e8bdfa3d8b..1a8dfe3da43b 100644
--- a/converters/p5-Sereal-Encoder/pkg-plist
+++ b/converters/p5-Sereal-Encoder/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sereal/Encoder/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sereal/Encoder/Encoder.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Sereal/Encoder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sereal/Encoder/Constants.pm
+%%SITE_ARCH%%/auto/Sereal/Encoder/Encoder.so
+%%SITE_ARCH%%/Sereal/Encoder.pm
+%%SITE_ARCH%%/Sereal/Encoder/Constants.pm
 %%PERL5_MAN3%%/Sereal::Encoder.3.gz
diff --git a/converters/p5-Sereal/Makefile b/converters/p5-Sereal/Makefile
index 743d7f6aca1a..16ed74139ef6 100644
--- a/converters/p5-Sereal/Makefile
+++ b/converters/p5-Sereal/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Sereal
 PORTVERSION=	3.003
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:YVES
diff --git a/converters/p5-Sereal/pkg-plist b/converters/p5-Sereal/pkg-plist
index daf5311b67a2..c4edf428e208 100644
--- a/converters/p5-Sereal/pkg-plist
+++ b/converters/p5-Sereal/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sereal/.packlist
 %%SITE_PERL%%/Sereal.pm
 %%PERL5_MAN3%%/Sereal.3.gz
diff --git a/converters/p5-Storable-AMF/Makefile b/converters/p5-Storable-AMF/Makefile
index 1e5654cfb7be..5e0c1307a77b 100644
--- a/converters/p5-Storable-AMF/Makefile
+++ b/converters/p5-Storable-AMF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Storable-AMF
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Storable-AMF/pkg-plist b/converters/p5-Storable-AMF/pkg-plist
index ce284592cf16..1372208a0af6 100644
--- a/converters/p5-Storable-AMF/pkg-plist
+++ b/converters/p5-Storable-AMF/pkg-plist
@@ -1,9 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Storable/AMF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Storable/AMF0.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Storable/AMF3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Storable/AMF/Mapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Storable/AMF/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Storable/AMF/AMF.so
+%%SITE_ARCH%%/Storable/AMF.pm
+%%SITE_ARCH%%/Storable/AMF0.pm
+%%SITE_ARCH%%/Storable/AMF3.pm
+%%SITE_ARCH%%/Storable/AMF/Mapper.pm
+%%SITE_ARCH%%/auto/Storable/AMF/AMF.so
 %%PERL5_MAN3%%/Storable::AMF.3.gz
 %%PERL5_MAN3%%/Storable::AMF0.3.gz
 %%PERL5_MAN3%%/Storable::AMF3.3.gz
diff --git a/converters/p5-String-Multibyte/Makefile b/converters/p5-String-Multibyte/Makefile
index 97b06321b043..ad12e9c25c8d 100644
--- a/converters/p5-String-Multibyte/Makefile
+++ b/converters/p5-String-Multibyte/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Multibyte
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SADAHIRO
diff --git a/converters/p5-String-Multibyte/pkg-plist b/converters/p5-String-Multibyte/pkg-plist
index 3fc442ae914d..b3ef147a8453 100644
--- a/converters/p5-String-Multibyte/pkg-plist
+++ b/converters/p5-String-Multibyte/pkg-plist
@@ -36,4 +36,3 @@
 %%SITE_PERL%%/String/Multibyte/UTF32LE.pm
 %%SITE_PERL%%/String/Multibyte/UTF8.pm
 %%SITE_PERL%%/String/Multibyte/Unicode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Multibyte/.packlist
diff --git a/converters/p5-String-SetUTF8/Makefile b/converters/p5-String-SetUTF8/Makefile
index 2ee7b4ee0284..21fa0dc52fa5 100644
--- a/converters/p5-String-SetUTF8/Makefile
+++ b/converters/p5-String-SetUTF8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-SetUTF8
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-String-SetUTF8/pkg-plist b/converters/p5-String-SetUTF8/pkg-plist
index 33c4c7ea78c1..282254eeacb1 100644
--- a/converters/p5-String-SetUTF8/pkg-plist
+++ b/converters/p5-String-SetUTF8/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/String/SetUTF8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/SetUTF8/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/SetUTF8/SetUTF8.so
+%%SITE_ARCH%%/String/SetUTF8.pm
+%%SITE_ARCH%%/auto/String/SetUTF8/SetUTF8.so
 %%PERL5_MAN3%%/String::SetUTF8.3.gz
diff --git a/converters/p5-Text-Bidi/Makefile b/converters/p5-Text-Bidi/Makefile
index e710927978f5..cf1a68a2d860 100644
--- a/converters/p5-Text-Bidi/Makefile
+++ b/converters/p5-Text-Bidi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Bidi
 PORTVERSION=	2.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Text-Bidi/pkg-plist b/converters/p5-Text-Bidi/pkg-plist
index 801fea5b17e6..e56634c30b0a 100644
--- a/converters/p5-Text-Bidi/pkg-plist
+++ b/converters/p5-Text-Bidi/pkg-plist
@@ -1,13 +1,12 @@
 bin/fribidi.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Bidi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Bidi/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Bidi/Array/Byte.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Bidi/Array/Long.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Bidi/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Bidi/Paragraph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Bidi/private.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bidi/private/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bidi/private/private.so
+%%SITE_ARCH%%/Text/Bidi.pm
+%%SITE_ARCH%%/Text/Bidi/Array.pm
+%%SITE_ARCH%%/Text/Bidi/Array/Byte.pm
+%%SITE_ARCH%%/Text/Bidi/Array/Long.pm
+%%SITE_ARCH%%/Text/Bidi/Constants.pm
+%%SITE_ARCH%%/Text/Bidi/Paragraph.pm
+%%SITE_ARCH%%/Text/Bidi/private.pm
+%%SITE_ARCH%%/auto/Text/Bidi/private/private.so
 %%PERL5_MAN3%%/Text::Bidi.3.gz
 %%PERL5_MAN3%%/Text::Bidi::Array.3.gz
 %%PERL5_MAN3%%/Text::Bidi::Array::Byte.3.gz
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index 11a75454d045..c8c9b0534bbb 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Iconv
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Text-Iconv/pkg-plist b/converters/p5-Text-Iconv/pkg-plist
index 8d40557386ac..9db9249fd66b 100644
--- a/converters/p5-Text-Iconv/pkg-plist
+++ b/converters/p5-Text-Iconv/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Text::Iconv.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Iconv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
+%%SITE_ARCH%%/Text/Iconv.pm
+%%SITE_ARCH%%/auto/Text/Iconv/Iconv.so
+%%SITE_ARCH%%/auto/Text/Iconv/autosplit.ix
diff --git a/converters/p5-Text-Unidecode/Makefile b/converters/p5-Text-Unidecode/Makefile
index bdbd83212af0..79c0d8142a51 100644
--- a/converters/p5-Text-Unidecode/Makefile
+++ b/converters/p5-Text-Unidecode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Unidecode
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Text-Unidecode/pkg-plist b/converters/p5-Text-Unidecode/pkg-plist
index 5c42b61d2aca..f3830fdf57da 100644
--- a/converters/p5-Text-Unidecode/pkg-plist
+++ b/converters/p5-Text-Unidecode/pkg-plist
@@ -179,5 +179,4 @@
 %%SITE_PERL%%/Text/Unidecode/xfd.pm
 %%SITE_PERL%%/Text/Unidecode/xfe.pm
 %%SITE_PERL%%/Text/Unidecode/xff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unidecode/.packlist
 %%PERL5_MAN3%%/Text::Unidecode.3.gz
diff --git a/converters/p5-URI-UTF8-Punycode/Makefile b/converters/p5-URI-UTF8-Punycode/Makefile
index e2b721343157..7a074c3d8929 100644
--- a/converters/p5-URI-UTF8-Punycode/Makefile
+++ b/converters/p5-URI-UTF8-Punycode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-UTF8-Punycode
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-URI-UTF8-Punycode/pkg-plist b/converters/p5-URI-UTF8-Punycode/pkg-plist
index ef66ba68b2f8..1cbe9d7caac1 100644
--- a/converters/p5-URI-UTF8-Punycode/pkg-plist
+++ b/converters/p5-URI-UTF8-Punycode/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/URI/UTF8/Punycode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/UTF8/Punycode/Punycode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/UTF8/Punycode/.packlist
+%%SITE_ARCH%%/URI/UTF8/Punycode.pm
+%%SITE_ARCH%%/auto/URI/UTF8/Punycode/Punycode.so
 %%PERL5_MAN3%%/URI::UTF8::Punycode.3.gz
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index bc39b92939c1..66af04b6a97a 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Unicode-IMAPUtf7
 PORTVERSION=	2.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FABPOT
diff --git a/converters/p5-Unicode-IMAPUtf7/pkg-plist b/converters/p5-Unicode-IMAPUtf7/pkg-plist
index b39854407bfb..aa22248cac44 100644
--- a/converters/p5-Unicode-IMAPUtf7/pkg-plist
+++ b/converters/p5-Unicode-IMAPUtf7/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Unicode::IMAPUtf7.3.gz
 %%SITE_PERL%%/Unicode/IMAPUtf7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7/.packlist
diff --git a/converters/p5-Unicode-Map/Makefile b/converters/p5-Unicode-Map/Makefile
index 12ba83dc980f..eeb1c3832629 100644
--- a/converters/p5-Unicode-Map/Makefile
+++ b/converters/p5-Unicode-Map/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Map
 PORTVERSION=	0.112
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Unicode-Map/pkg-plist b/converters/p5-Unicode-Map/pkg-plist
index c833d8c10cca..0bb3bcd7aadf 100644
--- a/converters/p5-Unicode-Map/pkg-plist
+++ b/converters/p5-Unicode-Map/pkg-plist
@@ -3,101 +3,100 @@ bin/mirrorMappings
 bin/mkCSGB2312
 bin/mkmapfile
 %%PERL5_MAN3%%/Unicode::Map.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/STDENC.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/ZDINGBAT.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ARABIC.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CENTEURO.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINSIMP.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINTRAD.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CROATIAN.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CYRILLIC.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DEVANAGA.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DINGBATS.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GREEK.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GUJARATI.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GURMUKHI.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/HEBREW.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ICELAND.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/JAPANESE.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/KOREAN.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMAN.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMANIAN.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/SYMBOL.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/THAI.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/TURKISH.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/BIG5.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/CNS-11643-1986.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-JP.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-KR.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB12345-80.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312-80.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0201.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0208.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0212.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JOHAB.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC1001.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC5601-1992.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/SHIFTJIS.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/IBM/IBM038.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-1.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-10.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-13.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-14.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-15.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-2.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-3.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-4.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-5.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-6.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-7.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-8.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-9.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/ISO646-US.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP437.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP737.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP775.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP850.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP852.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP855.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP857.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP860.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP861.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP862.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP863.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP864.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP865.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP866.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP869.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP874.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP037.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP1026.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP500.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP875.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/CYRILLIC.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/GREEK.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ICELAND.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/LATIN2.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ROMAN.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/TURKISH.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1250.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1251.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1252.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1253.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1254.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1255.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1256.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1257.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1258.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP932.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP936.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP949.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP950.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/REGISTRY
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.so
+%%SITE_ARCH%%/Unicode/Map.pm
+%%SITE_ARCH%%/Unicode/Map/ADOBE/STDENC.map
+%%SITE_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
+%%SITE_ARCH%%/Unicode/Map/ADOBE/ZDINGBAT.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/ARABIC.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/CENTEURO.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/CHINSIMP.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/CHINTRAD.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/CROATIAN.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/CYRILLIC.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/DEVANAGA.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/DINGBATS.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/GREEK.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/GUJARATI.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/GURMUKHI.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/HEBREW.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/ICELAND.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/JAPANESE.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/KOREAN.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/ROMAN.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/ROMANIAN.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/SYMBOL.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/THAI.map
+%%SITE_ARCH%%/Unicode/Map/APPLE/TURKISH.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/BIG5.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/CNS-11643-1986.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/EUC-JP.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/EUC-KR.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/GB12345-80.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/GB2312-80.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/GB2312.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0201.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0208.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0212.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/JOHAB.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/KSC1001.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/KSC5601-1992.map
+%%SITE_ARCH%%/Unicode/Map/EASTASIA/SHIFTJIS.map
+%%SITE_ARCH%%/Unicode/Map/IBM/IBM038.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-1.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-10.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-13.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-14.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-15.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-2.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-3.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-4.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-5.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-6.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-7.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-8.map
+%%SITE_ARCH%%/Unicode/Map/ISO/8859-9.map
+%%SITE_ARCH%%/Unicode/Map/ISO/ISO646-US.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP437.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP737.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP775.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP850.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP852.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP855.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP857.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP860.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP861.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP862.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP863.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP864.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP865.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP866.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP869.map
+%%SITE_ARCH%%/Unicode/Map/MS/DOS/CP874.map
+%%SITE_ARCH%%/Unicode/Map/MS/EBCDIC/CP037.map
+%%SITE_ARCH%%/Unicode/Map/MS/EBCDIC/CP1026.map
+%%SITE_ARCH%%/Unicode/Map/MS/EBCDIC/CP500.map
+%%SITE_ARCH%%/Unicode/Map/MS/EBCDIC/CP875.map
+%%SITE_ARCH%%/Unicode/Map/MS/MAC/CYRILLIC.map
+%%SITE_ARCH%%/Unicode/Map/MS/MAC/GREEK.map
+%%SITE_ARCH%%/Unicode/Map/MS/MAC/ICELAND.map
+%%SITE_ARCH%%/Unicode/Map/MS/MAC/LATIN2.map
+%%SITE_ARCH%%/Unicode/Map/MS/MAC/ROMAN.map
+%%SITE_ARCH%%/Unicode/Map/MS/MAC/TURKISH.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1250.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1251.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1252.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1253.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1254.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1255.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1256.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1257.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP1258.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP932.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP936.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP949.map
+%%SITE_ARCH%%/Unicode/Map/MS/WIN/CP950.map
+%%SITE_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
+%%SITE_ARCH%%/Unicode/Map/REGISTRY
+%%SITE_ARCH%%/auto/Unicode/Map/Map.so
 man/man1/map.1.gz
 man/man1/mkmapfile.1.gz
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index c4577fc82be8..2cc27225392c 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Map8
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,8 +18,8 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/Unicode/Map8/Map8.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/Unicode/Map8/Map8.so
-	${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/Unicode/Map8/Map8.so
+	${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Unicode/Map8/Map8.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Unicode/Map8/Map8.so
+	${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Unicode/Map8/Map8.so
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-Map8/pkg-plist b/converters/p5-Unicode-Map8/pkg-plist
index 03b8c0b6d21e..184c8143ba2c 100644
--- a/converters/p5-Unicode-Map8/pkg-plist
+++ b/converters/p5-Unicode-Map8/pkg-plist
@@ -1,187 +1,186 @@
 bin/umap
 %%PERL5_MAN3%%/Unicode::Map8.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ANSI_X3.110-1983.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ANSI_X3.4-1968.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ASMO_449.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/Adobe-Standard.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/Adobe-Symbol.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/Adobe-Zapf-Dingbats.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/BS_4730.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/BS_viewdata.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/CSA_Z243.4-1985-1.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/CSA_Z243.4-1985-2.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/CSA_Z243.4-1985-gr.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/CSN_369103.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/DEC-MCS.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/DIN_66003.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/DS_2089.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-AT-DE-A.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-AT-DE.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-CA-FR.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-DK-NO-A.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-DK-NO.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-ES-A.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-ES-S.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-ES.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-FI-SE-A.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-FI-SE.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-FR.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-IT.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-PT.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-UK.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/EBCDIC-US.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ECMA-cyrillic.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ES.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ES2.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/GB_1988-80.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/GOST_19768-74.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM037.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM038.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM1026.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM273.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM274.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM275.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM277.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM278.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM280.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM281.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM284.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM285.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM290.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM297.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM420.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM424.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM437.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM500.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM850.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM851.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM852.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM855.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM857.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM860.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM861.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM862.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM863.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM864.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM865.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM868.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM869.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM870.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM871.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM880.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM891.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM903.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM904.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM905.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IBM918.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IEC_P27-1.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/INIS-8.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/INIS-cyrillic.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/INIS.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/INVARIANT.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_10367-box.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_2033-1983.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_5427.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_5428.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_646.basic.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_646.irv.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_6937-2-25.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_6937-2-add.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-1.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-13.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-15.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-2.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-3.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-4.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-5.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-6.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-7.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-8.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-9.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ISO_8859-supp.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/IT.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6220-1969-jp.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6220-1969-ro.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-a.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-b-add.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-b.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-hand-add.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-hand.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-kana.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JIS_X0201.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JUS_I.B1.002.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JUS_I.B1.003-mac.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/JUS_I.B1.003-serb.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/KSC5636.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/Latin-greek-1.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/MSZ_7795.3.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NATS-DANO-ADD.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NATS-DANO.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NATS-SEFI-ADD.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NATS-SEFI.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NC_NC00-10.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NF_Z_62-010.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NS_4551-1.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/NS_4551-2.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/PT.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/PT2.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/SEN_850200_B.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/SEN_850200_C.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/T.101-G2.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/T.61-7bit.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/T.61-8bit.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/aliases
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp037.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp10000.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp10006.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp10007.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp10029.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp10079.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp10081.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1026.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1250.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1251.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1252.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1253.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1254.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1255.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1256.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1257.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp1258.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp437.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp500.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp737.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp775.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp850.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp852.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp855.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp857.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp860.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp861.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp862.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp863.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp864.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp865.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp866.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp866lr.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp869.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp874.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/cp875.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/dk-us.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/greek-ccitt.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/greek7-old.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/greek7.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/hp-roman8.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/iso-ir-90.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/koi8-r.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/koi8-u.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/latin-greek.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/latin-lap.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/latin6.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/macintosh.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/us-dk.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/videotex-suppl.bin
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8/Map8.so
+%%SITE_ARCH%%/Unicode/Map8.pm
+%%SITE_ARCH%%/Unicode/Map8/maps/ANSI_X3.110-1983.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ANSI_X3.4-1968.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ASMO_449.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/Adobe-Standard.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/Adobe-Symbol.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/Adobe-Zapf-Dingbats.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/BS_4730.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/BS_viewdata.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/CSA_Z243.4-1985-1.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/CSA_Z243.4-1985-2.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/CSA_Z243.4-1985-gr.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/CSN_369103.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/DEC-MCS.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/DIN_66003.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/DS_2089.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-AT-DE-A.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-AT-DE.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-CA-FR.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-DK-NO-A.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-DK-NO.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-ES-A.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-ES-S.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-ES.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-FI-SE-A.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-FI-SE.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-FR.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-IT.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-PT.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-UK.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/EBCDIC-US.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ECMA-cyrillic.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ES.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ES2.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/GB_1988-80.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/GOST_19768-74.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM037.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM038.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM1026.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM273.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM274.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM275.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM277.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM278.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM280.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM281.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM284.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM285.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM290.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM297.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM420.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM424.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM437.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM500.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM850.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM851.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM852.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM855.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM857.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM860.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM861.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM862.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM863.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM864.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM865.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM868.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM869.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM870.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM871.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM880.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM891.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM903.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM904.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM905.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IBM918.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IEC_P27-1.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/INIS-8.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/INIS-cyrillic.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/INIS.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/INVARIANT.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_10367-box.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_2033-1983.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_5427.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_5428.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_646.basic.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_646.irv.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_6937-2-25.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_6937-2-add.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-1.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-13.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-15.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-2.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-3.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-4.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-5.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-6.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-7.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-8.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-9.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/ISO_8859-supp.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/IT.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6220-1969-jp.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6220-1969-ro.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-a.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-b-add.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-b.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-hand-add.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-hand.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_C6229-1984-kana.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JIS_X0201.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JUS_I.B1.002.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JUS_I.B1.003-mac.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/JUS_I.B1.003-serb.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/KSC5636.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/Latin-greek-1.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/MSZ_7795.3.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NATS-DANO-ADD.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NATS-DANO.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NATS-SEFI-ADD.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NATS-SEFI.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NC_NC00-10.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NF_Z_62-010.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NS_4551-1.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/NS_4551-2.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/PT.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/PT2.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/SEN_850200_B.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/SEN_850200_C.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/T.101-G2.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/T.61-7bit.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/T.61-8bit.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/aliases
+%%SITE_ARCH%%/Unicode/Map8/maps/cp037.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp10000.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp10006.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp10007.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp10029.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp10079.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp10081.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1026.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1250.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1251.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1252.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1253.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1254.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1255.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1256.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1257.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp1258.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp437.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp500.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp737.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp775.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp850.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp852.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp855.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp857.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp860.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp861.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp862.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp863.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp864.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp865.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp866.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp866lr.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp869.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp874.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/cp875.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/dk-us.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/greek-ccitt.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/greek7-old.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/greek7.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/hp-roman8.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/iso-ir-90.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/koi8-r.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/koi8-u.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/latin-greek.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/latin-lap.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/latin6.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/macintosh.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/us-dk.bin
+%%SITE_ARCH%%/Unicode/Map8/maps/videotex-suppl.bin
+%%SITE_ARCH%%/auto/Unicode/Map8/Map8.so
 man/man1/umap.1.gz
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index cc6287b45007..e20bd2e9b5ef 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-MapUTF8
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Unicode-MapUTF8/pkg-plist b/converters/p5-Unicode-MapUTF8/pkg-plist
index 847d4ade8f3b..1a491533de0c 100644
--- a/converters/p5-Unicode-MapUTF8/pkg-plist
+++ b/converters/p5-Unicode-MapUTF8/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Unicode::MapUTF8.3.gz
 %%SITE_PERL%%/Unicode/MapUTF8.pm
 %%SITE_PERL%%/Unicode/MapUTF8.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8/.packlist
diff --git a/converters/p5-Unicode-RecursiveDowngrade/Makefile b/converters/p5-Unicode-RecursiveDowngrade/Makefile
index d5524ba2429b..a5c2043d2f46 100644
--- a/converters/p5-Unicode-RecursiveDowngrade/Makefile
+++ b/converters/p5-Unicode-RecursiveDowngrade/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Unicode-RecursiveDowngrade
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Unicode-RecursiveDowngrade/pkg-plist b/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
index 1bf7629e141c..7d4391cbf7a3 100644
--- a/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
+++ b/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Unicode/RecursiveDowngrade.pm
 %%PERL5_MAN3%%/Unicode::RecursiveDowngrade.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/RecursiveDowngrade/.packlist
diff --git a/converters/p5-Unicode-String/Makefile b/converters/p5-Unicode-String/Makefile
index b107a489c9b2..85b3438e4d2f 100644
--- a/converters/p5-Unicode-String/Makefile
+++ b/converters/p5-Unicode-String/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-String
 PORTVERSION=	2.09
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Unicode-String/pkg-plist b/converters/p5-Unicode-String/pkg-plist
index 116272633aa3..873f4023d11b 100644
--- a/converters/p5-Unicode-String/pkg-plist
+++ b/converters/p5-Unicode-String/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Unicode::CharName.3.gz
 %%PERL5_MAN3%%/Unicode::String.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/CharName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/String.so
+%%SITE_ARCH%%/Unicode/CharName.pm
+%%SITE_ARCH%%/Unicode/String.pm
+%%SITE_ARCH%%/auto/Unicode/String/String.so
diff --git a/converters/p5-Unicode-Stringprep/Makefile b/converters/p5-Unicode-Stringprep/Makefile
index 557db04a894c..96c34e63a6cd 100644
--- a/converters/p5-Unicode-Stringprep/Makefile
+++ b/converters/p5-Unicode-Stringprep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Stringprep
 PORTVERSION=	1.105
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Unicode-Stringprep/pkg-plist b/converters/p5-Unicode-Stringprep/pkg-plist
index e6b5e8924ca7..dc6fc9a1e36e 100644
--- a/converters/p5-Unicode-Stringprep/pkg-plist
+++ b/converters/p5-Unicode-Stringprep/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/Unicode/Stringprep/Prohibited.pm
 %%SITE_PERL%%/Unicode/Stringprep/Unassigned.pm
 %%SITE_PERL%%/Unicode/Stringprep/_Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Stringprep/.packlist
diff --git a/converters/p5-Unicode-UTF8simple/Makefile b/converters/p5-Unicode-UTF8simple/Makefile
index 1e6fd55356c9..88347cbdc480 100644
--- a/converters/p5-Unicode-UTF8simple/Makefile
+++ b/converters/p5-Unicode-UTF8simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-UTF8simple
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-Unicode-UTF8simple/pkg-plist b/converters/p5-Unicode-UTF8simple/pkg-plist
index 0787eb426ae0..c71ce9072170 100644
--- a/converters/p5-Unicode-UTF8simple/pkg-plist
+++ b/converters/p5-Unicode-UTF8simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Unicode::UTF8simple.3.gz
 %%SITE_PERL%%/Unicode/UTF8simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/UTF8simple/.packlist
diff --git a/converters/p5-WAP-wbxml/Makefile b/converters/p5-WAP-wbxml/Makefile
index 7de9945e3d57..a49488e1a979 100644
--- a/converters/p5-WAP-wbxml/Makefile
+++ b/converters/p5-WAP-wbxml/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WAP-wbxml
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-WAP-wbxml/pkg-plist b/converters/p5-WAP-wbxml/pkg-plist
index f220a27da7ef..cd8daaf39831 100644
--- a/converters/p5-WAP-wbxml/pkg-plist
+++ b/converters/p5-WAP-wbxml/pkg-plist
@@ -10,6 +10,5 @@ man/man1/wbxmlc.1.gz
 %%SITE_PERL%%/WAP/wbxml/wap.wbrules.xml
 %%SITE_PERL%%/WAP/wbxml/wv.wbrules.pl
 %%SITE_PERL%%/WAP/wbxml/wv.wbrules.xml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WAP/wbxml/.packlist
 %%PERL5_MAN3%%/WAP::wbxml.3.gz
 %%PERL5_MAN3%%/WAP::wbxml::WbRules.3.gz
diff --git a/converters/p5-XML-WBXML/Makefile b/converters/p5-XML-WBXML/Makefile
index 51846f8e0d03..06c0fca9eb45 100644
--- a/converters/p5-XML-WBXML/Makefile
+++ b/converters/p5-XML-WBXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-WBXML
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/converters/p5-XML-WBXML/pkg-plist b/converters/p5-XML-WBXML/pkg-plist
index ee45a8d41449..b699e8baea9f 100644
--- a/converters/p5-XML-WBXML/pkg-plist
+++ b/converters/p5-XML-WBXML/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/XML::WBXML.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/WBXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/WBXML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/WBXML/WBXML.so
+%%SITE_ARCH%%/XML/WBXML.pm
+%%SITE_ARCH%%/auto/XML/WBXML/WBXML.so
diff --git a/converters/p5-bsdconv/Makefile b/converters/p5-bsdconv/Makefile
index b2f8fa4fbba5..523d36ef0e4a 100644
--- a/converters/p5-bsdconv/Makefile
+++ b/converters/p5-bsdconv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bsdconv
 PORTVERSION=	11.1.0
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
diff --git a/converters/p5-bsdconv/pkg-plist b/converters/p5-bsdconv/pkg-plist
index 6b9bbd813f5e..b4b732815c52 100644
--- a/converters/p5-bsdconv/pkg-plist
+++ b/converters/p5-bsdconv/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/bsdconv/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/bsdconv/bsdconv.so
-%%SITE_PERL%%/%%PERL_ARCH%%/bsdconv.pm
+%%SITE_ARCH%%/auto/bsdconv/bsdconv.so
+%%SITE_ARCH%%/bsdconv.pm
 %%PERL5_MAN3%%/bsdconv.3.gz
diff --git a/databases/WWWdb/Makefile b/databases/WWWdb/Makefile
index bf5470c72531..5dc3df5bcf0c 100644
--- a/databases/WWWdb/Makefile
+++ b/databases/WWWdb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWWdb
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	databases perl5 www
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
diff --git a/databases/WWWdb/pkg-plist b/databases/WWWdb/pkg-plist
index f5eebff836fb..789ba2cd86fa 100644
--- a/databases/WWWdb/pkg-plist
+++ b/databases/WWWdb/pkg-plist
@@ -30,7 +30,6 @@
 %%SITE_PERL%%/WWWdb/DbSession/mysql.pm
 %%SITE_PERL%%/WWWdb/DbSession/ODBC.pm
 %%SITE_PERL%%/WWWdb/DbSession/InterBase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWWdb/.packlist
 %%PERL5_MAN3%%/WWWdb::Base.3.gz
 %%PERL5_MAN3%%/WWWdb::DbSession.3.gz
 %%PERL5_MAN3%%/WWWdb::List.3.gz
diff --git a/databases/innotop/Makefile b/databases/innotop/Makefile
index fcf908bc9ce2..ab7742602457 100644
--- a/databases/innotop/Makefile
+++ b/databases/innotop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	innotop
 PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/databases/innotop/pkg-plist b/databases/innotop/pkg-plist
index 0df005313279..02d7a86ee25f 100644
--- a/databases/innotop/pkg-plist
+++ b/databases/innotop/pkg-plist
@@ -1,3 +1,2 @@
 bin/innotop
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/innotop/.packlist
 man/man1/innotop.1.gz
diff --git a/databases/monetdb/Makefile b/databases/monetdb/Makefile
index 455bd9e33a63..c65e09b438c0 100644
--- a/databases/monetdb/Makefile
+++ b/databases/monetdb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	monetdb
 PORTVERSION=	11.15.19
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.monetdb.org/downloads/sources/Feb2013-SP6/
 DISTNAME=	MonetDB-${PORTVERSION}
@@ -221,8 +222,8 @@ pre-install:
 		${STAGEDIR}${MONETDB_RUNDIR} \
 		${STAGEDIR}${DOCSDIR}
 .if ${PORT_OPTIONS:MPERL}
-	${MKDIR} ${STAGEDIR}/${SITE_PERL}/${PERL_ARCH}/DBD/monetdb \
-		${STAGEDIR}/${SITE_PERL}/${PERL_ARCH}/MonetDB
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/DBD/monetdb \
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/MonetDB
 .endif
 	${INSTALL_DATA} ${WRKSRC}/sql/dump-restore.* ${STAGEDIR}${DOCSDIR}
 
@@ -234,13 +235,13 @@ post-install:
 	${RMDIR} ${STAGEDIR}${PREFIX}/var
 .if ${PORT_OPTIONS:MPERL}
 	${MV} ${STAGEDIR}${PREFIX}/Mapi.pm \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}
 	${MV} ${STAGEDIR}${PREFIX}/DBD/monetdb.pm \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/DBD
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/DBD
 	${MV} ${STAGEDIR}${PREFIX}/DBD/monetdb/*.pm \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/DBD/monetdb
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/DBD/monetdb
 	${MV} ${STAGEDIR}${PREFIX}/MonetDB \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}
 	${RM} -r ${STAGEDIR}${PREFIX}/DBD
 .endif
 .if ${PORT_OPTIONS:MPYTHON2} || ${PORT_OPTIONS:MPYTHON3}
diff --git a/databases/monetdb/pkg-plist b/databases/monetdb/pkg-plist
index b93a73e2f521..9ab38c29af1e 100644
--- a/databases/monetdb/pkg-plist
+++ b/databases/monetdb/pkg-plist
@@ -185,12 +185,12 @@ lib/monetdb5/vault.sql
 lib/monetdb5/xml.mal
 lib/monetdb5/zorder.mal
 @mode 644
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/DBD/monetdb.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/DBD/monetdb/GetInfo.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/DBD/monetdb/TypeInfo.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Mapi.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/MonetDB/CLI.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/MonetDB/CLI/MapiPP.pm
+%%PERL%%%%SITE_ARCH%%/DBD/monetdb.pm
+%%PERL%%%%SITE_ARCH%%/DBD/monetdb/GetInfo.pm
+%%PERL%%%%SITE_ARCH%%/DBD/monetdb/TypeInfo.pm
+%%PERL%%%%SITE_ARCH%%/Mapi.pm
+%%PERL%%%%SITE_ARCH%%/MonetDB/CLI.pm
+%%PERL%%%%SITE_ARCH%%/MonetDB/CLI/MapiPP.pm
 @mode
 %%TESTING%%%%PYTHON_SITELIBDIR%%/MonetDBtesting/__init__.py
 %%TESTING%%%%PYTHON_SITELIBDIR%%/MonetDBtesting/listexports.py
diff --git a/databases/mtop/Makefile b/databases/mtop/Makefile
index 0cecac0ff515..cb25909e3859 100644
--- a/databases/mtop/Makefile
+++ b/databases/mtop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mtop
 PORTVERSION=	0.6.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 
diff --git a/databases/mtop/pkg-plist b/databases/mtop/pkg-plist
index f11cd684707f..ff4c237c83af 100644
--- a/databases/mtop/pkg-plist
+++ b/databases/mtop/pkg-plist
@@ -2,4 +2,3 @@ bin/mkill
 bin/mtop
 man/man1/mkill.1.gz
 man/man1/mtop.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mtop/.packlist
diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
index 6bffb115015c..01063a32ed5a 100644
--- a/databases/mytop/Makefile
+++ b/databases/mytop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mytop
 PORTVERSION=	1.6
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	databases
 MASTER_SITES=	http://jeremy.zawodny.com/mysql/mytop/
 
diff --git a/databases/mytop/pkg-plist b/databases/mytop/pkg-plist
index 336b5b0f33c4..fc12bdd5c352 100644
--- a/databases/mytop/pkg-plist
+++ b/databases/mytop/pkg-plist
@@ -1,3 +1,2 @@
 bin/mytop
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mytop/.packlist
 man/man1/mytop.1.gz
diff --git a/databases/p5-Amazon-SimpleDB/Makefile b/databases/p5-Amazon-SimpleDB/Makefile
index 5c824f15a4ad..092eba1b18ba 100644
--- a/databases/p5-Amazon-SimpleDB/Makefile
+++ b/databases/p5-Amazon-SimpleDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Amazon-SimpleDB
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TIMA
diff --git a/databases/p5-Amazon-SimpleDB/pkg-plist b/databases/p5-Amazon-SimpleDB/pkg-plist
index 1c80e1c50f65..f5b63462853a 100644
--- a/databases/p5-Amazon-SimpleDB/pkg-plist
+++ b/databases/p5-Amazon-SimpleDB/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Amazon/SimpleDB/ListDomainsResponse.pm
 %%SITE_PERL%%/Amazon/SimpleDB/QueryResponse.pm
 %%SITE_PERL%%/Amazon/SimpleDB/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SimpleDB/.packlist
 %%PERL5_MAN3%%/Amazon::SimpleDB.3.gz
 %%PERL5_MAN3%%/Amazon::SimpleDB::Domain.3.gz
 %%PERL5_MAN3%%/Amazon::SimpleDB::ErrorResponse.3.gz
diff --git a/databases/p5-Amon2-DBI/Makefile b/databases/p5-Amon2-DBI/Makefile
index c0be0a8e81ec..50d8c516ec7a 100644
--- a/databases/p5-Amon2-DBI/Makefile
+++ b/databases/p5-Amon2-DBI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Amon2-DBI
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Amon2-DBI/pkg-plist b/databases/p5-Amon2-DBI/pkg-plist
index c596458eb7b8..8adcb88a883f 100644
--- a/databases/p5-Amon2-DBI/pkg-plist
+++ b/databases/p5-Amon2-DBI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2/DBI/.packlist
 %%SITE_PERL%%/Amon2/DBI.pm
 %%SITE_PERL%%/Amon2/Plugin/DBI.pm
 %%PERL5_MAN3%%/Amon2::DBI.3.gz
diff --git a/databases/p5-AnyEvent-BDB/Makefile b/databases/p5-AnyEvent-BDB/Makefile
index 5020d9c36490..e0f986203d47 100644
--- a/databases/p5-AnyEvent-BDB/Makefile
+++ b/databases/p5-AnyEvent-BDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-BDB
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-AnyEvent-BDB/pkg-plist b/databases/p5-AnyEvent-BDB/pkg-plist
index 2608b7ba569c..1cf79f29d34b 100644
--- a/databases/p5-AnyEvent-BDB/pkg-plist
+++ b/databases/p5-AnyEvent-BDB/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/AnyEvent/BDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/BDB/.packlist
 %%PERL5_MAN3%%/AnyEvent::BDB.3.gz
diff --git a/databases/p5-AnyEvent-CouchDB/Makefile b/databases/p5-AnyEvent-CouchDB/Makefile
index baf6b7557fbe..b6157b569a23 100644
--- a/databases/p5-AnyEvent-CouchDB/Makefile
+++ b/databases/p5-AnyEvent-CouchDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-CouchDB
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-AnyEvent-CouchDB/pkg-plist b/databases/p5-AnyEvent-CouchDB/pkg-plist
index c8f40e89b826..4ec038f0db32 100644
--- a/databases/p5-AnyEvent-CouchDB/pkg-plist
+++ b/databases/p5-AnyEvent-CouchDB/pkg-plist
@@ -3,7 +3,6 @@ bin/couchdb-push
 %%SITE_PERL%%/AnyEvent/CouchDB/Database.pm
 %%SITE_PERL%%/AnyEvent/CouchDB/Exceptions.pm
 %%SITE_PERL%%/AnyEvent/CouchDB/Stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/CouchDB/.packlist
 %%PERL5_MAN3%%/AnyEvent::CouchDB.3.gz
 %%PERL5_MAN3%%/AnyEvent::CouchDB::Database.3.gz
 %%PERL5_MAN3%%/AnyEvent::CouchDB::Exceptions.3.gz
diff --git a/databases/p5-AnyEvent-DBD-Pg/Makefile b/databases/p5-AnyEvent-DBD-Pg/Makefile
index 65ec868f71dd..75e361118157 100644
--- a/databases/p5-AnyEvent-DBD-Pg/Makefile
+++ b/databases/p5-AnyEvent-DBD-Pg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-DBD-Pg
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-AnyEvent-DBD-Pg/pkg-plist b/databases/p5-AnyEvent-DBD-Pg/pkg-plist
index 9c31ff90c10a..6c1d9f86716f 100644
--- a/databases/p5-AnyEvent-DBD-Pg/pkg-plist
+++ b/databases/p5-AnyEvent-DBD-Pg/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/DBD/Pg/.packlist
 %%SITE_PERL%%/AnyEvent/DBD/Pg.pm
 %%PERL5_MAN3%%/AnyEvent::DBD::Pg.3.gz
diff --git a/databases/p5-AnyEvent-Memcached/Makefile b/databases/p5-AnyEvent-Memcached/Makefile
index 6e0eccabb5e7..4c8d673fcd60 100644
--- a/databases/p5-AnyEvent-Memcached/Makefile
+++ b/databases/p5-AnyEvent-Memcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Memcached
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-AnyEvent-Memcached/pkg-plist b/databases/p5-AnyEvent-Memcached/pkg-plist
index 39531d074539..91871edeab5f 100644
--- a/databases/p5-AnyEvent-Memcached/pkg-plist
+++ b/databases/p5-AnyEvent-Memcached/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/AnyEvent/Memcached/Peer.pm
 %%SITE_PERL%%/AnyEvent/Memcached/Buckets.pm
 %%SITE_PERL%%/AnyEvent/Memcached/Hash/WithNext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Memcached/.packlist
diff --git a/databases/p5-AnyEvent-Redis/Makefile b/databases/p5-AnyEvent-Redis/Makefile
index 364ff00c64a0..e3a98ee1d7e9 100644
--- a/databases/p5-AnyEvent-Redis/Makefile
+++ b/databases/p5-AnyEvent-Redis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Redis
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DGL
diff --git a/databases/p5-AnyEvent-Redis/pkg-plist b/databases/p5-AnyEvent-Redis/pkg-plist
index 896ee88e6574..718e20f7c748 100644
--- a/databases/p5-AnyEvent-Redis/pkg-plist
+++ b/databases/p5-AnyEvent-Redis/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Redis/.packlist
 %%SITE_PERL%%/AnyEvent/Redis.pm
 %%SITE_PERL%%/AnyEvent/Redis/Error.pm
 %%SITE_PERL%%/AnyEvent/Redis/Protocol.pm
diff --git a/databases/p5-AsciiDB-TagFile/Makefile b/databases/p5-AsciiDB-TagFile/Makefile
index 21c703999650..0aa1e5dd2f75 100644
--- a/databases/p5-AsciiDB-TagFile/Makefile
+++ b/databases/p5-AsciiDB-TagFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AsciiDB-TagFile
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-AsciiDB-TagFile/pkg-plist b/databases/p5-AsciiDB-TagFile/pkg-plist
index 5e04b5258dd7..f5c910878d0b 100644
--- a/databases/p5-AsciiDB-TagFile/pkg-plist
+++ b/databases/p5-AsciiDB-TagFile/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AsciiDB/TagFile/.packlist
 %%SITE_PERL%%/AsciiDB/TagFile.pm
 %%SITE_PERL%%/AsciiDB/TagRecord.pm
 %%PERL5_MAN3%%/AsciiDB::TagFile.3.gz
diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile
index 2160747d2bce..e3dcf77ef10d 100644
--- a/databases/p5-BDB/Makefile
+++ b/databases/p5-BDB/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	BDB
 PORTVERSION=	1.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MLEHMANN
diff --git a/databases/p5-BDB/pkg-plist b/databases/p5-BDB/pkg-plist
index 923e8ef95dd7..6adbea085ee3 100644
--- a/databases/p5-BDB/pkg-plist
+++ b/databases/p5-BDB/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/BDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BDB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BDB/BDB.so
+%%SITE_ARCH%%/BDB.pm
+%%SITE_ARCH%%/auto/BDB/BDB.so
 %%PERL5_MAN3%%/BDB.3.gz
diff --git a/databases/p5-BSON/Makefile b/databases/p5-BSON/Makefile
index bdf21a0bc27d..7ad1bdc2c346 100644
--- a/databases/p5-BSON/Makefile
+++ b/databases/p5-BSON/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BSON
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MINIMAL
diff --git a/databases/p5-BSON/pkg-plist b/databases/p5-BSON/pkg-plist
index ce824199e19f..ed1e79d4e013 100644
--- a/databases/p5-BSON/pkg-plist
+++ b/databases/p5-BSON/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/BSON/String.pm
 %%SITE_PERL%%/BSON/Time.pm
 %%SITE_PERL%%/BSON/Timestamp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSON/.packlist
 %%PERL5_MAN3%%/BSON.3.gz
 %%PERL5_MAN3%%/BSON::Binary.3.gz
 %%PERL5_MAN3%%/BSON::Bool.3.gz
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index baea1be2257a..73d06851505a 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	BerkeleyDB
 PORTVERSION=	0.54
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PMQS
diff --git a/databases/p5-BerkeleyDB/pkg-plist b/databases/p5-BerkeleyDB/pkg-plist
index 51e1132f96f1..4e3c5959828e 100644
--- a/databases/p5-BerkeleyDB/pkg-plist
+++ b/databases/p5-BerkeleyDB/pkg-plist
@@ -1,9 +1,8 @@
 %%PERL5_MAN3%%/BerkeleyDB.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB/Btree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BerkeleyDB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BerkeleyDB/BerkeleyDB.so
-%%SITE_PERL%%/%%PERL_ARCH%%/mkconsts.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/scan.pl
+%%SITE_ARCH%%/BerkeleyDB.pm
+%%SITE_ARCH%%/BerkeleyDB.pod
+%%SITE_ARCH%%/BerkeleyDB/Btree.pm
+%%SITE_ARCH%%/BerkeleyDB/Hash.pm
+%%SITE_ARCH%%/auto/BerkeleyDB/BerkeleyDB.so
+%%SITE_ARCH%%/mkconsts.pl
+%%SITE_ARCH%%/scan.pl
diff --git a/databases/p5-Bucardo/Makefile b/databases/p5-Bucardo/Makefile
index 47c6ba2842e8..9f60c9ccce99 100644
--- a/databases/p5-Bucardo/Makefile
+++ b/databases/p5-Bucardo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Bucardo
 PORTVERSION=	5.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://bucardo.org/downloads/ LOCAL/mat/${PORTNAME}
 PKGNAMEPREFIX=	p5-
@@ -32,7 +32,5 @@ post-patch:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dist/bucardo.rc ${STAGEDIR}${PREFIX}/etc/rc.d/bucardo
-	${RM} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Bucardo/.packlist
-	${RMDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Bucardo
 
 .include <bsd.port.mk>
diff --git a/databases/p5-CDB_File-Generator/Makefile b/databases/p5-CDB_File-Generator/Makefile
index e874c66953dd..5272a55a73b3 100644
--- a/databases/p5-CDB_File-Generator/Makefile
+++ b/databases/p5-CDB_File-Generator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CDB_File-Generator
 PORTVERSION=	0.030
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-CDB_File-Generator/pkg-plist b/databases/p5-CDB_File-Generator/pkg-plist
index 8a1f31babb5c..4b4bf608e4d2 100644
--- a/databases/p5-CDB_File-Generator/pkg-plist
+++ b/databases/p5-CDB_File-Generator/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/CDB_File::Generator.3.gz
 %%SITE_PERL%%/CDB_File/Generator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/Generator/.packlist
diff --git a/databases/p5-CDB_File/Makefile b/databases/p5-CDB_File/Makefile
index ad00537a54bd..94403814f7ca 100644
--- a/databases/p5-CDB_File/Makefile
+++ b/databases/p5-CDB_File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CDB_File
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-CDB_File/pkg-plist b/databases/p5-CDB_File/pkg-plist
index 91c279c8b776..4cde6b5f9224 100644
--- a/databases/p5-CDB_File/pkg-plist
+++ b/databases/p5-CDB_File/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/CDB_File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/CDB_File.so
-%%SITE_PERL%%/%%PERL_ARCH%%/bun-x.pl
+%%SITE_ARCH%%/CDB_File.pm
+%%SITE_ARCH%%/auto/CDB_File/CDB_File.so
+%%SITE_ARCH%%/bun-x.pl
 %%PERL5_MAN3%%/CDB_File.3.gz
diff --git a/databases/p5-CGI-Session-Driver-memcached/Makefile b/databases/p5-CGI-Session-Driver-memcached/Makefile
index a6b69ca5a542..6e5bea25792d 100644
--- a/databases/p5-CGI-Session-Driver-memcached/Makefile
+++ b/databases/p5-CGI-Session-Driver-memcached/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-Session-Driver-memcached
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-CGI-Session-Driver-memcached/pkg-plist b/databases/p5-CGI-Session-Driver-memcached/pkg-plist
index aa8e08ec8203..e08f6845961a 100644
--- a/databases/p5-CGI-Session-Driver-memcached/pkg-plist
+++ b/databases/p5-CGI-Session-Driver-memcached/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/CGI::Session::Driver::memcached.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/Driver/memcached/.packlist
 %%SITE_PERL%%/CGI/Session/Driver/memcached.pm
diff --git a/databases/p5-Cache-BDB/Makefile b/databases/p5-Cache-BDB/Makefile
index 06712fb750da..b494ec425943 100644
--- a/databases/p5-Cache-BDB/Makefile
+++ b/databases/p5-Cache-BDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-BDB
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Cache-BDB/pkg-plist b/databases/p5-Cache-BDB/pkg-plist
index 71a11cf5e448..89cc829b742f 100644
--- a/databases/p5-Cache-BDB/pkg-plist
+++ b/databases/p5-Cache-BDB/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Cache/BDB.pm
 %%SITE_PERL%%/Cache/BDB.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/BDB/.packlist
 %%PERL5_MAN3%%/Cache::BDB.3.gz
diff --git a/databases/p5-Cache-Memcached-Fast/Makefile b/databases/p5-Cache-Memcached-Fast/Makefile
index 4c41323835a5..5609c3f7167b 100644
--- a/databases/p5-Cache-Memcached-Fast/Makefile
+++ b/databases/p5-Cache-Memcached-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Memcached-Fast
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Cache-Memcached-Fast/pkg-plist b/databases/p5-Cache-Memcached-Fast/pkg-plist
index 1c1352e9f982..5e972e4c2560 100644
--- a/databases/p5-Cache-Memcached-Fast/pkg-plist
+++ b/databases/p5-Cache-Memcached-Fast/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Cache::Memcached::Fast.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Cache/Memcached/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/Fast/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/Fast/Fast.so
+%%SITE_ARCH%%/Cache/Memcached/Fast.pm
+%%SITE_ARCH%%/auto/Cache/Memcached/Fast/Fast.so
diff --git a/databases/p5-Cache-Memcached-Managed/Makefile b/databases/p5-Cache-Memcached-Managed/Makefile
index 22079c96d78f..8942bce217b4 100644
--- a/databases/p5-Cache-Memcached-Managed/Makefile
+++ b/databases/p5-Cache-Memcached-Managed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Memcached-Managed
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Cache-Memcached-Managed/pkg-plist b/databases/p5-Cache-Memcached-Managed/pkg-plist
index cd56d198fb0b..91ae3ebce40c 100644
--- a/databases/p5-Cache-Memcached-Managed/pkg-plist
+++ b/databases/p5-Cache-Memcached-Managed/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Cache/Memcached/Managed.pm
 %%SITE_PERL%%/Cache/Memcached/Managed/Inactive.pm
 %%SITE_PERL%%/Cache/Memcached/Managed/Multi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/Managed/.packlist
diff --git a/databases/p5-Cache-Memcached-XS/Makefile b/databases/p5-Cache-Memcached-XS/Makefile
index 136007e2bb14..25461ec6f9cb 100644
--- a/databases/p5-Cache-Memcached-XS/Makefile
+++ b/databases/p5-Cache-Memcached-XS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Cache-Memcached-XS
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Cache-Memcached-XS/pkg-plist b/databases/p5-Cache-Memcached-XS/pkg-plist
index 34bf462845fd..50669da8bce2 100644
--- a/databases/p5-Cache-Memcached-XS/pkg-plist
+++ b/databases/p5-Cache-Memcached-XS/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Cache::Memcached::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Cache/Memcached/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/XS/XS.so
+%%SITE_ARCH%%/Cache/Memcached/XS.pm
+%%SITE_ARCH%%/auto/Cache/Memcached/XS/XS.so
diff --git a/databases/p5-Cache-Memcached-libmemcached/Makefile b/databases/p5-Cache-Memcached-libmemcached/Makefile
index 5f64797ed654..0c0cb4de8133 100644
--- a/databases/p5-Cache-Memcached-libmemcached/Makefile
+++ b/databases/p5-Cache-Memcached-libmemcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Memcached-libmemcached
 PORTVERSION=	0.02011
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/databases/p5-Cache-Memcached-libmemcached/pkg-plist b/databases/p5-Cache-Memcached-libmemcached/pkg-plist
index 8d477bf36f77..06daaec4c44b 100644
--- a/databases/p5-Cache-Memcached-libmemcached/pkg-plist
+++ b/databases/p5-Cache-Memcached-libmemcached/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Cache/Memcached/libmemcached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/libmemcached/.packlist
 %%PERL5_MAN3%%/Cache::Memcached::libmemcached.3.gz
diff --git a/databases/p5-Cache-Memcached/Makefile b/databases/p5-Cache-Memcached/Makefile
index 86738f2aa30e..057cfbcb0904 100644
--- a/databases/p5-Cache-Memcached/Makefile
+++ b/databases/p5-Cache-Memcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Memcached
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN \
 		http://www.danga.com/memcached/dist/
diff --git a/databases/p5-Cache-Memcached/pkg-plist b/databases/p5-Cache-Memcached/pkg-plist
index 190af585b077..acc52952b13d 100644
--- a/databases/p5-Cache-Memcached/pkg-plist
+++ b/databases/p5-Cache-Memcached/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Cache::Memcached.3.gz
 %%SITE_PERL%%/Cache/Memcached.pm
 %%SITE_PERL%%/Cache/Memcached/GetParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/.packlist
diff --git a/databases/p5-Class-DBI-AbstractSearch/Makefile b/databases/p5-Class-DBI-AbstractSearch/Makefile
index eb165ec6a456..37964ee3b3e0 100644
--- a/databases/p5-Class-DBI-AbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-AbstractSearch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-AbstractSearch
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-AbstractSearch/pkg-plist b/databases/p5-Class-DBI-AbstractSearch/pkg-plist
index 3928809603f6..d44344e474c2 100644
--- a/databases/p5-Class-DBI-AbstractSearch/pkg-plist
+++ b/databases/p5-Class-DBI-AbstractSearch/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::AbstractSearch.3.gz
 %%SITE_PERL%%/Class/DBI/AbstractSearch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AbstractSearch/.packlist
diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index c597a5c519a6..007873cd2c59 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-AsForm
 PORTVERSION=	2.42
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-AsForm/pkg-plist b/databases/p5-Class-DBI-AsForm/pkg-plist
index 4dc71f08cce1..47ee18260211 100644
--- a/databases/p5-Class-DBI-AsForm/pkg-plist
+++ b/databases/p5-Class-DBI-AsForm/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/AsForm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AsForm/.packlist
 %%PERL5_MAN3%%/Class::DBI::AsForm.3.gz
diff --git a/databases/p5-Class-DBI-AutoLoader/Makefile b/databases/p5-Class-DBI-AutoLoader/Makefile
index 14a9164faaac..6f6cca08d8a4 100644
--- a/databases/p5-Class-DBI-AutoLoader/Makefile
+++ b/databases/p5-Class-DBI-AutoLoader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-AutoLoader
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-AutoLoader/pkg-plist b/databases/p5-Class-DBI-AutoLoader/pkg-plist
index b50eb3340e7f..ee430adeb80a 100644
--- a/databases/p5-Class-DBI-AutoLoader/pkg-plist
+++ b/databases/p5-Class-DBI-AutoLoader/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::AutoLoader.3.gz
 %%SITE_PERL%%/Class/DBI/AutoLoader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AutoLoader/.packlist
diff --git a/databases/p5-Class-DBI-BaseDSN/Makefile b/databases/p5-Class-DBI-BaseDSN/Makefile
index 596069f4cd28..6fb8da7ee1c4 100644
--- a/databases/p5-Class-DBI-BaseDSN/Makefile
+++ b/databases/p5-Class-DBI-BaseDSN/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-DBI-BaseDSN
 PORTVERSION=	1.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-DATA-Schema/Makefile b/databases/p5-Class-DBI-DATA-Schema/Makefile
index 174b39246dd0..578bc1d6b115 100644
--- a/databases/p5-Class-DBI-DATA-Schema/Makefile
+++ b/databases/p5-Class-DBI-DATA-Schema/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-DATA-Schema
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-DATA-Schema/pkg-plist b/databases/p5-Class-DBI-DATA-Schema/pkg-plist
index fdaba469a2dd..690164abc8c0 100644
--- a/databases/p5-Class-DBI-DATA-Schema/pkg-plist
+++ b/databases/p5-Class-DBI-DATA-Schema/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/DATA/Schema.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/DATA/Schema/.packlist
 %%PERL5_MAN3%%/Class::DBI::DATA::Schema.3.gz
diff --git a/databases/p5-Class-DBI-DDL/Makefile b/databases/p5-Class-DBI-DDL/Makefile
index 50f5b52afe12..11260e36b26a 100644
--- a/databases/p5-Class-DBI-DDL/Makefile
+++ b/databases/p5-Class-DBI-DDL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-DDL
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-FromCGI/Makefile b/databases/p5-Class-DBI-FromCGI/Makefile
index db3f7e863a3d..77e1cc6cafa7 100644
--- a/databases/p5-Class-DBI-FromCGI/Makefile
+++ b/databases/p5-Class-DBI-FromCGI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-DBI-FromCGI
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-FromCGI/pkg-plist b/databases/p5-Class-DBI-FromCGI/pkg-plist
index 1b12a32115e0..0a8239996080 100644
--- a/databases/p5-Class-DBI-FromCGI/pkg-plist
+++ b/databases/p5-Class-DBI-FromCGI/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::FromCGI.3.gz
 %%SITE_PERL%%/Class/DBI/FromCGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromCGI/.packlist
diff --git a/databases/p5-Class-DBI-LazyInflate/Makefile b/databases/p5-Class-DBI-LazyInflate/Makefile
index 968349f15930..a89ae9497855 100644
--- a/databases/p5-Class-DBI-LazyInflate/Makefile
+++ b/databases/p5-Class-DBI-LazyInflate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-LazyInflate
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-LazyInflate/pkg-plist b/databases/p5-Class-DBI-LazyInflate/pkg-plist
index a13f9bc1187d..795cd7cd635d 100644
--- a/databases/p5-Class-DBI-LazyInflate/pkg-plist
+++ b/databases/p5-Class-DBI-LazyInflate/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/LazyInflate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/LazyInflate/.packlist
 %%PERL5_MAN3%%/Class::DBI::LazyInflate.3.gz
diff --git a/databases/p5-Class-DBI-Loader-Relationship/Makefile b/databases/p5-Class-DBI-Loader-Relationship/Makefile
index 586a0b12fe39..6b55b2f38111 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/databases/p5-Class-DBI-Loader-Relationship/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Loader-Relationship
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHUNZI
diff --git a/databases/p5-Class-DBI-Loader-Relationship/pkg-plist b/databases/p5-Class-DBI-Loader-Relationship/pkg-plist
index 4766976b6c9d..8b784e6d8532 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/pkg-plist
+++ b/databases/p5-Class-DBI-Loader-Relationship/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Loader/Relationship.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader/Relationship/.packlist
 %%PERL5_MAN3%%/Class::DBI::Loader::Relationship.3.gz
diff --git a/databases/p5-Class-DBI-Loader/Makefile b/databases/p5-Class-DBI-Loader/Makefile
index c0ba6f5a0a04..e166ea5eafe1 100644
--- a/databases/p5-Class-DBI-Loader/Makefile
+++ b/databases/p5-Class-DBI-Loader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-DBI-Loader
 PORTVERSION=	0.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/databases/p5-Class-DBI-Loader/pkg-plist b/databases/p5-Class-DBI-Loader/pkg-plist
index 95704f7647ff..4c8addd773f8 100644
--- a/databases/p5-Class-DBI-Loader/pkg-plist
+++ b/databases/p5-Class-DBI-Loader/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Class/DBI/Loader/Pg.pm
 %%SITE_PERL%%/Class/DBI/Loader/SQLite.pm
 %%SITE_PERL%%/Class/DBI/Loader/mysql.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader/.packlist
diff --git a/databases/p5-Class-DBI-Oracle/Makefile b/databases/p5-Class-DBI-Oracle/Makefile
index 4b28d034ed19..a3c90f092512 100644
--- a/databases/p5-Class-DBI-Oracle/Makefile
+++ b/databases/p5-Class-DBI-Oracle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Oracle
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Oracle/pkg-plist b/databases/p5-Class-DBI-Oracle/pkg-plist
index 98cc37831686..da2f884a2c47 100644
--- a/databases/p5-Class-DBI-Oracle/pkg-plist
+++ b/databases/p5-Class-DBI-Oracle/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::Oracle.3.gz
 %%SITE_PERL%%/Class/DBI/Oracle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Oracle/.packlist
diff --git a/databases/p5-Class-DBI-Pager/Makefile b/databases/p5-Class-DBI-Pager/Makefile
index ed95861d8687..2349f336e008 100644
--- a/databases/p5-Class-DBI-Pager/Makefile
+++ b/databases/p5-Class-DBI-Pager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Pager
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Pager/pkg-plist b/databases/p5-Class-DBI-Pager/pkg-plist
index 9eef4a860195..87e6c61e0ee2 100644
--- a/databases/p5-Class-DBI-Pager/pkg-plist
+++ b/databases/p5-Class-DBI-Pager/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::Pager.3.gz
 %%SITE_PERL%%/Class/DBI/Pager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Pager/.packlist
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index 8e34ab463f01..67060e94af41 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-DBI-Pg
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Class/DMAKI
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
index f34a840563e7..0f03bd41b453 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Plugin-AbstractCount
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist b/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist
index 4573797d0898..93d653b053b0 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Plugin/AbstractCount.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/AbstractCount/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin::AbstractCount.3.gz
diff --git a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
index 603877de6d5b..148feffc6ac0 100644
--- a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Plugin-DeepAbstractSearch
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRIHA
diff --git a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-plist b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-plist
index 0be433c8dd66..cdec46ac8031 100644
--- a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Plugin/DeepAbstractSearch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/DeepAbstractSearch/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin::DeepAbstractSearch.3.gz
diff --git a/databases/p5-Class-DBI-Plugin-Iterator/Makefile b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
index 39cfbbb1eef3..140f6073bcee 100644
--- a/databases/p5-Class-DBI-Plugin-Iterator/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-DBI-Plugin-Iterator
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Plugin-Iterator/pkg-plist b/databases/p5-Class-DBI-Plugin-Iterator/pkg-plist
index f9fe55c88c93..9f259c6cb046 100644
--- a/databases/p5-Class-DBI-Plugin-Iterator/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-Iterator/pkg-plist
@@ -4,6 +4,5 @@
 %%SITE_PERL%%/Class/DBI/Plugin/Iterator/mysql3.pm
 %%SITE_PERL%%/Class/DBI/Plugin/Iterator/mysql4.pm
 %%SITE_PERL%%/Class/DBI/Plugin/Iterator/subquery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/Iterator/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin::Iterator.3.gz
 %%PERL5_MAN3%%/Class::DBI::Plugin::Iterator::Nihongo.3.gz
diff --git a/databases/p5-Class-DBI-Plugin-Pager/Makefile b/databases/p5-Class-DBI-Plugin-Pager/Makefile
index 1fb478a2f233..7b7614c71e5d 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Pager/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-DBI-Plugin-Pager
 PORTVERSION=	0.566
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Plugin-Pager/pkg-plist b/databases/p5-Class-DBI-Plugin-Pager/pkg-plist
index b96cce6477aa..5cc21b074835 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-Pager/pkg-plist
@@ -3,5 +3,4 @@
 %%SITE_PERL%%/Class/DBI/Plugin/Pager/LimitXY.pm
 %%SITE_PERL%%/Class/DBI/Plugin/Pager/LimitYX.pm
 %%SITE_PERL%%/Class/DBI/Plugin/Pager/RowsTo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/Pager/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin::Pager.3.gz
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
index 8eb280e9fafa..b6282c870634 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Plugin-RetrieveAll
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist b/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist
index e3e80192ac6c..10a0caf9d611 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Plugin/RetrieveAll.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/RetrieveAll/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin::RetrieveAll.3.gz
diff --git a/databases/p5-Class-DBI-Plugin-Senna/Makefile b/databases/p5-Class-DBI-Plugin-Senna/Makefile
index 6c0563d767f4..cc175ca8b8fa 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Senna/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-DBI-Plugin-Senna
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Plugin-Senna/pkg-plist b/databases/p5-Class-DBI-Plugin-Senna/pkg-plist
index 1fc9d08c52bd..ad96751937cc 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-Senna/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Plugin/Senna.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/Senna/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin::Senna.3.gz
diff --git a/databases/p5-Class-DBI-Plugin-Type/Makefile b/databases/p5-Class-DBI-Plugin-Type/Makefile
index bbb1566a0caa..4d64b3283c09 100644
--- a/databases/p5-Class-DBI-Plugin-Type/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Type/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Plugin-Type
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Plugin-Type/pkg-plist b/databases/p5-Class-DBI-Plugin-Type/pkg-plist
index 638e5b22fea2..909dd8dbb9d2 100644
--- a/databases/p5-Class-DBI-Plugin-Type/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-Type/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Plugin/Type.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/Type/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin::Type.3.gz
diff --git a/databases/p5-Class-DBI-Plugin/Makefile b/databases/p5-Class-DBI-Plugin/Makefile
index fe2349ba20df..997e2eae0225 100644
--- a/databases/p5-Class-DBI-Plugin/Makefile
+++ b/databases/p5-Class-DBI-Plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Plugin
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Plugin/pkg-plist b/databases/p5-Class-DBI-Plugin/pkg-plist
index 0e96578e5b1e..55f29e3ab838 100644
--- a/databases/p5-Class-DBI-Plugin/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Plugin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/.packlist
 %%PERL5_MAN3%%/Class::DBI::Plugin.3.gz
diff --git a/databases/p5-Class-DBI-Replication/Makefile b/databases/p5-Class-DBI-Replication/Makefile
index ea275aed6b24..93332b99b5a1 100644
--- a/databases/p5-Class-DBI-Replication/Makefile
+++ b/databases/p5-Class-DBI-Replication/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Replication
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Replication/pkg-plist b/databases/p5-Class-DBI-Replication/pkg-plist
index d01ea25d7deb..11cb583a6888 100644
--- a/databases/p5-Class-DBI-Replication/pkg-plist
+++ b/databases/p5-Class-DBI-Replication/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::Replication.3.gz
 %%SITE_PERL%%/Class/DBI/Replication.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Replication/.packlist
diff --git a/databases/p5-Class-DBI-SAK/Makefile b/databases/p5-Class-DBI-SAK/Makefile
index 08b68fd97ed9..16eb85248f26 100644
--- a/databases/p5-Class-DBI-SAK/Makefile
+++ b/databases/p5-Class-DBI-SAK/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-SAK
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-SQLite/Makefile b/databases/p5-Class-DBI-SQLite/Makefile
index 98f97714d14d..d35e6d4c2983 100644
--- a/databases/p5-Class-DBI-SQLite/Makefile
+++ b/databases/p5-Class-DBI-SQLite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-DBI-SQLite
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-SQLite/pkg-plist b/databases/p5-Class-DBI-SQLite/pkg-plist
index d9c0563f9b51..ec9638e13f57 100644
--- a/databases/p5-Class-DBI-SQLite/pkg-plist
+++ b/databases/p5-Class-DBI-SQLite/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::SQLite.3.gz
 %%SITE_PERL%%/Class/DBI/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/SQLite/.packlist
diff --git a/databases/p5-Class-DBI-Sweet/Makefile b/databases/p5-Class-DBI-Sweet/Makefile
index b2158159db2c..3d0af8b2c5ec 100644
--- a/databases/p5-Class-DBI-Sweet/Makefile
+++ b/databases/p5-Class-DBI-Sweet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Sweet
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-ToSax/Makefile b/databases/p5-Class-DBI-ToSax/Makefile
index 1ce26c880953..d6bb70aa21f8 100644
--- a/databases/p5-Class-DBI-ToSax/Makefile
+++ b/databases/p5-Class-DBI-ToSax/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-ToSax
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	databases textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-ToSax/pkg-plist b/databases/p5-Class-DBI-ToSax/pkg-plist
index 26dccb292745..1f999c447c70 100644
--- a/databases/p5-Class-DBI-ToSax/pkg-plist
+++ b/databases/p5-Class-DBI-ToSax/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::ToSax.3.gz
 %%SITE_PERL%%/Class/DBI/ToSax.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/ToSax/.packlist
diff --git a/databases/p5-Class-DBI-Untaint/Makefile b/databases/p5-Class-DBI-Untaint/Makefile
index 20a811202e5d..383b274f973c 100644
--- a/databases/p5-Class-DBI-Untaint/Makefile
+++ b/databases/p5-Class-DBI-Untaint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-Untaint
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-Untaint/pkg-plist b/databases/p5-Class-DBI-Untaint/pkg-plist
index 43c62687889a..3e54cc182f1d 100644
--- a/databases/p5-Class-DBI-Untaint/pkg-plist
+++ b/databases/p5-Class-DBI-Untaint/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/DBI/Untaint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Untaint/.packlist
 %%PERL5_MAN3%%/Class::DBI::Untaint.3.gz
diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile
index b1115af5f3b1..4b3c76819769 100644
--- a/databases/p5-Class-DBI-mysql/Makefile
+++ b/databases/p5-Class-DBI-mysql/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-mysql
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI-mysql/pkg-plist b/databases/p5-Class-DBI-mysql/pkg-plist
index 10aa82a279be..6dc65462b731 100644
--- a/databases/p5-Class-DBI-mysql/pkg-plist
+++ b/databases/p5-Class-DBI-mysql/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::DBI::mysql.3.gz
 %%SITE_PERL%%/Class/DBI/mysql.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/mysql/.packlist
diff --git a/databases/p5-Class-DBI/Makefile b/databases/p5-Class-DBI/Makefile
index 75643248ba12..3883a0646a20 100644
--- a/databases/p5-Class-DBI/Makefile
+++ b/databases/p5-Class-DBI/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Class-DBI
 PORTVERSION=	3.0.17
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Class-DBI/pkg-plist b/databases/p5-Class-DBI/pkg-plist
index 22e75eee7e70..2be54c9b92c4 100644
--- a/databases/p5-Class-DBI/pkg-plist
+++ b/databases/p5-Class-DBI/pkg-plist
@@ -27,4 +27,3 @@
 %%SITE_PERL%%/Class/DBI/SQL/Transformer.pm
 %%SITE_PERL%%/Class/DBI/Search/Basic.pm
 %%SITE_PERL%%/Class/DBI/Test/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/.packlist
diff --git a/databases/p5-Class-Inflate/Makefile b/databases/p5-Class-Inflate/Makefile
index b1c9662a3f05..b275d31026d0 100644
--- a/databases/p5-Class-Inflate/Makefile
+++ b/databases/p5-Class-Inflate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Inflate
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-CouchDB-View/Makefile b/databases/p5-CouchDB-View/Makefile
index 11ba464ca4a7..5b06dc2353b9 100644
--- a/databases/p5-CouchDB-View/Makefile
+++ b/databases/p5-CouchDB-View/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CouchDB-View
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-CouchDB-View/pkg-plist b/databases/p5-CouchDB-View/pkg-plist
index 5970a3236308..338a2646e0d2 100644
--- a/databases/p5-CouchDB-View/pkg-plist
+++ b/databases/p5-CouchDB-View/pkg-plist
@@ -2,7 +2,6 @@ bin/couchdb-view-server.pl
 %%SITE_PERL%%/CouchDB/View.pm
 %%SITE_PERL%%/CouchDB/View/Document.pm
 %%SITE_PERL%%/CouchDB/View/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CouchDB/View/.packlist
 %%PERL5_MAN3%%/CouchDB::View.3.gz
 %%PERL5_MAN3%%/CouchDB::View::Document.3.gz
 %%PERL5_MAN3%%/CouchDB::View::Server.3.gz
diff --git a/databases/p5-DBD-AnyData/Makefile b/databases/p5-DBD-AnyData/Makefile
index e0e00e5a7189..c2c262d3183a 100644
--- a/databases/p5-DBD-AnyData/Makefile
+++ b/databases/p5-DBD-AnyData/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-AnyData
 PORTVERSION=	0.110
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-AnyData/pkg-plist b/databases/p5-DBD-AnyData/pkg-plist
index bb07522884ae..f53aff47e16f 100644
--- a/databases/p5-DBD-AnyData/pkg-plist
+++ b/databases/p5-DBD-AnyData/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBD::AnyData.3.gz
 %%SITE_PERL%%/DBD/AnyData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/AnyData/.packlist
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index a1b13b1e1beb..1441200c4a81 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBD-CSV
 PORTVERSION=	0.43
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
diff --git a/databases/p5-DBD-CSV/pkg-plist b/databases/p5-DBD-CSV/pkg-plist
index 5eb4c83d390a..79197f8046be 100644
--- a/databases/p5-DBD-CSV/pkg-plist
+++ b/databases/p5-DBD-CSV/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Bundle::DBD::CSV.3.gz
 %%PERL5_MAN3%%/DBD::CSV.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/CSV/.packlist
 %%SITE_PERL%%/Bundle/DBD/CSV.pm
 %%SITE_PERL%%/DBD/CSV.pm
 %%SITE_PERL%%/DBD/CSV/GetInfo.pm
diff --git a/databases/p5-DBD-Excel/Makefile b/databases/p5-DBD-Excel/Makefile
index 01bb033718d2..4808b0c10368 100644
--- a/databases/p5-DBD-Excel/Makefile
+++ b/databases/p5-DBD-Excel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-Excel
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-Excel/pkg-plist b/databases/p5-DBD-Excel/pkg-plist
index 374a4d829bc4..8010a22964d2 100644
--- a/databases/p5-DBD-Excel/pkg-plist
+++ b/databases/p5-DBD-Excel/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel/.packlist
 %%SITE_PERL%%/DBD/Excel.pm
 %%PORTEXAMPLES%%share/examples/DBD-Excel/README
 %%PORTEXAMPLES%%share/examples/DBD-Excel/dbdtest.xls
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index 3c860a351a65..57878e931ab5 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBD-Google
 PORTVERSION=	0.51
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-Google/pkg-plist b/databases/p5-DBD-Google/pkg-plist
index b6db44458f3e..7174f7734c3f 100644
--- a/databases/p5-DBD-Google/pkg-plist
+++ b/databases/p5-DBD-Google/pkg-plist
@@ -7,4 +7,3 @@
 %%SITE_PERL%%/DBD/Google/parser.pm
 %%SITE_PERL%%/DBD/Google/st.pm
 %%SITE_PERL%%/SQL/Dialects/Google.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Google/.packlist
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index d97510ec043a..e195fa0ed1af 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBD-InterBase
 PORTVERSION=	0.48
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	DBD
diff --git a/databases/p5-DBD-InterBase/pkg-plist b/databases/p5-DBD-InterBase/pkg-plist
index c55aafc725f5..9f8572bacf14 100644
--- a/databases/p5-DBD-InterBase/pkg-plist
+++ b/databases/p5-DBD-InterBase/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/InterBase/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/InterBase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/InterBase/GetInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/InterBase/TypeInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/InterBase/InterBase.so
+%%SITE_ARCH%%/DBD/InterBase.pm
+%%SITE_ARCH%%/DBD/InterBase/GetInfo.pm
+%%SITE_ARCH%%/DBD/InterBase/TypeInfo.pm
+%%SITE_ARCH%%/auto/DBD/InterBase/InterBase.so
 %%PERL5_MAN3%%/DBD::InterBase.3.gz
diff --git a/databases/p5-DBD-LDAP/Makefile b/databases/p5-DBD-LDAP/Makefile
index f8b49e640bc2..225b6c769d96 100644
--- a/databases/p5-DBD-LDAP/Makefile
+++ b/databases/p5-DBD-LDAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-LDAP
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-LDAP/pkg-plist b/databases/p5-DBD-LDAP/pkg-plist
index 249f385d9e34..b9832c24c956 100644
--- a/databases/p5-DBD-LDAP/pkg-plist
+++ b/databases/p5-DBD-LDAP/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/DBD::LDAP.3.gz
 %%SITE_PERL%%/DBD/LDAP.pm
 %%SITE_PERL%%/JLdap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/LDAP/.packlist
diff --git a/databases/p5-DBD-Mock/Makefile b/databases/p5-DBD-Mock/Makefile
index 3779209366b5..bc7e4bc8b518 100644
--- a/databases/p5-DBD-Mock/Makefile
+++ b/databases/p5-DBD-Mock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-Mock
 PORTVERSION=	1.45
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-Mock/pkg-plist b/databases/p5-DBD-Mock/pkg-plist
index fcae693b65ab..c34b9166eab8 100644
--- a/databases/p5-DBD-Mock/pkg-plist
+++ b/databases/p5-DBD-Mock/pkg-plist
@@ -7,5 +7,4 @@
 %%SITE_PERL%%/DBD/Mock/Session.pm
 %%SITE_PERL%%/DBD/Mock/Pool.pm
 %%SITE_PERL%%/DBD/Mock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Mock/.packlist
 %%PERL5_MAN3%%/DBD::Mock.3.gz
diff --git a/databases/p5-DBD-Multi/Makefile b/databases/p5-DBD-Multi/Makefile
index e6ff93c97aad..6f14711009cc 100644
--- a/databases/p5-DBD-Multi/Makefile
+++ b/databases/p5-DBD-Multi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-Multi
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-Multi/pkg-plist b/databases/p5-DBD-Multi/pkg-plist
index b8bf430c196f..323f5964d65a 100644
--- a/databases/p5-DBD-Multi/pkg-plist
+++ b/databases/p5-DBD-Multi/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBD/Multi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Multi/.packlist
 %%PERL5_MAN3%%/DBD::Multi.3.gz
diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile
index 00ad4e9924e0..18f09a32dd47 100644
--- a/databases/p5-DBD-ODBC/Makefile
+++ b/databases/p5-DBD-ODBC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-ODBC
 PORTVERSION=	1.50
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MJEVANS
@@ -38,7 +39,7 @@ post-configure:
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DBD/ODBC/ODBC.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/ODBC/ODBC.so
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-ODBC/pkg-plist b/databases/p5-DBD-ODBC/pkg-plist
index 3792c8004472..b2c6ed2d7530 100644
--- a/databases/p5-DBD-ODBC/pkg-plist
+++ b/databases/p5-DBD-ODBC/pkg-plist
@@ -1,7 +1,6 @@
 %%PERL5_MAN3%%/DBD::ODBC.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/ODBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/ODBC/Changes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/ODBC/FAQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/ODBC/TO_DO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/ODBC/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/ODBC/ODBC.so
+%%SITE_ARCH%%/DBD/ODBC.pm
+%%SITE_ARCH%%/DBD/ODBC/Changes.pm
+%%SITE_ARCH%%/DBD/ODBC/FAQ.pm
+%%SITE_ARCH%%/DBD/ODBC/TO_DO.pm
+%%SITE_ARCH%%/auto/DBD/ODBC/ODBC.so
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 9191a5b47a99..1f7ae3679d44 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBD-Oracle
 PORTVERSION=	1.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -52,7 +52,7 @@ post-patch:
 		${WRKSRC}/dbdimp.c ${WRKSRC}/Oracle.xs ${WRKSRC}/oci[78].c
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DBD/Oracle/Oracle.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/Oracle/Oracle.so
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Oracle.ex/Readme 	${STAGEDIR}${EXAMPLESDIR}
diff --git a/databases/p5-DBD-Oracle/pkg-plist b/databases/p5-DBD-Oracle/pkg-plist
index 6b3e32436884..65587d887c28 100644
--- a/databases/p5-DBD-Oracle/pkg-plist
+++ b/databases/p5-DBD-Oracle/pkg-plist
@@ -1,15 +1,14 @@
 bin/ora_explain
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Oracle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Oracle/GetInfo.pm
-%%MKTA%%%%SITE_PERL%%/%%PERL_ARCH%%/DBD/mkta.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Oraperl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/Oracle.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/Oracle.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/dbdimp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/mk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/ocitrace.h
-%%SITE_PERL%%/%%PERL_ARCH%%/oraperl.ph
+%%SITE_ARCH%%/DBD/Oracle.pm
+%%SITE_ARCH%%/DBD/Oracle/GetInfo.pm
+%%MKTA%%%%SITE_ARCH%%/DBD/mkta.pl
+%%SITE_ARCH%%/Oraperl.pm
+%%SITE_ARCH%%/auto/DBD/Oracle/Oracle.h
+%%SITE_ARCH%%/auto/DBD/Oracle/Oracle.so
+%%SITE_ARCH%%/auto/DBD/Oracle/dbdimp.h
+%%SITE_ARCH%%/auto/DBD/Oracle/mk.pm
+%%SITE_ARCH%%/auto/DBD/Oracle/ocitrace.h
+%%SITE_ARCH%%/oraperl.ph
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Readme
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/commit.pl
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index a548f167f989..7dc394fe4fd7 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBD-Pg
 PORTVERSION=	3.4.1
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -19,6 +20,6 @@ USES=		pgsql perl5
 USE_PERL5=	configure
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DBD/Pg/Pg.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/Pg/Pg.so
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg/pkg-plist b/databases/p5-DBD-Pg/pkg-plist
index 8e5318c57453..9d2cfe7c492c 100644
--- a/databases/p5-DBD-Pg/pkg-plist
+++ b/databases/p5-DBD-Pg/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Bundle::DBD::Pg.3.gz
 %%PERL5_MAN3%%/DBD::Pg.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD/Pg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Pg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so
+%%SITE_ARCH%%/Bundle/DBD/Pg.pm
+%%SITE_ARCH%%/DBD/Pg.pm
+%%SITE_ARCH%%/auto/DBD/Pg/Pg.so
diff --git a/databases/p5-DBD-Pg32/Makefile b/databases/p5-DBD-Pg32/Makefile
index 997e03a6ba11..6598fc68949c 100644
--- a/databases/p5-DBD-Pg32/Makefile
+++ b/databases/p5-DBD-Pg32/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-Pg
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-Pg32/pkg-plist b/databases/p5-DBD-Pg32/pkg-plist
index 8e5318c57453..9d2cfe7c492c 100644
--- a/databases/p5-DBD-Pg32/pkg-plist
+++ b/databases/p5-DBD-Pg32/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Bundle::DBD::Pg.3.gz
 %%PERL5_MAN3%%/DBD::Pg.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD/Pg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Pg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so
+%%SITE_ARCH%%/Bundle/DBD/Pg.pm
+%%SITE_ARCH%%/DBD/Pg.pm
+%%SITE_ARCH%%/auto/DBD/Pg/Pg.so
diff --git a/databases/p5-DBD-PgLite/Makefile b/databases/p5-DBD-PgLite/Makefile
index edd75e7827ae..9b31b1956b18 100644
--- a/databases/p5-DBD-PgLite/Makefile
+++ b/databases/p5-DBD-PgLite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBD-PgLite
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-PgLite/pkg-plist b/databases/p5-DBD-PgLite/pkg-plist
index 35912f2ce1c6..8d6668df4d89 100644
--- a/databases/p5-DBD-PgLite/pkg-plist
+++ b/databases/p5-DBD-PgLite/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/DBD/PgLite.pm
 %%SITE_PERL%%/DBD/PgLite/MirrorPgToSQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/PgLite/.packlist
 %%PERL5_MAN3%%/DBD::PgLite.3.gz
 %%PERL5_MAN3%%/DBD::PgLite::MirrorPgToSQLite.3.gz
diff --git a/databases/p5-DBD-PgPP/Makefile b/databases/p5-DBD-PgPP/Makefile
index 3472f378922c..d6d608401075 100644
--- a/databases/p5-DBD-PgPP/Makefile
+++ b/databases/p5-DBD-PgPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-PgPP
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-PgPP/pkg-plist b/databases/p5-DBD-PgPP/pkg-plist
index 6b01ebdd61af..5496dff3e2a2 100644
--- a/databases/p5-DBD-PgPP/pkg-plist
+++ b/databases/p5-DBD-PgPP/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBD::PgPP.3.gz
 %%SITE_PERL%%/DBD/PgPP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/PgPP/.packlist
diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile
index 6b09b0ac0f5a..702c58fd1d18 100644
--- a/databases/p5-DBD-SQLite/Makefile
+++ b/databases/p5-DBD-SQLite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-SQLite
 PORTVERSION=	1.42
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ISHIGAKI
diff --git a/databases/p5-DBD-SQLite/pkg-plist b/databases/p5-DBD-SQLite/pkg-plist
index bb5b4d0b6c3c..87dd789167e7 100644
--- a/databases/p5-DBD-SQLite/pkg-plist
+++ b/databases/p5-DBD-SQLite/pkg-plist
@@ -1,9 +1,8 @@
 %%PERL5_MAN3%%/DBD::SQLite.3.gz
 %%PERL5_MAN3%%/DBD::SQLite::Cookbook.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/SQLite/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/DBD-SQLite/sqlite3.c
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/DBD-SQLite/sqlite3.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/DBD-SQLite/sqlite3ext.h
+%%SITE_ARCH%%/DBD/SQLite.pm
+%%SITE_ARCH%%/DBD/SQLite/Cookbook.pod
+%%SITE_ARCH%%/auto/DBD/SQLite/SQLite.so
+%%SITE_ARCH%%/auto/share/dist/DBD-SQLite/sqlite3.c
+%%SITE_ARCH%%/auto/share/dist/DBD-SQLite/sqlite3.h
+%%SITE_ARCH%%/auto/share/dist/DBD-SQLite/sqlite3ext.h
diff --git a/databases/p5-DBD-SQLite2/Makefile b/databases/p5-DBD-SQLite2/Makefile
index 83e8841b7fc9..b7e101f4eba0 100644
--- a/databases/p5-DBD-SQLite2/Makefile
+++ b/databases/p5-DBD-SQLite2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-SQLite2
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-SQLite2/pkg-plist b/databases/p5-DBD-SQLite2/pkg-plist
index c8b43bb309bb..e64a4f26d591 100644
--- a/databases/p5-DBD-SQLite2/pkg-plist
+++ b/databases/p5-DBD-SQLite2/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/DBD::SQLite2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/SQLite2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/SQLite2.so
+%%SITE_ARCH%%/DBD/SQLite2.pm
+%%SITE_ARCH%%/auto/DBD/SQLite2/SQLite2.so
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 13946d00ac16..8b6d6f751169 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-Sybase
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-Sybase/pkg-plist b/databases/p5-DBD-Sybase/pkg-plist
index 61bd59812665..b53328eb55fb 100644
--- a/databases/p5-DBD-Sybase/pkg-plist
+++ b/databases/p5-DBD-Sybase/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/DBD::Sybase.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Sybase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/dbd-sybase.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase/Sybase.so
+%%SITE_ARCH%%/DBD/Sybase.pm
+%%SITE_ARCH%%/DBD/dbd-sybase.pod
+%%SITE_ARCH%%/auto/DBD/Sybase/Sybase.so
diff --git a/databases/p5-DBD-XBase/Makefile b/databases/p5-DBD-XBase/Makefile
index 74d00fae2815..79389bcf27f8 100644
--- a/databases/p5-DBD-XBase/Makefile
+++ b/databases/p5-DBD-XBase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-XBase
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBD-XBase/pkg-plist b/databases/p5-DBD-XBase/pkg-plist
index a37d62d8fb82..ad7a89baf4db 100644
--- a/databases/p5-DBD-XBase/pkg-plist
+++ b/databases/p5-DBD-XBase/pkg-plist
@@ -15,6 +15,5 @@ bin/indexdump
 %%SITE_PERL%%/XBase/Memo.pm
 %%SITE_PERL%%/XBase/SDBM.pm
 %%SITE_PERL%%/XBase/SQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XBase/.packlist
 man/man1/dbfdump.1.gz
 man/man1/indexdump.1.gz
diff --git a/databases/p5-DBD-cego/Makefile b/databases/p5-DBD-cego/Makefile
index 59beb4280474..c7d736660edf 100644
--- a/databases/p5-DBD-cego/Makefile
+++ b/databases/p5-DBD-cego/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBD-cego
 PORTVERSION=	1.2.9
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://www.lemke-it.com/
 PKGNAMEPREFIX=	p5-
@@ -24,6 +25,6 @@ USE_PERL5=	configure
 CC:=		${CXX}
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DBD/Cego/Cego.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/Cego/Cego.so
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-cego/pkg-plist b/databases/p5-DBD-cego/pkg-plist
index 5caefab03820..c91973c75133 100644
--- a/databases/p5-DBD-cego/pkg-plist
+++ b/databases/p5-DBD-cego/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Cego.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Cego/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Cego/Cego.so
+%%SITE_ARCH%%/DBD/Cego.pm
+%%SITE_ARCH%%/auto/DBD/Cego/Cego.so
 %%PERL5_MAN3%%/DBD::Cego.3.gz
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index fa755e36b48f..57208fc17115 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBD-mysql
 PORTVERSION=	4.028
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -29,6 +30,6 @@ SSL_RUN_DEPENDS=	${SSL_BUILD_DEPENDS}
 SSL_CONFIGURE_ON=	--ssl
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DBD/mysql/mysql.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-mysql/pkg-plist b/databases/p5-DBD-mysql/pkg-plist
index 036f2b9c0c2d..61dac170aeee 100644
--- a/databases/p5-DBD-mysql/pkg-plist
+++ b/databases/p5-DBD-mysql/pkg-plist
@@ -2,10 +2,9 @@
 %%PERL5_MAN3%%/DBD::README.3.gz
 %%PERL5_MAN3%%/DBD::mysql.3.gz
 %%PERL5_MAN3%%/DBD::mysql::INSTALL.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD/mysql.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/mysql.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/mysql/GetInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/mysql/INSTALL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/mysql/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.so
+%%SITE_ARCH%%/Bundle/DBD/mysql.pm
+%%SITE_ARCH%%/DBD/README.pod
+%%SITE_ARCH%%/DBD/mysql.pm
+%%SITE_ARCH%%/DBD/mysql/GetInfo.pm
+%%SITE_ARCH%%/DBD/mysql/INSTALL.pod
+%%SITE_ARCH%%/auto/DBD/mysql/mysql.so
diff --git a/databases/p5-DBI-Shell/Makefile b/databases/p5-DBI-Shell/Makefile
index f31679a892bb..da7c2874c49e 100644
--- a/databases/p5-DBI-Shell/Makefile
+++ b/databases/p5-DBI-Shell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBI-Shell
 PORTVERSION=	11.95
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBI-Shell/pkg-plist b/databases/p5-DBI-Shell/pkg-plist
index 1cf4ba51243d..938b133b9197 100644
--- a/databases/p5-DBI-Shell/pkg-plist
+++ b/databases/p5-DBI-Shell/pkg-plist
@@ -12,5 +12,4 @@ bin/dbish
 %%SITE_PERL%%/DBI/Shell/SQLMinus.pm
 %%SITE_PERL%%/DBI/Shell/Spool.pm
 %%SITE_PERL%%/DBI/Shell/Timing.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Shell/.packlist
 man/man1/dbish.1.gz
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 4acaf5ab8727..344eec9d6de9 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBI
 PORTVERSION=	1.631
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBI/pkg-plist b/databases/p5-DBI/pkg-plist
index 4e6f3d8c47d3..2fee3bd52803 100644
--- a/databases/p5-DBI/pkg-plist
+++ b/databases/p5-DBI/pkg-plist
@@ -1,70 +1,69 @@
 bin/dbilogstrip
 bin/dbiprof
 bin/dbiproxy
-%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/DBM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/ExampleP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/File/Developers.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/File/HowTo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/File/Roadmap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Policy/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Policy/classic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Policy/pedantic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Policy/rush.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Transport/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Transport/corostream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Transport/null.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Transport/pipeone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Gofer/Transport/stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/NullP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Proxy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Sponge.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Changes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ANSI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ODBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfoReturn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfoType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD/Metadata.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD/SqlEngine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD/SqlEngine/Developers.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD/SqlEngine/HowTo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/FAQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Execute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Request.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Serializer/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Serializer/DataDumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Serializer/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Transport/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Transport/pipeone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Gofer/Transport/stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Profile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper/Apache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileSubs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProxyServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/PurePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/SQL/Nano.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Util/_accessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Util/CacheMemory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBI/W32ODBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Win32/DBIODBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBIXS.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Driver.xst
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Driver_xst.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbd_xsh.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbi_sql.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbipport.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbivport.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbixs_rev.h
-%%SITE_PERL%%/%%PERL_ARCH%%/dbixs_rev.pl
+%%SITE_ARCH%%/Bundle/DBI.pm
+%%SITE_ARCH%%/DBD/DBM.pm
+%%SITE_ARCH%%/DBD/ExampleP.pm
+%%SITE_ARCH%%/DBD/File.pm
+%%SITE_ARCH%%/DBD/File/Developers.pod
+%%SITE_ARCH%%/DBD/File/HowTo.pod
+%%SITE_ARCH%%/DBD/File/Roadmap.pod
+%%SITE_ARCH%%/DBD/Gofer.pm
+%%SITE_ARCH%%/DBD/Gofer/Policy/Base.pm
+%%SITE_ARCH%%/DBD/Gofer/Policy/classic.pm
+%%SITE_ARCH%%/DBD/Gofer/Policy/pedantic.pm
+%%SITE_ARCH%%/DBD/Gofer/Policy/rush.pm
+%%SITE_ARCH%%/DBD/Gofer/Transport/Base.pm
+%%SITE_ARCH%%/DBD/Gofer/Transport/corostream.pm
+%%SITE_ARCH%%/DBD/Gofer/Transport/null.pm
+%%SITE_ARCH%%/DBD/Gofer/Transport/pipeone.pm
+%%SITE_ARCH%%/DBD/Gofer/Transport/stream.pm
+%%SITE_ARCH%%/DBD/NullP.pm
+%%SITE_ARCH%%/DBD/Proxy.pm
+%%SITE_ARCH%%/DBD/Sponge.pm
+%%SITE_ARCH%%/DBI.pm
+%%SITE_ARCH%%/DBI/Changes.pm
+%%SITE_ARCH%%/DBI/Const/GetInfo/ANSI.pm
+%%SITE_ARCH%%/DBI/Const/GetInfo/ODBC.pm
+%%SITE_ARCH%%/DBI/Const/GetInfoReturn.pm
+%%SITE_ARCH%%/DBI/Const/GetInfoType.pm
+%%SITE_ARCH%%/DBI/DBD.pm
+%%SITE_ARCH%%/DBI/DBD/Metadata.pm
+%%SITE_ARCH%%/DBI/DBD/SqlEngine.pm
+%%SITE_ARCH%%/DBI/DBD/SqlEngine/Developers.pod
+%%SITE_ARCH%%/DBI/DBD/SqlEngine/HowTo.pod
+%%SITE_ARCH%%/DBI/FAQ.pm
+%%SITE_ARCH%%/DBI/Gofer/Execute.pm
+%%SITE_ARCH%%/DBI/Gofer/Request.pm
+%%SITE_ARCH%%/DBI/Gofer/Response.pm
+%%SITE_ARCH%%/DBI/Gofer/Serializer/Base.pm
+%%SITE_ARCH%%/DBI/Gofer/Serializer/DataDumper.pm
+%%SITE_ARCH%%/DBI/Gofer/Serializer/Storable.pm
+%%SITE_ARCH%%/DBI/Gofer/Transport/Base.pm
+%%SITE_ARCH%%/DBI/Gofer/Transport/pipeone.pm
+%%SITE_ARCH%%/DBI/Gofer/Transport/stream.pm
+%%SITE_ARCH%%/DBI/Profile.pm
+%%SITE_ARCH%%/DBI/ProfileData.pm
+%%SITE_ARCH%%/DBI/ProfileDumper.pm
+%%SITE_ARCH%%/DBI/ProfileDumper/Apache.pm
+%%SITE_ARCH%%/DBI/ProfileSubs.pm
+%%SITE_ARCH%%/DBI/ProxyServer.pm
+%%SITE_ARCH%%/DBI/PurePerl.pm
+%%SITE_ARCH%%/DBI/SQL/Nano.pm
+%%SITE_ARCH%%/DBI/Util/_accessor.pm
+%%SITE_ARCH%%/DBI/Util/CacheMemory.pm
+%%SITE_ARCH%%/DBI/W32ODBC.pm
+%%SITE_ARCH%%/Win32/DBIODBC.pm
+%%SITE_ARCH%%/auto/DBI/DBI.so
+%%SITE_ARCH%%/auto/DBI/DBIXS.h
+%%SITE_ARCH%%/auto/DBI/Driver.xst
+%%SITE_ARCH%%/auto/DBI/Driver_xst.h
+%%SITE_ARCH%%/auto/DBI/dbd_xsh.h
+%%SITE_ARCH%%/auto/DBI/dbi_sql.h
+%%SITE_ARCH%%/auto/DBI/dbipport.h
+%%SITE_ARCH%%/auto/DBI/dbivport.h
+%%SITE_ARCH%%/auto/DBI/dbixs_rev.h
+%%SITE_ARCH%%/dbixs_rev.pl
 %%PERL5_MAN3%%/Bundle::DBI.3.gz
 %%PERL5_MAN3%%/DBD::DBM.3.gz
 %%PERL5_MAN3%%/DBD::File.3.gz
diff --git a/databases/p5-DBICx-Deploy/Makefile b/databases/p5-DBICx-Deploy/Makefile
index dacdd184b037..61851d6deb81 100644
--- a/databases/p5-DBICx-Deploy/Makefile
+++ b/databases/p5-DBICx-Deploy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBICx-Deploy
 PORTVERSION=	0.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
diff --git a/databases/p5-DBICx-Deploy/pkg-plist b/databases/p5-DBICx-Deploy/pkg-plist
index f6b4a02d1349..9af1b8c24f80 100644
--- a/databases/p5-DBICx-Deploy/pkg-plist
+++ b/databases/p5-DBICx-Deploy/pkg-plist
@@ -2,4 +2,3 @@ bin/dbicdeploy
 %%PERL5_MAN3%%/DBICx::Deploy.3.gz
 man/man1/dbicdeploy.1.gz
 %%SITE_PERL%%/DBICx/Deploy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBICx/Deploy/.packlist
diff --git a/databases/p5-DBICx-MapMaker/Makefile b/databases/p5-DBICx-MapMaker/Makefile
index 09cbe7f441ab..311036c532b4 100644
--- a/databases/p5-DBICx-MapMaker/Makefile
+++ b/databases/p5-DBICx-MapMaker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBICx-MapMaker
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
diff --git a/databases/p5-DBICx-MapMaker/pkg-plist b/databases/p5-DBICx-MapMaker/pkg-plist
index 1b61120de171..b894f10f5f48 100644
--- a/databases/p5-DBICx-MapMaker/pkg-plist
+++ b/databases/p5-DBICx-MapMaker/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBICx/MapMaker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBICx/MapMaker/.packlist
 %%PERL5_MAN3%%/DBICx::MapMaker.3.gz
diff --git a/databases/p5-DBICx-TestDatabase/Makefile b/databases/p5-DBICx-TestDatabase/Makefile
index b2bb6e7ad5b6..18acd6478c1f 100644
--- a/databases/p5-DBICx-TestDatabase/Makefile
+++ b/databases/p5-DBICx-TestDatabase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBICx-TestDatabase
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
diff --git a/databases/p5-DBICx-TestDatabase/pkg-plist b/databases/p5-DBICx-TestDatabase/pkg-plist
index 8e848bb87ea4..2364441253bd 100644
--- a/databases/p5-DBICx-TestDatabase/pkg-plist
+++ b/databases/p5-DBICx-TestDatabase/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/DBICx/TestDatabase.pm
 %%SITE_PERL%%/DBICx/TestDatabase/Subclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBICx/TestDatabase/.packlist
 %%PERL5_MAN3%%/DBICx::TestDatabase.3.gz
 %%PERL5_MAN3%%/DBICx::TestDatabase::Subclass.3.gz
diff --git a/databases/p5-DBICx-TxnInsert/Makefile b/databases/p5-DBICx-TxnInsert/Makefile
index 983d57e4e818..cd5b14fda52b 100644
--- a/databases/p5-DBICx-TxnInsert/Makefile
+++ b/databases/p5-DBICx-TxnInsert/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBICx-TxnInsert
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VOVKASM
diff --git a/databases/p5-DBICx-TxnInsert/pkg-plist b/databases/p5-DBICx-TxnInsert/pkg-plist
index a8915f70b5bd..463b626dd3ea 100644
--- a/databases/p5-DBICx-TxnInsert/pkg-plist
+++ b/databases/p5-DBICx-TxnInsert/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBICx::TxnInsert.3.gz
 %%SITE_PERL%%/DBICx/TxnInsert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBICx/TxnInsert/.packlist
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index 033b5a1ffb42..2ddfe950c134 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIWrapper
 PORTVERSION=	0.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIWrapper/pkg-plist b/databases/p5-DBIWrapper/pkg-plist
index a65ca35a0fa6..9cb0b073be68 100644
--- a/databases/p5-DBIWrapper/pkg-plist
+++ b/databases/p5-DBIWrapper/pkg-plist
@@ -7,4 +7,3 @@
 %%SITE_PERL%%/auto/DBIWrapper/ResultSet/autosplit.ix
 %%SITE_PERL%%/auto/DBIWrapper/XMLParser/autosplit.ix
 %%SITE_PERL%%/auto/DBIWrapper/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIWrapper/.packlist
diff --git a/databases/p5-DBIx-Abstract/Makefile b/databases/p5-DBIx-Abstract/Makefile
index 7ffd128b1739..66148c60dfeb 100644
--- a/databases/p5-DBIx-Abstract/Makefile
+++ b/databases/p5-DBIx-Abstract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Abstract
 PORTVERSION=	1.010
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Abstract/pkg-plist b/databases/p5-DBIx-Abstract/pkg-plist
index 552bf25610b3..7b49f179ada8 100644
--- a/databases/p5-DBIx-Abstract/pkg-plist
+++ b/databases/p5-DBIx-Abstract/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Abstract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Abstract/.packlist
 %%PERL5_MAN3%%/DBIx::Abstract.3.gz
diff --git a/databases/p5-DBIx-Admin-CreateTable/Makefile b/databases/p5-DBIx-Admin-CreateTable/Makefile
index 0e184e7607eb..274b0ad280e4 100644
--- a/databases/p5-DBIx-Admin-CreateTable/Makefile
+++ b/databases/p5-DBIx-Admin-CreateTable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Admin-CreateTable
 PORTVERSION=	2.10
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Admin-CreateTable/pkg-plist b/databases/p5-DBIx-Admin-CreateTable/pkg-plist
index 7570244de697..7c261519e8bc 100644
--- a/databases/p5-DBIx-Admin-CreateTable/pkg-plist
+++ b/databases/p5-DBIx-Admin-CreateTable/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Admin/CreateTable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Admin/CreateTable/.packlist
 %%PERL5_MAN3%%/DBIx::Admin::CreateTable.3.gz
diff --git a/databases/p5-DBIx-Admin-DSNManager/Makefile b/databases/p5-DBIx-Admin-DSNManager/Makefile
index 0bf9fb841ff8..b8d8b33600d2 100644
--- a/databases/p5-DBIx-Admin-DSNManager/Makefile
+++ b/databases/p5-DBIx-Admin-DSNManager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Admin-DSNManager
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Admin-DSNManager/pkg-plist b/databases/p5-DBIx-Admin-DSNManager/pkg-plist
index 21a0a2043295..783ea3fa1d5d 100644
--- a/databases/p5-DBIx-Admin-DSNManager/pkg-plist
+++ b/databases/p5-DBIx-Admin-DSNManager/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Admin/DSNManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Admin/DSNManager/.packlist
 %%PERL5_MAN3%%/DBIx::Admin::DSNManager.3.gz
diff --git a/databases/p5-DBIx-Admin-TableInfo/Makefile b/databases/p5-DBIx-Admin-TableInfo/Makefile
index 7c3af6a9a8cf..3cecd8041103 100644
--- a/databases/p5-DBIx-Admin-TableInfo/Makefile
+++ b/databases/p5-DBIx-Admin-TableInfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Admin-TableInfo
 PORTVERSION=	3.00
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Admin-TableInfo/pkg-plist b/databases/p5-DBIx-Admin-TableInfo/pkg-plist
index a023a0f323a8..eef9d80d7e2d 100644
--- a/databases/p5-DBIx-Admin-TableInfo/pkg-plist
+++ b/databases/p5-DBIx-Admin-TableInfo/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Admin/TableInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Admin/TableInfo/.packlist
 %%PERL5_MAN3%%/DBIx::Admin::TableInfo.3.gz
diff --git a/databases/p5-DBIx-AnyDBD/Makefile b/databases/p5-DBIx-AnyDBD/Makefile
index 613d1f4310df..e4a4b3102d19 100644
--- a/databases/p5-DBIx-AnyDBD/Makefile
+++ b/databases/p5-DBIx-AnyDBD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-AnyDBD
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-AnyDBD/pkg-plist b/databases/p5-DBIx-AnyDBD/pkg-plist
index f9e30248d642..6cd6bfb29543 100644
--- a/databases/p5-DBIx-AnyDBD/pkg-plist
+++ b/databases/p5-DBIx-AnyDBD/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::AnyDBD.3.gz
 %%SITE_PERL%%/DBIx/AnyDBD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD/.packlist
diff --git a/databases/p5-DBIx-Browse/Makefile b/databases/p5-DBIx-Browse/Makefile
index 3aa73f7a6509..ad88873f0080 100644
--- a/databases/p5-DBIx-Browse/Makefile
+++ b/databases/p5-DBIx-Browse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Browse
 PORTVERSION=	2.09
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Browse/pkg-plist b/databases/p5-DBIx-Browse/pkg-plist
index 168b6020634f..aa9b87c63fcc 100644
--- a/databases/p5-DBIx-Browse/pkg-plist
+++ b/databases/p5-DBIx-Browse/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/DBIx::Browse::CGI.3.gz
 %%SITE_PERL%%/DBIx/Browse.pm
 %%SITE_PERL%%/DBIx/Browse/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Browse/.packlist
diff --git a/databases/p5-DBIx-Class-AsFdat/Makefile b/databases/p5-DBIx-Class-AsFdat/Makefile
index b499b4ece68d..892bbeca7a91 100644
--- a/databases/p5-DBIx-Class-AsFdat/Makefile
+++ b/databases/p5-DBIx-Class-AsFdat/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	DBIx-Class-AsFdat
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-AsFdat/pkg-plist b/databases/p5-DBIx-Class-AsFdat/pkg-plist
index a98972d9ec33..c4cf2a244743 100644
--- a/databases/p5-DBIx-Class-AsFdat/pkg-plist
+++ b/databases/p5-DBIx-Class-AsFdat/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/AsFdat/.packlist
 %%SITE_PERL%%/DBIx/Class/AsFdat.pm
 %%PERL5_MAN3%%/DBIx::Class::AsFdat.3.gz
diff --git a/databases/p5-DBIx-Class-BitField/Makefile b/databases/p5-DBIx-Class-BitField/Makefile
index afb6db64092b..5297c0adc7e5 100644
--- a/databases/p5-DBIx-Class-BitField/Makefile
+++ b/databases/p5-DBIx-Class-BitField/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-BitField
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-BitField/pkg-plist b/databases/p5-DBIx-Class-BitField/pkg-plist
index d446640771e6..20e42bf03ae0 100644
--- a/databases/p5-DBIx-Class-BitField/pkg-plist
+++ b/databases/p5-DBIx-Class-BitField/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/DBIx::Class::ResultSet::BitField.3.gz
 %%SITE_PERL%%/DBIx/Class/BitField.pm
 %%SITE_PERL%%/DBIx/Class/ResultSet/BitField.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/BitField/.packlist
diff --git a/databases/p5-DBIx-Class-Candy/Makefile b/databases/p5-DBIx-Class-Candy/Makefile
index 1a3806ab9688..7dd6ebb15278 100644
--- a/databases/p5-DBIx-Class-Candy/Makefile
+++ b/databases/p5-DBIx-Class-Candy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-Candy
 PORTVERSION=	0.002105
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Candy/pkg-plist b/databases/p5-DBIx-Class-Candy/pkg-plist
index 3649e4f893a8..fddb69137ffb 100644
--- a/databases/p5-DBIx-Class-Candy/pkg-plist
+++ b/databases/p5-DBIx-Class-Candy/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/DBIx::Class::Candy::Exports.3.gz
 %%SITE_PERL%%/DBIx/Class/Candy.pm
 %%SITE_PERL%%/DBIx/Class/Candy/Exports.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Candy/.packlist
diff --git a/databases/p5-DBIx-Class-Cursor-Cached/Makefile b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
index 58692dee38e1..a6c29bd69eca 100644
--- a/databases/p5-DBIx-Class-Cursor-Cached/Makefile
+++ b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-Cursor-Cached
 PORTVERSION=	1.001.002
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Cursor-Cached/pkg-plist b/databases/p5-DBIx-Class-Cursor-Cached/pkg-plist
index e9c6be010918..135c24f17efc 100644
--- a/databases/p5-DBIx-Class-Cursor-Cached/pkg-plist
+++ b/databases/p5-DBIx-Class-Cursor-Cached/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/Cursor/Cached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Cursor/Cached/.packlist
 %%PERL5_MAN3%%/DBIx::Class::Cursor::Cached.3.gz
diff --git a/databases/p5-DBIx-Class-CustomPrefetch/Makefile b/databases/p5-DBIx-Class-CustomPrefetch/Makefile
index 9905831da43c..f5f2b1126725 100644
--- a/databases/p5-DBIx-Class-CustomPrefetch/Makefile
+++ b/databases/p5-DBIx-Class-CustomPrefetch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-CustomPrefetch
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-CustomPrefetch/pkg-plist b/databases/p5-DBIx-Class-CustomPrefetch/pkg-plist
index 07dd4d38a0c7..c15733f4c52c 100644
--- a/databases/p5-DBIx-Class-CustomPrefetch/pkg-plist
+++ b/databases/p5-DBIx-Class-CustomPrefetch/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/DBIx/Class/CustomPrefetch.pm
 %%SITE_PERL%%/DBIx/Class/ResultSet/CustomPrefetch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/CustomPrefetch/.packlist
 %%PERL5_MAN3%%/DBIx::Class::CustomPrefetch.3.gz
 %%PERL5_MAN3%%/DBIx::Class::ResultSet::CustomPrefetch.3.gz
diff --git a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
index f7970403c5cd..881888a818b6 100644
--- a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
+++ b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-DateTime-Epoch
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-DateTime-Epoch/pkg-plist b/databases/p5-DBIx-Class-DateTime-Epoch/pkg-plist
index 053757ade63d..75c399243638 100644
--- a/databases/p5-DBIx-Class-DateTime-Epoch/pkg-plist
+++ b/databases/p5-DBIx-Class-DateTime-Epoch/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Class::DateTime::Epoch.3.gz
 %%SITE_PERL%%/DBIx/Class/DateTime/Epoch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/DateTime/Epoch/.packlist
diff --git a/databases/p5-DBIx-Class-DeploymentHandler/Makefile b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
index 733ce175e16b..2c8ff57bd468 100644
--- a/databases/p5-DBIx-Class-DeploymentHandler/Makefile
+++ b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-DeploymentHandler
 PORTVERSION=	0.002212
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist b/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist
index d70663a20958..7481b712f49f 100644
--- a/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist
+++ b/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/DeploymentHandler/.packlist
 %%SITE_PERL%%/DBIx/Class/DeploymentHandler.pm
 %%SITE_PERL%%/DBIx/Class/DeploymentHandler/Cookbook/CustomResultSource.pod
 %%SITE_PERL%%/DBIx/Class/DeploymentHandler/Dad.pm
diff --git a/databases/p5-DBIx-Class-DigestColumns/Makefile b/databases/p5-DBIx-Class-DigestColumns/Makefile
index 5cce82ae57ff..0d182d510f90 100644
--- a/databases/p5-DBIx-Class-DigestColumns/Makefile
+++ b/databases/p5-DBIx-Class-DigestColumns/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Class-DigestColumns
 PORTVERSION=	0.06000
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-DynamicDefault/Makefile b/databases/p5-DBIx-Class-DynamicDefault/Makefile
index 131ba39e1fb2..990200d7e336 100644
--- a/databases/p5-DBIx-Class-DynamicDefault/Makefile
+++ b/databases/p5-DBIx-Class-DynamicDefault/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-DynamicDefault
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-DynamicDefault/pkg-plist b/databases/p5-DBIx-Class-DynamicDefault/pkg-plist
index db1409c9ed57..b50ceda54048 100644
--- a/databases/p5-DBIx-Class-DynamicDefault/pkg-plist
+++ b/databases/p5-DBIx-Class-DynamicDefault/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Class::DynamicDefault.3.gz
 %%SITE_PERL%%/DBIx/Class/DynamicDefault.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/DynamicDefault/.packlist
diff --git a/databases/p5-DBIx-Class-DynamicSubclass/Makefile b/databases/p5-DBIx-Class-DynamicSubclass/Makefile
index 8fa3245d9a4f..9c7a05dc718a 100644
--- a/databases/p5-DBIx-Class-DynamicSubclass/Makefile
+++ b/databases/p5-DBIx-Class-DynamicSubclass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-DynamicSubclass
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-DynamicSubclass/pkg-plist b/databases/p5-DBIx-Class-DynamicSubclass/pkg-plist
index 7340552d574c..c7d6f4ac5d93 100644
--- a/databases/p5-DBIx-Class-DynamicSubclass/pkg-plist
+++ b/databases/p5-DBIx-Class-DynamicSubclass/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/DynamicSubclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/DynamicSubclass/.packlist
 %%PERL5_MAN3%%/DBIx::Class::DynamicSubclass.3.gz
diff --git a/databases/p5-DBIx-Class-EncodeColumns/Makefile b/databases/p5-DBIx-Class-EncodeColumns/Makefile
index fbd71c967b36..97486c2984b3 100644
--- a/databases/p5-DBIx-Class-EncodeColumns/Makefile
+++ b/databases/p5-DBIx-Class-EncodeColumns/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-EncodeColumns
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile
index 4116925c7498..68bdcf00b090 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/Makefile
+++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-EncodedColumn
 PORTVERSION=	0.00013
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-EncodedColumn/pkg-plist b/databases/p5-DBIx-Class-EncodedColumn/pkg-plist
index 6ea23ee69e47..9c92a0029f3a 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/pkg-plist
+++ b/databases/p5-DBIx-Class-EncodedColumn/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/DBIx/Class/EncodedColumn/Crypt/Eksblowfish/Bcrypt.pm
 %%SITE_PERL%%/DBIx/Class/EncodedColumn/Crypt/OpenPGP.pm
 %%SITE_PERL%%/DBIx/Class/EncodedColumn/Digest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/EncodedColumn/.packlist
diff --git a/databases/p5-DBIx-Class-Fixtures/Makefile b/databases/p5-DBIx-Class-Fixtures/Makefile
index 1a9f870f53c2..7f33fac22e43 100644
--- a/databases/p5-DBIx-Class-Fixtures/Makefile
+++ b/databases/p5-DBIx-Class-Fixtures/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-Fixtures
 PORTVERSION=	1.001024
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SKAUFMAN
diff --git a/databases/p5-DBIx-Class-Fixtures/pkg-plist b/databases/p5-DBIx-Class-Fixtures/pkg-plist
index f90f0446a071..d8b6d3e0c635 100644
--- a/databases/p5-DBIx-Class-Fixtures/pkg-plist
+++ b/databases/p5-DBIx-Class-Fixtures/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/DBIx::Class::Fixtures.3.gz
 %%PERL5_MAN3%%/DBIx::Class::Fixtures::External::File.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Fixtures/.packlist
 %%SITE_PERL%%/DBIx/Class/Fixtures.pm
 %%SITE_PERL%%/DBIx/Class/Fixtures/DBI.pm
 %%SITE_PERL%%/DBIx/Class/Fixtures/DBI/Pg.pm
diff --git a/databases/p5-DBIx-Class-FrozenColumns/Makefile b/databases/p5-DBIx-Class-FrozenColumns/Makefile
index c33ca3d159f5..57477c8978b4 100644
--- a/databases/p5-DBIx-Class-FrozenColumns/Makefile
+++ b/databases/p5-DBIx-Class-FrozenColumns/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-FrozenColumns
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-FrozenColumns/pkg-plist b/databases/p5-DBIx-Class-FrozenColumns/pkg-plist
index aba27c89d0f3..5e41341e1324 100644
--- a/databases/p5-DBIx-Class-FrozenColumns/pkg-plist
+++ b/databases/p5-DBIx-Class-FrozenColumns/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/FrozenColumns.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/FrozenColumns/.packlist
 %%PERL5_MAN3%%/DBIx::Class::FrozenColumns.3.gz
diff --git a/databases/p5-DBIx-Class-Helpers/Makefile b/databases/p5-DBIx-Class-Helpers/Makefile
index 2c016521e864..0cac8a1edf10 100644
--- a/databases/p5-DBIx-Class-Helpers/Makefile
+++ b/databases/p5-DBIx-Class-Helpers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-Helpers
 PORTVERSION=	2.023000
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Helpers/pkg-plist b/databases/p5-DBIx-Class-Helpers/pkg-plist
index 9e97d17e37a4..9793604aadc5 100644
--- a/databases/p5-DBIx-Class-Helpers/pkg-plist
+++ b/databases/p5-DBIx-Class-Helpers/pkg-plist
@@ -51,7 +51,6 @@
 %%SITE_PERL%%/DBIx/Class/Helper/VirtualView.pm
 %%SITE_PERL%%/DBIx/Class/Helpers.pm
 %%SITE_PERL%%/DBIx/Class/Helpers/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Helpers/.packlist
 %%PERL5_MAN3%%/DBIx::Class::Helper::IgnoreWantarray.3.gz
 %%PERL5_MAN3%%/DBIx::Class::Helper::JoinTable.3.gz
 %%PERL5_MAN3%%/DBIx::Class::Helper::Random.3.gz
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
index b1fb479bfa44..02a6158e22f4 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-InflateColumn-Authen-Passphrase
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	DBIx
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-plist b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-plist
index a6814598e233..d5a4c8cc53f3 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-plist
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/InflateColumn/Authen/Passphrase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/InflateColumn/Authen/Passphrase/.packlist
 %%PERL5_MAN3%%/DBIx::Class::InflateColumn::Authen::Passphrase.3.gz
diff --git a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
index cad328408fec..54d6e271adb4 100644
--- a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-InflateColumn-FS
 PORTVERSION=	0.01007
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-InflateColumn-FS/pkg-plist b/databases/p5-DBIx-Class-InflateColumn-FS/pkg-plist
index bf7e19cb5ebd..9df161db312f 100644
--- a/databases/p5-DBIx-Class-InflateColumn-FS/pkg-plist
+++ b/databases/p5-DBIx-Class-InflateColumn-FS/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/InflateColumn/FS/.packlist
 %%SITE_PERL%%/DBIx/Class/InflateColumn/FS.pm
 %%SITE_PERL%%/DBIx/Class/InflateColumn/FS/ResultSet.pm
 %%PERL5_MAN3%%/DBIx::Class::InflateColumn::FS.3.gz
diff --git a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
index d3034de9a8b2..0be708ef5b39 100644
--- a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-InflateColumn-IP
 PORTVERSION=	0.02003
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-InflateColumn-IP/pkg-plist b/databases/p5-DBIx-Class-InflateColumn-IP/pkg-plist
index 1f17a4635026..85f8fa2090c1 100644
--- a/databases/p5-DBIx-Class-InflateColumn-IP/pkg-plist
+++ b/databases/p5-DBIx-Class-InflateColumn-IP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/InflateColumn/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/InflateColumn/IP/.packlist
 %%PERL5_MAN3%%/DBIx::Class::InflateColumn::IP.3.gz
diff --git a/databases/p5-DBIx-Class-IntrospectableM2M/Makefile b/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
index c4d656b98c99..d96a6d29ed4b 100644
--- a/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
+++ b/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Class-IntrospectableM2M
 PORTVERSION=	0.001001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-IntrospectableM2M/pkg-plist b/databases/p5-DBIx-Class-IntrospectableM2M/pkg-plist
index e004e9501e26..0d353196a1df 100644
--- a/databases/p5-DBIx-Class-IntrospectableM2M/pkg-plist
+++ b/databases/p5-DBIx-Class-IntrospectableM2M/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/IntrospectableM2M.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/IntrospectableM2M/.packlist
 %%PERL5_MAN3%%/DBIx::Class::IntrospectableM2M.3.gz
diff --git a/databases/p5-DBIx-Class-Loader/Makefile b/databases/p5-DBIx-Class-Loader/Makefile
index 1e3624444a86..a8f7337fb3db 100644
--- a/databases/p5-DBIx-Class-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Loader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Class-Loader
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Loader/pkg-plist b/databases/p5-DBIx-Class-Loader/pkg-plist
index 7d8f2fc07eaa..f5c725a1ddc3 100644
--- a/databases/p5-DBIx-Class-Loader/pkg-plist
+++ b/databases/p5-DBIx-Class-Loader/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/DBIx/Class/Loader/SQLite.pm
 %%SITE_PERL%%/DBIx/Class/Loader/Writing.pm
 %%SITE_PERL%%/DBIx/Class/Loader/mysql.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Loader/.packlist
diff --git a/databases/p5-DBIx-Class-Migration/Makefile b/databases/p5-DBIx-Class-Migration/Makefile
index c8dd39bc2727..bfa9adb476e8 100644
--- a/databases/p5-DBIx-Class-Migration/Makefile
+++ b/databases/p5-DBIx-Class-Migration/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-Migration
 PORTVERSION=	0.044
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Migration/pkg-plist b/databases/p5-DBIx-Class-Migration/pkg-plist
index da3d4d883b01..d17643d3661e 100644
--- a/databases/p5-DBIx-Class-Migration/pkg-plist
+++ b/databases/p5-DBIx-Class-Migration/pkg-plist
@@ -1,6 +1,5 @@
 bin/dbic-migration
 man/man1/dbic-migration.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Migration/.packlist
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/FromMigration.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/FromMigration/_MigrationHelper.pm
 %%SITE_PERL%%/DBIx/Class/Migration.pm
diff --git a/databases/p5-DBIx-Class-MooseColumns/Makefile b/databases/p5-DBIx-Class-MooseColumns/Makefile
index 0db7252e5e54..3e8763e9e6b8 100644
--- a/databases/p5-DBIx-Class-MooseColumns/Makefile
+++ b/databases/p5-DBIx-Class-MooseColumns/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	DBIx-Class-MooseColumns
 PORTVERSION=	0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MENDEL
diff --git a/databases/p5-DBIx-Class-MooseColumns/pkg-plist b/databases/p5-DBIx-Class-MooseColumns/pkg-plist
index 9b836cffad6a..38b717567b96 100644
--- a/databases/p5-DBIx-Class-MooseColumns/pkg-plist
+++ b/databases/p5-DBIx-Class-MooseColumns/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/DBIx/Class/MooseColumns/Meta/Role/Attribute/DBICColumn.pm
 %%SITE_PERL%%/DBIx/Class/MooseColumns/Meta/Role/Attribute.pm
 %%SITE_PERL%%/DBIx/Class/MooseColumns.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/MooseColumns/.packlist
 %%PERL5_MAN3%%/DBIx::Class::MooseColumns.3.gz
 %%PERL5_MAN3%%/DBIx::Class::MooseColumns::Meta::Role::Attribute.3.gz
 %%PERL5_MAN3%%/DBIx::Class::MooseColumns::Meta::Role::Attribute::DBICColumn.3.gz
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/Makefile b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
index 102c26671667..210a4a28a4e3 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/Makefile
+++ b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-PassphraseColumn
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	DBIx
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/pkg-plist b/databases/p5-DBIx-Class-PassphraseColumn/pkg-plist
index ac406a7ec151..fd72c6cad03e 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/pkg-plist
+++ b/databases/p5-DBIx-Class-PassphraseColumn/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/PassphraseColumn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/PassphraseColumn/.packlist
 %%PERL5_MAN3%%/DBIx::Class::PassphraseColumn.3.gz
diff --git a/databases/p5-DBIx-Class-QueryLog/Makefile b/databases/p5-DBIx-Class-QueryLog/Makefile
index d8fd8a389dfa..21e5e3d8486c 100644
--- a/databases/p5-DBIx-Class-QueryLog/Makefile
+++ b/databases/p5-DBIx-Class-QueryLog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-QueryLog
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-QueryLog/pkg-plist b/databases/p5-DBIx-Class-QueryLog/pkg-plist
index 4c8043cefdbf..1b8656d93fce 100644
--- a/databases/p5-DBIx-Class-QueryLog/pkg-plist
+++ b/databases/p5-DBIx-Class-QueryLog/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/DBIx/Class/QueryLog/Analyzer.pm
 %%SITE_PERL%%/DBIx/Class/QueryLog/Query.pm
 %%SITE_PERL%%/DBIx/Class/QueryLog/Transaction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/QueryLog/.packlist
diff --git a/databases/p5-DBIx-Class-QueryProfiler/Makefile b/databases/p5-DBIx-Class-QueryProfiler/Makefile
index e416041d710c..c89570cb69f7 100644
--- a/databases/p5-DBIx-Class-QueryProfiler/Makefile
+++ b/databases/p5-DBIx-Class-QueryProfiler/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 PORTNAME=	DBIx-Class-QueryProfiler
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-QueryProfiler/pkg-plist b/databases/p5-DBIx-Class-QueryProfiler/pkg-plist
index 7268c7200233..4e670e7474ea 100644
--- a/databases/p5-DBIx-Class-QueryProfiler/pkg-plist
+++ b/databases/p5-DBIx-Class-QueryProfiler/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Class::QueryProfiler.3.gz
 %%SITE_PERL%%/DBIx/Class/QueryProfiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/QueryProfiler/.packlist
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
index e910313e7f62..caabd7044048 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-ResultSet-HashRef
 PORTVERSION=	1.002
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist b/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist
index 1a928334bd55..eb950dffd5fb 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Class::ResultSet::HashRef.3.gz
 %%SITE_PERL%%/DBIx/Class/ResultSet/HashRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/ResultSet/HashRef/.packlist
diff --git a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
index 82342c8f4a36..1307b082c7a5 100644
--- a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-ResultSet-RecursiveUpdate
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-plist b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-plist
index 039dc9ca0966..340873c4f72d 100644
--- a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-plist
+++ b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Class::ResultSet::RecursiveUpdate.3.gz
 %%SITE_PERL%%/DBIx/Class/ResultSet/RecursiveUpdate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/ResultSet/RecursiveUpdate/.packlist
diff --git a/databases/p5-DBIx-Class-Schema-Config/Makefile b/databases/p5-DBIx-Class-Schema-Config/Makefile
index f36b6b1a1f11..81b8c0302594 100644
--- a/databases/p5-DBIx-Class-Schema-Config/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-Schema-Config
 PORTVERSION=	0.001008
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Schema-Config/pkg-plist b/databases/p5-DBIx-Class-Schema-Config/pkg-plist
index 1671c5795438..51d6dadfd696 100644
--- a/databases/p5-DBIx-Class-Schema-Config/pkg-plist
+++ b/databases/p5-DBIx-Class-Schema-Config/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/Schema/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Schema/Config/.packlist
 %%PERL5_MAN3%%/DBIx::Class::Schema::Config.3.gz
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 5e772b4211f7..539a6c33d5a5 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-Schema-Loader
 PORTVERSION=	0.07042
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
index 3c7fcc76b135..6ec8ae6d98bf 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
+++ b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
@@ -79,5 +79,4 @@ bin/dbicdump
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/Table/Informix.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/Table/Sybase.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Schema/Loader/.packlist
 man/man1/dbicdump.1.gz
diff --git a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
index 79cdf5507fa3..38b18e986658 100644
--- a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
+++ b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Class-Schema-PopulateMore
 PORTVERSION=	0.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-plist b/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-plist
index 87b190332721..4148e2c2b6e0 100644
--- a/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-plist
+++ b/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-plist
@@ -34,4 +34,3 @@
 %%SITE_PERL%%/DBIx/Class/Schema/PopulateMore/Test/Schema/ResultSet.pm
 %%SITE_PERL%%/DBIx/Class/Schema/PopulateMore/Test/Schema/ResultSet/Person.pm
 %%SITE_PERL%%/DBIx/Class/Schema/PopulateMore/Visitor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Schema/PopulateMore/.packlist
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index 46e30c941ca9..f597969bc11c 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Class-TimeStamp
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	DBIx
diff --git a/databases/p5-DBIx-Class-TimeStamp/pkg-plist b/databases/p5-DBIx-Class-TimeStamp/pkg-plist
index a45f1b01fe52..8604a9767757 100644
--- a/databases/p5-DBIx-Class-TimeStamp/pkg-plist
+++ b/databases/p5-DBIx-Class-TimeStamp/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/TimeStamp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/TimeStamp/.packlist
 %%PERL5_MAN3%%/DBIx::Class::TimeStamp.3.gz
diff --git a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
index 4f1e192627f6..ea64c4f52579 100644
--- a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
+++ b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-Tree-NestedSet
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Tree-NestedSet/pkg-plist b/databases/p5-DBIx-Class-Tree-NestedSet/pkg-plist
index 8cc27225ec88..3f7f5f37b202 100644
--- a/databases/p5-DBIx-Class-Tree-NestedSet/pkg-plist
+++ b/databases/p5-DBIx-Class-Tree-NestedSet/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Tree/NestedSet/.packlist
 %%SITE_PERL%%/DBIx/Class/Tree/NestedSet.pm
 %%PERL5_MAN3%%/DBIx::Class::Tree::NestedSet.3.gz
diff --git a/databases/p5-DBIx-Class-Tree/Makefile b/databases/p5-DBIx-Class-Tree/Makefile
index 556f0b02c51f..1ba6109e1759 100644
--- a/databases/p5-DBIx-Class-Tree/Makefile
+++ b/databases/p5-DBIx-Class-Tree/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Class-Tree
 PORTVERSION=	0.03003
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-Tree/pkg-plist b/databases/p5-DBIx-Class-Tree/pkg-plist
index a09cc17255da..7475c6c023b0 100644
--- a/databases/p5-DBIx-Class-Tree/pkg-plist
+++ b/databases/p5-DBIx-Class-Tree/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Tree/.packlist
 %%SITE_PERL%%/DBIx/Class/Tree.pm
 %%SITE_PERL%%/DBIx/Class/Tree/AdjacencyList.pm
 %%SITE_PERL%%/DBIx/Class/Tree/AdjacencyList/Ordered.pm
diff --git a/databases/p5-DBIx-Class-UUIDColumns/Makefile b/databases/p5-DBIx-Class-UUIDColumns/Makefile
index 88f0b75de1be..128362594515 100644
--- a/databases/p5-DBIx-Class-UUIDColumns/Makefile
+++ b/databases/p5-DBIx-Class-UUIDColumns/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-UUIDColumns
 PORTVERSION=	0.02006
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-UUIDColumns/pkg-plist b/databases/p5-DBIx-Class-UUIDColumns/pkg-plist
index 0921f4efb881..c694d45ad6d1 100644
--- a/databases/p5-DBIx-Class-UUIDColumns/pkg-plist
+++ b/databases/p5-DBIx-Class-UUIDColumns/pkg-plist
@@ -18,4 +18,3 @@
 %%SITE_PERL%%/DBIx/Class/UUIDColumns/UUIDMaker/UUID/Random.pm
 %%SITE_PERL%%/DBIx/Class/UUIDColumns/UUIDMaker/Win32/Guidgen.pm
 %%SITE_PERL%%/DBIx/Class/UUIDColumns/UUIDMaker/Win32API/GUID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/UUIDColumns/.packlist
diff --git a/databases/p5-DBIx-Class-VirtualColumns/Makefile b/databases/p5-DBIx-Class-VirtualColumns/Makefile
index 610c014dd31a..b00eaa525b8b 100644
--- a/databases/p5-DBIx-Class-VirtualColumns/Makefile
+++ b/databases/p5-DBIx-Class-VirtualColumns/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-VirtualColumns
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class-VirtualColumns/pkg-plist b/databases/p5-DBIx-Class-VirtualColumns/pkg-plist
index 58cf49350671..bf339f8a7ad8 100644
--- a/databases/p5-DBIx-Class-VirtualColumns/pkg-plist
+++ b/databases/p5-DBIx-Class-VirtualColumns/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Class/VirtualColumns.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/VirtualColumns/.packlist
 %%PERL5_MAN3%%/DBIx::Class::VirtualColumns.3.gz
diff --git a/databases/p5-DBIx-Class-WebForm/Makefile b/databases/p5-DBIx-Class-WebForm/Makefile
index 521d6c8a5cb1..ed7c3e4fede6 100644
--- a/databases/p5-DBIx-Class-WebForm/Makefile
+++ b/databases/p5-DBIx-Class-WebForm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Class-WebForm
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index 5021290ebf19..bc97d45a0f73 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class
 PORTVERSION=	0.08270
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RIBASUSHI
diff --git a/databases/p5-DBIx-Class/pkg-plist b/databases/p5-DBIx-Class/pkg-plist
index 54f9a17eaf93..7a901adb2b2a 100644
--- a/databases/p5-DBIx-Class/pkg-plist
+++ b/databases/p5-DBIx-Class/pkg-plist
@@ -294,5 +294,4 @@ bin/dbicadmin
 %%SITE_PERL%%/DBIx/Class/_Util.pm
 %%SITE_PERL%%/SQL/Translator/Parser/DBIx/Class.pm
 %%SITE_PERL%%/SQL/Translator/Producer/DBIx/Class/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/.packlist
 man/man1/dbicadmin.1.gz
diff --git a/databases/p5-DBIx-Connector/Makefile b/databases/p5-DBIx-Connector/Makefile
index 665d7be07aad..15fce4f0f320 100644
--- a/databases/p5-DBIx-Connector/Makefile
+++ b/databases/p5-DBIx-Connector/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Connector
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-ContextualFetch/Makefile b/databases/p5-DBIx-ContextualFetch/Makefile
index 6ee33d9d4457..dbe0882d550f 100644
--- a/databases/p5-DBIx-ContextualFetch/Makefile
+++ b/databases/p5-DBIx-ContextualFetch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-ContextualFetch
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-ContextualFetch/pkg-plist b/databases/p5-DBIx-ContextualFetch/pkg-plist
index 1bacb407512f..7427ceb3d73b 100644
--- a/databases/p5-DBIx-ContextualFetch/pkg-plist
+++ b/databases/p5-DBIx-ContextualFetch/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::ContextualFetch.3.gz
 %%SITE_PERL%%/DBIx/ContextualFetch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/ContextualFetch/.packlist
diff --git a/databases/p5-DBIx-Custom/Makefile b/databases/p5-DBIx-Custom/Makefile
index fc17485ef5a5..c8fed45a134f 100644
--- a/databases/p5-DBIx-Custom/Makefile
+++ b/databases/p5-DBIx-Custom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Custom
 PORTVERSION=	0.2900
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Custom/pkg-plist b/databases/p5-DBIx-Custom/pkg-plist
index fff770608345..e28b7be7b4af 100644
--- a/databases/p5-DBIx-Custom/pkg-plist
+++ b/databases/p5-DBIx-Custom/pkg-plist
@@ -20,4 +20,3 @@
 %%SITE_PERL%%/DBIx/Custom/Tag.pm
 %%SITE_PERL%%/DBIx/Custom/Util.pm
 %%SITE_PERL%%/DBIx/Custom/Where.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Custom/.packlist
diff --git a/databases/p5-DBIx-DBHResolver/Makefile b/databases/p5-DBIx-DBHResolver/Makefile
index c546a01abe8b..f57e4d312328 100644
--- a/databases/p5-DBIx-DBHResolver/Makefile
+++ b/databases/p5-DBIx-DBHResolver/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-DBHResolver
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-DBHResolver/pkg-plist b/databases/p5-DBIx-DBHResolver/pkg-plist
index b834dfd1c043..6c6d1cbbd56e 100644
--- a/databases/p5-DBIx-DBHResolver/pkg-plist
+++ b/databases/p5-DBIx-DBHResolver/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DBHResolver/.packlist
 %%SITE_PERL%%/DBIx/DBHResolver.pm
 %%SITE_PERL%%/DBIx/DBHResolver/Strategy.pm
 %%SITE_PERL%%/DBIx/DBHResolver/Strategy/Key.pm
diff --git a/databases/p5-DBIx-DBSchema/Makefile b/databases/p5-DBIx-DBSchema/Makefile
index 79f1815f6b68..26763b1883e5 100644
--- a/databases/p5-DBIx-DBSchema/Makefile
+++ b/databases/p5-DBIx-DBSchema/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-DBSchema
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-DBSchema/pkg-plist b/databases/p5-DBIx-DBSchema/pkg-plist
index 6ec51b6a17bf..7221a9de80a9 100644
--- a/databases/p5-DBIx-DBSchema/pkg-plist
+++ b/databases/p5-DBIx-DBSchema/pkg-plist
@@ -21,4 +21,3 @@
 %%SITE_PERL%%/DBIx/DBSchema/Index.pm
 %%SITE_PERL%%/DBIx/DBSchema/Table.pm
 %%SITE_PERL%%/DBIx/DBSchema/_util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DBSchema/.packlist
diff --git a/databases/p5-DBIx-DataSource/Makefile b/databases/p5-DBIx-DataSource/Makefile
index 5e8c4234e597..f4ec18b617c2 100644
--- a/databases/p5-DBIx-DataSource/Makefile
+++ b/databases/p5-DBIx-DataSource/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-DataSource
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-DataSource/pkg-plist b/databases/p5-DBIx-DataSource/pkg-plist
index cea05b7bdecf..dffbd90d9f67 100644
--- a/databases/p5-DBIx-DataSource/pkg-plist
+++ b/databases/p5-DBIx-DataSource/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DataSource/.packlist
 %%SITE_PERL%%/DBIx/DataSource.pm
 %%SITE_PERL%%/DBIx/DataSource/Driver.pm
 %%SITE_PERL%%/DBIx/DataSource/mysql.pm
diff --git a/databases/p5-DBIx-Dump/Makefile b/databases/p5-DBIx-Dump/Makefile
index e72bcda47be2..f56b8cd81940 100644
--- a/databases/p5-DBIx-Dump/Makefile
+++ b/databases/p5-DBIx-Dump/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Dump
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Dump/pkg-plist b/databases/p5-DBIx-Dump/pkg-plist
index 4f7b0a343ad7..ea2eec76942d 100644
--- a/databases/p5-DBIx-Dump/pkg-plist
+++ b/databases/p5-DBIx-Dump/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/DBIx::Dump.3.gz
 %%SITE_PERL%%/DBIx/Dump.pm
 %%SITE_PERL%%/DBIx/sample.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Dump/.packlist
diff --git a/databases/p5-DBIx-Ease/Makefile b/databases/p5-DBIx-Ease/Makefile
index 77a472a357a3..06ca02e80107 100644
--- a/databases/p5-DBIx-Ease/Makefile
+++ b/databases/p5-DBIx-Ease/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Ease
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL:S/$/:local/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	mat/:local DBIx/:cpan
diff --git a/databases/p5-DBIx-Ease/pkg-plist b/databases/p5-DBIx-Ease/pkg-plist
index 4b32bc03fbb4..9cfbcd671ece 100644
--- a/databases/p5-DBIx-Ease/pkg-plist
+++ b/databases/p5-DBIx-Ease/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Ease.3.gz
 %%SITE_PERL%%/DBIx/Ease.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Ease/.packlist
diff --git a/databases/p5-DBIx-HA/Makefile b/databases/p5-DBIx-HA/Makefile
index 7dc8ae116a1a..e734a0770a89 100644
--- a/databases/p5-DBIx-HA/Makefile
+++ b/databases/p5-DBIx-HA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-HA
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	DBIx
diff --git a/databases/p5-DBIx-HA/pkg-plist b/databases/p5-DBIx-HA/pkg-plist
index 1cfd2fc5318d..95210b003dfe 100644
--- a/databases/p5-DBIx-HA/pkg-plist
+++ b/databases/p5-DBIx-HA/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/HA/.packlist
 %%SITE_PERL%%/DBIx/HA.pm
 %%PERL5_MAN3%%/DBIx::HA.3.gz
diff --git a/databases/p5-DBIx-Inspector/Makefile b/databases/p5-DBIx-Inspector/Makefile
index 0fe4be223dff..0ee7fbfaeb72 100644
--- a/databases/p5-DBIx-Inspector/Makefile
+++ b/databases/p5-DBIx-Inspector/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Inspector
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/databases/p5-DBIx-Log4perl/Makefile b/databases/p5-DBIx-Log4perl/Makefile
index 72775f52dc1c..d07262613637 100644
--- a/databases/p5-DBIx-Log4perl/Makefile
+++ b/databases/p5-DBIx-Log4perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Log4perl
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Log4perl/pkg-plist b/databases/p5-DBIx-Log4perl/pkg-plist
index d1a41e7a6106..c1385fb9d122 100644
--- a/databases/p5-DBIx-Log4perl/pkg-plist
+++ b/databases/p5-DBIx-Log4perl/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/DBIx/Log4perl/Constants.pm
 %%SITE_PERL%%/DBIx/Log4perl/db.pm
 %%SITE_PERL%%/DBIx/Log4perl/st.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Log4perl/.packlist
diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile
index 5692357d318c..60622cbcc256 100644
--- a/databases/p5-DBIx-MySQLSequence/Makefile
+++ b/databases/p5-DBIx-MySQLSequence/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-MySQLSequence
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	DBIx
diff --git a/databases/p5-DBIx-MySQLSequence/pkg-plist b/databases/p5-DBIx-MySQLSequence/pkg-plist
index 5155289f3348..abbc6af37706 100644
--- a/databases/p5-DBIx-MySQLSequence/pkg-plist
+++ b/databases/p5-DBIx-MySQLSequence/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/MySQLSequence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/MySQLSequence/.packlist
 %%PERL5_MAN3%%/DBIx::MySQLSequence.3.gz
diff --git a/databases/p5-DBIx-NoSQL/Makefile b/databases/p5-DBIx-NoSQL/Makefile
index 6a9dc6ba400f..96d5c181d66f 100644
--- a/databases/p5-DBIx-NoSQL/Makefile
+++ b/databases/p5-DBIx-NoSQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-NoSQL
 PORTVERSION=	0.0020
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-NoSQL/pkg-plist b/databases/p5-DBIx-NoSQL/pkg-plist
index 6e2aa85cba16..d359c676e055 100644
--- a/databases/p5-DBIx-NoSQL/pkg-plist
+++ b/databases/p5-DBIx-NoSQL/pkg-plist
@@ -13,4 +13,3 @@
 %%SITE_PERL%%/DBIx/NoSQL/Store.pm
 %%SITE_PERL%%/DBIx/NoSQL/TypeMap.pm
 %%SITE_PERL%%/DBIx/NoSQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/NoSQL/.packlist
diff --git a/databases/p5-DBIx-Password/Makefile b/databases/p5-DBIx-Password/Makefile
index 43a3b10182d6..11a5d463bf20 100644
--- a/databases/p5-DBIx-Password/Makefile
+++ b/databases/p5-DBIx-Password/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Password
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Password/pkg-plist b/databases/p5-DBIx-Password/pkg-plist
index baa7c44f0284..31eac2a7c7c4 100644
--- a/databases/p5-DBIx-Password/pkg-plist
+++ b/databases/p5-DBIx-Password/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Password.3.gz
 %%SITE_PERL%%/DBIx/Password.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Password/.packlist
diff --git a/databases/p5-DBIx-Perlish/Makefile b/databases/p5-DBIx-Perlish/Makefile
index 3343f6d4879d..3282e48caa5d 100644
--- a/databases/p5-DBIx-Perlish/Makefile
+++ b/databases/p5-DBIx-Perlish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Perlish
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GRUBER
diff --git a/databases/p5-DBIx-Perlish/pkg-plist b/databases/p5-DBIx-Perlish/pkg-plist
index 449f99620c8d..4240a16540ff 100644
--- a/databases/p5-DBIx-Perlish/pkg-plist
+++ b/databases/p5-DBIx-Perlish/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/DBIx/Perlish.pm
 %%SITE_PERL%%/DBIx/Perlish/Parse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Perlish/.packlist
 %%PERL5_MAN3%%/DBIx::Perlish.3.gz
diff --git a/databases/p5-DBIx-QueryLog/Makefile b/databases/p5-DBIx-QueryLog/Makefile
index 480e5d37bac2..995e8e0a7d6a 100644
--- a/databases/p5-DBIx-QueryLog/Makefile
+++ b/databases/p5-DBIx-QueryLog/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-QueryLog
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Recordset/Makefile b/databases/p5-DBIx-Recordset/Makefile
index 0682ffe521bf..6afc74be6c1f 100644
--- a/databases/p5-DBIx-Recordset/Makefile
+++ b/databases/p5-DBIx-Recordset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Recordset
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Recordset/pkg-plist b/databases/p5-DBIx-Recordset/pkg-plist
index 3310741f0b7c..3664cc68a3fc 100644
--- a/databases/p5-DBIx-Recordset/pkg-plist
+++ b/databases/p5-DBIx-Recordset/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/DBIx/Recordset.pm
 %%SITE_PERL%%/DBIx/Recordset/DBSeq.pm
 %%SITE_PERL%%/DBIx/Recordset/FileSeq.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Recordset/.packlist
diff --git a/databases/p5-DBIx-RetryOverDisconnects/Makefile b/databases/p5-DBIx-RetryOverDisconnects/Makefile
index fe51e102adff..01126f696aa7 100644
--- a/databases/p5-DBIx-RetryOverDisconnects/Makefile
+++ b/databases/p5-DBIx-RetryOverDisconnects/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-RetryOverDisconnects
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-RetryOverDisconnects/pkg-plist b/databases/p5-DBIx-RetryOverDisconnects/pkg-plist
index 9c147e0bfe6f..5adb16c11149 100644
--- a/databases/p5-DBIx-RetryOverDisconnects/pkg-plist
+++ b/databases/p5-DBIx-RetryOverDisconnects/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/RetryOverDisconnects.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/RetryOverDisconnects/.packlist
 %%PERL5_MAN3%%/DBIx::RetryOverDisconnects.3.gz
diff --git a/databases/p5-DBIx-SQLEngine/Makefile b/databases/p5-DBIx-SQLEngine/Makefile
index 0e25ef1922e2..f07374d33936 100644
--- a/databases/p5-DBIx-SQLEngine/Makefile
+++ b/databases/p5-DBIx-SQLEngine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-SQLEngine
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-SQLEngine/pkg-plist b/databases/p5-DBIx-SQLEngine/pkg-plist
index 0294978a6d5f..eb26c33e4f5a 100644
--- a/databases/p5-DBIx-SQLEngine/pkg-plist
+++ b/databases/p5-DBIx-SQLEngine/pkg-plist
@@ -119,4 +119,3 @@
 %%SITE_PERL%%/DBIx/SQLEngine/Schema/TableSet.pm
 %%SITE_PERL%%/DBIx/SQLEngine/Utility/CloneWithParams.pm
 %%SITE_PERL%%/DBIx/test_cfg.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SQLEngine/.packlist
diff --git a/databases/p5-DBIx-SQLite-Simple/Makefile b/databases/p5-DBIx-SQLite-Simple/Makefile
index 1d1d7b92c9d7..3f1b424e65a7 100644
--- a/databases/p5-DBIx-SQLite-Simple/Makefile
+++ b/databases/p5-DBIx-SQLite-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-SQLite-Simple
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-SQLite-Simple/pkg-plist b/databases/p5-DBIx-SQLite-Simple/pkg-plist
index ee700b22fb41..8c9782d2fc94 100644
--- a/databases/p5-DBIx-SQLite-Simple/pkg-plist
+++ b/databases/p5-DBIx-SQLite-Simple/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/DBIx::SQLite::Simple::Table.3.gz
 %%SITE_PERL%%/DBIx/SQLite/Simple.pm
 %%SITE_PERL%%/DBIx/SQLite/Simple/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SQLite/Simple/.packlist
diff --git a/databases/p5-DBIx-Safe/Makefile b/databases/p5-DBIx-Safe/Makefile
index 9d2b026ab07a..99ca1a84cf5e 100644
--- a/databases/p5-DBIx-Safe/Makefile
+++ b/databases/p5-DBIx-Safe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Safe
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TURNSTEP
diff --git a/databases/p5-DBIx-Safe/pkg-plist b/databases/p5-DBIx-Safe/pkg-plist
index bfc08581320c..c8c87c5d980f 100644
--- a/databases/p5-DBIx-Safe/pkg-plist
+++ b/databases/p5-DBIx-Safe/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Safe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Safe/.packlist
 %%PERL5_MAN3%%/DBIx::Safe.3.gz
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 4b70ef55fb85..d10dcb618621 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-SearchBuilder
 PORTVERSION=	1.66
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-SearchBuilder/pkg-plist b/databases/p5-DBIx-SearchBuilder/pkg-plist
index fb78e0caa606..b5b5c22a360f 100644
--- a/databases/p5-DBIx-SearchBuilder/pkg-plist
+++ b/databases/p5-DBIx-SearchBuilder/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SearchBuilder/.packlist
 %%SITE_PERL%%/DBIx/SearchBuilder.pm
 %%SITE_PERL%%/DBIx/SearchBuilder/Handle.pm
 %%SITE_PERL%%/DBIx/SearchBuilder/Record.pm
diff --git a/databases/p5-DBIx-Sequence/Makefile b/databases/p5-DBIx-Sequence/Makefile
index bf10a4285db5..159a8f72c5a7 100644
--- a/databases/p5-DBIx-Sequence/Makefile
+++ b/databases/p5-DBIx-Sequence/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Sequence
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Sequence/pkg-plist b/databases/p5-DBIx-Sequence/pkg-plist
index 98bd80569085..cf8636820695 100644
--- a/databases/p5-DBIx-Sequence/pkg-plist
+++ b/databases/p5-DBIx-Sequence/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DBIx/Sequence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Sequence/.packlist
 %%PERL5_MAN3%%/DBIx::Sequence.3.gz
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index 9d20521b0ccb..e933d81e4c24 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Simple
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Simple/pkg-plist b/databases/p5-DBIx-Simple/pkg-plist
index 9a16424ac632..ed176df79f77 100644
--- a/databases/p5-DBIx-Simple/pkg-plist
+++ b/databases/p5-DBIx-Simple/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/DBIx/Simple/Comparison.pod
 %%SITE_PERL%%/DBIx/Simple/Examples.pod
 %%SITE_PERL%%/DBIx/Simple/Result/RowObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Simple/.packlist
 %%PERL5_MAN3%%/DBIx::Simple.3.gz
 %%PERL5_MAN3%%/DBIx::Simple::Comparison.3.gz
 %%PERL5_MAN3%%/DBIx::Simple::Examples.3.gz
diff --git a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
index 3d9d55ba92f4..3815ee5fd260 100644
--- a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
+++ b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Skinny-InflateColumn-DateTime
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-plist b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-plist
index ab216f5a1fd7..dab1cd002581 100644
--- a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-plist
+++ b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Skinny/InflateColumn/DateTime/.packlist
 %%SITE_PERL%%/DBIx/Skinny/InflateColumn/DateTime.pm
 %%SITE_PERL%%/DBIx/Skinny/InflateColumn/DateTime/Auto.pm
 %%PERL5_MAN3%%/DBIx::Skinny::InflateColumn::DateTime.3.gz
diff --git a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
index f654aad71005..79afb37f589e 100644
--- a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
+++ b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Skinny-Mixin-DBHResolver
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-plist b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-plist
index d805e32840c1..894f871dc4d7 100644
--- a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-plist
+++ b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Skinny/Mixin/DBHResolver/.packlist
 %%SITE_PERL%%/DBIx/Skinny/Mixin/DBHResolver.pm
 %%PERL5_MAN3%%/DBIx::Skinny::Mixin::DBHResolver.3.gz
diff --git a/databases/p5-DBIx-Skinny-Pager/Makefile b/databases/p5-DBIx-Skinny-Pager/Makefile
index dfd81c9da183..8d580522ead1 100644
--- a/databases/p5-DBIx-Skinny-Pager/Makefile
+++ b/databases/p5-DBIx-Skinny-Pager/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Skinny-Pager
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Skinny-Pager/pkg-plist b/databases/p5-DBIx-Skinny-Pager/pkg-plist
index 8f305b068382..58c0cea1862e 100644
--- a/databases/p5-DBIx-Skinny-Pager/pkg-plist
+++ b/databases/p5-DBIx-Skinny-Pager/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Skinny/Pager/.packlist
 %%SITE_PERL%%/DBIx/Skinny/Mixin/Pager.pm
 %%SITE_PERL%%/DBIx/Skinny/Mixin/SearchWithPager.pm
 %%SITE_PERL%%/DBIx/Skinny/Pager.pm
diff --git a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
index f9df0ca4123a..e3e457644eb0 100644
--- a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Skinny-Schema-Loader
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOYA
diff --git a/databases/p5-DBIx-Skinny-Schema-Loader/pkg-plist b/databases/p5-DBIx-Skinny-Schema-Loader/pkg-plist
index 09a384f19e1d..f1309c2c1433 100644
--- a/databases/p5-DBIx-Skinny-Schema-Loader/pkg-plist
+++ b/databases/p5-DBIx-Skinny-Schema-Loader/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Skinny/Schema/Loader/.packlist
 %%SITE_PERL%%/DBIx/Skinny/Schema/Loader.pm
 %%SITE_PERL%%/DBIx/Skinny/Schema/Loader/DBI.pm
 %%SITE_PERL%%/DBIx/Skinny/Schema/Loader/DBI/Pg.pm
diff --git a/databases/p5-DBIx-Skinny/Makefile b/databases/p5-DBIx-Skinny/Makefile
index d39cac945dd5..cc4229ad99a0 100644
--- a/databases/p5-DBIx-Skinny/Makefile
+++ b/databases/p5-DBIx-Skinny/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-Skinny
 PORTVERSION=	0.0742
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
diff --git a/databases/p5-DBIx-Skinny/pkg-plist b/databases/p5-DBIx-Skinny/pkg-plist
index 8ff8c1e61cff..f5f1b8a5f6bb 100644
--- a/databases/p5-DBIx-Skinny/pkg-plist
+++ b/databases/p5-DBIx-Skinny/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Skinny/.packlist
 %%SITE_PERL%%/DBIx/Skinny.pm
 %%SITE_PERL%%/DBIx/Skinny/DBD.pm
 %%SITE_PERL%%/DBIx/Skinny/DBD/Base.pm
diff --git a/databases/p5-DBIx-Sunny/Makefile b/databases/p5-DBIx-Sunny/Makefile
index a13f2a93da95..535fdaa1cb5b 100644
--- a/databases/p5-DBIx-Sunny/Makefile
+++ b/databases/p5-DBIx-Sunny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Sunny
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-TableHash/Makefile b/databases/p5-DBIx-TableHash/Makefile
index 7cd1353c74a0..d443b62de3e6 100644
--- a/databases/p5-DBIx-TableHash/Makefile
+++ b/databases/p5-DBIx-TableHash/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	DBIx-TableHash
 CATEGORIES=	databases perl5
 PORTVERSION=	1.05
+PORTREVISION=	1
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHTHORMAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-TableHash/pkg-plist b/databases/p5-DBIx-TableHash/pkg-plist
index 50016ff4b118..7d4dab4dc901 100644
--- a/databases/p5-DBIx-TableHash/pkg-plist
+++ b/databases/p5-DBIx-TableHash/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::TableHash.3.gz
 %%SITE_PERL%%/DBIx/TableHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/TableHash/.packlist
diff --git a/databases/p5-DBIx-TransactionManager/Makefile b/databases/p5-DBIx-TransactionManager/Makefile
index bb1713fc07dc..5a44b7a62ef2 100644
--- a/databases/p5-DBIx-TransactionManager/Makefile
+++ b/databases/p5-DBIx-TransactionManager/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	DBIx-TransactionManager
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
diff --git a/databases/p5-DBIx-TransactionManager/pkg-plist b/databases/p5-DBIx-TransactionManager/pkg-plist
index d95b4c1ad5eb..8a4d925175e1 100644
--- a/databases/p5-DBIx-TransactionManager/pkg-plist
+++ b/databases/p5-DBIx-TransactionManager/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/TransactionManager/.packlist
 %%SITE_PERL%%/DBIx/TransactionManager.pm
 %%SITE_PERL%%/DBIx/TransactionManager/Developers.pod
 %%PERL5_MAN3%%/DBIx::TransactionManager.3.gz
diff --git a/databases/p5-DBIx-Tree/Makefile b/databases/p5-DBIx-Tree/Makefile
index ad7e7720f6ae..1060756f3748 100644
--- a/databases/p5-DBIx-Tree/Makefile
+++ b/databases/p5-DBIx-Tree/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DBIx-Tree
 PORTVERSION=	1.96
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Tree/pkg-plist b/databases/p5-DBIx-Tree/pkg-plist
index 518d83a50b4e..bbbad789ba34 100644
--- a/databases/p5-DBIx-Tree/pkg-plist
+++ b/databases/p5-DBIx-Tree/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::Tree.3.gz
 %%SITE_PERL%%/DBIx/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Tree/.packlist
diff --git a/databases/p5-DBIx-VersionedDDL/Makefile b/databases/p5-DBIx-VersionedDDL/Makefile
index d7f822397601..89e4786eca4a 100644
--- a/databases/p5-DBIx-VersionedDDL/Makefile
+++ b/databases/p5-DBIx-VersionedDDL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-VersionedDDL
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-VersionedDDL/pkg-plist b/databases/p5-DBIx-VersionedDDL/pkg-plist
index 4a26c6be409e..e629f9b3ea17 100644
--- a/databases/p5-DBIx-VersionedDDL/pkg-plist
+++ b/databases/p5-DBIx-VersionedDDL/pkg-plist
@@ -1,5 +1,4 @@
 bin/migrate_schema
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/VersionedDDL/.packlist
 %%SITE_PERL%%/DBIx/VersionedDDL.pm
 %%SITE_PERL%%/DBIx/VersionedDDL/Plugin/DefaultScriptProcessor.pm
 %%PERL5_MAN3%%/DBIx::VersionedDDL.3.gz
diff --git a/databases/p5-DBIx-Wrapper/Makefile b/databases/p5-DBIx-Wrapper/Makefile
index 4d87b7749425..87b9a7a30dc6 100644
--- a/databases/p5-DBIx-Wrapper/Makefile
+++ b/databases/p5-DBIx-Wrapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Wrapper
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-Wrapper/pkg-plist b/databases/p5-DBIx-Wrapper/pkg-plist
index 67032b61ca2f..d56dd9542bab 100644
--- a/databases/p5-DBIx-Wrapper/pkg-plist
+++ b/databases/p5-DBIx-Wrapper/pkg-plist
@@ -7,6 +7,5 @@
 %%SITE_PERL%%/DBIx/Wrapper/SelectLoop.pm
 %%SITE_PERL%%/DBIx/Wrapper/Statement.pm
 %%SITE_PERL%%/DBIx/Wrapper/StatementLoop.pm
-%%SITE_PERL%%/mach/auto/DBIx/Wrapper/.packlist
 %%PERL5_MAN3%%/DBIx::Wrapper.3.gz
 %%PERL5_MAN3%%/DBIx::Wrapper::Request.3.gz
diff --git a/databases/p5-DBIx-XHTML_Table/Makefile b/databases/p5-DBIx-XHTML_Table/Makefile
index 0183ec7035a5..acd153ae5380 100644
--- a/databases/p5-DBIx-XHTML_Table/Makefile
+++ b/databases/p5-DBIx-XHTML_Table/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-XHTML_Table
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	databases www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-XHTML_Table/pkg-plist b/databases/p5-DBIx-XHTML_Table/pkg-plist
index 23ed544bfe6e..09792ac7c74d 100644
--- a/databases/p5-DBIx-XHTML_Table/pkg-plist
+++ b/databases/p5-DBIx-XHTML_Table/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DBIx::XHTML_Table.3.gz
 %%SITE_PERL%%/DBIx/XHTML_Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XHTML_Table/.packlist
diff --git a/databases/p5-DBIx-XML_RDB/Makefile b/databases/p5-DBIx-XML_RDB/Makefile
index a356adadefa9..e305dffc5e44 100644
--- a/databases/p5-DBIx-XML_RDB/Makefile
+++ b/databases/p5-DBIx-XML_RDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-XML_RDB
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBIx-XML_RDB/pkg-plist b/databases/p5-DBIx-XML_RDB/pkg-plist
index 89dd85033fb9..322a63f38620 100644
--- a/databases/p5-DBIx-XML_RDB/pkg-plist
+++ b/databases/p5-DBIx-XML_RDB/pkg-plist
@@ -4,4 +4,3 @@ bin/xml2sql.pl
 %%SITE_PERL%%/DBIx/XML_RDB.pm
 %%SITE_PERL%%/DBIx/sql2xml.pl
 %%SITE_PERL%%/DBIx/xml2sql.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB/.packlist
diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile
index 58c0bb44db39..aacbb09e83dc 100644
--- a/databases/p5-DBM-Deep/Makefile
+++ b/databases/p5-DBM-Deep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBM-Deep
 PORTVERSION=	2.0008
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DBM-Deep/pkg-plist b/databases/p5-DBM-Deep/pkg-plist
index c1105628373f..33eb74d431e3 100644
--- a/databases/p5-DBM-Deep/pkg-plist
+++ b/databases/p5-DBM-Deep/pkg-plist
@@ -27,7 +27,6 @@
 %%SITE_PERL%%/DBM/Deep/Cookbook.pod
 %%SITE_PERL%%/DBM/Deep.pod
 %%SITE_PERL%%/DBM/Deep.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBM/Deep/.packlist
 %%PERL5_MAN3%%/DBM::Deep.3.gz
 %%PERL5_MAN3%%/DBM::Deep::Cookbook.3.gz
 %%PERL5_MAN3%%/DBM::Deep::Internals.3.gz
diff --git a/databases/p5-DMOZ-ParseRDF/Makefile b/databases/p5-DMOZ-ParseRDF/Makefile
index c3636dd0c3c3..0fcb5b0c5115 100644
--- a/databases/p5-DMOZ-ParseRDF/Makefile
+++ b/databases/p5-DMOZ-ParseRDF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DMOZ-ParseRDF
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DMOZ-ParseRDF/pkg-plist b/databases/p5-DMOZ-ParseRDF/pkg-plist
index 7a229968f3fe..cd3b5b067545 100644
--- a/databases/p5-DMOZ-ParseRDF/pkg-plist
+++ b/databases/p5-DMOZ-ParseRDF/pkg-plist
@@ -1,2 +1 @@
 %%SITE_PERL%%/DMOZ/ParseRDF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DMOZ/ParseRDF/.packlist
diff --git a/databases/p5-DR-Tarantool/Makefile b/databases/p5-DR-Tarantool/Makefile
index 6faad98fcf2f..be78165a5621 100644
--- a/databases/p5-DR-Tarantool/Makefile
+++ b/databases/p5-DR-Tarantool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DR-Tarantool
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:UNERA
diff --git a/databases/p5-DR-Tarantool/pkg-plist b/databases/p5-DR-Tarantool/pkg-plist
index c12f170cc4cd..d2731560293f 100644
--- a/databases/p5-DR-Tarantool/pkg-plist
+++ b/databases/p5-DR-Tarantool/pkg-plist
@@ -1,15 +1,14 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/AsyncClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/CoroClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/LLClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/Spaces.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/StartTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/SyncClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DR/Tarantool/Tuple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DR/Tarantool/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DR/Tarantool/Tarantool.so
+%%SITE_ARCH%%/DR/README.pod
+%%SITE_ARCH%%/DR/Tarantool.pm
+%%SITE_ARCH%%/DR/Tarantool/AsyncClient.pm
+%%SITE_ARCH%%/DR/Tarantool/CoroClient.pm
+%%SITE_ARCH%%/DR/Tarantool/Iterator.pm
+%%SITE_ARCH%%/DR/Tarantool/LLClient.pm
+%%SITE_ARCH%%/DR/Tarantool/Spaces.pm
+%%SITE_ARCH%%/DR/Tarantool/StartTest.pm
+%%SITE_ARCH%%/DR/Tarantool/SyncClient.pm
+%%SITE_ARCH%%/DR/Tarantool/Tuple.pm
+%%SITE_ARCH%%/auto/DR/Tarantool/Tarantool.so
 %%PERL5_MAN3%%/DR::README.3.gz
 %%PERL5_MAN3%%/DR::Tarantool.3.gz
 %%PERL5_MAN3%%/DR::Tarantool::AsyncClient.3.gz
diff --git a/databases/p5-DWH_File/Makefile b/databases/p5-DWH_File/Makefile
index 4cddd48eb5a4..2582d4441aee 100644
--- a/databases/p5-DWH_File/Makefile
+++ b/databases/p5-DWH_File/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DWH_File
 PORTVERSION=	0.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-DWH_File/pkg-plist b/databases/p5-DWH_File/pkg-plist
index 0eb804b0e2a3..b2ebfb3c5ee9 100644
--- a/databases/p5-DWH_File/pkg-plist
+++ b/databases/p5-DWH_File/pkg-plist
@@ -50,4 +50,3 @@
 %%SITE_PERL%%/DWH_File/Value/Plain.pm
 %%SITE_PERL%%/DWH_File/Value/Undef.pm
 %%SITE_PERL%%/DWH_File/Work.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DWH_File/.packlist
diff --git a/databases/p5-Dancer-Plugin-DBIC/Makefile b/databases/p5-Dancer-Plugin-DBIC/Makefile
index cb53fd5d96eb..e18a225fd22d 100644
--- a/databases/p5-Dancer-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer-Plugin-DBIC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-DBIC
 PORTVERSION=	0.2100
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Dancer-Plugin-DBIC/pkg-plist b/databases/p5-Dancer-Plugin-DBIC/pkg-plist
index a4a8e7d865a7..5dc4ec783dd2 100644
--- a/databases/p5-Dancer-Plugin-DBIC/pkg-plist
+++ b/databases/p5-Dancer-Plugin-DBIC/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Dancer/Plugin/DBIC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/DBIC/.packlist
 %%PERL5_MAN3%%/Dancer::Plugin::DBIC.3.gz
diff --git a/databases/p5-Dancer-Plugin-Database-Core/Makefile b/databases/p5-Dancer-Plugin-Database-Core/Makefile
index 8ea052560b17..38347cfcd31a 100644
--- a/databases/p5-Dancer-Plugin-Database-Core/Makefile
+++ b/databases/p5-Dancer-Plugin-Database-Core/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Database-Core
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Dancer-Plugin-Database-Core/pkg-plist b/databases/p5-Dancer-Plugin-Database-Core/pkg-plist
index c144b3cd7925..7bdd74813ae8 100644
--- a/databases/p5-Dancer-Plugin-Database-Core/pkg-plist
+++ b/databases/p5-Dancer-Plugin-Database-Core/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Dancer/Plugin/Database/Core.pm
 %%SITE_PERL%%/Dancer/Plugin/Database/Core/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Database/Core/.packlist
 %%PERL5_MAN3%%/Dancer::Plugin::Database::Core.3.gz
 %%PERL5_MAN3%%/Dancer::Plugin::Database::Core::Handle.3.gz
diff --git a/databases/p5-Dancer-Plugin-Database/Makefile b/databases/p5-Dancer-Plugin-Database/Makefile
index 224676ab7c66..fafa507fcb10 100644
--- a/databases/p5-Dancer-Plugin-Database/Makefile
+++ b/databases/p5-Dancer-Plugin-Database/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Database
 PORTVERSION=	2.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Dancer-Plugin-Database/pkg-plist b/databases/p5-Dancer-Plugin-Database/pkg-plist
index 29b0a504fafb..f3470f7ae386 100644
--- a/databases/p5-Dancer-Plugin-Database/pkg-plist
+++ b/databases/p5-Dancer-Plugin-Database/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Dancer::Plugin::Database.3.gz
 %%SITE_PERL%%/Dancer/Plugin/Database.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Database/.packlist
diff --git a/databases/p5-Dancer-Plugin-Redis/Makefile b/databases/p5-Dancer-Plugin-Redis/Makefile
index be2de373acbe..75387babb2ab 100644
--- a/databases/p5-Dancer-Plugin-Redis/Makefile
+++ b/databases/p5-Dancer-Plugin-Redis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Redis
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CELOGEEK
diff --git a/databases/p5-Dancer-Session-Memcached/Makefile b/databases/p5-Dancer-Session-Memcached/Makefile
index f53f6d6f3e3b..7497d637f98c 100644
--- a/databases/p5-Dancer-Session-Memcached/Makefile
+++ b/databases/p5-Dancer-Session-Memcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Session-Memcached
 PORTVERSION=	0.2.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:XSAWYERX
diff --git a/databases/p5-Dancer-Session-Memcached/pkg-plist b/databases/p5-Dancer-Session-Memcached/pkg-plist
index a2435b2c3945..75000ba3fd90 100644
--- a/databases/p5-Dancer-Session-Memcached/pkg-plist
+++ b/databases/p5-Dancer-Session-Memcached/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Session/Memcached/.packlist
 %%SITE_PERL%%/Dancer/Session/Memcached.pm
 %%PERL5_MAN3%%/Dancer::Session::Memcached.3.gz
diff --git a/databases/p5-Dancer2-Plugin-DBIC/Makefile b/databases/p5-Dancer2-Plugin-DBIC/Makefile
index 0f5eff62be99..bf9f33885f41 100644
--- a/databases/p5-Dancer2-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer2-Plugin-DBIC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer2-Plugin-DBIC
 PORTVERSION=	0.0008
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Dancer2-Plugin-DBIC/pkg-plist b/databases/p5-Dancer2-Plugin-DBIC/pkg-plist
index 8ec031555b59..e2932c3e7e7f 100644
--- a/databases/p5-Dancer2-Plugin-DBIC/pkg-plist
+++ b/databases/p5-Dancer2-Plugin-DBIC/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Dancer2::Plugin::DBIC.3.gz
 %%SITE_PERL%%/Dancer2/Plugin/DBIC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer2/Plugin/DBIC/.packlist
diff --git a/databases/p5-Dancer2-Plugin-Database/Makefile b/databases/p5-Dancer2-Plugin-Database/Makefile
index 7b92c66e6802..d88d45d1e7a0 100644
--- a/databases/p5-Dancer2-Plugin-Database/Makefile
+++ b/databases/p5-Dancer2-Plugin-Database/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer2-Plugin-Database
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Dancer2-Plugin-Database/pkg-plist b/databases/p5-Dancer2-Plugin-Database/pkg-plist
index f1a255527ff4..842e356c30ba 100644
--- a/databases/p5-Dancer2-Plugin-Database/pkg-plist
+++ b/databases/p5-Dancer2-Plugin-Database/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Dancer2::Plugin::Database.3.gz
 %%SITE_PERL%%/Dancer2/Plugin/Database.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer2/Plugin/Database/.packlist
diff --git a/databases/p5-Data-Page/Makefile b/databases/p5-Data-Page/Makefile
index 87aa4b547a60..f03f1d9bf185 100644
--- a/databases/p5-Data-Page/Makefile
+++ b/databases/p5-Data-Page/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Page
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Data-Pageset/Makefile b/databases/p5-Data-Pageset/Makefile
index 375b6b8150d0..e15af8ee2323 100644
--- a/databases/p5-Data-Pageset/Makefile
+++ b/databases/p5-Data-Pageset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Pageset
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Data-Pageset/pkg-plist b/databases/p5-Data-Pageset/pkg-plist
index 0633825d6779..aee10dd2d075 100644
--- a/databases/p5-Data-Pageset/pkg-plist
+++ b/databases/p5-Data-Pageset/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Pageset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Pageset/.packlist
 %%PERL5_MAN3%%/Data::Pageset.3.gz
diff --git a/databases/p5-Exception-Class-DBI/Makefile b/databases/p5-Exception-Class-DBI/Makefile
index 773c389fafef..a2f7fc9bf692 100644
--- a/databases/p5-Exception-Class-DBI/Makefile
+++ b/databases/p5-Exception-Class-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exception-Class-DBI
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile
index 2cffce1887e6..8e5625e465e7 100644
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GDBM
 PORTVERSION=	1.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN/../../src
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-GDBM/pkg-plist b/databases/p5-GDBM/pkg-plist
index a1393bd000b5..44fea9e329ad 100644
--- a/databases/p5-GDBM/pkg-plist
+++ b/databases/p5-GDBM/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/GDBM_File.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/GDBM_File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDBM_File/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
+%%SITE_ARCH%%/GDBM_File.pm
+%%SITE_ARCH%%/auto/GDBM_File/GDBM_File.so
diff --git a/databases/p5-Genezzo/Makefile b/databases/p5-Genezzo/Makefile
index f114afa516a5..ef5062d869e1 100644
--- a/databases/p5-Genezzo/Makefile
+++ b/databases/p5-Genezzo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Genezzo
 PORTVERSION=	0.72
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Genezzo/pkg-plist b/databases/p5-Genezzo/pkg-plist
index 73f9a49f171c..ea4a19d509aa 100644
--- a/databases/p5-Genezzo/pkg-plist
+++ b/databases/p5-Genezzo/pkg-plist
@@ -144,6 +144,5 @@ bin/genexp.pl
 %%SITE_PERL%%/Genezzo/genexp.pl
 %%SITE_PERL%%/Genezzo/havok.sql
 %%SITE_PERL%%/Genezzo/syshook.sql
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Genezzo/.packlist
 man/man1/gendba.pl.1.gz
 man/man1/genexp.pl.1.gz
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index b3f0ec166f13..3a6e3a737b4c 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GraphViz-DBI
 PORTVERSION=	1.100860
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARCEL
diff --git a/databases/p5-GraphViz-DBI/pkg-plist b/databases/p5-GraphViz-DBI/pkg-plist
index 51772954bcd4..2da4e3a15ce5 100644
--- a/databases/p5-GraphViz-DBI/pkg-plist
+++ b/databases/p5-GraphViz-DBI/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GraphViz::DBI.3.gz
 %%SITE_PERL%%/GraphViz/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/DBI/.packlist
diff --git a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
index e2e16edd34b0..5292c8a4135e 100644
--- a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
+++ b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FormHandler-Model-DBIC
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	databases perl5 www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist b/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist
index 994c0f861607..c7b70d7d9fad 100644
--- a/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist
+++ b/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist
@@ -4,7 +4,6 @@ bin/form_generator.pl
 %%SITE_PERL%%/HTML/FormHandler/Model/DBIC/TypeMap.pm
 %%SITE_PERL%%/HTML/FormHandler/TraitFor/DBICFields.pm
 %%SITE_PERL%%/HTML/FormHandler/TraitFor/Model/DBIC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormHandler/Model/DBIC/.packlist
 %%PERL5_MAN3%%/HTML::FormHandler::Generator::DBIC.3.gz
 %%PERL5_MAN3%%/HTML::FormHandler::Model::DBIC.3.gz
 %%PERL5_MAN3%%/HTML::FormHandler::Model::DBIC::TypeMap.3.gz
diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile
index eaccf484049f..a7f4059edb37 100644
--- a/databases/p5-Ima-DBI/Makefile
+++ b/databases/p5-Ima-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Ima-DBI
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PERRIN
diff --git a/databases/p5-Ima-DBI/pkg-plist b/databases/p5-Ima-DBI/pkg-plist
index 82710f8f09b3..523563d9d56f 100644
--- a/databases/p5-Ima-DBI/pkg-plist
+++ b/databases/p5-Ima-DBI/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Ima::DBI.3.gz
 %%SITE_PERL%%/Ima/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ima/DBI/.packlist
diff --git a/databases/p5-Iterator-DBI/Makefile b/databases/p5-Iterator-DBI/Makefile
index 6e702ac75ab3..469a2dcd6ca2 100644
--- a/databases/p5-Iterator-DBI/Makefile
+++ b/databases/p5-Iterator-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Iterator-DBI
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Iterator-DBI/pkg-plist b/databases/p5-Iterator-DBI/pkg-plist
index 538c08df53ae..55e5c9e00021 100644
--- a/databases/p5-Iterator-DBI/pkg-plist
+++ b/databases/p5-Iterator-DBI/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Iterator::DBI.3.gz
 %%SITE_PERL%%/Iterator/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/DBI/.packlist
diff --git a/databases/p5-Jifty-DBI/Makefile b/databases/p5-Jifty-DBI/Makefile
index bdfe2ab65f87..7e587c43ac09 100644
--- a/databases/p5-Jifty-DBI/Makefile
+++ b/databases/p5-Jifty-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jifty-DBI
 PORTVERSION=	0.77
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Jifty-DBI/pkg-plist b/databases/p5-Jifty-DBI/pkg-plist
index fa9527395b64..e4e268deccb1 100644
--- a/databases/p5-Jifty-DBI/pkg-plist
+++ b/databases/p5-Jifty-DBI/pkg-plist
@@ -66,4 +66,3 @@
 %%SITE_PERL%%/Jifty/DBI/Record/Plugin.pm
 %%SITE_PERL%%/Jifty/DBI/Schema.pm
 %%SITE_PERL%%/Jifty/DBI/SchemaGenerator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/DBI/.packlist
diff --git a/databases/p5-KyotoCabinet/Makefile b/databases/p5-KyotoCabinet/Makefile
index 95371e3a29c2..a6ab7bdef19e 100644
--- a/databases/p5-KyotoCabinet/Makefile
+++ b/databases/p5-KyotoCabinet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	KyotoCabinet
 PORTVERSION=	1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://fallabs.com/kyotocabinet/perlpkg/
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-KyotoCabinet/pkg-plist b/databases/p5-KyotoCabinet/pkg-plist
index 2a7398d4a102..4298e697de1e 100644
--- a/databases/p5-KyotoCabinet/pkg-plist
+++ b/databases/p5-KyotoCabinet/pkg-plist
@@ -1,7 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/KyotoCabinet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KyotoCabinet.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KyotoCabinet/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KyotoCabinet/KyotoCabinet.so
-%%SITE_PERL%%/%%PERL_ARCH%%/kctest.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/makedoc.pl
+%%SITE_ARCH%%/KyotoCabinet.pm
+%%SITE_ARCH%%/KyotoCabinet.pod
+%%SITE_ARCH%%/auto/KyotoCabinet/KyotoCabinet.so
+%%SITE_ARCH%%/kctest.pl
+%%SITE_ARCH%%/makedoc.pl
 %%PERL5_MAN3%%/KyotoCabinet.3.gz
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 20f309b28326..19fc88a46105 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MLDBM-Sync
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-MLDBM-Sync/pkg-plist b/databases/p5-MLDBM-Sync/pkg-plist
index d092076ab60b..48479c3c9fb1 100644
--- a/databases/p5-MLDBM-Sync/pkg-plist
+++ b/databases/p5-MLDBM-Sync/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/MLDBM::Sync.3.gz
 %%SITE_PERL%%/MLDBM/Sync.pm
 %%SITE_PERL%%/MLDBM/Sync/SDBM_File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM/Sync/.packlist
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 7c0219815ee3..fda4d2554095 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MLDBM
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-MLDBM/pkg-plist b/databases/p5-MLDBM/pkg-plist
index f41f5a3a83d0..3bfda47ac20e 100644
--- a/databases/p5-MLDBM/pkg-plist
+++ b/databases/p5-MLDBM/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/MLDBM/Serializer/Data/Dumper.pm
 %%SITE_PERL%%/MLDBM/Serializer/FreezeThaw.pm
 %%SITE_PERL%%/MLDBM/Serializer/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM/.packlist
diff --git a/databases/p5-MR-Tarantool/Makefile b/databases/p5-MR-Tarantool/Makefile
index 79d0d9747219..7b914aa88191 100644
--- a/databases/p5-MR-Tarantool/Makefile
+++ b/databases/p5-MR-Tarantool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MR-Tarantool
 PORTVERSION=	0.0.24
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-MR-Tarantool/pkg-plist b/databases/p5-MR-Tarantool/pkg-plist
index 407cf425d9a7..c129d2d71a13 100644
--- a/databases/p5-MR-Tarantool/pkg-plist
+++ b/databases/p5-MR-Tarantool/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MR/Tarantool/.packlist
 %%SITE_PERL%%/MR/Pending.pm
 %%SITE_PERL%%/MR/IProto.pm
 %%SITE_PERL%%/MR/Tarantool/Box/Singleton.pm
diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile
index 2c3a5f206ac4..37e456309b59 100644
--- a/databases/p5-Memcached-libmemcached/Makefile
+++ b/databases/p5-Memcached-libmemcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Memcached-libmemcached
 PORTVERSION=	0.44.06
+PORTREVISION=	1
 CATEGORIES=	databases devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TIMB
diff --git a/databases/p5-Memcached-libmemcached/pkg-plist b/databases/p5-Memcached-libmemcached/pkg-plist
index b3fcb897148d..f6b74d6261d5 100644
--- a/databases/p5-Memcached-libmemcached/pkg-plist
+++ b/databases/p5-Memcached-libmemcached/pkg-plist
@@ -1,34 +1,33 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/const_hash.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/func_hash.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_auto.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_behavior.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_callback.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_create.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_delete.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_flush.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_get.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_quit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_server_st.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_servers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_stats.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_strerror.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_verbosity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_pool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_memory_allocators.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_generate_hash_value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_sasl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_user_data.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_analyze.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_result_st.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_dump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Memcached/libmemcached/memcached_flush_buffers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memcached/libmemcached/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memcached/libmemcached/libmemcached.so
+%%SITE_ARCH%%/Memcached/libmemcached.pm
+%%SITE_ARCH%%/Memcached/libmemcached/API.pm
+%%SITE_ARCH%%/Memcached/libmemcached/const_hash.pl
+%%SITE_ARCH%%/Memcached/libmemcached/constants.pm
+%%SITE_ARCH%%/Memcached/libmemcached/func_hash.pl
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_auto.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_behavior.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_callback.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_create.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_delete.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_flush.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_get.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_quit.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_server_st.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_servers.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_set.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_stats.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_strerror.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_verbosity.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_version.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_pool.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_memory_allocators.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_generate_hash_value.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_sasl.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_user_data.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_analyze.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_result_st.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_dump.pm
+%%SITE_ARCH%%/Memcached/libmemcached/memcached_flush_buffers.pm
+%%SITE_ARCH%%/auto/Memcached/libmemcached/libmemcached.so
 %%PERL5_MAN3%%/Memcached::libmemcached.3.gz
 %%PERL5_MAN3%%/Memcached::libmemcached::API.3.gz
 %%PERL5_MAN3%%/Memcached::libmemcached::constants.3.gz
diff --git a/databases/p5-Metadata/Makefile b/databases/p5-Metadata/Makefile
index 2f00c1399ed9..22a5a5c1ffa3 100644
--- a/databases/p5-Metadata/Makefile
+++ b/databases/p5-Metadata/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Metadata
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Metadata/pkg-plist b/databases/p5-Metadata/pkg-plist
index dc66fa2f492c..c3e586bac715 100644
--- a/databases/p5-Metadata/pkg-plist
+++ b/databases/p5-Metadata/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Metadata/HTTP.pm
 %%SITE_PERL%%/Metadata/IAFA.pm
 %%SITE_PERL%%/Metadata/SOIF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Metadata/.packlist
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index 007a8dbf5b83..bdb2888fca58 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MongoDB
 PORTVERSION=	0.702.2
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FRIEDO
diff --git a/databases/p5-MongoDB/pkg-plist b/databases/p5-MongoDB/pkg-plist
index f6184fac61d2..8f4a30d5310e 100644
--- a/databases/p5-MongoDB/pkg-plist
+++ b/databases/p5-MongoDB/pkg-plist
@@ -1,23 +1,22 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/BSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/BSON/Binary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Code.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Collection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Connection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Cursor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/DBRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/DataTypes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Database.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Examples.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/GridFS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/GridFS/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Indexing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/MongoClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/OID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Timestamp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MongoDB/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MongoDB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MongoDB/MongoDB.so
+%%SITE_ARCH%%/MongoDB.pm
+%%SITE_ARCH%%/MongoDB/BSON.pm
+%%SITE_ARCH%%/MongoDB/BSON/Binary.pm
+%%SITE_ARCH%%/MongoDB/Code.pm
+%%SITE_ARCH%%/MongoDB/Collection.pm
+%%SITE_ARCH%%/MongoDB/Connection.pm
+%%SITE_ARCH%%/MongoDB/Cursor.pm
+%%SITE_ARCH%%/MongoDB/DBRef.pm
+%%SITE_ARCH%%/MongoDB/DataTypes.pod
+%%SITE_ARCH%%/MongoDB/Database.pm
+%%SITE_ARCH%%/MongoDB/Examples.pod
+%%SITE_ARCH%%/MongoDB/GridFS.pm
+%%SITE_ARCH%%/MongoDB/GridFS/File.pm
+%%SITE_ARCH%%/MongoDB/Indexing.pod
+%%SITE_ARCH%%/MongoDB/MongoClient.pm
+%%SITE_ARCH%%/MongoDB/OID.pm
+%%SITE_ARCH%%/MongoDB/Timestamp.pm
+%%SITE_ARCH%%/MongoDB/Tutorial.pod
+%%SITE_ARCH%%/auto/MongoDB/MongoDB.so
 %%PERL5_MAN3%%/MongoDB.3.gz
 %%PERL5_MAN3%%/MongoDB::BSON.3.gz
 %%PERL5_MAN3%%/MongoDB::BSON::Binary.3.gz
diff --git a/databases/p5-MySQL-Diff/Makefile b/databases/p5-MySQL-Diff/Makefile
index 5643e036a1dc..9792a9bb5cfc 100644
--- a/databases/p5-MySQL-Diff/Makefile
+++ b/databases/p5-MySQL-Diff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MySQL-Diff
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-MySQL-Diff/pkg-plist b/databases/p5-MySQL-Diff/pkg-plist
index 67efeda35cad..2547784812fb 100644
--- a/databases/p5-MySQL-Diff/pkg-plist
+++ b/databases/p5-MySQL-Diff/pkg-plist
@@ -4,7 +4,6 @@ man/man1/mysqldiff.1.gz
 %%SITE_PERL%%/MySQL/Diff/Database.pm
 %%SITE_PERL%%/MySQL/Diff/Table.pm
 %%SITE_PERL%%/MySQL/Diff/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL/Diff/.packlist
 %%PERL5_MAN3%%/MySQL::Diff.3.gz
 %%PERL5_MAN3%%/MySQL::Diff::Database.3.gz
 %%PERL5_MAN3%%/MySQL::Diff::Table.3.gz
diff --git a/databases/p5-Net-Async-CassandraCQL/Makefile b/databases/p5-Net-Async-CassandraCQL/Makefile
index 8b37ccb71456..a14f06f63cd1 100644
--- a/databases/p5-Net-Async-CassandraCQL/Makefile
+++ b/databases/p5-Net-Async-CassandraCQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Async-CassandraCQL
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Net-Async-CassandraCQL/pkg-plist b/databases/p5-Net-Async-CassandraCQL/pkg-plist
index 5f184aa25ac3..3adf94c3f336 100644
--- a/databases/p5-Net-Async-CassandraCQL/pkg-plist
+++ b/databases/p5-Net-Async-CassandraCQL/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Net/Async/CassandraCQL.pm
 %%SITE_PERL%%/Net/Async/CassandraCQL/Connection.pm
 %%SITE_PERL%%/Net/Async/CassandraCQL/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async/CassandraCQL/.packlist
 %%PERL5_MAN3%%/Net::Async::CassandraCQL.3.gz
 %%PERL5_MAN3%%/Net::Async::CassandraCQL::Connection.3.gz
 %%PERL5_MAN3%%/Net::Async::CassandraCQL::Query.3.gz
diff --git a/databases/p5-ORLite-Migrate/Makefile b/databases/p5-ORLite-Migrate/Makefile
index e505e772ddf4..4917348d2c48 100644
--- a/databases/p5-ORLite-Migrate/Makefile
+++ b/databases/p5-ORLite-Migrate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ORLite-Migrate
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/databases/p5-ORLite-Migrate/pkg-plist b/databases/p5-ORLite-Migrate/pkg-plist
index 2fc4655311c1..a3e3ee1423ca 100644
--- a/databases/p5-ORLite-Migrate/pkg-plist
+++ b/databases/p5-ORLite-Migrate/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/ORLite/Migrate.pm
 %%SITE_PERL%%/ORLite/Migrate/Patch.pm
 %%SITE_PERL%%/ORLite/Migrate/Timeline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ORLite/Migrate/.packlist
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index 2512b985d800..fc05b4a9d7e8 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ORLite
 PORTVERSION=	1.98
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/databases/p5-ORLite/pkg-plist b/databases/p5-ORLite/pkg-plist
index 743a654fb170..f4dcd0773c95 100644
--- a/databases/p5-ORLite/pkg-plist
+++ b/databases/p5-ORLite/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ORLite/.packlist
 %%SITE_PERL%%/ORLite.pm
 %%PERL5_MAN3%%/ORLite.3.gz
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index 46d8f975e49b..d17a66c435d5 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Oryx
 PORTVERSION=	0.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	XML/RHUNDT
diff --git a/databases/p5-Oryx/pkg-plist b/databases/p5-Oryx/pkg-plist
index fde6b0ba4f09..7e4e580398b6 100644
--- a/databases/p5-Oryx/pkg-plist
+++ b/databases/p5-Oryx/pkg-plist
@@ -89,4 +89,3 @@
 %%SITE_PERL%%/Oryx/Value/Oid.pm
 %%SITE_PERL%%/Oryx/Value/String.pm
 %%SITE_PERL%%/Oryx/Value/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Oryx/.packlist
diff --git a/databases/p5-POE-Component-DBIAgent/Makefile b/databases/p5-POE-Component-DBIAgent/Makefile
index f53a5c0cd6c3..2979e795c0d7 100644
--- a/databases/p5-POE-Component-DBIAgent/Makefile
+++ b/databases/p5-POE-Component-DBIAgent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-DBIAgent
 PORTVERSION=	0.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-POE-Component-DBIAgent/pkg-plist b/databases/p5-POE-Component-DBIAgent/pkg-plist
index 5c7d3f2ad4dc..4e21596d00ff 100644
--- a/databases/p5-POE-Component-DBIAgent/pkg-plist
+++ b/databases/p5-POE-Component-DBIAgent/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/POE/Component/DBIAgent.pm
 %%SITE_PERL%%/POE/Component/DBIAgent/Helper.pm
 %%SITE_PERL%%/POE/Component/DBIAgent/Queue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DBIAgent/.packlist
diff --git a/databases/p5-POE-Component-EasyDBI/Makefile b/databases/p5-POE-Component-EasyDBI/Makefile
index ca5415064cb6..5c1b2483e11f 100644
--- a/databases/p5-POE-Component-EasyDBI/Makefile
+++ b/databases/p5-POE-Component-EasyDBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-EasyDBI
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-POE-Component-EasyDBI/pkg-plist b/databases/p5-POE-Component-EasyDBI/pkg-plist
index fe73ebd1ac5b..4836d5c98815 100644
--- a/databases/p5-POE-Component-EasyDBI/pkg-plist
+++ b/databases/p5-POE-Component-EasyDBI/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/POE::Component::EasyDBI::SubProcess.3.gz
 %%SITE_PERL%%/POE/Component/EasyDBI.pm
 %%SITE_PERL%%/POE/Component/EasyDBI/SubProcess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/EasyDBI/.packlist
diff --git a/databases/p5-POE-Component-LaDBI/Makefile b/databases/p5-POE-Component-LaDBI/Makefile
index 50a08141ab4b..09067b5ae310 100644
--- a/databases/p5-POE-Component-LaDBI/Makefile
+++ b/databases/p5-POE-Component-LaDBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-LaDBI
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-POE-Component-LaDBI/pkg-plist b/databases/p5-POE-Component-LaDBI/pkg-plist
index 6fae895ff96e..80c3593e4c31 100644
--- a/databases/p5-POE-Component-LaDBI/pkg-plist
+++ b/databases/p5-POE-Component-LaDBI/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/POE/Component/LaDBI/Engine.pm
 %%SITE_PERL%%/POE/Component/LaDBI/Request.pm
 %%SITE_PERL%%/POE/Component/LaDBI/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/LaDBI/.packlist
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index a5a70abb0e6a..7a6c1cb23a99 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-RRDTool
 PORTVERSION=	0.18
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index c2a2c36bd42b..af57fc5c98e9 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pg
 PORTVERSION=	2.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PGSQL}
diff --git a/databases/p5-Pg/pkg-plist b/databases/p5-Pg/pkg-plist
index 1fd8e04fe01f..35f7450701db 100644
--- a/databases/p5-Pg/pkg-plist
+++ b/databases/p5-Pg/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Pg.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Pg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg/Pg.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg/autosplit.ix
+%%SITE_ARCH%%/Pg.pm
+%%SITE_ARCH%%/auto/Pg/Pg.so
+%%SITE_ARCH%%/auto/Pg/autosplit.ix
diff --git a/databases/p5-PostgreSQL-PLPerl-Call/Makefile b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
index 36f57ddaf165..465d0914b841 100644
--- a/databases/p5-PostgreSQL-PLPerl-Call/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostgreSQL-PLPerl-Call
 PORTVERSION=	1.006
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TIMB
diff --git a/databases/p5-PostgreSQL-PLPerl-Call/pkg-plist b/databases/p5-PostgreSQL-PLPerl-Call/pkg-plist
index 84ebd4756cef..18bb0d783c87 100644
--- a/databases/p5-PostgreSQL-PLPerl-Call/pkg-plist
+++ b/databases/p5-PostgreSQL-PLPerl-Call/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/PostgreSQL/PLPerl/Call.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostgreSQL/PLPerl/Call/.packlist
 %%PERL5_MAN3%%/PostgreSQL::PLPerl::Call.3.gz
diff --git a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
index 7a84c80ee97f..7081622b2c86 100644
--- a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostgreSQL-PLPerl-Trace
 PORTVERSION=	1.001
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TIMB
diff --git a/databases/p5-PostgreSQL-PLPerl-Trace/pkg-plist b/databases/p5-PostgreSQL-PLPerl-Trace/pkg-plist
index f829b7d6a99a..c3d8f1b1850a 100644
--- a/databases/p5-PostgreSQL-PLPerl-Trace/pkg-plist
+++ b/databases/p5-PostgreSQL-PLPerl-Trace/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/PostgreSQL/PLPerl/Trace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostgreSQL/PLPerl/Trace/.packlist
 %%PERL5_MAN3%%/PostgreSQL::PLPerl::Trace.3.gz
diff --git a/databases/p5-Prophet/Makefile b/databases/p5-Prophet/Makefile
index 2867aa924089..60fc713fea38 100644
--- a/databases/p5-Prophet/Makefile
+++ b/databases/p5-Prophet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Prophet
 PORTVERSION=	0.751
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:IOANR
diff --git a/databases/p5-Protocol-CassandraCQL/Makefile b/databases/p5-Protocol-CassandraCQL/Makefile
index 6d4335749f9d..f1069aba4de1 100644
--- a/databases/p5-Protocol-CassandraCQL/Makefile
+++ b/databases/p5-Protocol-CassandraCQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Protocol-CassandraCQL
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/databases/p5-Protocol-CassandraCQL/pkg-plist b/databases/p5-Protocol-CassandraCQL/pkg-plist
index 708ea4a63394..7a2ed950f5d1 100644
--- a/databases/p5-Protocol-CassandraCQL/pkg-plist
+++ b/databases/p5-Protocol-CassandraCQL/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Protocol/CassandraCQL/Frames.pm
 %%SITE_PERL%%/Protocol/CassandraCQL/Result.pm
 %%SITE_PERL%%/Protocol/CassandraCQL/Type.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/CassandraCQL/.packlist
 %%PERL5_MAN3%%/Protocol::CassandraCQL.3.gz
 %%PERL5_MAN3%%/Protocol::CassandraCQL::Client.3.gz
 %%PERL5_MAN3%%/Protocol::CassandraCQL::ColumnMeta.3.gz
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index e1747a7c266a..4acea4afab7c 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	RRD-Simple
 PORTVERSION=	1.44
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Proc/NICOLAW
diff --git a/databases/p5-Redis-hiredis/Makefile b/databases/p5-Redis-hiredis/Makefile
index c48b66244bcc..aac5a7f03fc9 100644
--- a/databases/p5-Redis-hiredis/Makefile
+++ b/databases/p5-Redis-hiredis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Redis-hiredis
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEOPHENIX
diff --git a/databases/p5-Redis-hiredis/pkg-plist b/databases/p5-Redis-hiredis/pkg-plist
index 4138593ec8db..f1b2d8b6508a 100644
--- a/databases/p5-Redis-hiredis/pkg-plist
+++ b/databases/p5-Redis-hiredis/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Redis/hiredis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Redis/hiredis/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Redis/hiredis/hiredis.so
+%%SITE_ARCH%%/Redis/hiredis.pm
+%%SITE_ARCH%%/auto/Redis/hiredis/hiredis.so
 %%PERL5_MAN3%%/Redis::hiredis.3.gz
diff --git a/databases/p5-Redis/Makefile b/databases/p5-Redis/Makefile
index 5fe4737c3502..e516660cd1a6 100644
--- a/databases/p5-Redis/Makefile
+++ b/databases/p5-Redis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Redis
 PORTVERSION=	1.9650
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAMS
diff --git a/databases/p5-Redis/pkg-plist b/databases/p5-Redis/pkg-plist
index de3a5c6ba2b3..859b2d4ecd87 100644
--- a/databases/p5-Redis/pkg-plist
+++ b/databases/p5-Redis/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Redis.pm
 %%SITE_PERL%%/Redis/Hash.pm
 %%SITE_PERL%%/Redis/List.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Redis/.packlist
diff --git a/databases/p5-RedisDB-Parser/Makefile b/databases/p5-RedisDB-Parser/Makefile
index 78354a1fa1c9..bf9a473a9edb 100644
--- a/databases/p5-RedisDB-Parser/Makefile
+++ b/databases/p5-RedisDB-Parser/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	RedisDB-Parser
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-RedisDB-Parser/pkg-plist b/databases/p5-RedisDB-Parser/pkg-plist
index 6c2d7a9289a7..02fa22639db0 100644
--- a/databases/p5-RedisDB-Parser/pkg-plist
+++ b/databases/p5-RedisDB-Parser/pkg-plist
@@ -3,10 +3,9 @@
 %%PERL5_MAN3%%/RedisDB::Parser::PP.3.gz
 %%PERL5_MAN3%%/RedisDB::Parser::XS.3.gz
 %%PERL5_MAN3%%/RedisDB::README.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RedisDB/Parser/Parser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RedisDB/Parser/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/RedisDB/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RedisDB/Parser/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RedisDB/Parser/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RedisDB/Parser/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RedisDB/README.pod
+%%SITE_ARCH%%/auto/RedisDB/Parser/Parser.so
+%%SITE_ARCH%%/RedisDB/Parser.pm
+%%SITE_ARCH%%/RedisDB/Parser/Error.pm
+%%SITE_ARCH%%/RedisDB/Parser/PP.pm
+%%SITE_ARCH%%/RedisDB/Parser/XS.pm
+%%SITE_ARCH%%/RedisDB/README.pod
diff --git a/databases/p5-RedisDB/Makefile b/databases/p5-RedisDB/Makefile
index fa2ac053f2e4..3947b7ad6364 100644
--- a/databases/p5-RedisDB/Makefile
+++ b/databases/p5-RedisDB/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	RedisDB
 PORTVERSION=	2.36
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-RedisDB/pkg-plist b/databases/p5-RedisDB/pkg-plist
index 482fe84b6237..0cda376b5a45 100644
--- a/databases/p5-RedisDB/pkg-plist
+++ b/databases/p5-RedisDB/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/RedisDB.3.gz
 %%PERL5_MAN3%%/RedisDB::Error.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RedisDB/.packlist
 %%SITE_PERL%%/RedisDB.pm
 %%SITE_PERL%%/RedisDB/Error.pm
diff --git a/databases/p5-Relations-Query/Makefile b/databases/p5-Relations-Query/Makefile
index ce33f334f7d8..cd3bff589876 100644
--- a/databases/p5-Relations-Query/Makefile
+++ b/databases/p5-Relations-Query/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Relations-Query
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Relations-Query/pkg-plist b/databases/p5-Relations-Query/pkg-plist
index 3d6305a88489..30b990fd3d8d 100644
--- a/databases/p5-Relations-Query/pkg-plist
+++ b/databases/p5-Relations-Query/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Relations/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Relations/Query/.packlist
 %%PERL5_MAN3%%/Relations::Query.3.gz
diff --git a/databases/p5-Relations/Makefile b/databases/p5-Relations/Makefile
index 39e7edc532e7..3fe7d80e5378 100644
--- a/databases/p5-Relations/Makefile
+++ b/databases/p5-Relations/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Relations
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Relations/pkg-plist b/databases/p5-Relations/pkg-plist
index 91ed816393ba..918ef4700d6e 100644
--- a/databases/p5-Relations/pkg-plist
+++ b/databases/p5-Relations/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Relations.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Relations/.packlist
 %%PERL5_MAN3%%/Relations.3.gz
diff --git a/databases/p5-ResourcePool-Resource-DBI/Makefile b/databases/p5-ResourcePool-Resource-DBI/Makefile
index 59308e83c2a9..3bbed15af5b6 100644
--- a/databases/p5-ResourcePool-Resource-DBI/Makefile
+++ b/databases/p5-ResourcePool-Resource-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ResourcePool-Resource-DBI
 PORTVERSION=	1.0101
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
diff --git a/databases/p5-ResourcePool-Resource-DBI/pkg-plist b/databases/p5-ResourcePool-Resource-DBI/pkg-plist
index 196de1e600b1..91479b5f35c6 100644
--- a/databases/p5-ResourcePool-Resource-DBI/pkg-plist
+++ b/databases/p5-ResourcePool-Resource-DBI/pkg-plist
@@ -14,4 +14,3 @@
 %%SITE_PERL%%/ResourcePool/Factory/DBI.pod
 %%SITE_PERL%%/ResourcePool/Resource/DBI.pm
 %%SITE_PERL%%/ResourcePool/Resource/DBI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/DBI/.packlist
diff --git a/databases/p5-Rose-DB-Object/Makefile b/databases/p5-Rose-DB-Object/Makefile
index ece055b2ebad..8ea056e5097a 100644
--- a/databases/p5-Rose-DB-Object/Makefile
+++ b/databases/p5-Rose-DB-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-DB-Object
 PORTVERSION=	0.8100
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
diff --git a/databases/p5-Rose-DB-Object/pkg-plist b/databases/p5-Rose-DB-Object/pkg-plist
index 82face5fd596..d7f0a5c1d8bd 100644
--- a/databases/p5-Rose-DB-Object/pkg-plist
+++ b/databases/p5-Rose-DB-Object/pkg-plist
@@ -147,4 +147,3 @@
 %%SITE_PERL%%/Rose/DB/Object/Std/Metadata.pm
 %%SITE_PERL%%/Rose/DB/Object/Tutorial.pod
 %%SITE_PERL%%/Rose/DB/Object/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/DB/Object/.packlist
diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile
index 1ec603aa01f6..e007f4ae1513 100644
--- a/databases/p5-Rose-DB/Makefile
+++ b/databases/p5-Rose-DB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-DB
 PORTVERSION=	0.775
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
diff --git a/databases/p5-Rose-DB/pkg-plist b/databases/p5-Rose-DB/pkg-plist
index 586f6c121f0b..3ae2863a0fc2 100644
--- a/databases/p5-Rose-DB/pkg-plist
+++ b/databases/p5-Rose-DB/pkg-plist
@@ -24,4 +24,3 @@
 %%SITE_PERL%%/Rose/DB/Registry/Entry.pm
 %%SITE_PERL%%/Rose/DB/SQLite.pm
 %%SITE_PERL%%/Rose/DB/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/DB/.packlist
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
index 6b4d4101d199..b43663165858 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-DBx-Object-MoreHelpers
 PORTVERSION=	0.100
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Rose/KARMAN
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-plist b/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-plist
index ad824ac0cd14..aa26c5509242 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-plist
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Rose::DBx::Object::MoreHelpers.3.gz
 %%SITE_PERL%%/Rose/DBx/Object/MoreHelpers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/DBx/Object/MoreHelpers/.packlist
diff --git a/databases/p5-Rose-DBx-Object-Renderer/Makefile b/databases/p5-Rose-DBx-Object-Renderer/Makefile
index 7ec12f22bb79..54306dc4ccda 100644
--- a/databases/p5-Rose-DBx-Object-Renderer/Makefile
+++ b/databases/p5-Rose-DBx-Object-Renderer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-DBx-Object-Renderer
 PORTVERSION=	0.77
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Rose-DBx-Object-Renderer/pkg-plist b/databases/p5-Rose-DBx-Object-Renderer/pkg-plist
index 59a096139b1b..26b9a32759f0 100644
--- a/databases/p5-Rose-DBx-Object-Renderer/pkg-plist
+++ b/databases/p5-Rose-DBx-Object-Renderer/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Rose::DBx::Object::Renderer.3.gz
 %%SITE_PERL%%/Rose/DBx/Object/Renderer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/DBx/Object/Renderer/.packlist
diff --git a/databases/p5-SQL-Abstract-Limit/Makefile b/databases/p5-SQL-Abstract-Limit/Makefile
index 0fa5793a8060..8c0b16e145f9 100644
--- a/databases/p5-SQL-Abstract-Limit/Makefile
+++ b/databases/p5-SQL-Abstract-Limit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SQL-Abstract-Limit
 PORTVERSION=	0.141
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Abstract-More/Makefile b/databases/p5-SQL-Abstract-More/Makefile
index 8596eaa8529f..4819d343e6ca 100644
--- a/databases/p5-SQL-Abstract-More/Makefile
+++ b/databases/p5-SQL-Abstract-More/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQL-Abstract-More
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Abstract-More/pkg-plist b/databases/p5-SQL-Abstract-More/pkg-plist
index c7a17235d26c..66579b249c2e 100644
--- a/databases/p5-SQL-Abstract-More/pkg-plist
+++ b/databases/p5-SQL-Abstract-More/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SQL/Abstract/More.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Abstract/More/.packlist
 %%PERL5_MAN3%%/SQL::Abstract::More.3.gz
diff --git a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
index 4b3231343fdb..f672d37803de 100644
--- a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
+++ b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	SQL-Abstract-Plugin-InsertMulti
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index 157ffb6497d3..45b6cbd6208f 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQL-Abstract
 PORTVERSION=	1.81
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Abstract/pkg-plist b/databases/p5-SQL-Abstract/pkg-plist
index 6d733ca41607..7cc32340e06e 100644
--- a/databases/p5-SQL-Abstract/pkg-plist
+++ b/databases/p5-SQL-Abstract/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/SQL/Abstract.pm
 %%SITE_PERL%%/SQL/Abstract/Test.pm
 %%SITE_PERL%%/SQL/Abstract/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Abstract/.packlist
diff --git a/databases/p5-SQL-Interp/Makefile b/databases/p5-SQL-Interp/Makefile
index 0e8c37acfd7d..25186475f4ce 100644
--- a/databases/p5-SQL-Interp/Makefile
+++ b/databases/p5-SQL-Interp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQL-Interp
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Interp/pkg-plist b/databases/p5-SQL-Interp/pkg-plist
index 87032d6ca24e..c33812fd9367 100644
--- a/databases/p5-SQL-Interp/pkg-plist
+++ b/databases/p5-SQL-Interp/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/SQL::Interp.3.gz
 %%SITE_PERL%%/DBIx/Interp.pm
 %%SITE_PERL%%/SQL/Interp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Interp/.packlist
diff --git a/databases/p5-SQL-Maker/Makefile b/databases/p5-SQL-Maker/Makefile
index 9a1c055955bd..b3b390664f88 100644
--- a/databases/p5-SQL-Maker/Makefile
+++ b/databases/p5-SQL-Maker/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	SQL-Maker
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/databases/p5-SQL-Maker/pkg-plist b/databases/p5-SQL-Maker/pkg-plist
index 422222a79ea2..d338f5cb5091 100644
--- a/databases/p5-SQL-Maker/pkg-plist
+++ b/databases/p5-SQL-Maker/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_ARCH%%/auto/SQL/Maker/.packlist
 %%SITE_PERL%%/SQL/Maker.pm
 %%SITE_PERL%%/SQL/Maker/Condition.pm
 %%SITE_PERL%%/SQL/Maker/Plugin/InsertMulti.pm
diff --git a/databases/p5-SQL-ReservedWords/Makefile b/databases/p5-SQL-ReservedWords/Makefile
index 16d923b21047..f6278f6614af 100644
--- a/databases/p5-SQL-ReservedWords/Makefile
+++ b/databases/p5-SQL-ReservedWords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQL-ReservedWords
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-ReservedWords/pkg-plist b/databases/p5-SQL-ReservedWords/pkg-plist
index aa2c3bbe66e5..044e48452a4a 100644
--- a/databases/p5-SQL-ReservedWords/pkg-plist
+++ b/databases/p5-SQL-ReservedWords/pkg-plist
@@ -17,5 +17,4 @@ bin/sqlrw
 %%SITE_PERL%%/SQL/ReservedWords/SQLServer.pm
 %%SITE_PERL%%/SQL/ReservedWords/SQLite.pm
 %%SITE_PERL%%/SQL/ReservedWords/Sybase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/ReservedWords/.packlist
 man/man1/sqlrw.1.gz
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 724e524d51c5..e2525d4e7706 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQL-Statement
 PORTVERSION=	1.405
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Statement/pkg-plist b/databases/p5-SQL-Statement/pkg-plist
index 79b0224b4412..39f1b483454a 100644
--- a/databases/p5-SQL-Statement/pkg-plist
+++ b/databases/p5-SQL-Statement/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement/.packlist
 %%SITE_PERL%%/SQL/Dialects/ANSI.pm
 %%SITE_PERL%%/SQL/Dialects/AnyData.pm
 %%SITE_PERL%%/SQL/Dialects/CSV.pm
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index ebecc8c5c576..cd0963c3a50e 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SQL-Translator
 PORTVERSION=	0.11018
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-SQL-Translator/pkg-plist b/databases/p5-SQL-Translator/pkg-plist
index 3ffc1acc288d..272eca0b3dac 100644
--- a/databases/p5-SQL-Translator/pkg-plist
+++ b/databases/p5-SQL-Translator/pkg-plist
@@ -169,7 +169,6 @@ bin/sqlt-graph
 %%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class-start.tt2
 %%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class.tt2
 %%SITE_PERL%%/auto/share/dist/SQL-Translator/PrecompiledParsers/Parse/RecDescent/DDL/SQLT/README
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Translator/.packlist
 man/man1/sqlt-diagram.1.gz
 man/man1/sqlt-diff-old.1.gz
 man/man1/sqlt-diff.1.gz
diff --git a/databases/p5-SQLite-Work/Makefile b/databases/p5-SQLite-Work/Makefile
index 085d472c342b..37852e5e390d 100644
--- a/databases/p5-SQLite-Work/Makefile
+++ b/databases/p5-SQLite-Work/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQLite-Work
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	databases www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RUBYKAT
diff --git a/databases/p5-Search-InvertedIndex/Makefile b/databases/p5-Search-InvertedIndex/Makefile
index a893b638e530..cfacdc64bb5e 100644
--- a/databases/p5-Search-InvertedIndex/Makefile
+++ b/databases/p5-Search-InvertedIndex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Search-InvertedIndex
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Search-InvertedIndex/pkg-plist b/databases/p5-Search-InvertedIndex/pkg-plist
index 042deedad2dd..c036815dfbc6 100644
--- a/databases/p5-Search-InvertedIndex/pkg-plist
+++ b/databases/p5-Search-InvertedIndex/pkg-plist
@@ -14,4 +14,3 @@
 %%SITE_PERL%%/Search/InvertedIndex/Query/Leaf.pm
 %%SITE_PERL%%/Search/InvertedIndex/Result.pm
 %%SITE_PERL%%/Search/InvertedIndex/Update.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/InvertedIndex/.packlist
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index a9163dfb3290..88d3c075205b 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Search-Namazu
 PORTVERSION=	0.96
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Search-Namazu/pkg-plist b/databases/p5-Search-Namazu/pkg-plist
index 86022737cc71..e3d4a3889b19 100644
--- a/databases/p5-Search-Namazu/pkg-plist
+++ b/databases/p5-Search-Namazu/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Namazu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu/Namazu.so
+%%SITE_ARCH%%/Search/Namazu.pm
+%%SITE_ARCH%%/auto/Search/Namazu/Namazu.so
 %%PERL5_MAN3%%/Search::Namazu.3.gz
diff --git a/databases/p5-Search-Xapian/Makefile b/databases/p5-Search-Xapian/Makefile
index 46dbda5199d3..99ac409cb903 100644
--- a/databases/p5-Search-Xapian/Makefile
+++ b/databases/p5-Search-Xapian/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Search-Xapian
 PORTVERSION=	1.2.19.0
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
 		LOCAL/sunpoet \
diff --git a/databases/p5-Search-Xapian/pkg-plist b/databases/p5-Search-Xapian/pkg-plist
index 1df5e9966ace..2988eee6d1a1 100644
--- a/databases/p5-Search-Xapian/pkg-plist
+++ b/databases/p5-Search-Xapian/pkg-plist
@@ -1,54 +1,53 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/AssertionError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/BM25Weight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/BoolWeight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Database.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DatabaseCorruptError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DatabaseCreateError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DatabaseError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DatabaseLockError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DatabaseModifiedError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DatabaseOpeningError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DatabaseVersionError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/DocNotFoundError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Document.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/ESet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/ESetIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Enquire.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/FeatureUnavailableError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/InternalError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/InvalidArgumentError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/InvalidOperationError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/LogicError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MSet/Tied.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MSetIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MultiValueSorter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/NetworkError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/NetworkTimeoutError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/PerlStopper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/PositionIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/PostingIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/QueryParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/QueryParserError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/RSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/RangeError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/RuntimeError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/SerialisationError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/SimpleStopper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Stem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Stopper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/TermGenerator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/TermIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/TradWeight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/UnimplementedError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/ValueIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Weight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/WritableDatabase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/Xapian.so
+%%SITE_ARCH%%/Search/Xapian.pm
+%%SITE_ARCH%%/Search/Xapian/AssertionError.pm
+%%SITE_ARCH%%/Search/Xapian/BM25Weight.pm
+%%SITE_ARCH%%/Search/Xapian/BoolWeight.pm
+%%SITE_ARCH%%/Search/Xapian/Database.pm
+%%SITE_ARCH%%/Search/Xapian/DatabaseCorruptError.pm
+%%SITE_ARCH%%/Search/Xapian/DatabaseCreateError.pm
+%%SITE_ARCH%%/Search/Xapian/DatabaseError.pm
+%%SITE_ARCH%%/Search/Xapian/DatabaseLockError.pm
+%%SITE_ARCH%%/Search/Xapian/DatabaseModifiedError.pm
+%%SITE_ARCH%%/Search/Xapian/DatabaseOpeningError.pm
+%%SITE_ARCH%%/Search/Xapian/DatabaseVersionError.pm
+%%SITE_ARCH%%/Search/Xapian/DocNotFoundError.pm
+%%SITE_ARCH%%/Search/Xapian/Document.pm
+%%SITE_ARCH%%/Search/Xapian/ESet.pm
+%%SITE_ARCH%%/Search/Xapian/ESetIterator.pm
+%%SITE_ARCH%%/Search/Xapian/Enquire.pm
+%%SITE_ARCH%%/Search/Xapian/Error.pm
+%%SITE_ARCH%%/Search/Xapian/FeatureUnavailableError.pm
+%%SITE_ARCH%%/Search/Xapian/InternalError.pm
+%%SITE_ARCH%%/Search/Xapian/InvalidArgumentError.pm
+%%SITE_ARCH%%/Search/Xapian/InvalidOperationError.pm
+%%SITE_ARCH%%/Search/Xapian/LogicError.pm
+%%SITE_ARCH%%/Search/Xapian/MSet.pm
+%%SITE_ARCH%%/Search/Xapian/MSet/Tied.pm
+%%SITE_ARCH%%/Search/Xapian/MSetIterator.pm
+%%SITE_ARCH%%/Search/Xapian/MultiValueSorter.pm
+%%SITE_ARCH%%/Search/Xapian/NetworkError.pm
+%%SITE_ARCH%%/Search/Xapian/NetworkTimeoutError.pm
+%%SITE_ARCH%%/Search/Xapian/PerlStopper.pm
+%%SITE_ARCH%%/Search/Xapian/PositionIterator.pm
+%%SITE_ARCH%%/Search/Xapian/PostingIterator.pm
+%%SITE_ARCH%%/Search/Xapian/Query.pm
+%%SITE_ARCH%%/Search/Xapian/QueryParser.pm
+%%SITE_ARCH%%/Search/Xapian/QueryParserError.pm
+%%SITE_ARCH%%/Search/Xapian/RSet.pm
+%%SITE_ARCH%%/Search/Xapian/RangeError.pm
+%%SITE_ARCH%%/Search/Xapian/RuntimeError.pm
+%%SITE_ARCH%%/Search/Xapian/SerialisationError.pm
+%%SITE_ARCH%%/Search/Xapian/SimpleStopper.pm
+%%SITE_ARCH%%/Search/Xapian/Stem.pm
+%%SITE_ARCH%%/Search/Xapian/Stopper.pm
+%%SITE_ARCH%%/Search/Xapian/TermGenerator.pm
+%%SITE_ARCH%%/Search/Xapian/TermIterator.pm
+%%SITE_ARCH%%/Search/Xapian/TradWeight.pm
+%%SITE_ARCH%%/Search/Xapian/UnimplementedError.pm
+%%SITE_ARCH%%/Search/Xapian/ValueIterator.pm
+%%SITE_ARCH%%/Search/Xapian/Weight.pm
+%%SITE_ARCH%%/Search/Xapian/WritableDatabase.pm
+%%SITE_ARCH%%/auto/Search/Xapian/Xapian.so
 %%PERL5_MAN3%%/Search::Xapian.3.gz
 %%PERL5_MAN3%%/Search::Xapian::AssertionError.3.gz
 %%PERL5_MAN3%%/Search::Xapian::BM25Weight.3.gz
diff --git a/databases/p5-Search-Xapian10/Makefile b/databases/p5-Search-Xapian10/Makefile
index 2840066caec0..4d2ff189bf15 100644
--- a/databases/p5-Search-Xapian10/Makefile
+++ b/databases/p5-Search-Xapian10/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Search-Xapian10
 PORTVERSION=	1.0.23.0
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION:R}/
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Search-Xapian10/pkg-plist b/databases/p5-Search-Xapian10/pkg-plist
index 898875351b4d..b0109412149c 100644
--- a/databases/p5-Search-Xapian10/pkg-plist
+++ b/databases/p5-Search-Xapian10/pkg-plist
@@ -15,32 +15,31 @@
 %%PERL5_MAN3%%/Search::Xapian::ValueIterator.3.gz
 %%PERL5_MAN3%%/Search::Xapian::Weight.3.gz
 %%PERL5_MAN3%%/Search::Xapian::WritableDatabase.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/BM25Weight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/BoolWeight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Database.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Document.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/ESet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/ESetIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Enquire.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MSet/Tied.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MSetIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MultiValueSorter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/PerlStopper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/PositionIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/PostingIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/QueryParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/RSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/SimpleStopper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Stem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Stopper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/TermGenerator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/TermIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/TradWeight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/ValueIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/Weight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/WritableDatabase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/Xapian.so
+%%SITE_ARCH%%/Search/Xapian.pm
+%%SITE_ARCH%%/Search/Xapian/BM25Weight.pm
+%%SITE_ARCH%%/Search/Xapian/BoolWeight.pm
+%%SITE_ARCH%%/Search/Xapian/Database.pm
+%%SITE_ARCH%%/Search/Xapian/Document.pm
+%%SITE_ARCH%%/Search/Xapian/ESet.pm
+%%SITE_ARCH%%/Search/Xapian/ESetIterator.pm
+%%SITE_ARCH%%/Search/Xapian/Enquire.pm
+%%SITE_ARCH%%/Search/Xapian/MSet.pm
+%%SITE_ARCH%%/Search/Xapian/MSet/Tied.pm
+%%SITE_ARCH%%/Search/Xapian/MSetIterator.pm
+%%SITE_ARCH%%/Search/Xapian/MultiValueSorter.pm
+%%SITE_ARCH%%/Search/Xapian/PerlStopper.pm
+%%SITE_ARCH%%/Search/Xapian/PositionIterator.pm
+%%SITE_ARCH%%/Search/Xapian/PostingIterator.pm
+%%SITE_ARCH%%/Search/Xapian/Query.pm
+%%SITE_ARCH%%/Search/Xapian/QueryParser.pm
+%%SITE_ARCH%%/Search/Xapian/RSet.pm
+%%SITE_ARCH%%/Search/Xapian/SimpleStopper.pm
+%%SITE_ARCH%%/Search/Xapian/Stem.pm
+%%SITE_ARCH%%/Search/Xapian/Stopper.pm
+%%SITE_ARCH%%/Search/Xapian/TermGenerator.pm
+%%SITE_ARCH%%/Search/Xapian/TermIterator.pm
+%%SITE_ARCH%%/Search/Xapian/TradWeight.pm
+%%SITE_ARCH%%/Search/Xapian/ValueIterator.pm
+%%SITE_ARCH%%/Search/Xapian/Weight.pm
+%%SITE_ARCH%%/Search/Xapian/WritableDatabase.pm
+%%SITE_ARCH%%/auto/Search/Xapian/Xapian.so
diff --git a/databases/p5-T2/Makefile b/databases/p5-T2/Makefile
index c403e80c4f4a..8c6e97320b4a 100644
--- a/databases/p5-T2/Makefile
+++ b/databases/p5-T2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	T2
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAMV
diff --git a/databases/p5-T2/pkg-plist b/databases/p5-T2/pkg-plist
index ef170e403104..c7b1ba365255 100644
--- a/databases/p5-T2/pkg-plist
+++ b/databases/p5-T2/pkg-plist
@@ -18,4 +18,3 @@ bin/t2-write-js.pl
 %%SITE_PERL%%/T2/Method.pm
 %%SITE_PERL%%/T2/Schema.pm
 %%SITE_PERL%%/T2/Storage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/T2/.packlist
diff --git a/databases/p5-Tangram/Makefile b/databases/p5-Tangram/Makefile
index f763a80911eb..90f6f214aea7 100644
--- a/databases/p5-Tangram/Makefile
+++ b/databases/p5-Tangram/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tangram
 PORTVERSION=	2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Tangram/pkg-plist b/databases/p5-Tangram/pkg-plist
index 93f7fae2afd1..f62d06ea0fee 100644
--- a/databases/p5-Tangram/pkg-plist
+++ b/databases/p5-Tangram/pkg-plist
@@ -155,4 +155,3 @@
 %%SITE_PERL%%/Tangram/Type/TimeAndDate.pm
 %%SITE_PERL%%/Tangram/Type/TimeAndDate.pod
 %%SITE_PERL%%/auto/Tangram/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tangram/.packlist
diff --git a/databases/p5-Template-DBI/Makefile b/databases/p5-Template-DBI/Makefile
index 4198b657c40f..06ba99570622 100644
--- a/databases/p5-Template-DBI/Makefile
+++ b/databases/p5-Template-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-DBI
 PORTVERSION=	2.65
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Template-DBI/pkg-plist b/databases/p5-Template-DBI/pkg-plist
index 1facbab10843..5727e9bc19f5 100644
--- a/databases/p5-Template-DBI/pkg-plist
+++ b/databases/p5-Template-DBI/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Template/DBI.pod
 %%SITE_PERL%%/Template/Plugin/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/DBI/.packlist
 %%PERL5_MAN3%%/Template::DBI.3.gz
 %%PERL5_MAN3%%/Template::Plugin::DBI.3.gz
diff --git a/databases/p5-Teng/Makefile b/databases/p5-Teng/Makefile
index a72fa7784c99..bb6e01357958 100644
--- a/databases/p5-Teng/Makefile
+++ b/databases/p5-Teng/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Teng
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SATOH
diff --git a/databases/p5-Test-Cukes/Makefile b/databases/p5-Test-Cukes/Makefile
index 21b97e4dc8b3..aa6c111e0f76 100644
--- a/databases/p5-Test-Cukes/Makefile
+++ b/databases/p5-Test-Cukes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Cukes
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Test-Cukes/pkg-plist b/databases/p5-Test-Cukes/pkg-plist
index 6ada4d900bea..39d69be5a6d4 100644
--- a/databases/p5-Test-Cukes/pkg-plist
+++ b/databases/p5-Test-Cukes/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Cukes/.packlist
 %%SITE_PERL%%/Test/Cukes.pm
 %%SITE_PERL%%/Test/Cukes/Feature.pm
 %%SITE_PERL%%/Test/Cukes/Scenario.pm
diff --git a/databases/p5-Test-Database/Makefile b/databases/p5-Test-Database/Makefile
index d1a00573e110..abb6c7107f23 100644
--- a/databases/p5-Test-Database/Makefile
+++ b/databases/p5-Test-Database/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Database
 PORTVERSION=	1.113
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Test-Database/pkg-plist b/databases/p5-Test-Database/pkg-plist
index 3b9107db2d80..dcee9828b6a2 100644
--- a/databases/p5-Test-Database/pkg-plist
+++ b/databases/p5-Test-Database/pkg-plist
@@ -20,4 +20,3 @@
 %%SITE_PERL%%/Test/Database/Handle.pm
 %%SITE_PERL%%/Test/Database/Tutorial.pod
 %%SITE_PERL%%/Test/Database/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Database/.packlist
diff --git a/databases/p5-Test-DatabaseRow/Makefile b/databases/p5-Test-DatabaseRow/Makefile
index 3db9c6342bfc..952e74d367bf 100644
--- a/databases/p5-Test-DatabaseRow/Makefile
+++ b/databases/p5-Test-DatabaseRow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-DatabaseRow
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Test-DatabaseRow/pkg-plist b/databases/p5-Test-DatabaseRow/pkg-plist
index b38ca51668df..cc7b97a61db7 100644
--- a/databases/p5-Test-DatabaseRow/pkg-plist
+++ b/databases/p5-Test-DatabaseRow/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/DatabaseRow/.packlist
 %%SITE_PERL%%/Test/DatabaseRow/Result.pm
 %%SITE_PERL%%/Test/DatabaseRow/Object.pm
 %%SITE_PERL%%/Test/DatabaseRow.pm
diff --git a/databases/p5-Test-Fixture-DBI/Makefile b/databases/p5-Test-Fixture-DBI/Makefile
index 232e736569f7..b3ccbaefa632 100644
--- a/databases/p5-Test-Fixture-DBI/Makefile
+++ b/databases/p5-Test-Fixture-DBI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Fixture-DBI
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Test-Fixture-DBI/pkg-plist b/databases/p5-Test-Fixture-DBI/pkg-plist
index 54a11615975f..4f71ab83c012 100644
--- a/databases/p5-Test-Fixture-DBI/pkg-plist
+++ b/databases/p5-Test-Fixture-DBI/pkg-plist
@@ -1,6 +1,5 @@
 bin/make_database_yaml.pl
 bin/make_fixture_yaml.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Fixture/DBI/.packlist
 %%SITE_PERL%%/Test/Fixture/DBI.pm
 %%SITE_PERL%%/Test/Fixture/DBI/Util.pm
 %%SITE_PERL%%/Test/Fixture/DBI/Util/SQLite.pm
diff --git a/databases/p5-Test-mysqld/Makefile b/databases/p5-Test-mysqld/Makefile
index d09f919e4f36..7c025f339f29 100644
--- a/databases/p5-Test-mysqld/Makefile
+++ b/databases/p5-Test-mysqld/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-mysqld
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Test-mysqld/pkg-plist b/databases/p5-Test-mysqld/pkg-plist
index ad1b0f293e44..4ff5d21db8ab 100644
--- a/databases/p5-Test-mysqld/pkg-plist
+++ b/databases/p5-Test-mysqld/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/mysqld/.packlist
 %%SITE_PERL%%/Test/mysqld.pm
 %%PERL5_MAN3%%/Test::mysqld.3.gz
diff --git a/databases/p5-Test-postgresql/Makefile b/databases/p5-Test-postgresql/Makefile
index 3e3c582b1150..bb28c3fa276e 100644
--- a/databases/p5-Test-postgresql/Makefile
+++ b/databases/p5-Test-postgresql/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-postgresql
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Test-postgresql/pkg-plist b/databases/p5-Test-postgresql/pkg-plist
index 19c7c4128657..26f48f67b2d5 100644
--- a/databases/p5-Test-postgresql/pkg-plist
+++ b/databases/p5-Test-postgresql/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/postgresql/.packlist
 %%SITE_PERL%%/Test/postgresql.pm
 %%PERL5_MAN3%%/Test::postgresql.3.gz
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index 57d81afcf6ae..4b9d9275ca65 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Query-SQL
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Text-Query-SQL/pkg-plist b/databases/p5-Text-Query-SQL/pkg-plist
index 1f8d23e0daab..8c1ee1eb9b34 100644
--- a/databases/p5-Text-Query-SQL/pkg-plist
+++ b/databases/p5-Text-Query-SQL/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query/SQL/.packlist
 %%SITE_PERL%%/Text/Query/BuildSQLMifluz.pm
 %%SITE_PERL%%/Text/Query/BuildSQLMySQL.pm
 %%SITE_PERL%%/Text/Query/BuildSQLFulcrum.pm
diff --git a/databases/p5-Text-xSV/Makefile b/databases/p5-Text-xSV/Makefile
index 2f69403bf5af..299a5070f73b 100644
--- a/databases/p5-Text-xSV/Makefile
+++ b/databases/p5-Text-xSV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-xSV
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Text-xSV/pkg-plist b/databases/p5-Text-xSV/pkg-plist
index 83b4b3eeeb28..58b6df0e5cac 100644
--- a/databases/p5-Text-xSV/pkg-plist
+++ b/databases/p5-Text-xSV/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Text/xSV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/xSV/.packlist
 %%PERL5_MAN3%%/Text::xSV.3.gz
diff --git a/databases/p5-Tie-DBI/Makefile b/databases/p5-Tie-DBI/Makefile
index fabac66b23eb..6361c995c975 100644
--- a/databases/p5-Tie-DBI/Makefile
+++ b/databases/p5-Tie-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-DBI
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Tie-DBI/pkg-plist b/databases/p5-Tie-DBI/pkg-plist
index 0121d265b599..13267b3687f1 100644
--- a/databases/p5-Tie-DBI/pkg-plist
+++ b/databases/p5-Tie-DBI/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Tie::RDBM.3.gz
 %%SITE_PERL%%/Tie/DBI.pm
 %%SITE_PERL%%/Tie/RDBM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DBI/.packlist
diff --git a/databases/p5-Tie-LevelDB/Makefile b/databases/p5-Tie-LevelDB/Makefile
index feb791ccbb16..b80882da458e 100644
--- a/databases/p5-Tie-LevelDB/Makefile
+++ b/databases/p5-Tie-LevelDB/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tie-LevelDB
 PORTVERSION=	0.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Tie-LevelDB/pkg-plist b/databases/p5-Tie-LevelDB/pkg-plist
index aa8db6ca509e..041ac73062a7 100644
--- a/databases/p5-Tie-LevelDB/pkg-plist
+++ b/databases/p5-Tie-LevelDB/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tie/LevelDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/LevelDB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/LevelDB/LevelDB.so
+%%SITE_ARCH%%/Tie/LevelDB.pm
+%%SITE_ARCH%%/auto/Tie/LevelDB/LevelDB.so
 %%PERL5_MAN3%%/Tie::LevelDB.3.gz
diff --git a/databases/p5-Time-Piece-MySQL/Makefile b/databases/p5-Time-Piece-MySQL/Makefile
index 8747e02670d7..3dfe9addc289 100644
--- a/databases/p5-Time-Piece-MySQL/Makefile
+++ b/databases/p5-Time-Piece-MySQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Piece-MySQL
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	databases devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-Time-Piece-MySQL/pkg-plist b/databases/p5-Time-Piece-MySQL/pkg-plist
index cf57bdaec87a..88467ce0661a 100644
--- a/databases/p5-Time-Piece-MySQL/pkg-plist
+++ b/databases/p5-Time-Piece-MySQL/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Piece::MySQL.3.gz
 %%SITE_PERL%%/Time/Piece/MySQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/MySQL/.packlist
diff --git a/databases/p5-TokyoCabinet/Makefile b/databases/p5-TokyoCabinet/Makefile
index c32416f728ae..b8e1d79fcbeb 100644
--- a/databases/p5-TokyoCabinet/Makefile
+++ b/databases/p5-TokyoCabinet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	TokyoCabinet
 PORTVERSION=	1.34
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://fallabs.com/tokyocabinet/perlpkg/
diff --git a/databases/p5-TokyoCabinet/pkg-plist b/databases/p5-TokyoCabinet/pkg-plist
index 239b1f0af582..71d4c6d80558 100644
--- a/databases/p5-TokyoCabinet/pkg-plist
+++ b/databases/p5-TokyoCabinet/pkg-plist
@@ -1,11 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/TokyoCabinet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/TokyoCabinet.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TokyoCabinet/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TokyoCabinet/TokyoCabinet.so
-%%SITE_PERL%%/%%PERL_ARCH%%/memsize.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/tcatest.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/tcbtest.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/tcftest.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/tchtest.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/tcttest.pl
+%%SITE_ARCH%%/TokyoCabinet.pm
+%%SITE_ARCH%%/TokyoCabinet.pod
+%%SITE_ARCH%%/auto/TokyoCabinet/TokyoCabinet.so
+%%SITE_ARCH%%/memsize.pl
+%%SITE_ARCH%%/tcatest.pl
+%%SITE_ARCH%%/tcbtest.pl
+%%SITE_ARCH%%/tcftest.pl
+%%SITE_ARCH%%/tchtest.pl
+%%SITE_ARCH%%/tcttest.pl
 %%PERL5_MAN3%%/TokyoCabinet.3.gz
diff --git a/databases/p5-mysql-genocide/Makefile b/databases/p5-mysql-genocide/Makefile
index 8a410fe57d92..6f12b68900d3 100644
--- a/databases/p5-mysql-genocide/Makefile
+++ b/databases/p5-mysql-genocide/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mysql-genocide
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSOLIV
diff --git a/databases/p5-mysql-genocide/pkg-plist b/databases/p5-mysql-genocide/pkg-plist
index 459c2b65af66..0c3f6bd1066f 100644
--- a/databases/p5-mysql-genocide/pkg-plist
+++ b/databases/p5-mysql-genocide/pkg-plist
@@ -1,3 +1,2 @@
 bin/mysql-genocide
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mysql-genocide/.packlist
 man/man1/mysql-genocide.1.gz
diff --git a/databases/p5-qdbm/pkg-plist b/databases/p5-qdbm/pkg-plist
index ec4ab31167d9..d0d575f36221 100644
--- a/databases/p5-qdbm/pkg-plist
+++ b/databases/p5-qdbm/pkg-plist
@@ -1,15 +1,12 @@
 bin/plcrtest
 bin/pldptest
 bin/plvltest
-%%SITE_PERL%%/%%PERL_ARCH%%/Curia.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Depot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Villa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curia/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curia/Curia.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Depot/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Depot/Depot.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Villa/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Villa/Villa.so
+%%SITE_ARCH%%/Curia.pm
+%%SITE_ARCH%%/Depot.pm
+%%SITE_ARCH%%/Villa.pm
+%%SITE_ARCH%%/auto/Curia/Curia.so
+%%SITE_ARCH%%/auto/Depot/Depot.so
+%%SITE_ARCH%%/auto/Villa/Villa.so
 %%DATADIR%%/perl/plapidoc/Curia.pm.html
 %%DATADIR%%/perl/plapidoc/Depot.pm.html
 %%DATADIR%%/perl/plapidoc/Villa.pm.html
diff --git a/databases/p5-tokyotyrant/Makefile b/databases/p5-tokyotyrant/Makefile
index 7e57e320f8de..c7b6ab7e7aa1 100644
--- a/databases/p5-tokyotyrant/Makefile
+++ b/databases/p5-tokyotyrant/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tokyotyrant
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://fallabs.com/${PORTNAME}/perlpkg/
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-tokyotyrant/pkg-plist b/databases/p5-tokyotyrant/pkg-plist
index 606e52173b43..ee45ed11fe58 100644
--- a/databases/p5-tokyotyrant/pkg-plist
+++ b/databases/p5-tokyotyrant/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/TokyoTyrant.pm
 %%SITE_PERL%%/TokyoTyrant.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TokyoTyrant/.packlist
 %%SITE_PERL%%/tcrtest.pl
 %%SITE_PERL%%/ttutest.pl
 %%PERL5_MAN3%%/TokyoTyrant.3.gz
diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile
index 5c57271b131f..55f18f7495f8 100644
--- a/databases/percona-toolkit/Makefile
+++ b/databases/percona-toolkit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	percona-toolkit
 PORTVERSION=	2.2.11
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.percona.com/downloads/${PORTNAME}/${PORTVERSION}/
 
diff --git a/databases/percona-toolkit/pkg-plist b/databases/percona-toolkit/pkg-plist
index fab6bc0be442..e69054454fae 100644
--- a/databases/percona-toolkit/pkg-plist
+++ b/databases/percona-toolkit/pkg-plist
@@ -63,4 +63,3 @@ man/man1/pt-table-usage.1.gz
 man/man1/pt-upgrade.1.gz
 man/man1/pt-variable-advisor.1.gz
 man/man1/pt-visual-explain.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/percona-toolkit/.packlist
diff --git a/databases/pgbadger/Makefile b/databases/pgbadger/Makefile
index 8317f673a148..2b0ac445af0b 100644
--- a/databases/pgbadger/Makefile
+++ b/databases/pgbadger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pgbadger
 PORTVERSION=	6.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
diff --git a/databases/pgbadger/pkg-plist b/databases/pgbadger/pkg-plist
index 2afd52d691e9..c0b4214b3ce1 100644
--- a/databases/pgbadger/pkg-plist
+++ b/databases/pgbadger/pkg-plist
@@ -1,3 +1,2 @@
 bin/pgbadger
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pgBadger/.packlist
 man/man1/pgbadger.1.gz
diff --git a/databases/pgtop/Makefile b/databases/pgtop/Makefile
index adb788a269e0..6669dcaa4183 100644
--- a/databases/pgtop/Makefile
+++ b/databases/pgtop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgtop
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:COSIMO
diff --git a/databases/pgtop/pkg-plist b/databases/pgtop/pkg-plist
index 37fbe4619214..211e232b87e0 100644
--- a/databases/pgtop/pkg-plist
+++ b/databases/pgtop/pkg-plist
@@ -1,3 +1,2 @@
 bin/pgtop
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pgtop/.packlist
 man/man1/pgtop.1.gz
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 45409159903d..8ccad9dd1e1e 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.4.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -60,7 +60,7 @@ PLIST_SUB+=	WITH_RUBY="@comment "
 
 .if ${PORT_OPTIONS:MPERL_MODULE}
 USES+=		perl5
-USE_PERL5+=	build run fixpacklist
+USE_PERL5+=	build run
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
 .else
@@ -122,7 +122,7 @@ post-install:
 	@${ECHO_MSG} "############################################################################"
 .endif
 .if ${PORT_OPTIONS:MPERL_MODULE}
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/RRDs/RRDs.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/RRDs/RRDs.so
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 87eda0582e28..1f866dc02a88 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -47,10 +47,8 @@ libdata/pkgconfig/librrd.pc
 %%PORTDOCS%%man/man3/librrd.3.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/RRDp.3.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/RRDs.3.gz
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%WITH_PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so
+%%WITH_PERL%%%%SITE_ARCH%%/RRDs.pm
 %%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/py_rrdtool-0.2.2-py%%PYTHON_VER%%.egg-info
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index d757503784f3..34217a39b36c 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.0.50
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/
 PKGNAMESUFFIX=	10
@@ -20,7 +20,7 @@ CONFLICTS=	rrdtool12-1.* rrdtool-1.*
 USES=		pkgconfig perl5 libtool
 USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
 AUTOMAKE_ARGS=	-a -c -f
-USE_PERL5=	build run fixpacklist
+USE_PERL5=	build run
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-local-zlib
diff --git a/databases/rrdtool10/pkg-plist b/databases/rrdtool10/pkg-plist
index b5b5950c0b30..477b92f589ce 100644
--- a/databases/rrdtool10/pkg-plist
+++ b/databases/rrdtool10/pkg-plist
@@ -10,11 +10,9 @@ lib/librrd.so.0.0.0
 %%PERL5_MAN3%%/RRDp.3.gz
 %%PERL5_MAN3%%/RRDs.3.gz
 %%SITE_PERL%%/RRDp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%SITE_ARCH%%/RRDs.pm
+%%SITE_ARCH%%/auto/RRDs/RRDs.so
+%%SITE_ARCH%%/ntmake.pl
 man/man1/RRDp.1.gz
 man/man1/RRDs.1.gz
 man/man1/bin_dec_hex.1.gz
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 0a355e56b235..51224575fb04 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.2.30
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 PKGNAMESUFFIX=	12
@@ -48,7 +48,7 @@ PLIST_SUB+=	WITH_RUBY="@comment "
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
-USE_PERL5=	run build fixpacklist
+USE_PERL5=	run build
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
 .else
diff --git a/databases/rrdtool12/pkg-plist b/databases/rrdtool12/pkg-plist
index 498aa34ab69c..6e0c2c651b99 100644
--- a/databases/rrdtool12/pkg-plist
+++ b/databases/rrdtool12/pkg-plist
@@ -129,11 +129,9 @@ man/man1/rrdlastupdate.1.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/RRDp.3.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/RRDs.3.gz
 %%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%WITH_PERL%%%%SITE_ARCH%%/RRDs.pm
+%%WITH_PERL%%%%SITE_ARCH%%/ntmake.pl
+%%WITH_PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/py_rrdtool-0.2.1-py%%PYTHON_VER%%.egg-info
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
diff --git a/deskutils/note/Makefile b/deskutils/note/Makefile
index 9feacbcb8715..4cc791208727 100644
--- a/deskutils/note/Makefile
+++ b/deskutils/note/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	note
 PORTVERSION=	1.3.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/note/
 
diff --git a/deskutils/note/pkg-plist b/deskutils/note/pkg-plist
index 80a41e8d933e..0cf617f44de9 100644
--- a/deskutils/note/pkg-plist
+++ b/deskutils/note/pkg-plist
@@ -16,5 +16,4 @@ bin/note
 %%SITE_PERL%%/NOTEDB/mysql.pm
 %%SITE_PERL%%/NOTEDB/pwsafe3.pm
 %%SITE_PERL%%/NOTEDB/text.pm
-%%SITE_PERL%%/mach/auto/NOTEDB/.packlist
 %%SITE_PERL%%/note.pod
diff --git a/deskutils/p5-Data-ICal/Makefile b/deskutils/p5-Data-ICal/Makefile
index 4e5161647c4f..1d2fe59d4282 100644
--- a/deskutils/p5-Data-ICal/Makefile
+++ b/deskutils/p5-Data-ICal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-ICal
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/deskutils/p5-Data-ICal/pkg-plist b/deskutils/p5-Data-ICal/pkg-plist
index 3dd2892d58a2..b113335253bb 100644
--- a/deskutils/p5-Data-ICal/pkg-plist
+++ b/deskutils/p5-Data-ICal/pkg-plist
@@ -26,4 +26,3 @@
 %%SITE_PERL%%/Data/ICal/Entry/TimeZone/Standard.pm
 %%SITE_PERL%%/Data/ICal/Entry/Todo.pm
 %%SITE_PERL%%/Data/ICal/Property.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ICal/.packlist
diff --git a/deskutils/p5-Goo/Makefile b/deskutils/p5-Goo/Makefile
index 0269dccff673..bb75ae567b39 100644
--- a/deskutils/p5-Goo/Makefile
+++ b/deskutils/p5-Goo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Goo
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/deskutils/p5-Goo/pkg-plist b/deskutils/p5-Goo/pkg-plist
index 904b9bd1937a..91301087a686 100644
--- a/deskutils/p5-Goo/pkg-plist
+++ b/deskutils/p5-Goo/pkg-plist
@@ -283,6 +283,5 @@ bin/goo.pl
 %%SITE_PERL%%/Goo/WebDBLite.pm
 %%SITE_PERL%%/Goo/Zone.pm
 %%SITE_PERL%%/Goo/test.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Goo/.packlist
 man/man1/goo.1.gz
 man/man1/goo.pl.1.gz
diff --git a/deskutils/p5-ZConf-BGSet/Makefile b/deskutils/p5-ZConf-BGSet/Makefile
index ad98f6168a63..e6c483636588 100644
--- a/deskutils/p5-ZConf-BGSet/Makefile
+++ b/deskutils/p5-ZConf-BGSet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ZConf-BGSet
 PORTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/deskutils/p5-ZConf-BGSet/pkg-plist b/deskutils/p5-ZConf-BGSet/pkg-plist
index 28c146c18f7b..0eb8933c0fe1 100644
--- a/deskutils/p5-ZConf-BGSet/pkg-plist
+++ b/deskutils/p5-ZConf-BGSet/pkg-plist
@@ -2,5 +2,4 @@ bin/zbgset
 bin/zbgset-pt
 bin/zbgset-admin
 %%SITE_PERL%%/ZConf/BGSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/BGSet/.packlist
 %%PERL5_MAN3%%/ZConf::BGSet.3.gz
diff --git a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
index 7f65e68806d2..a6ef39a1e25c 100644
--- a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
+++ b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ZConf-Runner-GUI-GTK
 PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/deskutils/p5-ZConf-Runner-GUI-GTK/pkg-plist b/deskutils/p5-ZConf-Runner-GUI-GTK/pkg-plist
index f482279d5d67..5db3391575be 100644
--- a/deskutils/p5-ZConf-Runner-GUI-GTK/pkg-plist
+++ b/deskutils/p5-ZConf-Runner-GUI-GTK/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ZConf/Runner/GUI/GTK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Runner/GUI/GTK/.packlist
 %%PERL5_MAN3%%/ZConf::Runner::GUI::GTK.3.gz
diff --git a/deskutils/p5-ZConf-Runner/Makefile b/deskutils/p5-ZConf-Runner/Makefile
index 15a2ffbbd8bd..05171fc2a900 100644
--- a/deskutils/p5-ZConf-Runner/Makefile
+++ b/deskutils/p5-ZConf-Runner/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ZConf-Runner
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/deskutils/p5-ZConf-Runner/pkg-plist b/deskutils/p5-ZConf-Runner/pkg-plist
index 8c91c8224203..a8225b059b20 100644
--- a/deskutils/p5-ZConf-Runner/pkg-plist
+++ b/deskutils/p5-ZConf-Runner/pkg-plist
@@ -2,7 +2,6 @@ bin/zcrunner
 %%SITE_PERL%%/ZConf/Runner.pm
 %%SITE_PERL%%/ZConf/Runner/GUI.pm
 %%SITE_PERL%%/ZConf/Runner/GUI/Curses.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Runner/.packlist
 %%PERL5_MAN3%%/ZConf::Runner.3.gz
 %%PERL5_MAN3%%/ZConf::Runner::GUI.3.gz
 %%PERL5_MAN3%%/ZConf::Runner::GUI::Curses.3.gz
diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index 55654139b843..8f3d34345f72 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	autodia
 PORTVERSION=	2.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEEJAY
diff --git a/devel/autodia/pkg-plist b/devel/autodia/pkg-plist
index d924d5cbbd75..d1644ba6fe57 100644
--- a/devel/autodia/pkg-plist
+++ b/devel/autodia/pkg-plist
@@ -24,7 +24,6 @@ bin/autodia.pl
 %%SITE_PERL%%/Autodia/Handler/python.pm
 %%SITE_PERL%%/Autodia/Handler/umbrello.pm
 %%SITE_PERL%%/autodia.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Autodia/.packlist
 %%PERL5_MAN3%%/Autodia.3.gz
 %%PERL5_MAN3%%/Autodia::Diagram.3.gz
 %%PERL5_MAN3%%/Autodia::Diagram::Class.3.gz
diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index fb36384e4a03..84d118f915a8 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cil
 PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -75,15 +75,15 @@ pre-install:
 do-install:
 	(cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ${BINFILES} \
 		${STAGEDIR}${PREFIX}/bin)
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/CIL/App/Cilly
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/CIL/App/Cilly
 	${INSTALL_DATA} ${WRKSRC}/lib/App/Cilly/CilConfig.pm \
-		${STAGEDIR}${SITE_PERL}
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	(cd ${WRKSRC}/lib && ${INSTALL_DATA} ${LIBFILES} \
-		${STAGEDIR}${SITE_PERL}/CIL/App/Cilly)
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/CIL/App/Cilly)
 	(cd ${WRKSRC}/lib && ${INSTALL_DATA} ${LIBAFILES} \
-		${STAGEDIR}${SITE_PERL}/CIL/App)
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/CIL/App)
 	(cd ${WRKSRC}/lib && ${INSTALL_DATA} ${LIBBINS} \
-		${STAGEDIR}${SITE_PERL}/CIL)
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/CIL)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${RM} -rf ${WRKSRC}/doc/cilcode.tmp
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
diff --git a/devel/cpan-upload-http/Makefile b/devel/cpan-upload-http/Makefile
index f34bfde6ddc1..40e7f2aff2ba 100644
--- a/devel/cpan-upload-http/Makefile
+++ b/devel/cpan-upload-http/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cpan-upload-http
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
diff --git a/devel/cpan-upload-http/pkg-plist b/devel/cpan-upload-http/pkg-plist
index 5bb4bb81235e..2c8d4b3b8a26 100644
--- a/devel/cpan-upload-http/pkg-plist
+++ b/devel/cpan-upload-http/pkg-plist
@@ -1,3 +1,2 @@
 bin/cpan-upload-http
 man/man1/cpan-upload-http.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cpan-upload-http/.packlist
diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index d2a380f0a326..6729cc73957f 100644
--- a/devel/cpan-upload/Makefile
+++ b/devel/cpan-upload/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cpan-upload
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEILB/scripts
diff --git a/devel/cpan-upload/pkg-plist b/devel/cpan-upload/pkg-plist
index a707e369f554..b826d5c30dd6 100644
--- a/devel/cpan-upload/pkg-plist
+++ b/devel/cpan-upload/pkg-plist
@@ -1,3 +1,2 @@
 bin/cpan-upload
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cpan-upload/.packlist
 man/man1/cpan-upload.1.gz
diff --git a/devel/egypt/Makefile b/devel/egypt/Makefile
index c1735d1cce4f..b91850a14ed3 100644
--- a/devel/egypt/Makefile
+++ b/devel/egypt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	egypt
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://www.gson.org/egypt/download/ CENKES
 
@@ -16,8 +17,6 @@ USES=		perl5 shebangfix
 USE_PERL5=	configure
 SHEBANG_FILES=	egypt
 
-PLIST_FILES=	bin/${PORTNAME} %%SITE_PERL%%/%%PERL_ARCH%%/auto/${PORTNAME}/.packlist \
-		man/man1/egypt.1.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/egypt.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index c8c17618ddde..895d4c40540c 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fb303
 PORTVERSION=	${THRIFT_PORTVERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 352840405a78..50103c844955 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG
 MASTER_SITE_SUBDIR=	software/scm/git
@@ -237,7 +238,6 @@ post-install:
 	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
 .endif
-	-${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
@@ -260,8 +260,5 @@ post-install:
 .endif
 
 post-stage:
-.if ${PORT_OPTIONS:MPERL}
-	${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 6166cf73bcec..606e04c03285 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -371,7 +371,6 @@ libexec/git-core/mergetools/emerge
 libexec/git-core/mergetools/araxis
 %%GUI%%bin/gitk
 %%PERLSUB%%%%SITE_PERL%%/Git.pm
-%%PERLSUB%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist
 %%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/SVN.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/IndexInfo.pm
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index bd27df26ed5a..83492abd11a2 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitolite
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GH \
diff --git a/devel/naturaldocs/Makefile b/devel/naturaldocs/Makefile
index 7474eb187c0e..8a9f552dce1c 100644
--- a/devel/naturaldocs/Makefile
+++ b/devel/naturaldocs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	naturaldocs
 PORTVERSION=	1.52
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/Stable%20Releases/${PORTVERSION}
@@ -30,9 +30,9 @@ do-configure:
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/NaturalDocs.sh \
 		${STAGEDIR}${PREFIX}/bin/NaturalDocs
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/NaturalDocs
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/NaturalDocs
 	(cd ${WRKSRC}/Modules/NaturalDocs \
-		&& ${COPYTREE_SHARE} . ${STAGEDIR}${SITE_PERL}/NaturalDocs)
+		&& ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/NaturalDocs)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/NaturalDocs ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "Config Info JavaScript Styles" \
diff --git a/devel/p5-AI-Pathfinding-AStar/Makefile b/devel/p5-AI-Pathfinding-AStar/Makefile
index 6b27953c06f5..b4ef785a0d0b 100644
--- a/devel/p5-AI-Pathfinding-AStar/Makefile
+++ b/devel/p5-AI-Pathfinding-AStar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AI-Pathfinding-AStar
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AI-Pathfinding-AStar/pkg-plist b/devel/p5-AI-Pathfinding-AStar/pkg-plist
index 2e116da59065..5f8c4eccffc0 100644
--- a/devel/p5-AI-Pathfinding-AStar/pkg-plist
+++ b/devel/p5-AI-Pathfinding-AStar/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/AI::Pathfinding::AStar.3.gz
 %%SITE_PERL%%/AI/Pathfinding/AStar.pm
 %%SITE_PERL%%/AI/Pathfinding/AStar/AStarNode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Pathfinding/AStar/.packlist
diff --git a/devel/p5-AI-Prolog/Makefile b/devel/p5-AI-Prolog/Makefile
index 50b75ea984d3..4c8c62fe878a 100644
--- a/devel/p5-AI-Prolog/Makefile
+++ b/devel/p5-AI-Prolog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AI-Prolog
 PORTVERSION=	0.741
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOUGW
diff --git a/devel/p5-AI-Prolog/pkg-plist b/devel/p5-AI-Prolog/pkg-plist
index 05ab070ac4fa..70d371df948a 100644
--- a/devel/p5-AI-Prolog/pkg-plist
+++ b/devel/p5-AI-Prolog/pkg-plist
@@ -37,5 +37,4 @@ bin/aiprolog
 %%SITE_PERL%%/AI/Prolog/TermList/Clause.pm
 %%SITE_PERL%%/AI/Prolog/TermList/Primitive.pm
 %%SITE_PERL%%/AI/Prolog/TermList/Step.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Prolog/.packlist
 man/man1/aiprolog.1.gz
diff --git a/devel/p5-Acme-Comment/Makefile b/devel/p5-Acme-Comment/Makefile
index c58de1ed5cb7..831c8e2e5594 100644
--- a/devel/p5-Acme-Comment/Makefile
+++ b/devel/p5-Acme-Comment/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Acme-Comment
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Acme-Comment/pkg-plist b/devel/p5-Acme-Comment/pkg-plist
index 5315f5fd6721..cb1422a276af 100644
--- a/devel/p5-Acme-Comment/pkg-plist
+++ b/devel/p5-Acme-Comment/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Acme/Comment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Comment/.packlist
 %%PERL5_MAN3%%/Acme::Comment.3.gz
diff --git a/devel/p5-Acme-Damn/Makefile b/devel/p5-Acme-Damn/Makefile
index bc5ae15f2622..40daa64b5745 100644
--- a/devel/p5-Acme-Damn/Makefile
+++ b/devel/p5-Acme-Damn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Acme-Damn
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Acme-Damn/pkg-plist b/devel/p5-Acme-Damn/pkg-plist
index c98b30d234c8..66c2a23c3e52 100644
--- a/devel/p5-Acme-Damn/pkg-plist
+++ b/devel/p5-Acme-Damn/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Damn/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Damn/Damn.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Acme/Damn.pm
+%%SITE_ARCH%%/auto/Acme/Damn/Damn.so
+%%SITE_ARCH%%/Acme/Damn.pm
 %%PERL5_MAN3%%/Acme::Damn.3.gz
diff --git a/devel/p5-Acme-MetaSyntactic/Makefile b/devel/p5-Acme-MetaSyntactic/Makefile
index 7b9563af81e3..c864f8af453e 100644
--- a/devel/p5-Acme-MetaSyntactic/Makefile
+++ b/devel/p5-Acme-MetaSyntactic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Acme-MetaSyntactic
 PORTVERSION=	1.012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Acme-MetaSyntactic/pkg-plist b/devel/p5-Acme-MetaSyntactic/pkg-plist
index 9b6030fbe9b2..31e46f5f6e4b 100644
--- a/devel/p5-Acme-MetaSyntactic/pkg-plist
+++ b/devel/p5-Acme-MetaSyntactic/pkg-plist
@@ -11,7 +11,6 @@ bin/metafy
 %%SITE_PERL%%/Acme/MetaSyntactic/foo.pm
 %%SITE_PERL%%/Test/MetaSyntactic.pm
 %%SITE_PERL%%/eta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/MetaSyntactic/.packlist
 %%PERL5_MAN3%%/Acme::MetaSyntactic.3.gz
 %%PERL5_MAN3%%/Acme::MetaSyntactic::Alias.3.gz
 %%PERL5_MAN3%%/Acme::MetaSyntactic::List.3.gz
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index 3fb28cd888a4..f867e16033ab 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Agent
 PORTVERSION=	3.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Agent/pkg-plist b/devel/p5-Agent/pkg-plist
index d81526a9fd14..990e59e16d09 100644
--- a/devel/p5-Agent/pkg-plist
+++ b/devel/p5-Agent/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Agent/Message.pm
 %%SITE_PERL%%/Agent/Transport.pm
 %%SITE_PERL%%/Agent/Transport/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Agent/.packlist
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index aebcf82ec5e6..633a247ecadb 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Algorithm-Accounting
 PORTVERSION=	0.08
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Accounting/pkg-plist b/devel/p5-Algorithm-Accounting/pkg-plist
index c3c3de4c9328..5c249b223d27 100644
--- a/devel/p5-Algorithm-Accounting/pkg-plist
+++ b/devel/p5-Algorithm-Accounting/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Algorithm/Accounting/Report/Imager.pm
 %%SITE_PERL%%/Algorithm/Accounting/Report/Text.pm
 %%SITE_PERL%%/Algorithm/Accounting/Report/GDGraph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Accounting/.packlist
 %%PERL5_MAN3%%/Algorithm::Accounting.3.gz
 %%PERL5_MAN3%%/Algorithm::Accounting::Report.3.gz
 %%PERL5_MAN3%%/Algorithm::Accounting::Report::Imager.3.gz
diff --git a/devel/p5-Algorithm-Annotate/Makefile b/devel/p5-Algorithm-Annotate/Makefile
index f362721a72ed..950bb1b858d1 100644
--- a/devel/p5-Algorithm-Annotate/Makefile
+++ b/devel/p5-Algorithm-Annotate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Annotate
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Annotate/pkg-plist b/devel/p5-Algorithm-Annotate/pkg-plist
index eaeb29041f1d..1a7e0557326c 100644
--- a/devel/p5-Algorithm-Annotate/pkg-plist
+++ b/devel/p5-Algorithm-Annotate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::Annotate.3.gz
 %%SITE_PERL%%/Algorithm/Annotate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Annotate/.packlist
diff --git a/devel/p5-Algorithm-Binpack/Makefile b/devel/p5-Algorithm-Binpack/Makefile
index 1e985db59b40..1d2ff043779c 100644
--- a/devel/p5-Algorithm-Binpack/Makefile
+++ b/devel/p5-Algorithm-Binpack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Algorithm-BinPack
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Binpack/pkg-plist b/devel/p5-Algorithm-Binpack/pkg-plist
index 0eb34117b62e..5931f0cf5800 100644
--- a/devel/p5-Algorithm-Binpack/pkg-plist
+++ b/devel/p5-Algorithm-Binpack/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/BinPack/.packlist
 %%SITE_PERL%%/Algorithm/BinPack.pm
 %%PERL5_MAN3%%/Algorithm::BinPack.3.gz
diff --git a/devel/p5-Algorithm-Bucketizer/Makefile b/devel/p5-Algorithm-Bucketizer/Makefile
index 8f9b580d6f4e..5f49ecc53147 100644
--- a/devel/p5-Algorithm-Bucketizer/Makefile
+++ b/devel/p5-Algorithm-Bucketizer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Bucketizer
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Bucketizer/pkg-plist b/devel/p5-Algorithm-Bucketizer/pkg-plist
index 204fa6eb3d86..abb702125416 100644
--- a/devel/p5-Algorithm-Bucketizer/pkg-plist
+++ b/devel/p5-Algorithm-Bucketizer/pkg-plist
@@ -1,5 +1,4 @@
 bin/bucketize
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Bucketizer/.packlist
 %%SITE_PERL%%/Algorithm/Bucketizer.pm
 %%PERL5_MAN3%%/Algorithm::Bucketizer.3.gz
 man/man1/bucketize.1.gz
diff --git a/devel/p5-Algorithm-C3/Makefile b/devel/p5-Algorithm-C3/Makefile
index 4c0b67943861..6d8c01294d82 100644
--- a/devel/p5-Algorithm-C3/Makefile
+++ b/devel/p5-Algorithm-C3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-C3
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-C3/pkg-plist b/devel/p5-Algorithm-C3/pkg-plist
index a93c3328c6a6..0389e8353b35 100644
--- a/devel/p5-Algorithm-C3/pkg-plist
+++ b/devel/p5-Algorithm-C3/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::C3.3.gz
 %%SITE_PERL%%/Algorithm/C3.pm
-%%SITE_PERL%%/mach/auto/Algorithm/C3/.packlist
diff --git a/devel/p5-Algorithm-ChooseSubsets/Makefile b/devel/p5-Algorithm-ChooseSubsets/Makefile
index 8c93e38202c7..401843e77b33 100644
--- a/devel/p5-Algorithm-ChooseSubsets/Makefile
+++ b/devel/p5-Algorithm-ChooseSubsets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-ChooseSubsets
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-ChooseSubsets/pkg-plist b/devel/p5-Algorithm-ChooseSubsets/pkg-plist
index a7126d13c4bf..20ac51c6f0d4 100644
--- a/devel/p5-Algorithm-ChooseSubsets/pkg-plist
+++ b/devel/p5-Algorithm-ChooseSubsets/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Algorithm/ChooseSubsets.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/ChooseSubsets/.packlist
 %%PERL5_MAN3%%/Algorithm::ChooseSubsets.3.gz
diff --git a/devel/p5-Algorithm-Cluster/Makefile b/devel/p5-Algorithm-Cluster/Makefile
index d345ec756710..0d7e88e6d1f5 100644
--- a/devel/p5-Algorithm-Cluster/Makefile
+++ b/devel/p5-Algorithm-Cluster/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Cluster
 PORTVERSION=	1.52
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MDEHOON
diff --git a/devel/p5-Algorithm-Cluster/pkg-plist b/devel/p5-Algorithm-Cluster/pkg-plist
index b73c731a92ca..9de4c268d67a 100644
--- a/devel/p5-Algorithm-Cluster/pkg-plist
+++ b/devel/p5-Algorithm-Cluster/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Algorithm::Cluster.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/Cluster.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/Cluster/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Cluster/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Cluster/Cluster.so
+%%SITE_ARCH%%/Algorithm/Cluster.pm
+%%SITE_ARCH%%/Algorithm/Cluster/Record.pm
+%%SITE_ARCH%%/auto/Algorithm/Cluster/Cluster.so
diff --git a/devel/p5-Algorithm-Dependency-Objects/Makefile b/devel/p5-Algorithm-Dependency-Objects/Makefile
index e1776970a8d9..8a8e2ef8f55f 100644
--- a/devel/p5-Algorithm-Dependency-Objects/Makefile
+++ b/devel/p5-Algorithm-Dependency-Objects/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Algorithm-Dependency-Objects
 PORTVERSION=	0.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Dependency-Objects/pkg-plist b/devel/p5-Algorithm-Dependency-Objects/pkg-plist
index 58c33da4903b..dce1a1ed027b 100644
--- a/devel/p5-Algorithm-Dependency-Objects/pkg-plist
+++ b/devel/p5-Algorithm-Dependency-Objects/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Algorithm::Dependency::Objects::Ordered.3.gz
 %%SITE_PERL%%/Algorithm/Dependency/Objects.pm
 %%SITE_PERL%%/Algorithm/Dependency/Objects/Ordered.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Dependency/Objects/.packlist
diff --git a/devel/p5-Algorithm-Dependency/Makefile b/devel/p5-Algorithm-Dependency/Makefile
index a8de3d81c6ee..c19057fdffaa 100644
--- a/devel/p5-Algorithm-Dependency/Makefile
+++ b/devel/p5-Algorithm-Dependency/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Dependency
 PORTVERSION=	1.110
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Dependency/pkg-plist b/devel/p5-Algorithm-Dependency/pkg-plist
index 6d8d54110995..595b5c57a1a1 100644
--- a/devel/p5-Algorithm-Dependency/pkg-plist
+++ b/devel/p5-Algorithm-Dependency/pkg-plist
@@ -14,4 +14,3 @@
 %%SITE_PERL%%/Algorithm/Dependency/Source/HoA.pm
 %%SITE_PERL%%/Algorithm/Dependency/Source/Invert.pm
 %%SITE_PERL%%/Algorithm/Dependency/Weight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Dependency/.packlist
diff --git a/devel/p5-Algorithm-Diff/Makefile b/devel/p5-Algorithm-Diff/Makefile
index 6d93582f7136..b3191af5388a 100644
--- a/devel/p5-Algorithm-Diff/Makefile
+++ b/devel/p5-Algorithm-Diff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Diff
 PORTVERSION=	1.1902
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Diff/pkg-plist b/devel/p5-Algorithm-Diff/pkg-plist
index d866a3008ca9..ddf59aadb0ac 100644
--- a/devel/p5-Algorithm-Diff/pkg-plist
+++ b/devel/p5-Algorithm-Diff/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Diff/.packlist
 %%SITE_PERL%%/Algorithm/Diff.pm
 %%SITE_PERL%%/Algorithm/DiffOld.pm
 %%SITE_PERL%%/Algorithm/cdiff.pl
diff --git a/devel/p5-Algorithm-Evolutionary/Makefile b/devel/p5-Algorithm-Evolutionary/Makefile
index 84d5783eefa7..911db1f0a93c 100644
--- a/devel/p5-Algorithm-Evolutionary/Makefile
+++ b/devel/p5-Algorithm-Evolutionary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Evolutionary
 PORTVERSION=	0.80
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Evolutionary/pkg-plist b/devel/p5-Algorithm-Evolutionary/pkg-plist
index 1907e7aed78b..4fce14a99ad7 100644
--- a/devel/p5-Algorithm-Evolutionary/pkg-plist
+++ b/devel/p5-Algorithm-Evolutionary/pkg-plist
@@ -152,7 +152,6 @@ bin/tide_float.pl
 %%SITE_PERL%%/Algorithm/Evolutionary/Run.pm
 %%SITE_PERL%%/Algorithm/Evolutionary/Utils.pm
 %%SITE_PERL%%/Algorithm/Evolutionary/Wheel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Evolutionary/.packlist
 man/man1/canonical-genetic-algorithm.pl.1.gz
 man/man1/rectangle-coverage.pl.1.gz
 man/man1/tide_bitstring.pl.1.gz
diff --git a/devel/p5-Algorithm-FloodControl/Makefile b/devel/p5-Algorithm-FloodControl/Makefile
index 60d4912639a2..3b8afad20f60 100644
--- a/devel/p5-Algorithm-FloodControl/Makefile
+++ b/devel/p5-Algorithm-FloodControl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-FloodControl
 PORTVERSION=	2.001000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-FloodControl/pkg-plist b/devel/p5-Algorithm-FloodControl/pkg-plist
index 7d5f1c86cc2b..5ec324290f86 100644
--- a/devel/p5-Algorithm-FloodControl/pkg-plist
+++ b/devel/p5-Algorithm-FloodControl/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Algorithm/FloodControl/Backend/Cache/FastMmap.pm
 %%SITE_PERL%%/Algorithm/FloodControl/Backend/Cache/Memcached.pm
 %%SITE_PERL%%/Algorithm/FloodControl/Backend/Cache/Memcached/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/FloodControl/.packlist
diff --git a/devel/p5-Algorithm-IncludeExclude/Makefile b/devel/p5-Algorithm-IncludeExclude/Makefile
index a4a3ef3b0b08..f101a2f413b5 100644
--- a/devel/p5-Algorithm-IncludeExclude/Makefile
+++ b/devel/p5-Algorithm-IncludeExclude/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-IncludeExclude
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-IncludeExclude/pkg-plist b/devel/p5-Algorithm-IncludeExclude/pkg-plist
index 1fb8b550d484..bc8bb3518d9e 100644
--- a/devel/p5-Algorithm-IncludeExclude/pkg-plist
+++ b/devel/p5-Algorithm-IncludeExclude/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Algorithm/IncludeExclude.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/IncludeExclude/.packlist
 %%PERL5_MAN3%%/Algorithm::IncludeExclude.3.gz
diff --git a/devel/p5-Algorithm-Interval2Prefix/Makefile b/devel/p5-Algorithm-Interval2Prefix/Makefile
index 55e8358e9f39..81d8e238341d 100644
--- a/devel/p5-Algorithm-Interval2Prefix/Makefile
+++ b/devel/p5-Algorithm-Interval2Prefix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Interval2Prefix
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Interval2Prefix/pkg-plist b/devel/p5-Algorithm-Interval2Prefix/pkg-plist
index 1ee624711659..555e949de204 100644
--- a/devel/p5-Algorithm-Interval2Prefix/pkg-plist
+++ b/devel/p5-Algorithm-Interval2Prefix/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Algorithm/Interval2Prefix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Interval2Prefix/.packlist
 %%PERL5_MAN3%%/Algorithm::Interval2Prefix.3.gz
diff --git a/devel/p5-Algorithm-LCS/Makefile b/devel/p5-Algorithm-LCS/Makefile
index 88426b5709f9..0abe531f6414 100644
--- a/devel/p5-Algorithm-LCS/Makefile
+++ b/devel/p5-Algorithm-LCS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-LCS
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JOESUF
diff --git a/devel/p5-Algorithm-LCS/pkg-plist b/devel/p5-Algorithm-LCS/pkg-plist
index 58fef49bbc81..513e5b586ba4 100644
--- a/devel/p5-Algorithm-LCS/pkg-plist
+++ b/devel/p5-Algorithm-LCS/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Algorithm::LCS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/LCS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LCS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LCS/LCS.so
+%%SITE_ARCH%%/Algorithm/LCS.pm
+%%SITE_ARCH%%/auto/Algorithm/LCS/LCS.so
diff --git a/devel/p5-Algorithm-LUHN/Makefile b/devel/p5-Algorithm-LUHN/Makefile
index d0cedabbc895..c6413a7eec31 100644
--- a/devel/p5-Algorithm-LUHN/Makefile
+++ b/devel/p5-Algorithm-LUHN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-LUHN
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-LUHN/pkg-plist b/devel/p5-Algorithm-LUHN/pkg-plist
index 64e9f9430982..85fa3a66cf7b 100644
--- a/devel/p5-Algorithm-LUHN/pkg-plist
+++ b/devel/p5-Algorithm-LUHN/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::LUHN.3.gz
 %%SITE_PERL%%/Algorithm/LUHN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LUHN/.packlist
diff --git a/devel/p5-Algorithm-MarkovChain/Makefile b/devel/p5-Algorithm-MarkovChain/Makefile
index cca026ff6ca5..9c3a2503ce2c 100644
--- a/devel/p5-Algorithm-MarkovChain/Makefile
+++ b/devel/p5-Algorithm-MarkovChain/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Algorithm-MarkovChain
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Merge/Makefile b/devel/p5-Algorithm-Merge/Makefile
index ce3578842124..f3f0e73ca697 100644
--- a/devel/p5-Algorithm-Merge/Makefile
+++ b/devel/p5-Algorithm-Merge/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Merge
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Merge/pkg-plist b/devel/p5-Algorithm-Merge/pkg-plist
index 18168d1b6ac5..4dd63af95b40 100644
--- a/devel/p5-Algorithm-Merge/pkg-plist
+++ b/devel/p5-Algorithm-Merge/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::Merge.3.gz
 %%SITE_PERL%%/Algorithm/Merge.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Merge/.packlist
diff --git a/devel/p5-Algorithm-MinMax/Makefile b/devel/p5-Algorithm-MinMax/Makefile
index c3fed31a982a..36dc78a9ffbd 100644
--- a/devel/p5-Algorithm-MinMax/Makefile
+++ b/devel/p5-Algorithm-MinMax/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-MinMax
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-MinMax/pkg-plist b/devel/p5-Algorithm-MinMax/pkg-plist
index 2aea43bef803..977f22d75772 100644
--- a/devel/p5-Algorithm-MinMax/pkg-plist
+++ b/devel/p5-Algorithm-MinMax/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::MinMax.3.gz
 %%SITE_PERL%%/Algorithm/MinMax.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MinMax/.packlist
diff --git a/devel/p5-Algorithm-NaiveBayes/Makefile b/devel/p5-Algorithm-NaiveBayes/Makefile
index ac9d950168e4..f87f1461a7a0 100644
--- a/devel/p5-Algorithm-NaiveBayes/Makefile
+++ b/devel/p5-Algorithm-NaiveBayes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-NaiveBayes
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Networksort/Makefile b/devel/p5-Algorithm-Networksort/Makefile
index 46bb523ab00d..4952d50debdc 100644
--- a/devel/p5-Algorithm-Networksort/Makefile
+++ b/devel/p5-Algorithm-Networksort/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Networksort
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Networksort/pkg-plist b/devel/p5-Algorithm-Networksort/pkg-plist
index 46719941b5ec..a09d1f99ab6a 100644
--- a/devel/p5-Algorithm-Networksort/pkg-plist
+++ b/devel/p5-Algorithm-Networksort/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::Networksort.3.gz
 %%SITE_PERL%%/Algorithm/Networksort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Networksort/.packlist
diff --git a/devel/p5-Algorithm-Numerical-Shuffle/Makefile b/devel/p5-Algorithm-Numerical-Shuffle/Makefile
index 6a664440ef65..da9a9a51a4aa 100644
--- a/devel/p5-Algorithm-Numerical-Shuffle/Makefile
+++ b/devel/p5-Algorithm-Numerical-Shuffle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Numerical-Shuffle
 PORTVERSION=	2009110301
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ABIGAIL
diff --git a/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist b/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist
index 02d3fad953c9..00784616e872 100644
--- a/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist
+++ b/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::Numerical::Shuffle.3.gz
 %%SITE_PERL%%/Algorithm/Numerical/Shuffle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Numerical/Shuffle/.packlist
diff --git a/devel/p5-Algorithm-Permute/Makefile b/devel/p5-Algorithm-Permute/Makefile
index 74b22ae07f10..fae4f3d7dfd4 100644
--- a/devel/p5-Algorithm-Permute/Makefile
+++ b/devel/p5-Algorithm-Permute/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Permute
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-Permute/pkg-plist b/devel/p5-Algorithm-Permute/pkg-plist
index 0835389a3cff..8c5c7c0c95c4 100644
--- a/devel/p5-Algorithm-Permute/pkg-plist
+++ b/devel/p5-Algorithm-Permute/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/Permute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Permute/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Permute/Permute.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Permute/autosplit.ix
+%%SITE_ARCH%%/Algorithm/Permute.pm
+%%SITE_ARCH%%/auto/Algorithm/Permute/Permute.so
+%%SITE_ARCH%%/auto/Algorithm/Permute/autosplit.ix
 %%PERL5_MAN3%%/Algorithm::Permute.3.gz
diff --git a/devel/p5-Algorithm-SVM/Makefile b/devel/p5-Algorithm-SVM/Makefile
index 53698016b1fb..273166dcf1d9 100644
--- a/devel/p5-Algorithm-SVM/Makefile
+++ b/devel/p5-Algorithm-SVM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-SVM
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Algorithm-SVM/pkg-plist b/devel/p5-Algorithm-SVM/pkg-plist
index de1c11a90164..dfc0ea9b10f1 100644
--- a/devel/p5-Algorithm-SVM/pkg-plist
+++ b/devel/p5-Algorithm-SVM/pkg-plist
@@ -1,7 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/SVM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/SVM/DataSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVM/SVM.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVM/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVM/.packlist
+%%SITE_ARCH%%/Algorithm/SVM.pm
+%%SITE_ARCH%%/Algorithm/SVM/DataSet.pm
+%%SITE_ARCH%%/auto/Algorithm/SVM/SVM.so
+%%SITE_ARCH%%/auto/Algorithm/SVM/autosplit.ix
 %%PERL5_MAN3%%/Algorithm::SVM.3.gz
 %%PERL5_MAN3%%/Algorithm::SVM::DataSet.3.gz
diff --git a/devel/p5-Alias/Makefile b/devel/p5-Alias/Makefile
index f3a441193181..0e321ffcd574 100644
--- a/devel/p5-Alias/Makefile
+++ b/devel/p5-Alias/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Alias
 PORTVERSION=	2.32
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Alias/pkg-plist b/devel/p5-Alias/pkg-plist
index 33290471659f..ccc7d6feb50b 100644
--- a/devel/p5-Alias/pkg-plist
+++ b/devel/p5-Alias/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Alias.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Alias/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Alias/Alias.so
+%%SITE_ARCH%%/Alias.pm
+%%SITE_ARCH%%/auto/Alias/Alias.so
diff --git a/devel/p5-Alien-SDL/Makefile b/devel/p5-Alien-SDL/Makefile
index f0ef4e00917f..88775f7fd705 100644
--- a/devel/p5-Alien-SDL/Makefile
+++ b/devel/p5-Alien-SDL/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Alien-SDL
 PORTVERSION=	1.440
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Alzabo/Makefile b/devel/p5-Alzabo/Makefile
index 311d3d2cba9f..11d3fe95317b 100644
--- a/devel/p5-Alzabo/Makefile
+++ b/devel/p5-Alzabo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Alzabo
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Any-Moose-Convert/Makefile b/devel/p5-Any-Moose-Convert/Makefile
index 2414e88c2180..7e773610ae1b 100644
--- a/devel/p5-Any-Moose-Convert/Makefile
+++ b/devel/p5-Any-Moose-Convert/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Any-Moose-Convert
 PORTVERSION=	0.004
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Any-Moose-Convert/pkg-plist b/devel/p5-Any-Moose-Convert/pkg-plist
index 45c8ce85eaf1..618cd66bfec4 100644
--- a/devel/p5-Any-Moose-Convert/pkg-plist
+++ b/devel/p5-Any-Moose-Convert/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Any/Moose/Convert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Any/Moose/Convert/.packlist
 %%PERL5_MAN3%%/Any::Moose::Convert.3.gz
diff --git a/devel/p5-Any-Moose/Makefile b/devel/p5-Any-Moose/Makefile
index b7f87164685d..27ad0445c443 100644
--- a/devel/p5-Any-Moose/Makefile
+++ b/devel/p5-Any-Moose/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Any-Moose
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-Any-Moose/pkg-plist b/devel/p5-Any-Moose/pkg-plist
index 9f1574069ad1..57dcf69488a1 100644
--- a/devel/p5-Any-Moose/pkg-plist
+++ b/devel/p5-Any-Moose/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Any::Moose.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Any/Moose/.packlist
 %%SITE_PERL%%/Any/Moose.pm
diff --git a/devel/p5-AnyData/Makefile b/devel/p5-AnyData/Makefile
index 55c481705a73..16e2af11fa2d 100644
--- a/devel/p5-AnyData/Makefile
+++ b/devel/p5-AnyData/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyData
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SDOWIDEIT
diff --git a/devel/p5-AnyData/pkg-plist b/devel/p5-AnyData/pkg-plist
index 743992f18314..6ef78bcbf6b5 100644
--- a/devel/p5-AnyData/pkg-plist
+++ b/devel/p5-AnyData/pkg-plist
@@ -32,4 +32,3 @@
 %%SITE_PERL%%/AnyData/Storage/PassThru.pm
 %%SITE_PERL%%/AnyData/Storage/RAM.pm
 %%SITE_PERL%%/AnyData/Storage/TiedHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyData/.packlist
diff --git a/devel/p5-AnyEvent-AIO/Makefile b/devel/p5-AnyEvent-AIO/Makefile
index 5c9e531f1c08..5711af491fab 100644
--- a/devel/p5-AnyEvent-AIO/Makefile
+++ b/devel/p5-AnyEvent-AIO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-AIO
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	AnyEvent
diff --git a/devel/p5-AnyEvent-AIO/pkg-plist b/devel/p5-AnyEvent-AIO/pkg-plist
index 421bd3d379b8..02706554f66f 100644
--- a/devel/p5-AnyEvent-AIO/pkg-plist
+++ b/devel/p5-AnyEvent-AIO/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/AnyEvent/AIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/AIO/.packlist
 %%PERL5_MAN3%%/AnyEvent::AIO.3.gz
diff --git a/devel/p5-AnyEvent-Connection/Makefile b/devel/p5-AnyEvent-Connection/Makefile
index 9c016e633a3d..9e229e631081 100644
--- a/devel/p5-AnyEvent-Connection/Makefile
+++ b/devel/p5-AnyEvent-Connection/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Connection
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-Connection/pkg-plist b/devel/p5-AnyEvent-Connection/pkg-plist
index ac0e50076a63..2ca26e27c0fe 100644
--- a/devel/p5-AnyEvent-Connection/pkg-plist
+++ b/devel/p5-AnyEvent-Connection/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/AnyEvent/Connection/Util.pm
 %%SITE_PERL%%/AnyEvent/Connection/Raw.pm
 %%SITE_PERL%%/AnyEvent/Connection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Connection/.packlist
 %%PERL5_MAN3%%/AnyEvent::Connection.3.gz
diff --git a/devel/p5-AnyEvent-DBI-Abstract/Makefile b/devel/p5-AnyEvent-DBI-Abstract/Makefile
index cc5dc6ffe12a..02071ef7888a 100644
--- a/devel/p5-AnyEvent-DBI-Abstract/Makefile
+++ b/devel/p5-AnyEvent-DBI-Abstract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-DBI-Abstract
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-DBI-Abstract/pkg-plist b/devel/p5-AnyEvent-DBI-Abstract/pkg-plist
index ad0757c998d5..68bb2a57f344 100644
--- a/devel/p5-AnyEvent-DBI-Abstract/pkg-plist
+++ b/devel/p5-AnyEvent-DBI-Abstract/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/AnyEvent/DBI/Abstract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/DBI/Abstract/.packlist
 %%PERL5_MAN3%%/AnyEvent::DBI::Abstract.3.gz
diff --git a/devel/p5-AnyEvent-DBI/Makefile b/devel/p5-AnyEvent-DBI/Makefile
index cea20365fdd8..3bd353990c63 100644
--- a/devel/p5-AnyEvent-DBI/Makefile
+++ b/devel/p5-AnyEvent-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-DBI
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-DBI/pkg-plist b/devel/p5-AnyEvent-DBI/pkg-plist
index d39749509e23..ed8147c34441 100644
--- a/devel/p5-AnyEvent-DBI/pkg-plist
+++ b/devel/p5-AnyEvent-DBI/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/AnyEvent/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/DBI/.packlist
 %%PERL5_MAN3%%/AnyEvent::DBI.3.gz
diff --git a/devel/p5-AnyEvent-DBus/Makefile b/devel/p5-AnyEvent-DBus/Makefile
index d92c80132e52..06e44c76cd0f 100644
--- a/devel/p5-AnyEvent-DBus/Makefile
+++ b/devel/p5-AnyEvent-DBus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-DBus
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-DBus/pkg-plist b/devel/p5-AnyEvent-DBus/pkg-plist
index f9612c6d875d..7284278d16e1 100644
--- a/devel/p5-AnyEvent-DBus/pkg-plist
+++ b/devel/p5-AnyEvent-DBus/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/AnyEvent/DBus.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/DBus/.packlist
 %%PERL5_MAN3%%/AnyEvent::DBus.3.gz
diff --git a/devel/p5-AnyEvent-Filesys-Notify/Makefile b/devel/p5-AnyEvent-Filesys-Notify/Makefile
index 708e33fd19db..d39d411ad2cd 100644
--- a/devel/p5-AnyEvent-Filesys-Notify/Makefile
+++ b/devel/p5-AnyEvent-Filesys-Notify/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-Filesys-Notify
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MGRIMES
diff --git a/devel/p5-AnyEvent-Gearman/Makefile b/devel/p5-AnyEvent-Gearman/Makefile
index d1f8de53e55a..ff0a338db6b8 100644
--- a/devel/p5-AnyEvent-Gearman/Makefile
+++ b/devel/p5-AnyEvent-Gearman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Gearman
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-Gearman/pkg-plist b/devel/p5-AnyEvent-Gearman/pkg-plist
index 233ee61576c0..307eb47d024a 100644
--- a/devel/p5-AnyEvent-Gearman/pkg-plist
+++ b/devel/p5-AnyEvent-Gearman/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/AnyEvent/Gearman/Types.pm
 %%SITE_PERL%%/AnyEvent/Gearman/Worker.pm
 %%SITE_PERL%%/AnyEvent/Gearman/Worker/Connection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Gearman/.packlist
 %%PERL5_MAN3%%/AnyEvent::Gearman.3.gz
 %%PERL5_MAN3%%/AnyEvent::Gearman::Client.3.gz
 %%PERL5_MAN3%%/AnyEvent::Gearman::Client::Connection.3.gz
diff --git a/devel/p5-AnyEvent-Graphite/Makefile b/devel/p5-AnyEvent-Graphite/Makefile
index d42f813333f7..0212f6bf5b0e 100644
--- a/devel/p5-AnyEvent-Graphite/Makefile
+++ b/devel/p5-AnyEvent-Graphite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Graphite
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-Graphite/pkg-plist b/devel/p5-AnyEvent-Graphite/pkg-plist
index 3e9a9e65b776..539e600dc38b 100644
--- a/devel/p5-AnyEvent-Graphite/pkg-plist
+++ b/devel/p5-AnyEvent-Graphite/pkg-plist
@@ -1,6 +1,5 @@
 bin/graphite_client
 %%SITE_PERL%%/AnyEvent/Graphite/SNMPAgent.pm
 %%SITE_PERL%%/AnyEvent/Graphite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Graphite/.packlist
 %%PERL5_MAN3%%/AnyEvent::Graphite.3.gz
 %%PERL5_MAN3%%/AnyEvent::Graphite::SNMPAgent.3.gz
diff --git a/devel/p5-AnyEvent-I3/Makefile b/devel/p5-AnyEvent-I3/Makefile
index 101f4fd95c08..85719ef47a8b 100644
--- a/devel/p5-AnyEvent-I3/Makefile
+++ b/devel/p5-AnyEvent-I3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-I3
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-I3/pkg-plist b/devel/p5-AnyEvent-I3/pkg-plist
index 6e9423cc9aa4..9baa1bed54a3 100644
--- a/devel/p5-AnyEvent-I3/pkg-plist
+++ b/devel/p5-AnyEvent-I3/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/AnyEvent::I3.3.gz
 %%SITE_PERL%%/AnyEvent/I3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/I3/.packlist
diff --git a/devel/p5-AnyEvent-MessagePack/Makefile b/devel/p5-AnyEvent-MessagePack/Makefile
index c63e45a039e9..3ab213ea39f9 100644
--- a/devel/p5-AnyEvent-MessagePack/Makefile
+++ b/devel/p5-AnyEvent-MessagePack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-MessagePack
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-RPC/Makefile b/devel/p5-AnyEvent-RPC/Makefile
index 1e71888bc5fc..d8fe5dd22f37 100644
--- a/devel/p5-AnyEvent-RPC/Makefile
+++ b/devel/p5-AnyEvent-RPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-RPC
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-RPC/pkg-plist b/devel/p5-AnyEvent-RPC/pkg-plist
index 9524a25152a8..4626aa39a425 100644
--- a/devel/p5-AnyEvent-RPC/pkg-plist
+++ b/devel/p5-AnyEvent-RPC/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/AnyEvent/RPC/Enc/REST.pm
 %%SITE_PERL%%/AnyEvent/RPC/Enc/YAML.pm
 %%SITE_PERL%%/AnyEvent/RPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/RPC/.packlist
 %%PERL5_MAN3%%/AnyEvent::RPC.3.gz
 %%PERL5_MAN3%%/AnyEvent::RPC::Enc::YAML.3.gz
 %%PERL5_MAN3%%/AnyEvent::RPC::Enc::REST.3.gz
diff --git a/devel/p5-AnyEvent-Run/Makefile b/devel/p5-AnyEvent-Run/Makefile
index 9b388d4f19dc..09d12ccaad12 100644
--- a/devel/p5-AnyEvent-Run/Makefile
+++ b/devel/p5-AnyEvent-Run/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Run
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-Run/pkg-plist b/devel/p5-AnyEvent-Run/pkg-plist
index 18a0d155db3a..7c2d3f20d5de 100644
--- a/devel/p5-AnyEvent-Run/pkg-plist
+++ b/devel/p5-AnyEvent-Run/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/AnyEvent/Run.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Run/.packlist
 %%PERL5_MAN3%%/AnyEvent::Run.3.gz
diff --git a/devel/p5-AnyEvent-Subprocess/Makefile b/devel/p5-AnyEvent-Subprocess/Makefile
index 6baf14fc2681..d5b8c7046d7f 100644
--- a/devel/p5-AnyEvent-Subprocess/Makefile
+++ b/devel/p5-AnyEvent-Subprocess/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Subprocess
 PORTVERSION=	1.102912
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-Subprocess/pkg-plist b/devel/p5-AnyEvent-Subprocess/pkg-plist
index 00043a675285..5aad9aa7f0e3 100644
--- a/devel/p5-AnyEvent-Subprocess/pkg-plist
+++ b/devel/p5-AnyEvent-Subprocess/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Subprocess/.packlist
 %%PERL5_MAN3%%/AnyEvent::Subprocess.3.gz
 %%PERL5_MAN3%%/AnyEvent::Subprocess::DefaultDelegates.3.gz
 %%PERL5_MAN3%%/AnyEvent::Subprocess::Delegate.3.gz
diff --git a/devel/p5-AnyEvent-Task/Makefile b/devel/p5-AnyEvent-Task/Makefile
index 833a80ab7e6a..96576bd373b7 100644
--- a/devel/p5-AnyEvent-Task/Makefile
+++ b/devel/p5-AnyEvent-Task/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-Task
 PORTVERSION=	0.801
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-Task/pkg-plist b/devel/p5-AnyEvent-Task/pkg-plist
index f9ea95372c9a..c950f082d68f 100644
--- a/devel/p5-AnyEvent-Task/pkg-plist
+++ b/devel/p5-AnyEvent-Task/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/AnyEvent/Task/Server.pm
 %%SITE_PERL%%/AnyEvent/Task/Server/Worker.pm
 %%SITE_PERL%%/AnyEvent/Task/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Task/.packlist
diff --git a/devel/p5-AnyEvent-Worker/Makefile b/devel/p5-AnyEvent-Worker/Makefile
index 5633c48f9841..e1863850fa79 100644
--- a/devel/p5-AnyEvent-Worker/Makefile
+++ b/devel/p5-AnyEvent-Worker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Worker
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AnyEvent-Worker/pkg-plist b/devel/p5-AnyEvent-Worker/pkg-plist
index 40913a21b350..09a5862fbdc6 100644
--- a/devel/p5-AnyEvent-Worker/pkg-plist
+++ b/devel/p5-AnyEvent-Worker/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/AnyEvent/Worker.pm
 %%SITE_PERL%%/AnyEvent/Worker/Pool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Worker/.packlist
 %%PERL5_MAN3%%/AnyEvent::Worker.3.gz
 %%PERL5_MAN3%%/AnyEvent::Worker::Pool.3.gz
diff --git a/devel/p5-AnyEvent/Makefile b/devel/p5-AnyEvent/Makefile
index 74659948709e..fdb9d4ff3b87 100644
--- a/devel/p5-AnyEvent/Makefile
+++ b/devel/p5-AnyEvent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent
 PORTVERSION=	7.07
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-AnyEvent/pkg-plist b/devel/p5-AnyEvent/pkg-plist
index cfc7212331bd..b560eafb2b80 100644
--- a/devel/p5-AnyEvent/pkg-plist
+++ b/devel/p5-AnyEvent/pkg-plist
@@ -26,35 +26,34 @@
 %%PERL5_MAN3%%/AnyEvent::Strict.3.gz
 %%PERL5_MAN3%%/AnyEvent::TLS.3.gz
 %%PERL5_MAN3%%/AnyEvent::Util.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/AE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/DNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/IO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/IO/IOAIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/IO/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/Cocoa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/EV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/EventLib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/FLTK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/Glib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/IOAsync.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/Irssi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/POE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/Qt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Impl/Tk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Intro.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Log.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Loop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Strict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/TLS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Util/idna.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/Util/uts46data.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/constants.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/.packlist
+%%SITE_ARCH%%/AE.pm
+%%SITE_ARCH%%/AnyEvent.pm
+%%SITE_ARCH%%/AnyEvent/DNS.pm
+%%SITE_ARCH%%/AnyEvent/Debug.pm
+%%SITE_ARCH%%/AnyEvent/FAQ.pod
+%%SITE_ARCH%%/AnyEvent/Handle.pm
+%%SITE_ARCH%%/AnyEvent/IO.pm
+%%SITE_ARCH%%/AnyEvent/IO/IOAIO.pm
+%%SITE_ARCH%%/AnyEvent/IO/Perl.pm
+%%SITE_ARCH%%/AnyEvent/Impl/Cocoa.pm
+%%SITE_ARCH%%/AnyEvent/Impl/EV.pm
+%%SITE_ARCH%%/AnyEvent/Impl/Event.pm
+%%SITE_ARCH%%/AnyEvent/Impl/EventLib.pm
+%%SITE_ARCH%%/AnyEvent/Impl/FLTK.pm
+%%SITE_ARCH%%/AnyEvent/Impl/Glib.pm
+%%SITE_ARCH%%/AnyEvent/Impl/IOAsync.pm
+%%SITE_ARCH%%/AnyEvent/Impl/Irssi.pm
+%%SITE_ARCH%%/AnyEvent/Impl/POE.pm
+%%SITE_ARCH%%/AnyEvent/Impl/Perl.pm
+%%SITE_ARCH%%/AnyEvent/Impl/Qt.pm
+%%SITE_ARCH%%/AnyEvent/Impl/Tk.pm
+%%SITE_ARCH%%/AnyEvent/Intro.pod
+%%SITE_ARCH%%/AnyEvent/Log.pm
+%%SITE_ARCH%%/AnyEvent/Loop.pm
+%%SITE_ARCH%%/AnyEvent/Socket.pm
+%%SITE_ARCH%%/AnyEvent/Strict.pm
+%%SITE_ARCH%%/AnyEvent/TLS.pm
+%%SITE_ARCH%%/AnyEvent/Util.pm
+%%SITE_ARCH%%/AnyEvent/Util/idna.pl
+%%SITE_ARCH%%/AnyEvent/Util/uts46data.pl
+%%SITE_ARCH%%/AnyEvent/constants.pl
diff --git a/devel/p5-AnyMQ/Makefile b/devel/p5-AnyMQ/Makefile
index 68199968cb5b..220e49e7bc2a 100644
--- a/devel/p5-AnyMQ/Makefile
+++ b/devel/p5-AnyMQ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyMQ
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/devel/p5-AnyMQ/pkg-plist b/devel/p5-AnyMQ/pkg-plist
index cfde098c9945..01447da30df8 100644
--- a/devel/p5-AnyMQ/pkg-plist
+++ b/devel/p5-AnyMQ/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/AnyMQ/Queue.pm
 %%SITE_PERL%%/AnyMQ/Topic.pm
 %%SITE_PERL%%/AnyMQ/Topic/Trait/WithBacklog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyMQ/.packlist
 %%PERL5_MAN3%%/AnyMQ.3.gz
 %%PERL5_MAN3%%/AnyMQ::Queue.3.gz
 %%PERL5_MAN3%%/AnyMQ::Topic.3.gz
diff --git a/devel/p5-App-Build/Makefile b/devel/p5-App-Build/Makefile
index cf8c6639e86d..9afdfa9d4188 100644
--- a/devel/p5-App-Build/Makefile
+++ b/devel/p5-App-Build/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Build
 PORTVERSION=	0.74
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-CLI-Extension/Makefile b/devel/p5-App-CLI-Extension/Makefile
index e8f5b596a61c..fde3622bc158 100644
--- a/devel/p5-App-CLI-Extension/Makefile
+++ b/devel/p5-App-CLI-Extension/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-CLI-Extension
 PORTVERSION=	1.42.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HOLLY
diff --git a/devel/p5-App-CLI-Extension/pkg-plist b/devel/p5-App-CLI-Extension/pkg-plist
index 1a26c6eb6f90..60e326e133b6 100644
--- a/devel/p5-App-CLI-Extension/pkg-plist
+++ b/devel/p5-App-CLI-Extension/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/App/CLI/Extension/Component/Stash.pm
 %%SITE_PERL%%/App/CLI/Extension/Exception.pm
 %%SITE_PERL%%/App/CLI/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/CLI/Extension/.packlist
diff --git a/devel/p5-App-CLI/Makefile b/devel/p5-App-CLI/Makefile
index c726aadc1fbd..0bd84598a8a4 100644
--- a/devel/p5-App-CLI/Makefile
+++ b/devel/p5-App-CLI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-CLI
 PORTVERSION=	0.313
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-CLI/pkg-plist b/devel/p5-App-CLI/pkg-plist
index ef9f73a17974..11172e747486 100644
--- a/devel/p5-App-CLI/pkg-plist
+++ b/devel/p5-App-CLI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/CLI/.packlist
 %%SITE_PERL%%/App/CLI.pm
 %%SITE_PERL%%/App/CLI/Command.pm
 %%SITE_PERL%%/App/CLI/Command/Help.pm
diff --git a/devel/p5-App-Cache/Makefile b/devel/p5-App-Cache/Makefile
index dae22eb1f7a9..5d64a27a2aad 100644
--- a/devel/p5-App-Cache/Makefile
+++ b/devel/p5-App-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Cache
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-Cache/pkg-plist b/devel/p5-App-Cache/pkg-plist
index 256562204b85..1244fd8ab89f 100644
--- a/devel/p5-App-Cache/pkg-plist
+++ b/devel/p5-App-Cache/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/App::Cache.3.gz
 %%SITE_PERL%%/App/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Cache/.packlist
diff --git a/devel/p5-App-Cmd/Makefile b/devel/p5-App-Cmd/Makefile
index 02204694e5d3..53fb97104b3e 100644
--- a/devel/p5-App-Cmd/Makefile
+++ b/devel/p5-App-Cmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Cmd
 PORTVERSION=	0.323
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-Cmd/pkg-plist b/devel/p5-App-Cmd/pkg-plist
index 32d657dc1d60..cf5183bfc0fd 100644
--- a/devel/p5-App-Cmd/pkg-plist
+++ b/devel/p5-App-Cmd/pkg-plist
@@ -12,7 +12,6 @@
 %%SITE_PERL%%/App/Cmd/Tester.pm
 %%SITE_PERL%%/App/Cmd/Tester/CaptureExternal.pm
 %%SITE_PERL%%/App/Cmd/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Cmd/.packlist
 %%PERL5_MAN3%%/App::Cmd.3.gz
 %%PERL5_MAN3%%/App::Cmd::ArgProcessor.3.gz
 %%PERL5_MAN3%%/App::Cmd::Command.3.gz
diff --git a/devel/p5-App-Control/Makefile b/devel/p5-App-Control/Makefile
index 36b6ab665aaf..23f881697490 100644
--- a/devel/p5-App-Control/Makefile
+++ b/devel/p5-App-Control/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Control
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-Control/pkg-plist b/devel/p5-App-Control/pkg-plist
index 99d8d67d6a77..2bb9cdc581af 100644
--- a/devel/p5-App-Control/pkg-plist
+++ b/devel/p5-App-Control/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Control/.packlist
 %%SITE_PERL%%/App/Control.pm
 %%PERL5_MAN3%%/App::Control.3.gz
diff --git a/devel/p5-App-FatPacker/Makefile b/devel/p5-App-FatPacker/Makefile
index 5b9385676451..c496e454536d 100644
--- a/devel/p5-App-FatPacker/Makefile
+++ b/devel/p5-App-FatPacker/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	App-FatPacker
 PORTVERSION=	0.010002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-FatPacker/pkg-plist b/devel/p5-App-FatPacker/pkg-plist
index 52ca995f00db..c28f865a27f6 100644
--- a/devel/p5-App-FatPacker/pkg-plist
+++ b/devel/p5-App-FatPacker/pkg-plist
@@ -2,6 +2,5 @@ bin/fatpack
 man/man1/fatpack.1.gz
 %%PERL5_MAN3%%/App::FatPacker.3.gz
 %%PERL5_MAN3%%/App::FatPacker::Trace.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/FatPacker/.packlist
 %%SITE_PERL%%/App/FatPacker.pm
 %%SITE_PERL%%/App/FatPacker/Trace.pm
diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile
index 7ec71cfdadce..766676fd4f35 100644
--- a/devel/p5-App-GitGot/Makefile
+++ b/devel/p5-App-GitGot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-GitGot
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GENEHACK
diff --git a/devel/p5-App-GitGot/pkg-plist b/devel/p5-App-GitGot/pkg-plist
index be1792a9a288..20328c7c1798 100644
--- a/devel/p5-App-GitGot/pkg-plist
+++ b/devel/p5-App-GitGot/pkg-plist
@@ -24,7 +24,6 @@ bin/got-complete
 %%SITE_PERL%%/App/GitGot/Outputter.pm
 %%SITE_PERL%%/App/GitGot/Repo.pm
 %%SITE_PERL%%/App/GitGot/Repo/Git.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/GitGot/.packlist
 %%PERL5_MAN3%%/App::GitGot.3.gz
 %%PERL5_MAN3%%/App::GitGot::Command.3.gz
 %%PERL5_MAN3%%/App::GitGot::Command::add.3.gz
diff --git a/devel/p5-App-GitHub/Makefile b/devel/p5-App-GitHub/Makefile
index a4ba4147d021..050c93f539e2 100644
--- a/devel/p5-App-GitHub/Makefile
+++ b/devel/p5-App-GitHub/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-GitHub
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	App
diff --git a/devel/p5-App-GitHub/pkg-plist b/devel/p5-App-GitHub/pkg-plist
index ad739f54fd93..af7d762e7d3f 100644
--- a/devel/p5-App-GitHub/pkg-plist
+++ b/devel/p5-App-GitHub/pkg-plist
@@ -1,5 +1,4 @@
 bin/github.pl
 %%PERL5_MAN3%%/App::GitHub.3.gz
 %%SITE_PERL%%/App/GitHub.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/GitHub/.packlist
 man/man1/github.pl.1.gz
diff --git a/devel/p5-App-Info/Makefile b/devel/p5-App-Info/Makefile
index eb77c0881287..d84c1849e203 100644
--- a/devel/p5-App-Info/Makefile
+++ b/devel/p5-App-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Info
 PORTVERSION=	0.57
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-Options/Makefile b/devel/p5-App-Options/Makefile
index f9451b391d3a..c7d0b75f8cf1 100644
--- a/devel/p5-App-Options/Makefile
+++ b/devel/p5-App-Options/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Options
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-Options/pkg-plist b/devel/p5-App-Options/pkg-plist
index 4912636bbcee..aa8ec8becb44 100644
--- a/devel/p5-App-Options/pkg-plist
+++ b/devel/p5-App-Options/pkg-plist
@@ -2,4 +2,3 @@ bin/prefix
 bin/prefixadmin
 %%PERL5_MAN3%%/App::Options.3.gz
 %%SITE_PERL%%/App/Options.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App-Options/.packlist
diff --git a/devel/p5-App-Rad/Makefile b/devel/p5-App-Rad/Makefile
index 9aa628992bfb..312b9cffbc5f 100644
--- a/devel/p5-App-Rad/Makefile
+++ b/devel/p5-App-Rad/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Rad
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-Rad/pkg-plist b/devel/p5-App-Rad/pkg-plist
index 113c6d892447..2b604d9f6719 100644
--- a/devel/p5-App-Rad/pkg-plist
+++ b/devel/p5-App-Rad/pkg-plist
@@ -4,7 +4,6 @@
 %%SITE_PERL%%/App/Rad/Help.pm
 %%SITE_PERL%%/App/Rad/Include.pm
 %%SITE_PERL%%/App/Rad/Plugin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Rad/.packlist
 %%PERL5_MAN3%%/App::Rad.3.gz
 %%PERL5_MAN3%%/App::Rad::Exclude.3.gz
 %%PERL5_MAN3%%/App::Rad::Help.3.gz
diff --git a/devel/p5-App-SD/Makefile b/devel/p5-App-SD/Makefile
index 45426ec389c8..457860ed1160 100644
--- a/devel/p5-App-SD/Makefile
+++ b/devel/p5-App-SD/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	App-SD
 PORTVERSION=	0.75
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SPANG
diff --git a/devel/p5-App-SD/pkg-plist b/devel/p5-App-SD/pkg-plist
index a5fc1a1f0740..cdbae8cb6e0b 100644
--- a/devel/p5-App-SD/pkg-plist
+++ b/devel/p5-App-SD/pkg-plist
@@ -113,5 +113,4 @@ bin/sd
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/css/main.css
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/images/gradient.png
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/images/sd.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SD/.packlist
 man/man1/sd.1.gz
diff --git a/devel/p5-App-SVN-Bisect/Makefile b/devel/p5-App-SVN-Bisect/Makefile
index 05168c148071..bb8a2008dae7 100644
--- a/devel/p5-App-SVN-Bisect/Makefile
+++ b/devel/p5-App-SVN-Bisect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-SVN-Bisect
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-SVN-Bisect/pkg-plist b/devel/p5-App-SVN-Bisect/pkg-plist
index f3db8b4693e1..026852eb76e4 100644
--- a/devel/p5-App-SVN-Bisect/pkg-plist
+++ b/devel/p5-App-SVN-Bisect/pkg-plist
@@ -1,5 +1,4 @@
 bin/svn-bisect
 %%PERL5_MAN3%%/App::SVN::Bisect.3.gz
 %%SITE_PERL%%/App/SVN/Bisect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SVN/Bisect/.packlist
 man/man1/svn-bisect.1.gz
diff --git a/devel/p5-App-Trace/Makefile b/devel/p5-App-Trace/Makefile
index 020a15e30f1b..ba3c2fe9870a 100644
--- a/devel/p5-App-Trace/Makefile
+++ b/devel/p5-App-Trace/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	App-Trace
 PORTVERSION=	0.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-Trace/pkg-plist b/devel/p5-App-Trace/pkg-plist
index 97f8f561c8bb..6e466158eb9a 100644
--- a/devel/p5-App-Trace/pkg-plist
+++ b/devel/p5-App-Trace/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/App/Trace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Trace/.packlist
 %%PERL5_MAN3%%/App::Trace.3.gz
diff --git a/devel/p5-App-cpanminus/Makefile b/devel/p5-App-cpanminus/Makefile
index 633e4a95c162..81fc33d3b594 100644
--- a/devel/p5-App-cpanminus/Makefile
+++ b/devel/p5-App-cpanminus/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	App-cpanminus
 PORTVERSION=	1.7016
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-App-cpanminus/pkg-plist b/devel/p5-App-cpanminus/pkg-plist
index 1fdf194733b1..7ad7e9a8ba7a 100644
--- a/devel/p5-App-cpanminus/pkg-plist
+++ b/devel/p5-App-cpanminus/pkg-plist
@@ -2,6 +2,5 @@ bin/cpanm
 man/man1/cpanm.1.gz
 %%PERL5_MAN3%%/App::cpanminus.3.gz
 %%PERL5_MAN3%%/App::cpanminus::fatscript.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/cpanminus/.packlist
 %%SITE_PERL%%/App/cpanminus.pm
 %%SITE_PERL%%/App/cpanminus/fatscript.pm
diff --git a/devel/p5-App-cpanoutdated/Makefile b/devel/p5-App-cpanoutdated/Makefile
index 5226d00d5357..d38d8df478da 100644
--- a/devel/p5-App-cpanoutdated/Makefile
+++ b/devel/p5-App-cpanoutdated/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-cpanoutdated
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-cpanoutdated/pkg-plist b/devel/p5-App-cpanoutdated/pkg-plist
index 4b8d7b1a7efb..50e078e471ff 100644
--- a/devel/p5-App-cpanoutdated/pkg-plist
+++ b/devel/p5-App-cpanoutdated/pkg-plist
@@ -1,5 +1,4 @@
 bin/cpan-outdated
 %%SITE_PERL%%/App/cpanoutdated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/cpanoutdated/.packlist
 %%PERL5_MAN3%%/App::cpanoutdated.3.gz
 man/man1/cpan-outdated.1.gz
diff --git a/devel/p5-App-scan_prereqs_cpanfile/Makefile b/devel/p5-App-scan_prereqs_cpanfile/Makefile
index 940bea43865d..3401aa5f4c96 100644
--- a/devel/p5-App-scan_prereqs_cpanfile/Makefile
+++ b/devel/p5-App-scan_prereqs_cpanfile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	App-scan_prereqs_cpanfile
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-App-scan_prereqs_cpanfile/pkg-plist b/devel/p5-App-scan_prereqs_cpanfile/pkg-plist
index 384a11c67bb3..996bda423b4c 100644
--- a/devel/p5-App-scan_prereqs_cpanfile/pkg-plist
+++ b/devel/p5-App-scan_prereqs_cpanfile/pkg-plist
@@ -1,5 +1,4 @@
 bin/scan-prereqs-cpanfile
-%%SITE_ARCH%%/auto/App/scan_prereqs_cpanfile/.packlist
 %%SITE_PERL%%/App/scan_prereqs_cpanfile.pm
 man/man1/scan-prereqs-cpanfile.1.gz
 %%PERL5_MAN3%%/App::scan_prereqs_cpanfile.3.gz
diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index a45b18255111..3b3271c2af7c 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AppConfig-Std
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AppConfig-Std/pkg-plist b/devel/p5-AppConfig-Std/pkg-plist
index f4dd45dd2a5b..fe97efd011d1 100644
--- a/devel/p5-AppConfig-Std/pkg-plist
+++ b/devel/p5-AppConfig-Std/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/AppConfig/Std.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/Std/.packlist
 %%PERL5_MAN3%%/AppConfig::Std.3.gz
diff --git a/devel/p5-AppConfig/Makefile b/devel/p5-AppConfig/Makefile
index b6378a81d5c3..bd48b13d1711 100644
--- a/devel/p5-AppConfig/Makefile
+++ b/devel/p5-AppConfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AppConfig
 PORTVERSION=	1.66
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AppConfig/pkg-plist b/devel/p5-AppConfig/pkg-plist
index dd49c2df6311..5e472b3f3749 100644
--- a/devel/p5-AppConfig/pkg-plist
+++ b/devel/p5-AppConfig/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/AppConfig/Getopt.pm
 %%SITE_PERL%%/AppConfig/State.pm
 %%SITE_PERL%%/AppConfig/Sys.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/.packlist
 %%PERL5_MAN3%%/AppConfig.3.gz
 %%PERL5_MAN3%%/AppConfig::Args.3.gz
 %%PERL5_MAN3%%/AppConfig::CGI.3.gz
diff --git a/devel/p5-Array-Group/Makefile b/devel/p5-Array-Group/Makefile
index 6445ed81dadf..a116708e2db5 100644
--- a/devel/p5-Array-Group/Makefile
+++ b/devel/p5-Array-Group/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-Group
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TBONE
diff --git a/devel/p5-Array-Group/pkg-plist b/devel/p5-Array-Group/pkg-plist
index 3e2700b1996c..f078fe6c3cf2 100644
--- a/devel/p5-Array-Group/pkg-plist
+++ b/devel/p5-Array-Group/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Array::Group.3.gz
 %%SITE_PERL%%/Array/Group.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Group/.packlist
diff --git a/devel/p5-Array-Iterator/Makefile b/devel/p5-Array-Iterator/Makefile
index c2a8f730d462..fb11a98eb1b1 100644
--- a/devel/p5-Array-Iterator/Makefile
+++ b/devel/p5-Array-Iterator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-Iterator
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Array-Iterator/pkg-plist b/devel/p5-Array-Iterator/pkg-plist
index 7fb4a8111568..a6398d301763 100644
--- a/devel/p5-Array-Iterator/pkg-plist
+++ b/devel/p5-Array-Iterator/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Array/Iterator/BiDirectional.pm
 %%SITE_PERL%%/Array/Iterator/Circular.pm
 %%SITE_PERL%%/Array/Iterator/Reusable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Iterator/.packlist
 %%PERL5_MAN3%%/Array::Iterator.3.gz
 %%PERL5_MAN3%%/Array::Iterator::BiDirectional.3.gz
 %%PERL5_MAN3%%/Array::Iterator::Circular.3.gz
diff --git a/devel/p5-Array-Unique/Makefile b/devel/p5-Array-Unique/Makefile
index da76ebfe067b..f23798ab07f3 100644
--- a/devel/p5-Array-Unique/Makefile
+++ b/devel/p5-Array-Unique/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-Unique
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Array-Unique/pkg-plist b/devel/p5-Array-Unique/pkg-plist
index b1ecbfa91ba7..8c567a2e5c50 100644
--- a/devel/p5-Array-Unique/pkg-plist
+++ b/devel/p5-Array-Unique/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Array/Unique.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Unique/.packlist
 %%PERL5_MAN3%%/Array::Unique.3.gz
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 72f48e54930e..d9184ab29e8a 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-Window
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Array-Window/pkg-plist b/devel/p5-Array-Window/pkg-plist
index a1074cd400dc..e10c7457afb1 100644
--- a/devel/p5-Array-Window/pkg-plist
+++ b/devel/p5-Array-Window/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Array::Window.3.gz
 %%SITE_PERL%%/Array/Window.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Window/.packlist
diff --git a/devel/p5-Async-Interrupt/Makefile b/devel/p5-Async-Interrupt/Makefile
index 0821dca012d1..9c366a716a2b 100644
--- a/devel/p5-Async-Interrupt/Makefile
+++ b/devel/p5-Async-Interrupt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Async-Interrupt
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Async-Interrupt/pkg-plist b/devel/p5-Async-Interrupt/pkg-plist
index 173ea7dd908d..eb8830719629 100644
--- a/devel/p5-Async-Interrupt/pkg-plist
+++ b/devel/p5-Async-Interrupt/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Async::Interrupt.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Async/Interrupt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/Interrupt/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/Interrupt/Interrupt.so
+%%SITE_ARCH%%/Async/Interrupt.pm
+%%SITE_ARCH%%/auto/Async/Interrupt/Interrupt.so
diff --git a/devel/p5-Async-MergePoint/Makefile b/devel/p5-Async-MergePoint/Makefile
index ea344d72ffe8..18adfca96a43 100644
--- a/devel/p5-Async-MergePoint/Makefile
+++ b/devel/p5-Async-MergePoint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Async-MergePoint
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,11 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 PLIST_FILES=	%%SITE_PERL%%/Async/MergePoint.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/MergePoint/.packlist \
 		%%PERL5_MAN3%%/Async::MergePoint.3.gz
 
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/MergePoint \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Async \
-		%%SITE_PERL%%/Async
-
 .include <bsd.port.mk>
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 419f0855be2f..3cabce5db087 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AtExit
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AtExit/pkg-plist b/devel/p5-AtExit/pkg-plist
index 8b1ff1a0b18f..7833b2d215cc 100644
--- a/devel/p5-AtExit/pkg-plist
+++ b/devel/p5-AtExit/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/AtExit.3.gz
 %%SITE_PERL%%/AtExit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AtExit/.packlist
diff --git a/devel/p5-Attribute-Handlers-Prospective/Makefile b/devel/p5-Attribute-Handlers-Prospective/Makefile
index 890a9b6303f3..43cc5a21e9d1 100644
--- a/devel/p5-Attribute-Handlers-Prospective/Makefile
+++ b/devel/p5-Attribute-Handlers-Prospective/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Attribute-Handlers-Prospective
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Attribute-Handlers-Prospective/pkg-plist b/devel/p5-Attribute-Handlers-Prospective/pkg-plist
index 89e28db561af..fc898b624c57 100644
--- a/devel/p5-Attribute-Handlers-Prospective/pkg-plist
+++ b/devel/p5-Attribute-Handlers-Prospective/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Attribute::Handlers::Prospective.3.gz
 %%SITE_PERL%%/Attribute/Handlers/Prospective.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/Prospective/.packlist
diff --git a/devel/p5-Attribute-Handlers/Makefile b/devel/p5-Attribute-Handlers/Makefile
index 1b7ee08b1379..a3cfc96d8d89 100644
--- a/devel/p5-Attribute-Handlers/Makefile
+++ b/devel/p5-Attribute-Handlers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Attribute-Handlers
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Attribute-Handlers/pkg-plist b/devel/p5-Attribute-Handlers/pkg-plist
index 862c2db128cb..9982151cfe1c 100644
--- a/devel/p5-Attribute-Handlers/pkg-plist
+++ b/devel/p5-Attribute-Handlers/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Attribute::Handlers.3.gz
 %%SITE_PERL%%/Attribute/Handlers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/.packlist
diff --git a/devel/p5-Attribute-Persistent/Makefile b/devel/p5-Attribute-Persistent/Makefile
index 65499d335ea1..fcacd6d0478a 100644
--- a/devel/p5-Attribute-Persistent/Makefile
+++ b/devel/p5-Attribute-Persistent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Attribute-Persistent
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Attribute-Persistent/pkg-plist b/devel/p5-Attribute-Persistent/pkg-plist
index a62d954ec620..d248395e0378 100644
--- a/devel/p5-Attribute-Persistent/pkg-plist
+++ b/devel/p5-Attribute-Persistent/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Attribute::Persistent.3.gz
 %%SITE_PERL%%/Attribute/Persistent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Persistent/.packlist
diff --git a/devel/p5-AutoLoader/Makefile b/devel/p5-AutoLoader/Makefile
index ce060fcc5c8e..d294fd9798da 100644
--- a/devel/p5-AutoLoader/Makefile
+++ b/devel/p5-AutoLoader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AutoLoader
 PORTVERSION=	5.73
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-AutoLoader/pkg-plist b/devel/p5-AutoLoader/pkg-plist
index e075a4e8c821..444d4787d6d2 100644
--- a/devel/p5-AutoLoader/pkg-plist
+++ b/devel/p5-AutoLoader/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/AutoSplit.3.gz
 %%SITE_PERL%%/AutoLoader.pm
 %%SITE_PERL%%/AutoSplit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoLoader/.packlist
diff --git a/devel/p5-AutoXS-Header/Makefile b/devel/p5-AutoXS-Header/Makefile
index edf73bc23aa9..c31da4014d39 100644
--- a/devel/p5-AutoXS-Header/Makefile
+++ b/devel/p5-AutoXS-Header/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AutoXS-Header
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/devel/p5-AutoXS-Header/pkg-plist b/devel/p5-AutoXS-Header/pkg-plist
index 69e94cd1296a..dfdc78992109 100644
--- a/devel/p5-AutoXS-Header/pkg-plist
+++ b/devel/p5-AutoXS-Header/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/AutoXS::Header.3.gz
 %%SITE_PERL%%/AutoXS/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoXS/Header/.packlist
diff --git a/devel/p5-B-Compiling/Makefile b/devel/p5-B-Compiling/Makefile
index c53a12daa41a..21d08a23f710 100644
--- a/devel/p5-B-Compiling/Makefile
+++ b/devel/p5-B-Compiling/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	B-Compiling
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Compiling/pkg-plist b/devel/p5-B-Compiling/pkg-plist
index 73d2b35a3a43..78bd97bddbd1 100644
--- a/devel/p5-B-Compiling/pkg-plist
+++ b/devel/p5-B-Compiling/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/B::Compiling.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Compiling/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Compiling/Compiling.so
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Compiling.pm
+%%SITE_ARCH%%/auto/B/Compiling/Compiling.so
+%%SITE_ARCH%%/B/Compiling.pm
diff --git a/devel/p5-B-Deobfuscate/Makefile b/devel/p5-B-Deobfuscate/Makefile
index c5f342ba850b..6c4fed13fbde 100644
--- a/devel/p5-B-Deobfuscate/Makefile
+++ b/devel/p5-B-Deobfuscate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Deobfuscate
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Deobfuscate/pkg-plist b/devel/p5-B-Deobfuscate/pkg-plist
index 355320ca8e9e..07e6fb2b0862 100644
--- a/devel/p5-B-Deobfuscate/pkg-plist
+++ b/devel/p5-B-Deobfuscate/pkg-plist
@@ -5,4 +5,3 @@
 %%SITE_PERL%%/B/Deobfuscate.pod
 %%SITE_PERL%%/B/Deobfuscate/Dict/Flowers.pm
 %%SITE_PERL%%/B/Deobfuscate/Dict/PGPHashWords.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Deobfuscate/.packlist
diff --git a/devel/p5-B-Generate/Makefile b/devel/p5-B-Generate/Makefile
index 5c894373af27..704513271b3e 100644
--- a/devel/p5-B-Generate/Makefile
+++ b/devel/p5-B-Generate/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	B-Generate
 PORTVERSION=	1.47
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Generate/pkg-plist b/devel/p5-B-Generate/pkg-plist
index ff835428e702..a219d84b0a26 100644
--- a/devel/p5-B-Generate/pkg-plist
+++ b/devel/p5-B-Generate/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Generate/Generate.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Generate/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Generate.pm
+%%SITE_ARCH%%/auto/B/Generate/Generate.so
+%%SITE_ARCH%%/B/Generate.pm
 %%PERL5_MAN3%%/B::Generate.3.gz
diff --git a/devel/p5-B-Graph/Makefile b/devel/p5-B-Graph/Makefile
index e59020227e0e..291e5fe74d5f 100644
--- a/devel/p5-B-Graph/Makefile
+++ b/devel/p5-B-Graph/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Graph
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Graph/pkg-plist b/devel/p5-B-Graph/pkg-plist
index b2293f5cdeaa..bf76d6877bc3 100644
--- a/devel/p5-B-Graph/pkg-plist
+++ b/devel/p5-B-Graph/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/B::Graph.3.gz
 %%SITE_PERL%%/B/Graph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph/.packlist
diff --git a/devel/p5-B-Hooks-EndOfScope/Makefile b/devel/p5-B-Hooks-EndOfScope/Makefile
index 5259bc5319c0..c60a96af4808 100644
--- a/devel/p5-B-Hooks-EndOfScope/Makefile
+++ b/devel/p5-B-Hooks-EndOfScope/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Hooks-EndOfScope
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Hooks-EndOfScope/pkg-plist b/devel/p5-B-Hooks-EndOfScope/pkg-plist
index 5c605d3b3764..f8ae1405c289 100644
--- a/devel/p5-B-Hooks-EndOfScope/pkg-plist
+++ b/devel/p5-B-Hooks-EndOfScope/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/B/Hooks/EndOfScope/PP/FieldHash.pm
 %%SITE_PERL%%/B/Hooks/EndOfScope/PP/HintHash.pm
 %%SITE_PERL%%/B/Hooks/EndOfScope/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/EndOfScope/.packlist
diff --git a/devel/p5-B-Hooks-OP-Annotation/Makefile b/devel/p5-B-Hooks-OP-Annotation/Makefile
index 71cf2bd3a699..bcd3a1ea0243 100644
--- a/devel/p5-B-Hooks-OP-Annotation/Makefile
+++ b/devel/p5-B-Hooks-OP-Annotation/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Hooks-OP-Annotation
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Hooks-OP-Annotation/pkg-plist b/devel/p5-B-Hooks-OP-Annotation/pkg-plist
index 752cfd47dce7..fa61b7abaec9 100644
--- a/devel/p5-B-Hooks-OP-Annotation/pkg-plist
+++ b/devel/p5-B-Hooks-OP-Annotation/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Annotation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Annotation/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Annotation/Install/hook_op_annotation.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/Annotation/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/Annotation/Annotation.so
+%%SITE_ARCH%%/B/Hooks/OP/Annotation.pm
+%%SITE_ARCH%%/B/Hooks/OP/Annotation/Install/Files.pm
+%%SITE_ARCH%%/B/Hooks/OP/Annotation/Install/hook_op_annotation.h
+%%SITE_ARCH%%/auto/B/Hooks/OP/Annotation/Annotation.so
 %%PERL5_MAN3%%/B::Hooks::OP::Annotation.3.gz
diff --git a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
index 2fe07d22202e..aa00b972766a 100644
--- a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
+++ b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	B-Hooks-OP-Check-EntersubForCV
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Hooks-OP-Check-EntersubForCV/pkg-plist b/devel/p5-B-Hooks-OP-Check-EntersubForCV/pkg-plist
index 9fdb4fa92cd2..59fed2e62d66 100644
--- a/devel/p5-B-Hooks-OP-Check-EntersubForCV/pkg-plist
+++ b/devel/p5-B-Hooks-OP-Check-EntersubForCV/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/Check/EntersubForCV/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/Check/EntersubForCV/EntersubForCV.so
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Check/EntersubForCV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Check/EntersubForCV/Install/hook_op_check_entersubforcv.h
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Check/EntersubForCV/Install/Files.pm
+%%SITE_ARCH%%/auto/B/Hooks/OP/Check/EntersubForCV/EntersubForCV.so
+%%SITE_ARCH%%/B/Hooks/OP/Check/EntersubForCV.pm
+%%SITE_ARCH%%/B/Hooks/OP/Check/EntersubForCV/Install/hook_op_check_entersubforcv.h
+%%SITE_ARCH%%/B/Hooks/OP/Check/EntersubForCV/Install/Files.pm
 %%PERL5_MAN3%%/B::Hooks::OP::Check::EntersubForCV.3.gz
diff --git a/devel/p5-B-Hooks-OP-Check/Makefile b/devel/p5-B-Hooks-OP-Check/Makefile
index a333b080eaf0..0dcdf4d34c0b 100644
--- a/devel/p5-B-Hooks-OP-Check/Makefile
+++ b/devel/p5-B-Hooks-OP-Check/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Hooks-OP-Check
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Hooks-OP-Check/pkg-plist b/devel/p5-B-Hooks-OP-Check/pkg-plist
index 4eab3400454a..dc136c902497 100644
--- a/devel/p5-B-Hooks-OP-Check/pkg-plist
+++ b/devel/p5-B-Hooks-OP-Check/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Check.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Check/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/Check/Install/hook_op_check.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/Check/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/Check/Check.so
+%%SITE_ARCH%%/B/Hooks/OP/Check.pm
+%%SITE_ARCH%%/B/Hooks/OP/Check/Install/Files.pm
+%%SITE_ARCH%%/B/Hooks/OP/Check/Install/hook_op_check.h
+%%SITE_ARCH%%/auto/B/Hooks/OP/Check/Check.so
 %%PERL5_MAN3%%/B::Hooks::OP::Check.3.gz
diff --git a/devel/p5-B-Hooks-OP-PPAddr/Makefile b/devel/p5-B-Hooks-OP-PPAddr/Makefile
index f4bf9fe9c9cb..822e425bf3b5 100644
--- a/devel/p5-B-Hooks-OP-PPAddr/Makefile
+++ b/devel/p5-B-Hooks-OP-PPAddr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Hooks-OP-PPAddr
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	B
diff --git a/devel/p5-B-Hooks-OP-PPAddr/pkg-plist b/devel/p5-B-Hooks-OP-PPAddr/pkg-plist
index 932bbdfa5fc5..5c7afc5de50c 100644
--- a/devel/p5-B-Hooks-OP-PPAddr/pkg-plist
+++ b/devel/p5-B-Hooks-OP-PPAddr/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/PPAddr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/PPAddr/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/OP/PPAddr/Install/hook_op_ppaddr.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/PPAddr/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/OP/PPAddr/PPAddr.so
+%%SITE_ARCH%%/B/Hooks/OP/PPAddr.pm
+%%SITE_ARCH%%/B/Hooks/OP/PPAddr/Install/Files.pm
+%%SITE_ARCH%%/B/Hooks/OP/PPAddr/Install/hook_op_ppaddr.h
+%%SITE_ARCH%%/auto/B/Hooks/OP/PPAddr/PPAddr.so
 %%PERL5_MAN3%%/B::Hooks::OP::PPAddr.3.gz
diff --git a/devel/p5-B-Hooks-Parser/Makefile b/devel/p5-B-Hooks-Parser/Makefile
index d1f66635d61e..dba99af97499 100644
--- a/devel/p5-B-Hooks-Parser/Makefile
+++ b/devel/p5-B-Hooks-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Hooks-Parser
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Hooks-Parser/pkg-plist b/devel/p5-B-Hooks-Parser/pkg-plist
index 72690e9b8d12..f5ae6819bd98 100644
--- a/devel/p5-B-Hooks-Parser/pkg-plist
+++ b/devel/p5-B-Hooks-Parser/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/B::Hooks::Parser.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser/Install/hook_parser.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/Parser/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/Parser/Parser.so
+%%SITE_ARCH%%/B/Hooks/Parser.pm
+%%SITE_ARCH%%/B/Hooks/Parser/Install/Files.pm
+%%SITE_ARCH%%/B/Hooks/Parser/Install/hook_parser.h
+%%SITE_ARCH%%/auto/B/Hooks/Parser/Parser.so
diff --git a/devel/p5-B-Keywords/Makefile b/devel/p5-B-Keywords/Makefile
index f376c22fb001..0325f6d91803 100644
--- a/devel/p5-B-Keywords/Makefile
+++ b/devel/p5-B-Keywords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Keywords
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Keywords/pkg-plist b/devel/p5-B-Keywords/pkg-plist
index 10d779c55676..93624235f653 100644
--- a/devel/p5-B-Keywords/pkg-plist
+++ b/devel/p5-B-Keywords/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/B::Keywords.3.gz
 %%SITE_PERL%%/B/Keywords.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Keywords/.packlist
diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile
index 0bc81beb389b..914776dc5113 100644
--- a/devel/p5-B-OPCheck/Makefile
+++ b/devel/p5-B-OPCheck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-OPCheck
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	B
diff --git a/devel/p5-B-OPCheck/pkg-plist b/devel/p5-B-OPCheck/pkg-plist
index e27a7cee452f..bd3f13a28eea 100644
--- a/devel/p5-B-OPCheck/pkg-plist
+++ b/devel/p5-B-OPCheck/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/B::OPCheck.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/B/OPCheck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/OPCheck/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/OPCheck/OPCheck.so
+%%SITE_ARCH%%/B/OPCheck.pm
+%%SITE_ARCH%%/auto/B/OPCheck/OPCheck.so
diff --git a/devel/p5-B-Size2/Makefile b/devel/p5-B-Size2/Makefile
index e7e3bb3d4473..9081c977b73a 100644
--- a/devel/p5-B-Size2/Makefile
+++ b/devel/p5-B-Size2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	B-Size2
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-B-Size2/pkg-plist b/devel/p5-B-Size2/pkg-plist
index ffccbf2eabe5..db2bf29f4ac6 100644
--- a/devel/p5-B-Size2/pkg-plist
+++ b/devel/p5-B-Size2/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Size2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Size2/Size2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Size2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Size2/Terse.pm
+%%SITE_ARCH%%/auto/B/Size2/Size2.so
+%%SITE_ARCH%%/B/Size2.pm
+%%SITE_ARCH%%/B/Size2/Terse.pm
 %%PERL5_MAN3%%/B::Size2.3.gz
 %%PERL5_MAN3%%/B::Size2::Terse.3.gz
diff --git a/devel/p5-B-Utils/Makefile b/devel/p5-B-Utils/Makefile
index bb24a2e19e96..990a04330b5a 100644
--- a/devel/p5-B-Utils/Makefile
+++ b/devel/p5-B-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	B-Utils
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JJORE
diff --git a/devel/p5-B-Utils/pkg-plist b/devel/p5-B-Utils/pkg-plist
index 286c479c0f86..ddce909f8a95 100644
--- a/devel/p5-B-Utils/pkg-plist
+++ b/devel/p5-B-Utils/pkg-plist
@@ -1,9 +1,8 @@
 %%PERL5_MAN3%%/B::Utils.3.gz
 %%PERL5_MAN3%%/B::Utils::OP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install/BUtils.h
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/OP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils/Utils.so
+%%SITE_ARCH%%/B/Utils.pm
+%%SITE_ARCH%%/B/Utils/Install/BUtils.h
+%%SITE_ARCH%%/B/Utils/Install/Files.pm
+%%SITE_ARCH%%/B/Utils/Install/typemap
+%%SITE_ARCH%%/B/Utils/OP.pm
+%%SITE_ARCH%%/auto/B/Utils/Utils.so
diff --git a/devel/p5-BFD/Makefile b/devel/p5-BFD/Makefile
index 5f7e331dd5e5..50a6e07af920 100644
--- a/devel/p5-BFD/Makefile
+++ b/devel/p5-BFD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BFD
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RBS
diff --git a/devel/p5-BFD/pkg-plist b/devel/p5-BFD/pkg-plist
index fa42b3f8b8ea..64f4540e97fd 100644
--- a/devel/p5-BFD/pkg-plist
+++ b/devel/p5-BFD/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/BFD.3.gz
 %%SITE_PERL%%/BFD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BFD/.packlist
diff --git a/devel/p5-BS-Event/Makefile b/devel/p5-BS-Event/Makefile
index 13f78d717c59..3f697ee4b1c8 100644
--- a/devel/p5-BS-Event/Makefile
+++ b/devel/p5-BS-Event/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BS-Event
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ELMEX
diff --git a/devel/p5-BS-Event/pkg-plist b/devel/p5-BS-Event/pkg-plist
index 965954dc236d..732d1cde2c83 100644
--- a/devel/p5-BS-Event/pkg-plist
+++ b/devel/p5-BS-Event/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/BS/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BS/Event/.packlist
 %%PERL5_MAN3%%/BS::Event.3.gz
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index c40b312f646f..b63c5d900fb3 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BSD-Resource
 PORTVERSION=	1.2907
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-BSD-Resource/pkg-plist b/devel/p5-BSD-Resource/pkg-plist
index 92f17e06a842..bc08ee06ebd0 100644
--- a/devel/p5-BSD-Resource/pkg-plist
+++ b/devel/p5-BSD-Resource/pkg-plist
@@ -1,34 +1,33 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/Resource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/Resource.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/_find_prio.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/_find_rlimit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/_g.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/get_prios.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/get_rlimits.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/getpriority.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/getrlimit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/getrusage.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/hard.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/idrss.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/inblock.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/isrss.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/ixrss.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/majflt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/maxrss.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/minflt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/msgrcv.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/msgsnd.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nivcsw.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nsignals.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nswap.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nvcsw.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/oublock.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/setpriority.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/setrlimit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/soft.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/stime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/times.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/utime.al
+%%SITE_ARCH%%/BSD/Resource.pm
+%%SITE_ARCH%%/auto/BSD/Resource/Resource.so
+%%SITE_ARCH%%/auto/BSD/Resource/_find_prio.al
+%%SITE_ARCH%%/auto/BSD/Resource/_find_rlimit.al
+%%SITE_ARCH%%/auto/BSD/Resource/_g.al
+%%SITE_ARCH%%/auto/BSD/Resource/autosplit.ix
+%%SITE_ARCH%%/auto/BSD/Resource/get_prios.al
+%%SITE_ARCH%%/auto/BSD/Resource/get_rlimits.al
+%%SITE_ARCH%%/auto/BSD/Resource/getpriority.al
+%%SITE_ARCH%%/auto/BSD/Resource/getrlimit.al
+%%SITE_ARCH%%/auto/BSD/Resource/getrusage.al
+%%SITE_ARCH%%/auto/BSD/Resource/hard.al
+%%SITE_ARCH%%/auto/BSD/Resource/idrss.al
+%%SITE_ARCH%%/auto/BSD/Resource/inblock.al
+%%SITE_ARCH%%/auto/BSD/Resource/isrss.al
+%%SITE_ARCH%%/auto/BSD/Resource/ixrss.al
+%%SITE_ARCH%%/auto/BSD/Resource/majflt.al
+%%SITE_ARCH%%/auto/BSD/Resource/maxrss.al
+%%SITE_ARCH%%/auto/BSD/Resource/minflt.al
+%%SITE_ARCH%%/auto/BSD/Resource/msgrcv.al
+%%SITE_ARCH%%/auto/BSD/Resource/msgsnd.al
+%%SITE_ARCH%%/auto/BSD/Resource/nivcsw.al
+%%SITE_ARCH%%/auto/BSD/Resource/nsignals.al
+%%SITE_ARCH%%/auto/BSD/Resource/nswap.al
+%%SITE_ARCH%%/auto/BSD/Resource/nvcsw.al
+%%SITE_ARCH%%/auto/BSD/Resource/oublock.al
+%%SITE_ARCH%%/auto/BSD/Resource/setpriority.al
+%%SITE_ARCH%%/auto/BSD/Resource/setrlimit.al
+%%SITE_ARCH%%/auto/BSD/Resource/soft.al
+%%SITE_ARCH%%/auto/BSD/Resource/stime.al
+%%SITE_ARCH%%/auto/BSD/Resource/times.al
+%%SITE_ARCH%%/auto/BSD/Resource/utime.al
 %%PERL5_MAN3%%/BSD::Resource.3.gz
diff --git a/devel/p5-BSD-devstat/Makefile b/devel/p5-BSD-devstat/Makefile
index 4581c8da3d9a..a4d0609c90e0 100644
--- a/devel/p5-BSD-devstat/Makefile
+++ b/devel/p5-BSD-devstat/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	BSD-devstat
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-BSD-devstat/pkg-plist b/devel/p5-BSD-devstat/pkg-plist
index a0010ad019f9..c3672f411066 100644
--- a/devel/p5-BSD-devstat/pkg-plist
+++ b/devel/p5-BSD-devstat/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/devstat/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/devstat/devstat.so
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/devstat.pm
+%%SITE_ARCH%%/auto/BSD/devstat/devstat.so
+%%SITE_ARCH%%/BSD/devstat.pm
 %%PERL5_MAN3%%/BSD::devstat.3.gz
diff --git a/devel/p5-BSD-stat/Makefile b/devel/p5-BSD-stat/Makefile
index 100f7585c057..a31918fce6e4 100644
--- a/devel/p5-BSD-stat/Makefile
+++ b/devel/p5-BSD-stat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BSD-stat
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-BSD-stat/pkg-plist b/devel/p5-BSD-stat/pkg-plist
index 0c85324a82bc..e91d71b0708a 100644
--- a/devel/p5-BSD-stat/pkg-plist
+++ b/devel/p5-BSD-stat/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/BSD::stat.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/stat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/stat.so
+%%SITE_ARCH%%/BSD/stat.pm
+%%SITE_ARCH%%/auto/BSD/stat/autosplit.ix
+%%SITE_ARCH%%/auto/BSD/stat/stat.so
diff --git a/devel/p5-BZ-Client/Makefile b/devel/p5-BZ-Client/Makefile
index 6e414d78f6ea..e965f92c6c11 100644
--- a/devel/p5-BZ-Client/Makefile
+++ b/devel/p5-BZ-Client/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	BZ-Client
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JWIED
diff --git a/devel/p5-BZ-Client/pkg-plist b/devel/p5-BZ-Client/pkg-plist
index 127be5a30560..63e3a0382adb 100644
--- a/devel/p5-BZ-Client/pkg-plist
+++ b/devel/p5-BZ-Client/pkg-plist
@@ -20,4 +20,3 @@
 %%SITE_PERL%%/BZ/Client/XMLRPC/Response.pm
 %%SITE_PERL%%/BZ/Client/XMLRPC/Struct.pm
 %%SITE_PERL%%/BZ/Client/XMLRPC/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BZ/Client/.packlist
diff --git a/devel/p5-Badger/Makefile b/devel/p5-Badger/Makefile
index 0bde30582ee4..cb19e221e582 100644
--- a/devel/p5-Badger/Makefile
+++ b/devel/p5-Badger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Badger
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Badger
diff --git a/devel/p5-Badger/pkg-plist b/devel/p5-Badger/pkg-plist
index 7dff195a81e5..109613397ab7 100644
--- a/devel/p5-Badger/pkg-plist
+++ b/devel/p5-Badger/pkg-plist
@@ -51,7 +51,6 @@
 %%SITE_PERL%%/Badger/Timestamp.pm
 %%SITE_PERL%%/Badger/URL.pm
 %%SITE_PERL%%/Badger/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Badger/.packlist
 %%PERL5_MAN3%%/Badger.3.gz
 %%PERL5_MAN3%%/Badger::Base.3.gz
 %%PERL5_MAN3%%/Badger::Class.3.gz
diff --git a/devel/p5-Benchmark-Timer/Makefile b/devel/p5-Benchmark-Timer/Makefile
index eaac830db2ed..d6068fa34fec 100644
--- a/devel/p5-Benchmark-Timer/Makefile
+++ b/devel/p5-Benchmark-Timer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Benchmark-Timer
 PORTVERSION=	0.7102
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Benchmark-Timer/pkg-plist b/devel/p5-Benchmark-Timer/pkg-plist
index 3b996a22335d..7cd8ae852862 100644
--- a/devel/p5-Benchmark-Timer/pkg-plist
+++ b/devel/p5-Benchmark-Timer/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Benchmark/Timer.pm
 %%SITE_PERL%%/Benchmark/delta.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark/Timer/.packlist
 %%PERL5_MAN3%%/Benchmark::Timer.3.gz
 %%PERL5_MAN3%%/Benchmark::delta.3.gz
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index 6c27ed72b8fa..9a59bc6ef829 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Best
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GAAL
diff --git a/devel/p5-Best/pkg-plist b/devel/p5-Best/pkg-plist
index e3e55c01a885..9ead45c6743c 100644
--- a/devel/p5-Best/pkg-plist
+++ b/devel/p5-Best/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Best.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Best/.packlist
 %%PERL5_MAN3%%/Best.3.gz
diff --git a/devel/p5-Bread-Board-Declare/Makefile b/devel/p5-Bread-Board-Declare/Makefile
index 633a74d73697..7e818f7f9ef5 100644
--- a/devel/p5-Bread-Board-Declare/Makefile
+++ b/devel/p5-Bread-Board-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bread-Board-Declare
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/devel/p5-Bread-Board-Declare/pkg-plist b/devel/p5-Bread-Board-Declare/pkg-plist
index 91a87caf44e8..2f3fbdd6dc67 100644
--- a/devel/p5-Bread-Board-Declare/pkg-plist
+++ b/devel/p5-Bread-Board-Declare/pkg-plist
@@ -9,7 +9,6 @@
 %%SITE_PERL%%/Bread/Board/Declare/Meta/Role/Instance.pm
 %%SITE_PERL%%/Bread/Board/Declare/Role/Object.pm
 %%SITE_PERL%%/Bread/Board/Declare/Role/Service.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bread/Board/Declare/.packlist
 %%PERL5_MAN3%%/Bread::Board::Declare.3.gz
 %%PERL5_MAN3%%/Bread::Board::Declare::BlockInjection.3.gz
 %%PERL5_MAN3%%/Bread::Board::Declare::ConstructorInjection.3.gz
diff --git a/devel/p5-Bread-Board/Makefile b/devel/p5-Bread-Board/Makefile
index 2cc2e12c1eb1..fd9c6c8d04df 100644
--- a/devel/p5-Bread-Board/Makefile
+++ b/devel/p5-Bread-Board/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bread-Board
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/devel/p5-Bread-Board/pkg-plist b/devel/p5-Bread-Board/pkg-plist
index 382b1efeb794..2b796ff4d050 100644
--- a/devel/p5-Bread-Board/pkg-plist
+++ b/devel/p5-Bread-Board/pkg-plist
@@ -28,7 +28,6 @@
 %%SITE_PERL%%/Bread/Board/SetterInjection.pm
 %%SITE_PERL%%/Bread/Board/Traversable.pm
 %%SITE_PERL%%/Bread/Board/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bread/Board/.packlist
 %%PERL5_MAN3%%/Bread::Board.3.gz
 %%PERL5_MAN3%%/Bread::Board::BlockInjection.3.gz
 %%PERL5_MAN3%%/Bread::Board::ConstructorInjection.3.gz
diff --git a/devel/p5-Bundle-Perl6/Makefile b/devel/p5-Bundle-Perl6/Makefile
index 6d2628961f6c..6514a3ea42e9 100644
--- a/devel/p5-Bundle-Perl6/Makefile
+++ b/devel/p5-Bundle-Perl6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bundle-Perl6
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Bundle-Perl6/pkg-plist b/devel/p5-Bundle-Perl6/pkg-plist
index bf77e4a7cdba..527b2c776c3e 100644
--- a/devel/p5-Bundle-Perl6/pkg-plist
+++ b/devel/p5-Bundle-Perl6/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Bundle/Perl6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Perl6/.packlist
 %%PERL5_MAN3%%/Bundle::Perl6.3.gz
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index afc8fdd4d733..46c9b8be3a88 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	C-Scan
 PORTVERSION=	0.74
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-C-Scan/pkg-plist b/devel/p5-C-Scan/pkg-plist
index ff3d84d28b1d..33860c64c0cc 100644
--- a/devel/p5-C-Scan/pkg-plist
+++ b/devel/p5-C-Scan/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/C::Scan.3.gz
 %%SITE_PERL%%/C/Scan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/C/Scan/.packlist
diff --git a/devel/p5-CBOR-XS/Makefile b/devel/p5-CBOR-XS/Makefile
index 45e05fe9c402..b16d004a667b 100644
--- a/devel/p5-CBOR-XS/Makefile
+++ b/devel/p5-CBOR-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CBOR-XS
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MLEHMANN
@@ -17,6 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/CBOR/XS/XS.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/CBOR/XS/XS.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-CBOR-XS/pkg-plist b/devel/p5-CBOR-XS/pkg-plist
index fb7c8416f3e9..c98c680bfcb6 100644
--- a/devel/p5-CBOR-XS/pkg-plist
+++ b/devel/p5-CBOR-XS/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/CBOR/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CBOR/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CBOR/XS/XS.so
+%%SITE_ARCH%%/CBOR/XS.pm
+%%SITE_ARCH%%/auto/CBOR/XS/XS.so
 %%PERL5_MAN3%%/CBOR::XS.3.gz
diff --git a/devel/p5-CHI/Makefile b/devel/p5-CHI/Makefile
index e7169a8df38e..08177f5850ef 100644
--- a/devel/p5-CHI/Makefile
+++ b/devel/p5-CHI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CHI
 PORTVERSION=	0.580
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
diff --git a/devel/p5-CHI/pkg-plist b/devel/p5-CHI/pkg-plist
index b4cec9fc515b..d1247cdfcc55 100644
--- a/devel/p5-CHI/pkg-plist
+++ b/devel/p5-CHI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CHI/.packlist
 %%SITE_PERL%%/CHI.pm
 %%SITE_PERL%%/CHI/Benchmarks.pod
 %%SITE_PERL%%/CHI/CacheObject.pm
diff --git a/devel/p5-CLASS/Makefile b/devel/p5-CLASS/Makefile
index 364b9bfd3e45..017bd7ec1efd 100644
--- a/devel/p5-CLASS/Makefile
+++ b/devel/p5-CLASS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CLASS
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSCHWERN
diff --git a/devel/p5-CLASS/pkg-plist b/devel/p5-CLASS/pkg-plist
index 3fc0d8c00629..efd47610c174 100644
--- a/devel/p5-CLASS/pkg-plist
+++ b/devel/p5-CLASS/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CLASS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CLASS/.packlist
 %%PERL5_MAN3%%/CLASS.3.gz
diff --git a/devel/p5-CPAN-Changes/Makefile b/devel/p5-CPAN-Changes/Makefile
index 8c3bbb024ad9..bd989baa08ec 100644
--- a/devel/p5-CPAN-Changes/Makefile
+++ b/devel/p5-CPAN-Changes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Changes
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Changes/pkg-plist b/devel/p5-CPAN-Changes/pkg-plist
index 4c8710351c99..e18445103edb 100644
--- a/devel/p5-CPAN-Changes/pkg-plist
+++ b/devel/p5-CPAN-Changes/pkg-plist
@@ -4,7 +4,6 @@ bin/tidy_changelog
 %%SITE_PERL%%/CPAN/Changes/Release.pm
 %%SITE_PERL%%/CPAN/Changes/Spec.pod
 %%SITE_PERL%%/Test/CPAN/Changes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Changes/.packlist
 %%PERL5_MAN3%%/CPAN::Changes.3.gz
 %%PERL5_MAN3%%/CPAN::Changes::Group.3.gz
 %%PERL5_MAN3%%/CPAN::Changes::Release.3.gz
diff --git a/devel/p5-CPAN-Checksums/Makefile b/devel/p5-CPAN-Checksums/Makefile
index 9956ae08e283..9e0feba0e234 100644
--- a/devel/p5-CPAN-Checksums/Makefile
+++ b/devel/p5-CPAN-Checksums/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Checksums
 PORTVERSION=	2.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Checksums/pkg-plist b/devel/p5-CPAN-Checksums/pkg-plist
index 137f0149722b..cb489e63f5d1 100644
--- a/devel/p5-CPAN-Checksums/pkg-plist
+++ b/devel/p5-CPAN-Checksums/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/CPAN::Checksums.3.gz
 %%SITE_PERL%%/CPAN/Checksums.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Checksums/.packlist
diff --git a/devel/p5-CPAN-DistnameInfo/Makefile b/devel/p5-CPAN-DistnameInfo/Makefile
index 0de7213e6893..540e5e2658aa 100644
--- a/devel/p5-CPAN-DistnameInfo/Makefile
+++ b/devel/p5-CPAN-DistnameInfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-DistnameInfo
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-DistnameInfo/pkg-plist b/devel/p5-CPAN-DistnameInfo/pkg-plist
index 0df28ab8de76..077fa56a8f54 100644
--- a/devel/p5-CPAN-DistnameInfo/pkg-plist
+++ b/devel/p5-CPAN-DistnameInfo/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CPAN/DistnameInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/DistnameInfo/.packlist
 %%PERL5_MAN3%%/CPAN::DistnameInfo.3.gz
diff --git a/devel/p5-CPAN-Inject/Makefile b/devel/p5-CPAN-Inject/Makefile
index a6d414bf5b7c..f20f2469ce04 100644
--- a/devel/p5-CPAN-Inject/Makefile
+++ b/devel/p5-CPAN-Inject/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Inject
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Inject/pkg-plist b/devel/p5-CPAN-Inject/pkg-plist
index 9bd51bb86843..fb9f271193c2 100644
--- a/devel/p5-CPAN-Inject/pkg-plist
+++ b/devel/p5-CPAN-Inject/pkg-plist
@@ -1,5 +1,4 @@
 bin/cpaninject
 %%SITE_PERL%%/CPAN/Inject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Inject/.packlist
 %%PERL5_MAN3%%/CPAN::Inject.3.gz
 man/man1/cpaninject.1.gz
diff --git a/devel/p5-CPAN-Meta-Check/Makefile b/devel/p5-CPAN-Meta-Check/Makefile
index dc8532365008..669b68ad75a7 100644
--- a/devel/p5-CPAN-Meta-Check/Makefile
+++ b/devel/p5-CPAN-Meta-Check/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Meta-Check
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Meta-Check/pkg-plist b/devel/p5-CPAN-Meta-Check/pkg-plist
index e5ab538c0be0..6e316a29bd3d 100644
--- a/devel/p5-CPAN-Meta-Check/pkg-plist
+++ b/devel/p5-CPAN-Meta-Check/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CPAN/Meta/Check.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Meta/Check/.packlist
 %%PERL5_MAN3%%/CPAN::Meta::Check.3.gz
diff --git a/devel/p5-CPAN-Meta-Requirements/Makefile b/devel/p5-CPAN-Meta-Requirements/Makefile
index d0db56eca3c1..eab9b8300342 100644
--- a/devel/p5-CPAN-Meta-Requirements/Makefile
+++ b/devel/p5-CPAN-Meta-Requirements/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Meta-Requirements
 PORTVERSION=	2.130
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Meta-Requirements/pkg-plist b/devel/p5-CPAN-Meta-Requirements/pkg-plist
index f41a13e81c6f..c9f6c63777ba 100644
--- a/devel/p5-CPAN-Meta-Requirements/pkg-plist
+++ b/devel/p5-CPAN-Meta-Requirements/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CPAN/Meta/Requirements.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Meta/Requirements/.packlist
 %%PERL5_MAN3%%/CPAN::Meta::Requirements.3.gz
diff --git a/devel/p5-CPAN-Meta-YAML/Makefile b/devel/p5-CPAN-Meta-YAML/Makefile
index 5d0b277eceab..2d42db0d7807 100644
--- a/devel/p5-CPAN-Meta-YAML/Makefile
+++ b/devel/p5-CPAN-Meta-YAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Meta-YAML
 PORTVERSION=	0.012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Meta-YAML/pkg-plist b/devel/p5-CPAN-Meta-YAML/pkg-plist
index a359fe0942c3..1554e50303cb 100644
--- a/devel/p5-CPAN-Meta-YAML/pkg-plist
+++ b/devel/p5-CPAN-Meta-YAML/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Meta/YAML/.packlist
 %%SITE_PERL%%/CPAN/Meta/YAML.pm
 %%PERL5_MAN3%%/CPAN::Meta::YAML.3.gz
diff --git a/devel/p5-CPAN-Meta/Makefile b/devel/p5-CPAN-Meta/Makefile
index 803da428efe3..0304bcafef1c 100644
--- a/devel/p5-CPAN-Meta/Makefile
+++ b/devel/p5-CPAN-Meta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Meta
 PORTVERSION=	2.143240
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Meta/pkg-plist b/devel/p5-CPAN-Meta/pkg-plist
index 1513c004ce82..cd3fdaedc4bc 100644
--- a/devel/p5-CPAN-Meta/pkg-plist
+++ b/devel/p5-CPAN-Meta/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/CPAN/Meta/Prereqs.pm
 %%SITE_PERL%%/CPAN/Meta/Spec.pm
 %%SITE_PERL%%/CPAN/Meta/Validator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Meta/.packlist
 %%PERL5_MAN3%%/CPAN::Meta.3.gz
 %%PERL5_MAN3%%/CPAN::Meta::Converter.3.gz
 %%PERL5_MAN3%%/CPAN::Meta::Feature.3.gz
diff --git a/devel/p5-CPAN-Mini/Makefile b/devel/p5-CPAN-Mini/Makefile
index b4d37f0f3a7b..a6f40cc3860a 100644
--- a/devel/p5-CPAN-Mini/Makefile
+++ b/devel/p5-CPAN-Mini/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Mini
 PORTVERSION=	1.111013
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-CPAN-Mini/pkg-plist b/devel/p5-CPAN-Mini/pkg-plist
index 4950136b9490..89b08e2b92a0 100644
--- a/devel/p5-CPAN-Mini/pkg-plist
+++ b/devel/p5-CPAN-Mini/pkg-plist
@@ -1,5 +1,4 @@
 bin/minicpan
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Mini/.packlist
 %%SITE_PERL%%/CPAN/Mini.pm
 %%SITE_PERL%%/CPAN/Mini/App.pm
 %%PERL5_MAN3%%/CPAN::Mini.3.gz
diff --git a/devel/p5-CPAN-Perl-Releases/Makefile b/devel/p5-CPAN-Perl-Releases/Makefile
index 7b67579346d0..c86269c4d82a 100644
--- a/devel/p5-CPAN-Perl-Releases/Makefile
+++ b/devel/p5-CPAN-Perl-Releases/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Perl-Releases
 PORTVERSION=	1.96
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Perl-Releases/pkg-plist b/devel/p5-CPAN-Perl-Releases/pkg-plist
index eee31d61d08e..98cd4a655c40 100644
--- a/devel/p5-CPAN-Perl-Releases/pkg-plist
+++ b/devel/p5-CPAN-Perl-Releases/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CPAN/Perl/Releases.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Perl/Releases/.packlist
 %%PERL5_MAN3%%/CPAN::Perl::Releases.3.gz
diff --git a/devel/p5-CPAN-Recent-Uploads/Makefile b/devel/p5-CPAN-Recent-Uploads/Makefile
index f5a120b61ab0..853433468ac0 100644
--- a/devel/p5-CPAN-Recent-Uploads/Makefile
+++ b/devel/p5-CPAN-Recent-Uploads/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Recent-Uploads
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/devel/p5-CPAN-Recent-Uploads/pkg-plist b/devel/p5-CPAN-Recent-Uploads/pkg-plist
index 90de3795d8d7..546f0c1f3c08 100644
--- a/devel/p5-CPAN-Recent-Uploads/pkg-plist
+++ b/devel/p5-CPAN-Recent-Uploads/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/CPAN/Recent/Uploads/Retriever.pm
 %%SITE_PERL%%/CPAN/Recent/Uploads.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Recent/Uploads/.packlist
 %%PERL5_MAN3%%/CPAN::Recent::Uploads.3.gz
 %%PERL5_MAN3%%/CPAN::Recent::Uploads::Retriever.3.gz
diff --git a/devel/p5-CPAN-Reporter-Smoker/Makefile b/devel/p5-CPAN-Reporter-Smoker/Makefile
index b540366ccbc8..eb82c23eb538 100644
--- a/devel/p5-CPAN-Reporter-Smoker/Makefile
+++ b/devel/p5-CPAN-Reporter-Smoker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Reporter-Smoker
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-CPAN-Reporter-Smoker/pkg-plist b/devel/p5-CPAN-Reporter-Smoker/pkg-plist
index 392db5f84783..28be7d7b9fe2 100644
--- a/devel/p5-CPAN-Reporter-Smoker/pkg-plist
+++ b/devel/p5-CPAN-Reporter-Smoker/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Reporter/Smoker/.packlist
 %%SITE_PERL%%/CPAN/Reporter/Smoker.pm
 %%PERL5_MAN3%%/CPAN::Reporter::Smoker.3.gz
diff --git a/devel/p5-CPAN-Reporter/Makefile b/devel/p5-CPAN-Reporter/Makefile
index 41fe9054881f..6be54155bcbc 100644
--- a/devel/p5-CPAN-Reporter/Makefile
+++ b/devel/p5-CPAN-Reporter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Reporter
 PORTVERSION=	1.2011
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-CPAN-Reporter/pkg-plist b/devel/p5-CPAN-Reporter/pkg-plist
index 5f09f4208b17..54cfe62908e5 100644
--- a/devel/p5-CPAN-Reporter/pkg-plist
+++ b/devel/p5-CPAN-Reporter/pkg-plist
@@ -4,7 +4,6 @@
 %%SITE_PERL%%/CPAN/Reporter/FAQ.pm
 %%SITE_PERL%%/CPAN/Reporter/API.pm
 %%SITE_PERL%%/CPAN/Reporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Reporter/.packlist
 %%PERL5_MAN3%%/CPAN::Reporter::API.3.gz
 %%PERL5_MAN3%%/CPAN::Reporter::Config.3.gz
 %%PERL5_MAN3%%/CPAN::Reporter::History.3.gz
diff --git a/devel/p5-CPAN-SQLite/Makefile b/devel/p5-CPAN-SQLite/Makefile
index 81e1b701d61e..f24a06954ff6 100644
--- a/devel/p5-CPAN-SQLite/Makefile
+++ b/devel/p5-CPAN-SQLite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-SQLite
 PORTVERSION=	0.199
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RKOBES
diff --git a/devel/p5-CPAN-SQLite/pkg-plist b/devel/p5-CPAN-SQLite/pkg-plist
index a76f85e60d81..0c7b3bffae01 100644
--- a/devel/p5-CPAN-SQLite/pkg-plist
+++ b/devel/p5-CPAN-SQLite/pkg-plist
@@ -10,7 +10,6 @@ bin/cpandb
 %%SITE_PERL%%/CPAN/SQLite/Search.pm
 %%SITE_PERL%%/CPAN/SQLite/State.pm
 %%SITE_PERL%%/CPAN/SQLite/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/SQLite/.packlist
 %%PERL5_MAN3%%/CPAN::SQLite.3.gz
 %%PERL5_MAN3%%/CPAN::SQLite::DBI.3.gz
 %%PERL5_MAN3%%/CPAN::SQLite::DBI::Index.3.gz
diff --git a/devel/p5-CPAN-Site/Makefile b/devel/p5-CPAN-Site/Makefile
index b9769919fc42..ee480d06ba25 100644
--- a/devel/p5-CPAN-Site/Makefile
+++ b/devel/p5-CPAN-Site/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Site
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Site/pkg-plist b/devel/p5-CPAN-Site/pkg-plist
index 8ab999b750df..6aee5086b22f 100644
--- a/devel/p5-CPAN-Site/pkg-plist
+++ b/devel/p5-CPAN-Site/pkg-plist
@@ -2,4 +2,3 @@ bin/cpansite
 man/man1/cpansite.1.gz
 %%SITE_PERL%%/CPAN/Site.pm
 %%SITE_PERL%%/CPAN/Site/Index.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Site/.packlist
diff --git a/devel/p5-CPAN-Testers-Report/Makefile b/devel/p5-CPAN-Testers-Report/Makefile
index 1c322ed4a918..5dc98e757d83 100644
--- a/devel/p5-CPAN-Testers-Report/Makefile
+++ b/devel/p5-CPAN-Testers-Report/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Testers-Report
 PORTVERSION=	1.999001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-CPAN-Testers-Report/pkg-plist b/devel/p5-CPAN-Testers-Report/pkg-plist
index fc582b6ff71f..245e935cc215 100644
--- a/devel/p5-CPAN-Testers-Report/pkg-plist
+++ b/devel/p5-CPAN-Testers-Report/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/CPAN/Testers/Fact/TestSummary.pm
 %%SITE_PERL%%/CPAN/Testers/Fact/TestOutput.pm
 %%SITE_PERL%%/CPAN/Testers/Fact/TestEnvironment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Testers/Report/.packlist
 %%PERL5_MAN3%%/CPAN::Testers::Fact::LegacyReport.3.gz
 %%PERL5_MAN3%%/CPAN::Testers::Fact::TestEnvironment.3.gz
 %%PERL5_MAN3%%/CPAN::Testers::Fact::InstalledModules.3.gz
diff --git a/devel/p5-CPAN-Uploader/Makefile b/devel/p5-CPAN-Uploader/Makefile
index 545f068fdd0e..67afc403e676 100644
--- a/devel/p5-CPAN-Uploader/Makefile
+++ b/devel/p5-CPAN-Uploader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPAN-Uploader
 PORTVERSION=	0.103004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Uploader/pkg-plist b/devel/p5-CPAN-Uploader/pkg-plist
index 97255656a58f..5dc17a50775b 100644
--- a/devel/p5-CPAN-Uploader/pkg-plist
+++ b/devel/p5-CPAN-Uploader/pkg-plist
@@ -1,5 +1,4 @@
 bin/cpan-upload
 %%SITE_PERL%%/CPAN/Uploader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Uploader/.packlist
 %%PERL5_MAN3%%/CPAN::Uploader.3.gz
 man/man1/cpan-upload.1.gz
diff --git a/devel/p5-CPAN-YACSmoke/Makefile b/devel/p5-CPAN-YACSmoke/Makefile
index d0035d88b78f..a2f55f05cff9 100644
--- a/devel/p5-CPAN-YACSmoke/Makefile
+++ b/devel/p5-CPAN-YACSmoke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CPAN-YACSmoke
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-YACSmoke/pkg-plist b/devel/p5-CPAN-YACSmoke/pkg-plist
index 8c4c130b5a5c..c3c521cefd5e 100644
--- a/devel/p5-CPAN-YACSmoke/pkg-plist
+++ b/devel/p5-CPAN-YACSmoke/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/CPAN/YACSmoke.pm
 %%SITE_PERL%%/CPAN/YACSmoke/Plugin/Recent.pm
 %%SITE_PERL%%/CPAN/YACSmoke/Plugin/SmokeDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/YACSmoke/.packlist
diff --git a/devel/p5-CPANPLUS-Dist-Build/Makefile b/devel/p5-CPANPLUS-Dist-Build/Makefile
index 2a23991fe6e3..a80e5398233d 100644
--- a/devel/p5-CPANPLUS-Dist-Build/Makefile
+++ b/devel/p5-CPANPLUS-Dist-Build/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPANPLUS-Dist-Build
 PORTVERSION=	0.78
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPANPLUS-Dist-Build/pkg-plist b/devel/p5-CPANPLUS-Dist-Build/pkg-plist
index 16b6db65d2de..53173e0b1f1e 100644
--- a/devel/p5-CPANPLUS-Dist-Build/pkg-plist
+++ b/devel/p5-CPANPLUS-Dist-Build/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/CPANPLUS::Dist::Build::Constants.3.gz
 %%SITE_PERL%%/CPANPLUS/Dist/Build.pm
 %%SITE_PERL%%/CPANPLUS/Dist/Build/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPANPLUS/Dist/Build/.packlist
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index 2f616da21164..d26e4461287c 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPANPLUS
 PORTVERSION=	0.9152
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/devel/p5-CPANPLUS/pkg-plist b/devel/p5-CPANPLUS/pkg-plist
index 855c97c28f2f..1eb8f2bcf574 100644
--- a/devel/p5-CPANPLUS/pkg-plist
+++ b/devel/p5-CPANPLUS/pkg-plist
@@ -76,4 +76,3 @@
 %%SITE_PERL%%/CPANPLUS/Shell/Default/Plugins/HOWTO.pod
 %%SITE_PERL%%/CPANPLUS/Shell/Default/Plugins/Remote.pm
 %%SITE_PERL%%/CPANPLUS/Shell/Default/Plugins/Source.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPANPLUS/.packlist
diff --git a/devel/p5-CPS/Makefile b/devel/p5-CPS/Makefile
index 1f755e1ee20a..1874d3a09b05 100644
--- a/devel/p5-CPS/Makefile
+++ b/devel/p5-CPS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CPS
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/devel/p5-Cache-AgainstFile/Makefile b/devel/p5-Cache-AgainstFile/Makefile
index 087f18040d91..74c7897b0059 100644
--- a/devel/p5-Cache-AgainstFile/Makefile
+++ b/devel/p5-Cache-AgainstFile/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Cache-AgainstFile
 PORTVERSION=	1.016
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Cache
diff --git a/devel/p5-Cache-AgainstFile/pkg-plist b/devel/p5-Cache-AgainstFile/pkg-plist
index d00d7bf9739f..fbe386fa1b45 100644
--- a/devel/p5-Cache-AgainstFile/pkg-plist
+++ b/devel/p5-Cache-AgainstFile/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/Cache/AgainstFile/Memory.pm
 %%SITE_PERL%%/Cache/AgainstFile/Null.pm
 %%SITE_PERL%%/Cache/AgainstFile/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/AgainstFile/.packlist
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index e98eb876a55a..ca12e8f90952 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Cache
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Cache-Cache/pkg-plist b/devel/p5-Cache-Cache/pkg-plist
index f326541635d8..bee7d8d2584e 100644
--- a/devel/p5-Cache-Cache/pkg-plist
+++ b/devel/p5-Cache-Cache/pkg-plist
@@ -38,4 +38,3 @@
 %%SITE_PERL%%/Cache/SizeAwareFileCache.pm
 %%SITE_PERL%%/Cache/SizeAwareMemoryCache.pm
 %%SITE_PERL%%/Cache/SizeAwareSharedMemoryCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Cache/.packlist
diff --git a/devel/p5-Cache-FastMmap/Makefile b/devel/p5-Cache-FastMmap/Makefile
index 9e5ef557df00..ef6d8a987c60 100644
--- a/devel/p5-Cache-FastMmap/Makefile
+++ b/devel/p5-Cache-FastMmap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-FastMmap
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROBM
diff --git a/devel/p5-Cache-FastMmap/pkg-plist b/devel/p5-Cache-FastMmap/pkg-plist
index 4be90e668b87..264e9417331a 100644
--- a/devel/p5-Cache-FastMmap/pkg-plist
+++ b/devel/p5-Cache-FastMmap/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Cache::FastMmap.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Cache/FastMmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/FastMmap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/FastMmap/FastMmap.so
+%%SITE_ARCH%%/Cache/FastMmap.pm
+%%SITE_ARCH%%/auto/Cache/FastMmap/FastMmap.so
diff --git a/devel/p5-Cache-LRU/Makefile b/devel/p5-Cache-LRU/Makefile
index e0e963eb4ca4..9262f9995197 100644
--- a/devel/p5-Cache-LRU/Makefile
+++ b/devel/p5-Cache-LRU/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-LRU
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZUHO
diff --git a/devel/p5-Cache-LRU/pkg-plist b/devel/p5-Cache-LRU/pkg-plist
index 80bec0cf7fed..d9005ba77cce 100644
--- a/devel/p5-Cache-LRU/pkg-plist
+++ b/devel/p5-Cache-LRU/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Cache::LRU.3.gz
 %%SITE_PERL%%/Cache/LRU.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/LRU/.packlist
diff --git a/devel/p5-Cache-Memcached-Tie/Makefile b/devel/p5-Cache-Memcached-Tie/Makefile
index ae24eda24ba7..fc88f2999031 100644
--- a/devel/p5-Cache-Memcached-Tie/Makefile
+++ b/devel/p5-Cache-Memcached-Tie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Memcached-Tie
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Cache-Memcached-Tie/pkg-plist b/devel/p5-Cache-Memcached-Tie/pkg-plist
index 9d6f6f2aba61..52fe9cd44f0d 100644
--- a/devel/p5-Cache-Memcached-Tie/pkg-plist
+++ b/devel/p5-Cache-Memcached-Tie/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Cache::Memcached::Tie.3.gz
 %%SITE_PERL%%/Cache/Memcached/Tie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/Tie/.packlist
diff --git a/devel/p5-Cache-Mmap/Makefile b/devel/p5-Cache-Mmap/Makefile
index db77c7cd399b..1b120c778d9b 100644
--- a/devel/p5-Cache-Mmap/Makefile
+++ b/devel/p5-Cache-Mmap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Mmap
 PORTVERSION=	0.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Cache-Mmap/pkg-plist b/devel/p5-Cache-Mmap/pkg-plist
index 264ec0c23ee0..8d9faf909f7a 100644
--- a/devel/p5-Cache-Mmap/pkg-plist
+++ b/devel/p5-Cache-Mmap/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Cache::Mmap.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Cache/Mmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap/Mmap.so
+%%SITE_ARCH%%/Cache/Mmap.pm
+%%SITE_ARCH%%/auto/Cache/Mmap/Mmap.so
diff --git a/devel/p5-Cache-Simple-TimedExpiry/Makefile b/devel/p5-Cache-Simple-TimedExpiry/Makefile
index b7ee02d4ea6a..c24cf4e7ca76 100644
--- a/devel/p5-Cache-Simple-TimedExpiry/Makefile
+++ b/devel/p5-Cache-Simple-TimedExpiry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache-Simple-TimedExpiry
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Cache-Simple-TimedExpiry/pkg-plist b/devel/p5-Cache-Simple-TimedExpiry/pkg-plist
index 806b90fdcccf..c491a5bd40dc 100644
--- a/devel/p5-Cache-Simple-TimedExpiry/pkg-plist
+++ b/devel/p5-Cache-Simple-TimedExpiry/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Cache::Simple::TimedExpiry.3.gz
 %%SITE_PERL%%/Cache/Simple/TimedExpiry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Simple/TimedExpiry/.packlist
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index 29938de49cc1..6f0044bf3946 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cache
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Cairo-GObject/Makefile b/devel/p5-Cairo-GObject/Makefile
index b32ffc8322cf..b504bb2b2891 100644
--- a/devel/p5-Cairo-GObject/Makefile
+++ b/devel/p5-Cairo-GObject/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cairo-GObject
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	devel graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:XAOC
diff --git a/devel/p5-Cairo-GObject/pkg-plist b/devel/p5-Cairo-GObject/pkg-plist
index d4ec311792f2..0aeaf2b4be91 100644
--- a/devel/p5-Cairo-GObject/pkg-plist
+++ b/devel/p5-Cairo-GObject/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/GObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/GObject/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cairo/GObject/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cairo/GObject/GObject.so
+%%SITE_ARCH%%/Cairo/GObject.pm
+%%SITE_ARCH%%/Cairo/GObject/Install/Files.pm
+%%SITE_ARCH%%/auto/Cairo/GObject/GObject.so
 %%PERL5_MAN3%%/Cairo::GObject.3.gz
diff --git a/devel/p5-Calendar-Simple/Makefile b/devel/p5-Calendar-Simple/Makefile
index fdfe7e61fcf9..5ae0b5da3f29 100644
--- a/devel/p5-Calendar-Simple/Makefile
+++ b/devel/p5-Calendar-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Calendar-Simple
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAVECROSS
diff --git a/devel/p5-Callback-Frame/Makefile b/devel/p5-Callback-Frame/Makefile
index 98342e2101af..a33d2143fa6d 100644
--- a/devel/p5-Callback-Frame/Makefile
+++ b/devel/p5-Callback-Frame/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Callback-Frame
 PORTVERSION=	1.100
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Callback-Frame/pkg-plist b/devel/p5-Callback-Frame/pkg-plist
index 2310d7b0d64c..4d2ac700236b 100644
--- a/devel/p5-Callback-Frame/pkg-plist
+++ b/devel/p5-Callback-Frame/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Callback::Frame.3.gz
 %%SITE_PERL%%/Callback/Frame.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Callback/Frame/.packlist
diff --git a/devel/p5-Capture-Tiny/Makefile b/devel/p5-Capture-Tiny/Makefile
index 97f31cc1dc42..7b7a325e1197 100644
--- a/devel/p5-Capture-Tiny/Makefile
+++ b/devel/p5-Capture-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Capture-Tiny
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Capture-Tiny/pkg-plist b/devel/p5-Capture-Tiny/pkg-plist
index f39da3faa0df..fd48dd0edbd8 100644
--- a/devel/p5-Capture-Tiny/pkg-plist
+++ b/devel/p5-Capture-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Capture/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Capture/Tiny/.packlist
 %%PERL5_MAN3%%/Capture::Tiny.3.gz
diff --git a/devel/p5-Carp-Always-Color/Makefile b/devel/p5-Carp-Always-Color/Makefile
index ce52a400365c..4dbe1a866191 100644
--- a/devel/p5-Carp-Always-Color/Makefile
+++ b/devel/p5-Carp-Always-Color/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp-Always-Color
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Carp-Always-Color/pkg-plist b/devel/p5-Carp-Always-Color/pkg-plist
index b1283794376e..987dcf70572a 100644
--- a/devel/p5-Carp-Always-Color/pkg-plist
+++ b/devel/p5-Carp-Always-Color/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Carp/Always/Color.pm
 %%SITE_PERL%%/Carp/Always/Color/HTML.pm
 %%SITE_PERL%%/Carp/Always/Color/Term.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Always/Color/.packlist
 %%PERL5_MAN3%%/Carp::Always::Color.3.gz
 %%PERL5_MAN3%%/Carp::Always::Color::HTML.3.gz
 %%PERL5_MAN3%%/Carp::Always::Color::Term.3.gz
diff --git a/devel/p5-Carp-Always/Makefile b/devel/p5-Carp-Always/Makefile
index 476edced16c5..63de11f1bf75 100644
--- a/devel/p5-Carp-Always/Makefile
+++ b/devel/p5-Carp-Always/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Carp-Always
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Carp-Always/pkg-plist b/devel/p5-Carp-Always/pkg-plist
index 25ae3f668a17..216d8fc68561 100644
--- a/devel/p5-Carp-Always/pkg-plist
+++ b/devel/p5-Carp-Always/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Always/.packlist
 %%SITE_PERL%%/Carp/Always.pm
 %%PERL5_MAN3%%/Carp::Always.3.gz
diff --git a/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile
index 347d8cb3c9ee..64e949889045 100644
--- a/devel/p5-Carp-Assert-More/Makefile
+++ b/devel/p5-Carp-Assert-More/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp-Assert-More
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Carp-Assert-More/pkg-plist b/devel/p5-Carp-Assert-More/pkg-plist
index 464d0f5c372e..ff2db5e70ddc 100644
--- a/devel/p5-Carp-Assert-More/pkg-plist
+++ b/devel/p5-Carp-Assert-More/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Carp::Assert::More.3.gz
 %%SITE_PERL%%/Carp/Assert/More.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Assert/More/.packlist
diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index d54ef4b03789..47916f97a706 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp-Assert
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Carp-Assert/pkg-plist b/devel/p5-Carp-Assert/pkg-plist
index c4f88877cbec..3b21202897d3 100644
--- a/devel/p5-Carp-Assert/pkg-plist
+++ b/devel/p5-Carp-Assert/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Carp::Assert.3.gz
 %%SITE_PERL%%/Carp/Assert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Assert/.packlist
diff --git a/devel/p5-Carp-Clan-Share/Makefile b/devel/p5-Carp-Clan-Share/Makefile
index 4b2abf04e098..9245d917425e 100644
--- a/devel/p5-Carp-Clan-Share/Makefile
+++ b/devel/p5-Carp-Clan-Share/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp-Clan-Share
 PORTVERSION=	0.013
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Carp
diff --git a/devel/p5-Carp-Clan-Share/pkg-plist b/devel/p5-Carp-Clan-Share/pkg-plist
index 14f64845446e..be66910b6d3b 100644
--- a/devel/p5-Carp-Clan-Share/pkg-plist
+++ b/devel/p5-Carp-Clan-Share/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Carp/Clan/Share.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Clan/Share/.packlist
 %%PERL5_MAN3%%/Carp::Clan::Share.3.gz
diff --git a/devel/p5-Carp-Clan/Makefile b/devel/p5-Carp-Clan/Makefile
index e812511d47d3..ee2dea8d1539 100644
--- a/devel/p5-Carp-Clan/Makefile
+++ b/devel/p5-Carp-Clan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp-Clan
 PORTVERSION=	6.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Carp-Clan/pkg-plist b/devel/p5-Carp-Clan/pkg-plist
index 94af42b76beb..ed6558d7af5b 100644
--- a/devel/p5-Carp-Clan/pkg-plist
+++ b/devel/p5-Carp-Clan/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Carp::Clan.3.gz
 %%SITE_PERL%%/Carp/Clan.pm
 %%SITE_PERL%%/Carp/Clan.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Clan/.packlist
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index da57ab6e95c7..54d3fc8b8b16 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp-Datum
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Carp-Datum/pkg-plist b/devel/p5-Carp-Datum/pkg-plist
index 21059a6af7f3..a58a9eeb04c0 100644
--- a/devel/p5-Carp-Datum/pkg-plist
+++ b/devel/p5-Carp-Datum/pkg-plist
@@ -8,7 +8,6 @@ bin/datum_strip
 %%SITE_PERL%%/Carp/Datum/Parser.pm
 %%SITE_PERL%%/Carp/Datum/Parser.y
 %%SITE_PERL%%/Carp/Datum/Strip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Datum/.packlist
 %%PERL5_MAN3%%/Carp::Datum.3.gz
 %%PERL5_MAN3%%/Carp::Datum::Assert.3.gz
 %%PERL5_MAN3%%/Carp::Datum::Cfg.3.gz
diff --git a/devel/p5-Carp-REPL/Makefile b/devel/p5-Carp-REPL/Makefile
index b20c0bc2a6d5..e6d0fdbfa337 100644
--- a/devel/p5-Carp-REPL/Makefile
+++ b/devel/p5-Carp-REPL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp-REPL
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TSIBLEY
diff --git a/devel/p5-Carp-REPL/pkg-plist b/devel/p5-Carp-REPL/pkg-plist
index cae3d3d0755d..fc11f6f92b76 100644
--- a/devel/p5-Carp-REPL/pkg-plist
+++ b/devel/p5-Carp-REPL/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Devel::REPL::Plugin::Carp::REPL.3.gz
 %%SITE_PERL%%/Carp/REPL.pm
 %%SITE_PERL%%/Devel/REPL/Plugin/Carp/REPL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/REPL/.packlist
diff --git a/devel/p5-Carp/Makefile b/devel/p5-Carp/Makefile
index 802455161a2b..deb24c994a6a 100644
--- a/devel/p5-Carp/Makefile
+++ b/devel/p5-Carp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Carp
 PORTVERSION=	1.33.01
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Carp/pkg-plist b/devel/p5-Carp/pkg-plist
index 0226f524f42b..8cd35beb5c17 100644
--- a/devel/p5-Carp/pkg-plist
+++ b/devel/p5-Carp/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Carp.pm
 %%SITE_PERL%%/Carp/Heavy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/.packlist
 %%PERL5_MAN3%%/Carp.3.gz
diff --git a/devel/p5-Cdk/Makefile b/devel/p5-Cdk/Makefile
index 98035d90f167..beba683514db 100644
--- a/devel/p5-Cdk/Makefile
+++ b/devel/p5-Cdk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cdk
 PORTVERSION=	5.20120324
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	ftp://dickey.his.com/cdk/
 PKGNAMEPREFIX=	p5-
@@ -22,9 +23,6 @@ INSTALL_TARGET=	pure_install
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-post-stage:
-	@${SED} -i '' -e 's,${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Cdk/.packlist
-
 .include <bsd.port.pre.mk>
 
 .if ${PERL_VER} >= 5.18
diff --git a/devel/p5-Cdk/pkg-plist b/devel/p5-Cdk/pkg-plist
index d6301beb2952..cb5528675f9e 100644
--- a/devel/p5-Cdk/pkg-plist
+++ b/devel/p5-Cdk/pkg-plist
@@ -1,28 +1,27 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Alphalist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Buttonbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Calendar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Diag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Dialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Entry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Fselect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Graph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Histogram.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Itemlist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Label.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Marquee.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Matrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Mentry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Menu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Radio.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Scale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Scroll.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Selection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Slider.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Swindow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Viewer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk/Cdk.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk/autosplit.ix
+%%SITE_ARCH%%/Cdk.pm
+%%SITE_ARCH%%/Cdk/Alphalist.pm
+%%SITE_ARCH%%/Cdk/Buttonbox.pm
+%%SITE_ARCH%%/Cdk/Calendar.pm
+%%SITE_ARCH%%/Cdk/Debug.pm
+%%SITE_ARCH%%/Cdk/Diag.pm
+%%SITE_ARCH%%/Cdk/Dialog.pm
+%%SITE_ARCH%%/Cdk/Entry.pm
+%%SITE_ARCH%%/Cdk/Fselect.pm
+%%SITE_ARCH%%/Cdk/Graph.pm
+%%SITE_ARCH%%/Cdk/Histogram.pm
+%%SITE_ARCH%%/Cdk/Itemlist.pm
+%%SITE_ARCH%%/Cdk/Label.pm
+%%SITE_ARCH%%/Cdk/Marquee.pm
+%%SITE_ARCH%%/Cdk/Matrix.pm
+%%SITE_ARCH%%/Cdk/Mentry.pm
+%%SITE_ARCH%%/Cdk/Menu.pm
+%%SITE_ARCH%%/Cdk/Radio.pm
+%%SITE_ARCH%%/Cdk/Scale.pm
+%%SITE_ARCH%%/Cdk/Scroll.pm
+%%SITE_ARCH%%/Cdk/Selection.pm
+%%SITE_ARCH%%/Cdk/Slider.pm
+%%SITE_ARCH%%/Cdk/Swindow.pm
+%%SITE_ARCH%%/Cdk/Template.pm
+%%SITE_ARCH%%/Cdk/Viewer.pm
+%%SITE_ARCH%%/auto/Cdk/Cdk.so
+%%SITE_ARCH%%/auto/Cdk/autosplit.ix
diff --git a/devel/p5-Check-ISA/Makefile b/devel/p5-Check-ISA/Makefile
index 740d4dcb3343..a2f6942b58a0 100644
--- a/devel/p5-Check-ISA/Makefile
+++ b/devel/p5-Check-ISA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Check-ISA
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NUFFIN
diff --git a/devel/p5-Check-ISA/pkg-plist b/devel/p5-Check-ISA/pkg-plist
index 00d5bba3de1c..02eb31e0fdf3 100644
--- a/devel/p5-Check-ISA/pkg-plist
+++ b/devel/p5-Check-ISA/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Check::ISA.3.gz
 %%SITE_PERL%%/Check/ISA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Check/ISA/.packlist
diff --git a/devel/p5-Child/Makefile b/devel/p5-Child/Makefile
index 3b973f75b972..20f818045294 100644
--- a/devel/p5-Child/Makefile
+++ b/devel/p5-Child/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Child
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
diff --git a/devel/p5-Chooser/Makefile b/devel/p5-Chooser/Makefile
index 12d5f42ae71e..ed814cf3eb99 100644
--- a/devel/p5-Chooser/Makefile
+++ b/devel/p5-Chooser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Chooser
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/devel/p5-Chooser/pkg-plist b/devel/p5-Chooser/pkg-plist
index 9a25b62b7ed8..c52d50c34268 100644
--- a/devel/p5-Chooser/pkg-plist
+++ b/devel/p5-Chooser/pkg-plist
@@ -1,4 +1,3 @@
 bin/chooser
 %%SITE_PERL%%/Chooser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chooser/.packlist
 %%PERL5_MAN3%%/Chooser.3.gz
diff --git a/devel/p5-Class-Accessor-Chained/Makefile b/devel/p5-Class-Accessor-Chained/Makefile
index 225ec5a2334e..633d644f7987 100644
--- a/devel/p5-Class-Accessor-Chained/Makefile
+++ b/devel/p5-Class-Accessor-Chained/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-Accessor-Chained
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Chained/pkg-plist b/devel/p5-Class-Accessor-Chained/pkg-plist
index 89f150bbeac4..765a13a00f05 100644
--- a/devel/p5-Class-Accessor-Chained/pkg-plist
+++ b/devel/p5-Class-Accessor-Chained/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Class::Accessor::Chained::Fast.3.gz
 %%SITE_PERL%%/Class/Accessor/Chained.pm
 %%SITE_PERL%%/Class/Accessor/Chained/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Chained/.packlist
diff --git a/devel/p5-Class-Accessor-Children/Makefile b/devel/p5-Class-Accessor-Children/Makefile
index 6df326944f5c..78e4c47407ba 100644
--- a/devel/p5-Class-Accessor-Children/Makefile
+++ b/devel/p5-Class-Accessor-Children/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Children
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Children/pkg-plist b/devel/p5-Class-Accessor-Children/pkg-plist
index e921d0f271d2..3f84f7afc3fe 100644
--- a/devel/p5-Class-Accessor-Children/pkg-plist
+++ b/devel/p5-Class-Accessor-Children/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Class/Accessor/Children.pm
 %%SITE_PERL%%/Class/Accessor/Children/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Children/.packlist
 %%PERL5_MAN3%%/Class::Accessor::Children.3.gz
 %%PERL5_MAN3%%/Class::Accessor::Children::Fast.3.gz
diff --git a/devel/p5-Class-Accessor-Complex/Makefile b/devel/p5-Class-Accessor-Complex/Makefile
index ed075b84e48f..8014a57a7216 100644
--- a/devel/p5-Class-Accessor-Complex/Makefile
+++ b/devel/p5-Class-Accessor-Complex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-Accessor-Complex
 PORTVERSION=	1.100880
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Complex/pkg-plist b/devel/p5-Class-Accessor-Complex/pkg-plist
index 4a8c1ac15b5c..52ed665dad20 100644
--- a/devel/p5-Class-Accessor-Complex/pkg-plist
+++ b/devel/p5-Class-Accessor-Complex/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Accessor/Complex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Complex/.packlist
 %%PERL5_MAN3%%/Class::Accessor::Complex.3.gz
diff --git a/devel/p5-Class-Accessor-Constructor/Makefile b/devel/p5-Class-Accessor-Constructor/Makefile
index bf3275bebe6f..3589a043c158 100644
--- a/devel/p5-Class-Accessor-Constructor/Makefile
+++ b/devel/p5-Class-Accessor-Constructor/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-Accessor-Constructor
 PORTVERSION=	1.111590
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Constructor/pkg-plist b/devel/p5-Class-Accessor-Constructor/pkg-plist
index 8cb6a125ce56..92ce32d629cb 100644
--- a/devel/p5-Class-Accessor-Constructor/pkg-plist
+++ b/devel/p5-Class-Accessor-Constructor/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Constructor/.packlist
 %%SITE_PERL%%/Class/Accessor/Constructor.pm
 %%SITE_PERL%%/Class/Accessor/Constructor/Base.pm
 %%PERL5_MAN3%%/Class::Accessor::Constructor.3.gz
diff --git a/devel/p5-Class-Accessor-Fast-Contained/Makefile b/devel/p5-Class-Accessor-Fast-Contained/Makefile
index 5547deade5f1..6ebb472a2e12 100644
--- a/devel/p5-Class-Accessor-Fast-Contained/Makefile
+++ b/devel/p5-Class-Accessor-Fast-Contained/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Fast-Contained
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Class
diff --git a/devel/p5-Class-Accessor-Fast-Contained/pkg-plist b/devel/p5-Class-Accessor-Fast-Contained/pkg-plist
index aa428ea3197a..694559178272 100644
--- a/devel/p5-Class-Accessor-Fast-Contained/pkg-plist
+++ b/devel/p5-Class-Accessor-Fast-Contained/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Accessor::Fast::Contained.3.gz
 %%SITE_PERL%%/Class/Accessor/Fast/Contained.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Fast/Contained/.packlist
diff --git a/devel/p5-Class-Accessor-Fast-XS/Makefile b/devel/p5-Class-Accessor-Fast-XS/Makefile
index 23852977b546..8013c3966093 100644
--- a/devel/p5-Class-Accessor-Fast-XS/Makefile
+++ b/devel/p5-Class-Accessor-Fast-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Fast-XS
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Fast-XS/pkg-plist b/devel/p5-Class-Accessor-Fast-XS/pkg-plist
index 28422b51cdfb..6e59071066df 100644
--- a/devel/p5-Class-Accessor-Fast-XS/pkg-plist
+++ b/devel/p5-Class-Accessor-Fast-XS/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::Accessor::Fast::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/Accessor/Fast/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Fast/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Fast/XS/XS.so
+%%SITE_ARCH%%/Class/Accessor/Fast/XS.pm
+%%SITE_ARCH%%/auto/Class/Accessor/Fast/XS/XS.so
diff --git a/devel/p5-Class-Accessor-Grouped/Makefile b/devel/p5-Class-Accessor-Grouped/Makefile
index e421a532e652..1772bee551f7 100644
--- a/devel/p5-Class-Accessor-Grouped/Makefile
+++ b/devel/p5-Class-Accessor-Grouped/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Grouped
 PORTVERSION=	0.10012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RIBASUSHI
diff --git a/devel/p5-Class-Accessor-Grouped/pkg-plist b/devel/p5-Class-Accessor-Grouped/pkg-plist
index efc144d4189b..969a9625c3e4 100644
--- a/devel/p5-Class-Accessor-Grouped/pkg-plist
+++ b/devel/p5-Class-Accessor-Grouped/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Accessor::Grouped.3.gz
 %%SITE_PERL%%/Class/Accessor/Grouped.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Grouped/.packlist
diff --git a/devel/p5-Class-Accessor-Installer/Makefile b/devel/p5-Class-Accessor-Installer/Makefile
index 5dafb5d8e181..5b879d95e1d9 100644
--- a/devel/p5-Class-Accessor-Installer/Makefile
+++ b/devel/p5-Class-Accessor-Installer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Installer
 PORTVERSION=	1.100880
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=
diff --git a/devel/p5-Class-Accessor-Installer/pkg-plist b/devel/p5-Class-Accessor-Installer/pkg-plist
index a8edc583addc..ed2c942cb24d 100644
--- a/devel/p5-Class-Accessor-Installer/pkg-plist
+++ b/devel/p5-Class-Accessor-Installer/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Accessor::Installer.3.gz
 %%SITE_PERL%%/Class/Accessor/Installer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Installer/.packlist
diff --git a/devel/p5-Class-Accessor-Lite/Makefile b/devel/p5-Class-Accessor-Lite/Makefile
index 49c2deb4a16b..97fd29b8df22 100644
--- a/devel/p5-Class-Accessor-Lite/Makefile
+++ b/devel/p5-Class-Accessor-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Lite
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Lite/pkg-plist b/devel/p5-Class-Accessor-Lite/pkg-plist
index ef857f16d028..fd9b0631dd76 100644
--- a/devel/p5-Class-Accessor-Lite/pkg-plist
+++ b/devel/p5-Class-Accessor-Lite/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Accessor/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Lite/.packlist
 %%PERL5_MAN3%%/Class::Accessor::Lite.3.gz
diff --git a/devel/p5-Class-Accessor-Lvalue/Makefile b/devel/p5-Class-Accessor-Lvalue/Makefile
index 81bcf30ba2c7..c318729e1a96 100644
--- a/devel/p5-Class-Accessor-Lvalue/Makefile
+++ b/devel/p5-Class-Accessor-Lvalue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Lvalue
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Named/Makefile b/devel/p5-Class-Accessor-Named/Makefile
index 6cb47a669798..3f1212f37364 100644
--- a/devel/p5-Class-Accessor-Named/Makefile
+++ b/devel/p5-Class-Accessor-Named/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor-Named
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor-Named/pkg-plist b/devel/p5-Class-Accessor-Named/pkg-plist
index 06af1ba1685e..d4d7ed1d5772 100644
--- a/devel/p5-Class-Accessor-Named/pkg-plist
+++ b/devel/p5-Class-Accessor-Named/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Accessor::Named.3.gz
 %%SITE_PERL%%/Class/Accessor/Named.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Named/.packlist
diff --git a/devel/p5-Class-Accessor/Makefile b/devel/p5-Class-Accessor/Makefile
index f54fe1110948..a711cbcfb8ce 100644
--- a/devel/p5-Class-Accessor/Makefile
+++ b/devel/p5-Class-Accessor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Accessor
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Accessor/pkg-plist b/devel/p5-Class-Accessor/pkg-plist
index ca8490ce116d..f99b5734b596 100644
--- a/devel/p5-Class-Accessor/pkg-plist
+++ b/devel/p5-Class-Accessor/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Class/Accessor.pm
 %%SITE_PERL%%/Class/Accessor/Fast.pm
 %%SITE_PERL%%/Class/Accessor/Faster.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/.packlist
diff --git a/devel/p5-Class-Adapter/Makefile b/devel/p5-Class-Adapter/Makefile
index 76e89704beb5..ead59839c40c 100644
--- a/devel/p5-Class-Adapter/Makefile
+++ b/devel/p5-Class-Adapter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Adapter
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Adapter/pkg-plist b/devel/p5-Class-Adapter/pkg-plist
index 37bb3b230a9d..489530d160b4 100644
--- a/devel/p5-Class-Adapter/pkg-plist
+++ b/devel/p5-Class-Adapter/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Class/Adapter.pm
 %%SITE_PERL%%/Class/Adapter/Builder.pm
 %%SITE_PERL%%/Class/Adapter/Clear.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Adapter/.packlist
 %%PERL5_MAN3%%/Class::Adapter.3.gz
 %%PERL5_MAN3%%/Class::Adapter::Builder.3.gz
 %%PERL5_MAN3%%/Class::Adapter::Clear.3.gz
diff --git a/devel/p5-Class-AlzaboWrapper/Makefile b/devel/p5-Class-AlzaboWrapper/Makefile
index 06efe4f221b8..38052b531560 100644
--- a/devel/p5-Class-AlzaboWrapper/Makefile
+++ b/devel/p5-Class-AlzaboWrapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-AlzaboWrapper
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-ArrayObjects/Makefile b/devel/p5-Class-ArrayObjects/Makefile
index f26f10efa39c..cf1f43d3e67a 100644
--- a/devel/p5-Class-ArrayObjects/Makefile
+++ b/devel/p5-Class-ArrayObjects/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-ArrayObjects
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-ArrayObjects/pkg-plist b/devel/p5-Class-ArrayObjects/pkg-plist
index d385b267d038..0f84e6e3f001 100644
--- a/devel/p5-Class-ArrayObjects/pkg-plist
+++ b/devel/p5-Class-ArrayObjects/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::ArrayObjects.3.gz
 %%SITE_PERL%%/Class/ArrayObjects.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ArrayObjects/.packlist
diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile
index c5bbb4052a6b..582bd02309f9 100644
--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-AutoClass
 PORTVERSION=	1.56
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index 9a6d16b6c929..5b749e2672b5 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Autouse
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/devel/p5-Class-Autouse/pkg-plist b/devel/p5-Class-Autouse/pkg-plist
index 4f2f2d5127f8..1ede5adc4069 100644
--- a/devel/p5-Class-Autouse/pkg-plist
+++ b/devel/p5-Class-Autouse/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::Autouse.3.gz
 %%SITE_PERL%%/Class/Autouse.pm
 %%SITE_PERL%%/Class/Autouse/Parent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Autouse/.packlist
diff --git a/devel/p5-Class-Base/Makefile b/devel/p5-Class-Base/Makefile
index 55316b8c0bdb..b69c28a91e26 100644
--- a/devel/p5-Class-Base/Makefile
+++ b/devel/p5-Class-Base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Base
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Base/pkg-plist b/devel/p5-Class-Base/pkg-plist
index 1c6c31c2fc17..fb109ec4bf61 100644
--- a/devel/p5-Class-Base/pkg-plist
+++ b/devel/p5-Class-Base/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Base/.packlist
 %%PERL5_MAN3%%/Class::Base.3.gz
diff --git a/devel/p5-Class-BlackHole/Makefile b/devel/p5-Class-BlackHole/Makefile
index 018673c3114f..ba5fb9f6fe96 100644
--- a/devel/p5-Class-BlackHole/Makefile
+++ b/devel/p5-Class-BlackHole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-BlackHole
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-BlackHole/pkg-plist b/devel/p5-Class-BlackHole/pkg-plist
index 60b192902660..3de946bddda7 100644
--- a/devel/p5-Class-BlackHole/pkg-plist
+++ b/devel/p5-Class-BlackHole/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::BlackHole.3.gz
 %%SITE_PERL%%/Class/BlackHole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/BlackHole/.packlist
diff --git a/devel/p5-Class-C3-Adopt-NEXT/Makefile b/devel/p5-Class-C3-Adopt-NEXT/Makefile
index 4421c940488b..7c079add9378 100644
--- a/devel/p5-Class-C3-Adopt-NEXT/Makefile
+++ b/devel/p5-Class-C3-Adopt-NEXT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-C3-Adopt-NEXT
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-C3-Adopt-NEXT/pkg-plist b/devel/p5-Class-C3-Adopt-NEXT/pkg-plist
index 3fb69961e63a..7475c6101d2e 100644
--- a/devel/p5-Class-C3-Adopt-NEXT/pkg-plist
+++ b/devel/p5-Class-C3-Adopt-NEXT/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/C3/Adopt/NEXT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3/Adopt/NEXT/.packlist
 %%PERL5_MAN3%%/Class::C3::Adopt::NEXT.3.gz
diff --git a/devel/p5-Class-C3-Componentised/Makefile b/devel/p5-Class-C3-Componentised/Makefile
index 0d30d8f82748..0b70dc0164da 100644
--- a/devel/p5-Class-C3-Componentised/Makefile
+++ b/devel/p5-Class-C3-Componentised/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-C3-Componentised
 PORTVERSION=	1.0010
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-C3-Componentised/pkg-plist b/devel/p5-Class-C3-Componentised/pkg-plist
index 6d38ed2c7886..db2db95d59c9 100644
--- a/devel/p5-Class-C3-Componentised/pkg-plist
+++ b/devel/p5-Class-C3-Componentised/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Class::C3::Componentised::ApplyHooks.3.gz
 %%SITE_PERL%%/Class/C3/Componentised.pm
 %%SITE_PERL%%/Class/C3/Componentised/ApplyHooks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3/Componentised/.packlist
diff --git a/devel/p5-Class-C3-XS/Makefile b/devel/p5-Class-C3-XS/Makefile
index 49fe412b9463..d9d6b6d9b132 100644
--- a/devel/p5-Class-C3-XS/Makefile
+++ b/devel/p5-Class-C3-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-C3-XS
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-C3-XS/pkg-plist b/devel/p5-Class-C3-XS/pkg-plist
index 297f2dfeeeda..b637253a649c 100644
--- a/devel/p5-Class-C3-XS/pkg-plist
+++ b/devel/p5-Class-C3-XS/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::C3::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/C3/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3/XS/XS.so
+%%SITE_ARCH%%/Class/C3/XS.pm
+%%SITE_ARCH%%/auto/Class/C3/XS/XS.so
diff --git a/devel/p5-Class-C3/Makefile b/devel/p5-Class-C3/Makefile
index 1ac7c5358b48..9d4f781d904b 100644
--- a/devel/p5-Class-C3/Makefile
+++ b/devel/p5-Class-C3/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-C3
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-C3/pkg-plist b/devel/p5-Class-C3/pkg-plist
index 4fd02abec091..333592d4d4f0 100644
--- a/devel/p5-Class-C3/pkg-plist
+++ b/devel/p5-Class-C3/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Class::C3::next.3.gz
 %%SITE_PERL%%/Class/C3.pm
 %%SITE_PERL%%/Class/C3/next.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3/.packlist
diff --git a/devel/p5-Class-Closure/Makefile b/devel/p5-Class-Closure/Makefile
index 92711679c835..8582ab5a987a 100644
--- a/devel/p5-Class-Closure/Makefile
+++ b/devel/p5-Class-Closure/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Closure
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Closure/pkg-plist b/devel/p5-Class-Closure/pkg-plist
index bd9f4a9cefd4..97123679c9e7 100644
--- a/devel/p5-Class-Closure/pkg-plist
+++ b/devel/p5-Class-Closure/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Class/Closure.pm
 %%SITE_PERL%%/Class/benchmark.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Closure/.packlist
 %%PERL5_MAN3%%/Class::Closure.3.gz
diff --git a/devel/p5-Class-CodeStyler/Makefile b/devel/p5-Class-CodeStyler/Makefile
index 343c895ad640..313c3ececb6c 100644
--- a/devel/p5-Class-CodeStyler/Makefile
+++ b/devel/p5-Class-CodeStyler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-CodeStyler
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-CodeStyler/pkg-plist b/devel/p5-Class-CodeStyler/pkg-plist
index 60205b53a31c..ca5ccffbe83a 100644
--- a/devel/p5-Class-CodeStyler/pkg-plist
+++ b/devel/p5-Class-CodeStyler/pkg-plist
@@ -1,2 +1 @@
 %%SITE_PERL%%/Class/CodeStyler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/CodeStyler/.packlist
diff --git a/devel/p5-Class-Component/Makefile b/devel/p5-Class-Component/Makefile
index b1363bcdd136..40fdb5b6a0ea 100644
--- a/devel/p5-Class-Component/Makefile
+++ b/devel/p5-Class-Component/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Component
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Component/pkg-plist b/devel/p5-Class-Component/pkg-plist
index 95be47de0dfd..3ef70ff21bc9 100644
--- a/devel/p5-Class-Component/pkg-plist
+++ b/devel/p5-Class-Component/pkg-plist
@@ -19,4 +19,3 @@
 %%SITE_PERL%%/Class/Component/Component/Plaggerize/PluginLoader.pm
 %%SITE_PERL%%/Class/Component/Component/SingletonMethod.pm
 %%SITE_PERL%%/Class/Component/Plugin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Component/.packlist
diff --git a/devel/p5-Class-Constant/Makefile b/devel/p5-Class-Constant/Makefile
index 21c616c3df05..b3d4f9954f64 100644
--- a/devel/p5-Class-Constant/Makefile
+++ b/devel/p5-Class-Constant/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Constant
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROBN
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index 2124e3c51806..fbe515bc3316 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Container
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Container/pkg-plist b/devel/p5-Class-Container/pkg-plist
index 171f08c4b12e..bc896d2b8e71 100644
--- a/devel/p5-Class-Container/pkg-plist
+++ b/devel/p5-Class-Container/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Container.3.gz
 %%SITE_PERL%%/Class/Container.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Container/.packlist
diff --git a/devel/p5-Class-Contract/Makefile b/devel/p5-Class-Contract/Makefile
index 5085aa4175f5..3c7c7f95d99d 100644
--- a/devel/p5-Class-Contract/Makefile
+++ b/devel/p5-Class-Contract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Contract
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Contract/pkg-plist b/devel/p5-Class-Contract/pkg-plist
index d9bed4808756..c5dabc76a0fc 100644
--- a/devel/p5-Class-Contract/pkg-plist
+++ b/devel/p5-Class-Contract/pkg-plist
@@ -2,5 +2,4 @@
 %%PERL5_MAN3%%/Class::Contract::Production.3.gz
 %%SITE_PERL%%/Class/Contract.pm
 %%SITE_PERL%%/Class/Contract/Production.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Contract/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo.pl
diff --git a/devel/p5-Class-Data-ConfigHash/Makefile b/devel/p5-Class-Data-ConfigHash/Makefile
index ed6ede99a1af..c419a1221e3a 100644
--- a/devel/p5-Class-Data-ConfigHash/Makefile
+++ b/devel/p5-Class-Data-ConfigHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Data-ConfigHash
 PORTVERSION=	0.00002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Data-ConfigHash/pkg-plist b/devel/p5-Class-Data-ConfigHash/pkg-plist
index 5620830a8d3f..df6c40070d5a 100644
--- a/devel/p5-Class-Data-ConfigHash/pkg-plist
+++ b/devel/p5-Class-Data-ConfigHash/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data/ConfigHash/.packlist
 %%SITE_PERL%%/Class/Data/ConfigHash.pm
 %%PERL5_MAN3%%/Class::Data::ConfigHash.3.gz
diff --git a/devel/p5-Class-Data-Inheritable/Makefile b/devel/p5-Class-Data-Inheritable/Makefile
index 0a7837d25077..d76ece58439d 100644
--- a/devel/p5-Class-Data-Inheritable/Makefile
+++ b/devel/p5-Class-Data-Inheritable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Data-Inheritable
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Data-Inheritable/pkg-plist b/devel/p5-Class-Data-Inheritable/pkg-plist
index 1b61ae74eb9e..7d7bffcded4a 100644
--- a/devel/p5-Class-Data-Inheritable/pkg-plist
+++ b/devel/p5-Class-Data-Inheritable/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Data::Inheritable.3.gz
 %%SITE_PERL%%/Class/Data/Inheritable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data/Inheritable/.packlist
diff --git a/devel/p5-Class-Date/Makefile b/devel/p5-Class-Date/Makefile
index d5fca20f996e..9d098a44d0c5 100644
--- a/devel/p5-Class-Date/Makefile
+++ b/devel/p5-Class-Date/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Date
 PORTVERSION=	1.1.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Date/pkg-plist b/devel/p5-Class-Date/pkg-plist
index 4d91070ccef3..a70226b2ab01 100644
--- a/devel/p5-Class-Date/pkg-plist
+++ b/devel/p5-Class-Date/pkg-plist
@@ -1,8 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date/Invalid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date/Rel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date/Date.so
+%%SITE_ARCH%%/Class/Date.pm
+%%SITE_ARCH%%/Class/Date.pod
+%%SITE_ARCH%%/Class/Date/Const.pm
+%%SITE_ARCH%%/Class/Date/Invalid.pm
+%%SITE_ARCH%%/Class/Date/Rel.pm
+%%SITE_ARCH%%/auto/Class/Date/Date.so
 %%PERL5_MAN3%%/Class::Date.3.gz
diff --git a/devel/p5-Class-Declare/Makefile b/devel/p5-Class-Declare/Makefile
index a528fe890abb..b89f79f72bf4 100644
--- a/devel/p5-Class-Declare/Makefile
+++ b/devel/p5-Class-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Declare
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Declare/pkg-plist b/devel/p5-Class-Declare/pkg-plist
index 404cf535a7c4..cf7925848885 100644
--- a/devel/p5-Class-Declare/pkg-plist
+++ b/devel/p5-Class-Declare/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Class/Declare.pm
 %%SITE_PERL%%/Class/Declare/Dump.pm
 %%SITE_PERL%%/Class/Declare/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Declare/.packlist
 %%PERL5_MAN3%%/Class::Declare::Dump.3.gz
 %%PERL5_MAN3%%/Class::Declare.3.gz
 %%PERL5_MAN3%%/Class::Declare::Hash.3.gz
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index b43704dad9f2..3aff17e7f405 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Default
 PORTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Default/pkg-plist b/devel/p5-Class-Default/pkg-plist
index a9c7cbce8266..343172e9bd38 100644
--- a/devel/p5-Class-Default/pkg-plist
+++ b/devel/p5-Class-Default/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Default.3.gz
 %%SITE_PERL%%/Class/Default.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Default/.packlist
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index a2a580e32db6..8b21c9905c4d 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Delegation
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DCONWAY
diff --git a/devel/p5-Class-Delegation/pkg-plist b/devel/p5-Class-Delegation/pkg-plist
index 86391aef4acf..1ee55b1fd395 100644
--- a/devel/p5-Class-Delegation/pkg-plist
+++ b/devel/p5-Class-Delegation/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Class::Delegation.3.gz
 %%SITE_PERL%%/Class/Delegation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Delegation/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_adapt_interface.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_change_semantics.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_facade.pl
diff --git a/devel/p5-Class-ErrorHandler/Makefile b/devel/p5-Class-ErrorHandler/Makefile
index 0c84ba8285e8..04c327a92020 100644
--- a/devel/p5-Class-ErrorHandler/Makefile
+++ b/devel/p5-Class-ErrorHandler/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-ErrorHandler
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Factory-Util/Makefile b/devel/p5-Class-Factory-Util/Makefile
index a45e8369633b..5911c5c9e9f9 100644
--- a/devel/p5-Class-Factory-Util/Makefile
+++ b/devel/p5-Class-Factory-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Factory-Util
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Factory/Makefile b/devel/p5-Class-Factory/Makefile
index 5072903d925e..c9d892a4d887 100644
--- a/devel/p5-Class-Factory/Makefile
+++ b/devel/p5-Class-Factory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-Factory
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Factory/pkg-plist b/devel/p5-Class-Factory/pkg-plist
index b3fee1ca2597..c53d449a1a22 100644
--- a/devel/p5-Class-Factory/pkg-plist
+++ b/devel/p5-Class-Factory/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Factory.3.gz
 %%SITE_PERL%%/Class/Factory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory/.packlist
diff --git a/devel/p5-Class-Field/Makefile b/devel/p5-Class-Field/Makefile
index 0f9788d837e0..ae49b667c705 100644
--- a/devel/p5-Class-Field/Makefile
+++ b/devel/p5-Class-Field/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Field
 DISTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Field/pkg-plist b/devel/p5-Class-Field/pkg-plist
index d6b2f3d29906..e3226abe560f 100644
--- a/devel/p5-Class-Field/pkg-plist
+++ b/devel/p5-Class-Field/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::Field.3.gz
 %%SITE_PERL%%/Class/Field.pm
 %%SITE_PERL%%/Class/Field.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Field/.packlist
diff --git a/devel/p5-Class-Forward/Makefile b/devel/p5-Class-Forward/Makefile
index 0cc1b2093ac1..11e8c10958fd 100644
--- a/devel/p5-Class-Forward/Makefile
+++ b/devel/p5-Class-Forward/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-Forward
 PORTVERSION=	0.100006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Forward/pkg-plist b/devel/p5-Class-Forward/pkg-plist
index 10d0ef6446af..78f92b5f458b 100644
--- a/devel/p5-Class-Forward/pkg-plist
+++ b/devel/p5-Class-Forward/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Forward/.packlist
 %%SITE_PERL%%/Class/Forward.pm
 %%PERL5_MAN3%%/Class::Forward.3.gz
diff --git a/devel/p5-Class-Generate/Makefile b/devel/p5-Class-Generate/Makefile
index 095b2837b607..d307e8188007 100644
--- a/devel/p5-Class-Generate/Makefile
+++ b/devel/p5-Class-Generate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Generate
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Gomor/Makefile b/devel/p5-Class-Gomor/Makefile
index ca8602945391..77f2f34439ef 100644
--- a/devel/p5-Class-Gomor/Makefile
+++ b/devel/p5-Class-Gomor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Gomor
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Gomor/pkg-plist b/devel/p5-Class-Gomor/pkg-plist
index 024cfa2700ac..529cf9540439 100644
--- a/devel/p5-Class-Gomor/pkg-plist
+++ b/devel/p5-Class-Gomor/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Class/Gomor.pm
 %%SITE_PERL%%/Class/Gomor/Array.pm
 %%SITE_PERL%%/Class/Gomor/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Gomor/.packlist
 %%PERL5_MAN3%%/Class::Gomor.3.gz
 %%PERL5_MAN3%%/Class::Gomor::Hash.3.gz
 %%PERL5_MAN3%%/Class::Gomor::Array.3.gz
diff --git a/devel/p5-Class-Handle/Makefile b/devel/p5-Class-Handle/Makefile
index 0bdf734887c7..1e260905f0ff 100644
--- a/devel/p5-Class-Handle/Makefile
+++ b/devel/p5-Class-Handle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Handle
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Handle/pkg-plist b/devel/p5-Class-Handle/pkg-plist
index a275bbaeefbe..29eacbb458f9 100644
--- a/devel/p5-Class-Handle/pkg-plist
+++ b/devel/p5-Class-Handle/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Handle.3.gz
 %%SITE_PERL%%/Class/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Handle/.packlist
diff --git a/devel/p5-Class-Hook/Makefile b/devel/p5-Class-Hook/Makefile
index a7fd95b692d8..3d43f374b366 100644
--- a/devel/p5-Class-Hook/Makefile
+++ b/devel/p5-Class-Hook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Hook
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Hook/pkg-plist b/devel/p5-Class-Hook/pkg-plist
index 4177f873b22b..28347c209bde 100644
--- a/devel/p5-Class-Hook/pkg-plist
+++ b/devel/p5-Class-Hook/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Hook.3.gz
 %%SITE_PERL%%/Class/Hook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Hook/.packlist
diff --git a/devel/p5-Class-ISA/Makefile b/devel/p5-Class-ISA/Makefile
index 5b43ecda5d52..eceb52468bca 100644
--- a/devel/p5-Class-ISA/Makefile
+++ b/devel/p5-Class-ISA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-ISA
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-ISA/pkg-plist b/devel/p5-Class-ISA/pkg-plist
index 570294c87811..60cc62f6ee70 100644
--- a/devel/p5-Class-ISA/pkg-plist
+++ b/devel/p5-Class-ISA/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::ISA.3.gz
 %%SITE_PERL%%/Class/ISA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ISA/.packlist
diff --git a/devel/p5-Class-Inner/Makefile b/devel/p5-Class-Inner/Makefile
index a1453b3f9d70..11afc4c25148 100644
--- a/devel/p5-Class-Inner/Makefile
+++ b/devel/p5-Class-Inner/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Inner
 PORTVERSION=	0.200001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Inner/pkg-plist b/devel/p5-Class-Inner/pkg-plist
index 31f832d52749..c969259e4c97 100644
--- a/devel/p5-Class-Inner/pkg-plist
+++ b/devel/p5-Class-Inner/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Inner.3.gz
 %%SITE_PERL%%/Class/Inner.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inner/.packlist
diff --git a/devel/p5-Class-InsideOut/Makefile b/devel/p5-Class-InsideOut/Makefile
index 43c612a6d6cc..1283314298cf 100644
--- a/devel/p5-Class-InsideOut/Makefile
+++ b/devel/p5-Class-InsideOut/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-InsideOut
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-InsideOut/pkg-plist b/devel/p5-Class-InsideOut/pkg-plist
index cd98269f016a..f7985352e03b 100644
--- a/devel/p5-Class-InsideOut/pkg-plist
+++ b/devel/p5-Class-InsideOut/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Class/InsideOut.pm
 %%SITE_PERL%%/Class/InsideOut/Manual/About.pod
 %%SITE_PERL%%/Class/InsideOut/Manual/Advanced.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/InsideOut/.packlist
diff --git a/devel/p5-Class-Inspector/Makefile b/devel/p5-Class-Inspector/Makefile
index dedf180935be..fed8ba842739 100644
--- a/devel/p5-Class-Inspector/Makefile
+++ b/devel/p5-Class-Inspector/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Inspector
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Inspector/pkg-plist b/devel/p5-Class-Inspector/pkg-plist
index f29a3bb8ea63..16390e5275a5 100644
--- a/devel/p5-Class-Inspector/pkg-plist
+++ b/devel/p5-Class-Inspector/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Class::Inspector::Functions.3.gz
 %%SITE_PERL%%/Class/Inspector.pm
 %%SITE_PERL%%/Class/Inspector/Functions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inspector/.packlist
diff --git a/devel/p5-Class-Interfaces/Makefile b/devel/p5-Class-Interfaces/Makefile
index 2866ad83e673..d8765d7ea1b7 100644
--- a/devel/p5-Class-Interfaces/Makefile
+++ b/devel/p5-Class-Interfaces/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Interfaces
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Interfaces/pkg-plist b/devel/p5-Class-Interfaces/pkg-plist
index fd1788994f4d..7185d6e344d0 100644
--- a/devel/p5-Class-Interfaces/pkg-plist
+++ b/devel/p5-Class-Interfaces/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Interfaces.3.gz
 %%SITE_PERL%%/Class/Interfaces.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Interfaces/.packlist
diff --git a/devel/p5-Class-Load-XS/Makefile b/devel/p5-Class-Load-XS/Makefile
index c2d642208036..feabf253bdb5 100644
--- a/devel/p5-Class-Load-XS/Makefile
+++ b/devel/p5-Class-Load-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Load-XS
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Load-XS/pkg-plist b/devel/p5-Class-Load-XS/pkg-plist
index 5318bbf6c25a..c4024327fbae 100644
--- a/devel/p5-Class-Load-XS/pkg-plist
+++ b/devel/p5-Class-Load-XS/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/Load/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Load/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Load/XS/XS.so
+%%SITE_ARCH%%/Class/Load/XS.pm
+%%SITE_ARCH%%/auto/Class/Load/XS/XS.so
 %%PERL5_MAN3%%/Class::Load::XS.3.gz
diff --git a/devel/p5-Class-Load/Makefile b/devel/p5-Class-Load/Makefile
index 2954ee50116d..6b0d9c6d23d9 100644
--- a/devel/p5-Class-Load/Makefile
+++ b/devel/p5-Class-Load/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-Load
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Load/pkg-plist b/devel/p5-Class-Load/pkg-plist
index 870b849f68db..ba2df1cad58a 100644
--- a/devel/p5-Class-Load/pkg-plist
+++ b/devel/p5-Class-Load/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Class/Load/PP.pm
 %%SITE_PERL%%/Class/Load.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Load/.packlist
 %%PERL5_MAN3%%/Class::Load.3.gz
diff --git a/devel/p5-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index d8e65ed607ab..8cc9e0be6fa3 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Loader
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Loader/pkg-plist b/devel/p5-Class-Loader/pkg-plist
index d3e26917945e..8c92e131027e 100644
--- a/devel/p5-Class-Loader/pkg-plist
+++ b/devel/p5-Class-Loader/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::Loader.3.gz
 %%SITE_PERL%%/Class/Loader.pm
 %%SITE_PERL%%/Class/LoaderTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Loader/.packlist
diff --git a/devel/p5-Class-MakeMethods/Makefile b/devel/p5-Class-MakeMethods/Makefile
index 15093c718d35..50ba476fb2ae 100644
--- a/devel/p5-Class-MakeMethods/Makefile
+++ b/devel/p5-Class-MakeMethods/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-MakeMethods
 PORTVERSION=	1.010
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-MakeMethods/pkg-plist b/devel/p5-Class-MakeMethods/pkg-plist
index 29f414d0fdfc..40eb1a257c20 100644
--- a/devel/p5-Class-MakeMethods/pkg-plist
+++ b/devel/p5-Class-MakeMethods/pkg-plist
@@ -116,4 +116,3 @@
 %%SITE_PERL%%/Class/MakeMethods/Utility/Inheritable.pm
 %%SITE_PERL%%/Class/MakeMethods/Utility/Ref.pm
 %%SITE_PERL%%/Class/MakeMethods/Utility/TextBuilder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MakeMethods/.packlist
diff --git a/devel/p5-Class-Measure/Makefile b/devel/p5-Class-Measure/Makefile
index ec0db1f6b18d..ee3c839ff02f 100644
--- a/devel/p5-Class-Measure/Makefile
+++ b/devel/p5-Class-Measure/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Measure
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Class
diff --git a/devel/p5-Class-Measure/pkg-plist b/devel/p5-Class-Measure/pkg-plist
index fb7bc7a61cc4..fb73a498ef89 100644
--- a/devel/p5-Class-Measure/pkg-plist
+++ b/devel/p5-Class-Measure/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Class::Measure::Length.3.gz
 %%SITE_PERL%%/Class/Measure.pm
 %%SITE_PERL%%/Class/Measure/Length.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Measure/.packlist
diff --git a/devel/p5-Class-Method-Modifiers-Fast/Makefile b/devel/p5-Class-Method-Modifiers-Fast/Makefile
index 42912a88d143..8d4d01e78fb5 100644
--- a/devel/p5-Class-Method-Modifiers-Fast/Makefile
+++ b/devel/p5-Class-Method-Modifiers-Fast/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-Method-Modifiers-Fast
 PORTVERSION=	0.041
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Method-Modifiers-Fast/pkg-plist b/devel/p5-Class-Method-Modifiers-Fast/pkg-plist
index ea700665c8d1..a268bcc23457 100644
--- a/devel/p5-Class-Method-Modifiers-Fast/pkg-plist
+++ b/devel/p5-Class-Method-Modifiers-Fast/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Method/Modifiers/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Method/Modifiers/Fast/.packlist
 %%PERL5_MAN3%%/Class::Method::Modifiers::Fast.3.gz
diff --git a/devel/p5-Class-Method-Modifiers/Makefile b/devel/p5-Class-Method-Modifiers/Makefile
index d6f69ad8fb29..5f76cca1da5e 100644
--- a/devel/p5-Class-Method-Modifiers/Makefile
+++ b/devel/p5-Class-Method-Modifiers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Method-Modifiers
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Method-Modifiers/pkg-plist b/devel/p5-Class-Method-Modifiers/pkg-plist
index b2980925bad3..d89dd5b6a59b 100644
--- a/devel/p5-Class-Method-Modifiers/pkg-plist
+++ b/devel/p5-Class-Method-Modifiers/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Method/Modifiers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Method/Modifiers/.packlist
 %%PERL5_MAN3%%/Class::Method::Modifiers.3.gz
diff --git a/devel/p5-Class-MethodMaker/Makefile b/devel/p5-Class-MethodMaker/Makefile
index c0542ee6f235..d695e3c2ea5a 100644
--- a/devel/p5-Class-MethodMaker/Makefile
+++ b/devel/p5-Class-MethodMaker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-MethodMaker
 PORTVERSION=	2.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-MethodMaker/pkg-plist b/devel/p5-Class-MethodMaker/pkg-plist
index 4bf3955e3c49..ad5915b143ac 100644
--- a/devel/p5-Class-MethodMaker/pkg-plist
+++ b/devel/p5-Class-MethodMaker/pkg-plist
@@ -6,885 +6,884 @@
 %%PERL5_MAN3%%/Class::MethodMaker::array.3.gz
 %%PERL5_MAN3%%/Class::MethodMaker::hash.3.gz
 %%PERL5_MAN3%%/Class::MethodMaker::scalar.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker/Engine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker/OptExt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker/V1Compat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker/array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker/hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MethodMaker/scalar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/Engine/_boolean.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/Engine/abstract.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/Engine/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/Engine/copy.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/Engine/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/MethodMaker.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0000.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0001.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0002.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0003.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0004.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0005.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0006.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0007.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0008.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0009.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra000a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra000b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0010.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0011.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0012.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0013.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0014.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0015.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0016.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0017.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0018.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0019.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra001a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra001b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0020.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0021.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0022.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0023.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0024.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0025.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0026.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0027.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0028.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0029.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra002a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra002b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0030.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0031.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0032.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0033.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0034.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0035.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0036.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0037.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0038.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0039.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra003a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra003b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0040.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0041.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0042.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0043.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0044.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0045.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0046.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0047.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0048.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0049.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra004a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra004b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0050.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0051.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0052.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0053.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0054.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0055.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0056.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0057.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0058.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0059.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra005a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra005b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0060.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0061.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0062.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0063.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0064.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0065.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0066.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0067.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0068.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0069.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra006a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra006b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0070.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0071.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0072.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0073.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0074.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0075.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0076.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0077.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0078.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0079.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra007a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra007b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0080.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0081.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0082.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0083.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0084.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0085.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0086.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0087.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0088.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0089.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra008a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra008b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0090.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0091.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0092.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0093.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0094.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0095.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0096.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0097.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0098.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0099.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra009a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra009b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00a9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00aa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00ab.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00b9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00ba.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00bb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00c9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00ca.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00cb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00d9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00da.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00db.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00e9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00ea.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00eb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00f9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00fa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra00fb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0100.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0101.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0104.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0105.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0108.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0109.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0110.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0111.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0114.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0115.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0118.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0119.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0120.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0121.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0124.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0125.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0129.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0130.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0131.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0134.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0135.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0138.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0139.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0140.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0141.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0144.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0145.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0148.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0149.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0150.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0151.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0154.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0155.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0158.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0159.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0160.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0161.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0164.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0165.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0168.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0169.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0170.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0171.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0174.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0175.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0178.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0179.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0180.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0181.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0184.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0185.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0188.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0189.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0190.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0191.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0194.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0195.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0198.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra0199.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01a0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01a1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01a4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01a5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01a8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01a9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01b0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01b1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01b4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01b5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01b8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01b9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01c0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01c1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01c4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01c5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01c8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01c9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01d0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01d1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01d4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01d5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01d8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01d9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01e0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01e1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01e4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01e5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01e8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01e9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01f0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01f1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01f4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01f5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01f8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/arra01f9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0000.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0001.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0002.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0003.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0004.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0005.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0006.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0007.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0008.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0009.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash000a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash000b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0010.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0011.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0012.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0013.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0014.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0015.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0016.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0017.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0018.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0019.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash001a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash001b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0020.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0021.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0022.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0023.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0024.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0025.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0026.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0027.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0028.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0029.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash002a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash002b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0030.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0031.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0032.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0033.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0034.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0035.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0036.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0037.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0038.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0039.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash003a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash003b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0040.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0041.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0042.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0043.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0044.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0045.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0046.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0047.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0048.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0049.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash004a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash004b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0050.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0051.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0052.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0053.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0054.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0055.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0056.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0057.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0058.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0059.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash005a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash005b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0060.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0061.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0062.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0063.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0064.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0065.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0066.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0067.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0068.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0069.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash006a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash006b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0070.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0071.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0072.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0073.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0074.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0075.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0076.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0077.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0078.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0079.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash007a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash007b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0080.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0081.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0082.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0083.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0084.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0085.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0086.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0087.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0088.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0089.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash008a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash008b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0090.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0091.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0092.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0093.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0094.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0095.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0096.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0097.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0098.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0099.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash009a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash009b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00a9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00aa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00ab.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00b9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00ba.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00bb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00c9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00ca.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00cb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00d9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00da.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00db.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00e9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00ea.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00eb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00f9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00fa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash00fb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0100.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0101.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0104.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0105.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0108.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0109.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0110.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0111.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0114.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0115.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0118.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0119.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0120.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0121.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0124.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0125.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0129.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0130.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0131.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0134.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0135.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0138.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0139.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0140.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0141.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0144.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0145.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0148.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0149.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0150.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0151.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0154.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0155.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0158.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0159.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0160.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0161.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0164.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0165.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0168.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0169.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0170.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0171.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0174.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0175.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0178.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0179.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0180.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0181.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0184.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0185.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0188.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0189.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0190.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0191.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0194.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0195.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0198.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash0199.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01a0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01a1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01a4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01a5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01a8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01a9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01b0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01b1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01b4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01b5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01b8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01b9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01c0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01c1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01c4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01c5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01c8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01c9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01d0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01d1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01d4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01d5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01d8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01d9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01e0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01e1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01e4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01e5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01e8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01e9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01f0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01f1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01f4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01f5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01f8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/hash/hash01f9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0000.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0001.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0002.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0003.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0004.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0005.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0006.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0007.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0008.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0009.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal000a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal000b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0010.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0011.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0012.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0013.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0014.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0015.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0016.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0017.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0018.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0019.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal001a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal001b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0020.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0021.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0022.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0023.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0024.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0025.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0026.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0027.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0028.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0029.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal002a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal002b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0030.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0031.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0032.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0033.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0034.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0035.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0036.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0037.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0038.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0039.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal003a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal003b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0040.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0041.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0042.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0043.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0044.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0045.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0046.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0047.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0048.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0049.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal004a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal004b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0050.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0051.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0052.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0053.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0054.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0055.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0056.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0057.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0058.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0059.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal005a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal005b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0060.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0061.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0062.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0063.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0064.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0065.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0066.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0067.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0068.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0069.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal006a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal006b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0070.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0071.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0072.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0073.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0074.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0075.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0076.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0077.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0078.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0079.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal007a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal007b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0080.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0081.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0082.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0083.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0084.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0085.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0086.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0087.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0088.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0089.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal008a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal008b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0090.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0091.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0092.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0093.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0094.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0095.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0096.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0097.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0098.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0099.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal009a.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal009b.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00a9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00aa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00ab.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00b9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00ba.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00bb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00c9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00ca.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00cb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00d9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00da.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00db.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00e9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00ea.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00eb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f7.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00f9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00fa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal00fb.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0100.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0101.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0104.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0105.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0108.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0109.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0110.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0111.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0114.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0115.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0118.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0119.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0120.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0121.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0124.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0125.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0129.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0130.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0131.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0134.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0135.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0138.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0139.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0140.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0141.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0144.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0145.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0148.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0149.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0150.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0151.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0154.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0155.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0158.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0159.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0160.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0161.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0164.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0165.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0168.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0169.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0170.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0171.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0174.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0175.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0178.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0179.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0180.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0181.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0184.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0185.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0188.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0189.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0190.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0191.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0194.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0195.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0198.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal0199.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01a0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01a1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01a4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01a5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01a8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01a9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01b0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01b1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01b4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01b5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01b8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01b9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01c0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01c1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01c4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01c5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01c8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01c9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01d0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01d1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01d4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01d5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01d8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01d9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01e0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01e1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01e4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01e5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01e8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01e9.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01f0.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01f1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01f4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01f5.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01f8.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar/scal01f9.al
+%%SITE_ARCH%%/Class/MethodMaker.pm
+%%SITE_ARCH%%/Class/MethodMaker/Constants.pm
+%%SITE_ARCH%%/Class/MethodMaker/Engine.pm
+%%SITE_ARCH%%/Class/MethodMaker/OptExt.pm
+%%SITE_ARCH%%/Class/MethodMaker/V1Compat.pm
+%%SITE_ARCH%%/Class/MethodMaker/array.pm
+%%SITE_ARCH%%/Class/MethodMaker/hash.pm
+%%SITE_ARCH%%/Class/MethodMaker/scalar.pm
+%%SITE_ARCH%%/auto/Class/MethodMaker/Engine/_boolean.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/Engine/abstract.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/Engine/autosplit.ix
+%%SITE_ARCH%%/auto/Class/MethodMaker/Engine/copy.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/Engine/new.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/MethodMaker.so
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0000.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0001.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0002.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0003.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0004.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0005.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0006.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0007.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0008.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0009.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra000a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra000b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0010.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0011.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0012.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0013.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0014.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0015.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0016.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0017.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0018.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0019.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra001a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra001b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0020.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0021.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0022.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0023.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0024.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0025.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0026.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0027.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0028.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0029.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra002a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra002b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0030.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0031.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0032.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0033.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0034.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0035.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0036.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0037.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0038.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0039.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra003a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra003b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0040.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0041.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0042.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0043.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0044.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0045.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0046.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0047.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0048.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0049.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra004a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra004b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0050.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0051.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0052.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0053.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0054.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0055.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0056.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0057.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0058.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0059.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra005a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra005b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0060.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0061.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0062.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0063.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0064.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0065.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0066.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0067.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0068.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0069.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra006a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra006b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0070.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0071.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0072.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0073.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0074.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0075.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0076.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0077.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0078.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0079.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra007a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra007b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0080.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0081.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0082.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0083.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0084.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0085.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0086.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0087.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0088.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0089.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra008a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra008b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0090.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0091.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0092.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0093.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0094.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0095.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0096.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0097.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0098.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0099.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra009a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra009b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00a9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00aa.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00ab.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00b9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00ba.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00bb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00c9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00ca.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00cb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00d9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00da.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00db.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00e9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00ea.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00eb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00f9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00fa.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra00fb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0100.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0101.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0104.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0105.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0108.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0109.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0110.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0111.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0114.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0115.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0118.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0119.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0120.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0121.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0124.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0125.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0128.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0129.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0130.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0131.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0134.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0135.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0138.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0139.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0140.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0141.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0144.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0145.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0148.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0149.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0150.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0151.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0154.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0155.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0158.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0159.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0160.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0161.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0164.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0165.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0168.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0169.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0170.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0171.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0174.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0175.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0178.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0179.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0180.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0181.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0184.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0185.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0188.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0189.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0190.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0191.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0194.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0195.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0198.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra0199.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01a0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01a1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01a4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01a5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01a8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01a9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01b0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01b1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01b4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01b5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01b8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01b9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01c0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01c1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01c4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01c5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01c8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01c9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01d0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01d1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01d4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01d5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01d8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01d9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01e0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01e1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01e4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01e5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01e8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01e9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01f0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01f1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01f4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01f5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01f8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/arra01f9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/array/autosplit.ix
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/autosplit.ix
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0000.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0001.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0002.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0003.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0004.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0005.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0006.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0007.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0008.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0009.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash000a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash000b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0010.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0011.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0012.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0013.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0014.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0015.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0016.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0017.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0018.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0019.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash001a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash001b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0020.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0021.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0022.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0023.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0024.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0025.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0026.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0027.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0028.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0029.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash002a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash002b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0030.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0031.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0032.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0033.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0034.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0035.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0036.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0037.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0038.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0039.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash003a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash003b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0040.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0041.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0042.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0043.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0044.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0045.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0046.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0047.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0048.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0049.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash004a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash004b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0050.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0051.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0052.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0053.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0054.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0055.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0056.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0057.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0058.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0059.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash005a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash005b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0060.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0061.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0062.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0063.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0064.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0065.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0066.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0067.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0068.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0069.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash006a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash006b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0070.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0071.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0072.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0073.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0074.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0075.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0076.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0077.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0078.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0079.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash007a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash007b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0080.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0081.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0082.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0083.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0084.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0085.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0086.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0087.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0088.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0089.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash008a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash008b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0090.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0091.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0092.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0093.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0094.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0095.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0096.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0097.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0098.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0099.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash009a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash009b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00a9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00aa.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00ab.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00b9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00ba.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00bb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00c9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00ca.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00cb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00d9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00da.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00db.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00e9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00ea.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00eb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00f9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00fa.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash00fb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0100.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0101.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0104.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0105.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0108.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0109.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0110.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0111.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0114.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0115.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0118.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0119.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0120.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0121.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0124.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0125.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0128.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0129.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0130.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0131.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0134.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0135.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0138.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0139.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0140.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0141.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0144.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0145.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0148.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0149.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0150.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0151.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0154.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0155.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0158.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0159.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0160.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0161.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0164.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0165.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0168.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0169.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0170.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0171.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0174.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0175.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0178.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0179.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0180.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0181.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0184.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0185.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0188.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0189.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0190.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0191.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0194.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0195.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0198.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash0199.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01a0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01a1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01a4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01a5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01a8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01a9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01b0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01b1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01b4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01b5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01b8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01b9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01c0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01c1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01c4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01c5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01c8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01c9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01d0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01d1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01d4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01d5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01d8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01d9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01e0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01e1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01e4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01e5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01e8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01e9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01f0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01f1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01f4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01f5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01f8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/hash/hash01f9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/autosplit.ix
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0000.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0001.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0002.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0003.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0004.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0005.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0006.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0007.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0008.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0009.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal000a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal000b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0010.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0011.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0012.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0013.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0014.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0015.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0016.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0017.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0018.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0019.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal001a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal001b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0020.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0021.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0022.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0023.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0024.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0025.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0026.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0027.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0028.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0029.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal002a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal002b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0030.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0031.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0032.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0033.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0034.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0035.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0036.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0037.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0038.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0039.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal003a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal003b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0040.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0041.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0042.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0043.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0044.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0045.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0046.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0047.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0048.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0049.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal004a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal004b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0050.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0051.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0052.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0053.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0054.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0055.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0056.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0057.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0058.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0059.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal005a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal005b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0060.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0061.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0062.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0063.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0064.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0065.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0066.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0067.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0068.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0069.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal006a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal006b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0070.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0071.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0072.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0073.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0074.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0075.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0076.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0077.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0078.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0079.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal007a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal007b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0080.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0081.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0082.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0083.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0084.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0085.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0086.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0087.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0088.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0089.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal008a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal008b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0090.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0091.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0092.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0093.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0094.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0095.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0096.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0097.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0098.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0099.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal009a.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal009b.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00a9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00aa.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00ab.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00b9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00ba.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00bb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00c9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00ca.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00cb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00d9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00da.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00db.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00e9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00ea.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00eb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f2.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f3.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f6.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f7.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00f9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00fa.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal00fb.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0100.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0101.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0104.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0105.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0108.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0109.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0110.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0111.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0114.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0115.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0118.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0119.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0120.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0121.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0124.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0125.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0128.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0129.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0130.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0131.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0134.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0135.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0138.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0139.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0140.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0141.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0144.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0145.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0148.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0149.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0150.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0151.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0154.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0155.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0158.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0159.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0160.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0161.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0164.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0165.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0168.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0169.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0170.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0171.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0174.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0175.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0178.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0179.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0180.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0181.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0184.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0185.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0188.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0189.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0190.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0191.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0194.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0195.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0198.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal0199.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01a0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01a1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01a4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01a5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01a8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01a9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01b0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01b1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01b4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01b5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01b8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01b9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01c0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01c1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01c4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01c5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01c8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01c9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01d0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01d1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01d4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01d5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01d8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01d9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01e0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01e1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01e4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01e5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01e8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01e9.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01f0.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01f1.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01f4.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01f5.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01f8.al
+%%SITE_ARCH%%/auto/Class/MethodMaker/scalar/scal01f9.al
diff --git a/devel/p5-Class-MethodMapper/Makefile b/devel/p5-Class-MethodMapper/Makefile
index f608452bc6e3..ca65f8c6aa1e 100644
--- a/devel/p5-Class-MethodMapper/Makefile
+++ b/devel/p5-Class-MethodMapper/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-MethodMapper
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-MethodMapper/pkg-plist b/devel/p5-Class-MethodMapper/pkg-plist
index be5f0cda57af..63bbbda5961c 100644
--- a/devel/p5-Class-MethodMapper/pkg-plist
+++ b/devel/p5-Class-MethodMapper/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Class/MethodMapper.pm
 %%SITE_PERL%%/auto/Class/MethodMapper/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMapper/.packlist
 %%PERL5_MAN3%%/Class::MethodMapper.3.gz
diff --git a/devel/p5-Class-Mix/Makefile b/devel/p5-Class-Mix/Makefile
index a74b8d6560a7..307a8907ab62 100644
--- a/devel/p5-Class-Mix/Makefile
+++ b/devel/p5-Class-Mix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-Mix
 PORTVERSION=	0.005
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Mixin/Makefile b/devel/p5-Class-Mixin/Makefile
index 9406dacb8dfa..d83e508bfa9f 100644
--- a/devel/p5-Class-Mixin/Makefile
+++ b/devel/p5-Class-Mixin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Mixin
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Mixin/pkg-plist b/devel/p5-Class-Mixin/pkg-plist
index a9467889b0fb..17c78bfed794 100644
--- a/devel/p5-Class-Mixin/pkg-plist
+++ b/devel/p5-Class-Mixin/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Mixin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Mixin/.packlist
 %%PERL5_MAN3%%/Class::Mixin.3.gz
diff --git a/devel/p5-Class-MixinFactory/Makefile b/devel/p5-Class-MixinFactory/Makefile
index 03ea1509f1ca..78e19d412ce9 100644
--- a/devel/p5-Class-MixinFactory/Makefile
+++ b/devel/p5-Class-MixinFactory/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-MixinFactory
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-MixinFactory/pkg-plist b/devel/p5-Class-MixinFactory/pkg-plist
index 1e007b825c44..0e30d638df53 100644
--- a/devel/p5-Class-MixinFactory/pkg-plist
+++ b/devel/p5-Class-MixinFactory/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/Class/MixinFactory/InsideOutAttr.pm
 %%SITE_PERL%%/Class/MixinFactory/NEXT.pm
 %%SITE_PERL%%/Class/MixinFactory/ReadMe.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MixinFactory/.packlist
diff --git a/devel/p5-Class-Multimethods-Pure/Makefile b/devel/p5-Class-Multimethods-Pure/Makefile
index 9a57a17c993a..0d6d6b412049 100644
--- a/devel/p5-Class-Multimethods-Pure/Makefile
+++ b/devel/p5-Class-Multimethods-Pure/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Multimethods-Pure
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Multimethods-Pure/pkg-plist b/devel/p5-Class-Multimethods-Pure/pkg-plist
index e4d80f3f8f86..69da96adc149 100644
--- a/devel/p5-Class-Multimethods-Pure/pkg-plist
+++ b/devel/p5-Class-Multimethods-Pure/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Multimethods::Pure.3.gz
 %%SITE_PERL%%/Class/Multimethods/Pure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Multimethods/Pure/.packlist
diff --git a/devel/p5-Class-Multimethods/Makefile b/devel/p5-Class-Multimethods/Makefile
index 3a628b5e2cf7..17ce1f6d5371 100644
--- a/devel/p5-Class-Multimethods/Makefile
+++ b/devel/p5-Class-Multimethods/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Multimethods
 PORTVERSION=	1.70
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Multimethods/pkg-plist b/devel/p5-Class-Multimethods/pkg-plist
index d43bc7ce8d41..8eccd987c583 100644
--- a/devel/p5-Class-Multimethods/pkg-plist
+++ b/devel/p5-Class-Multimethods/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::Multimethods.3.gz
 %%SITE_PERL%%/Class/Multimethods.pm
 %%SITE_PERL%%/Class/Multimethods.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Multimethods/.packlist
diff --git a/devel/p5-Class-NamedParms/Makefile b/devel/p5-Class-NamedParms/Makefile
index 3abcbe794a66..ce461a8cfbe6 100644
--- a/devel/p5-Class-NamedParms/Makefile
+++ b/devel/p5-Class-NamedParms/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-NamedParms
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-NamedParms/pkg-plist b/devel/p5-Class-NamedParms/pkg-plist
index b61a87006369..5db940bc9897 100644
--- a/devel/p5-Class-NamedParms/pkg-plist
+++ b/devel/p5-Class-NamedParms/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::NamedParms.3.gz
 %%SITE_PERL%%/Class/NamedParms.pm
 %%SITE_PERL%%/Class/NamedParms.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/NamedParms/.packlist
diff --git a/devel/p5-Class-Null/Makefile b/devel/p5-Class-Null/Makefile
index 74b168ee6864..5958dac0ad1c 100644
--- a/devel/p5-Class-Null/Makefile
+++ b/devel/p5-Class-Null/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Null
 PORTVERSION=	2.110730
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Null/pkg-plist b/devel/p5-Class-Null/pkg-plist
index 2a4bc4baf133..f228064346e8 100644
--- a/devel/p5-Class-Null/pkg-plist
+++ b/devel/p5-Class-Null/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Null.3.gz
 %%SITE_PERL%%/Class/Null.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Null/.packlist
diff --git a/devel/p5-Class-OOorNO/Makefile b/devel/p5-Class-OOorNO/Makefile
index c65ce9ba4ddb..8d48baf6b26c 100644
--- a/devel/p5-Class-OOorNO/Makefile
+++ b/devel/p5-Class-OOorNO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-OOorNO
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-OOorNO/pkg-plist b/devel/p5-Class-OOorNO/pkg-plist
index 097605c7f35f..ce47f31c4d23 100644
--- a/devel/p5-Class-OOorNO/pkg-plist
+++ b/devel/p5-Class-OOorNO/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::OOorNO.3.gz
 %%SITE_PERL%%/Class/OOorNO.pm
 %%SITE_PERL%%/Class/OOorNO.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/OOorNO/.packlist
diff --git a/devel/p5-Class-ObjectTemplate-DB/Makefile b/devel/p5-Class-ObjectTemplate-DB/Makefile
index 2c0b13c47699..2d78591dc487 100644
--- a/devel/p5-Class-ObjectTemplate-DB/Makefile
+++ b/devel/p5-Class-ObjectTemplate-DB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-ObjectTemplate-DB
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-ObjectTemplate-DB/pkg-plist b/devel/p5-Class-ObjectTemplate-DB/pkg-plist
index 64361d4a7071..19e67cdfae04 100644
--- a/devel/p5-Class-ObjectTemplate-DB/pkg-plist
+++ b/devel/p5-Class-ObjectTemplate-DB/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::ObjectTemplate::DB.3.gz
 %%SITE_PERL%%/Class/ObjectTemplate/DB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate/DB/.packlist
diff --git a/devel/p5-Class-ObjectTemplate/Makefile b/devel/p5-Class-ObjectTemplate/Makefile
index c8cfcd69430f..2fb53cf0453a 100644
--- a/devel/p5-Class-ObjectTemplate/Makefile
+++ b/devel/p5-Class-ObjectTemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-ObjectTemplate
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-ObjectTemplate/pkg-plist b/devel/p5-Class-ObjectTemplate/pkg-plist
index a9e6234441d7..20543db6201d 100644
--- a/devel/p5-Class-ObjectTemplate/pkg-plist
+++ b/devel/p5-Class-ObjectTemplate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::ObjectTemplate.3.gz
 %%SITE_PERL%%/Class/ObjectTemplate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate/.packlist
diff --git a/devel/p5-Class-Observable/Makefile b/devel/p5-Class-Observable/Makefile
index 93215e5b2f77..2f355bbf90ba 100644
--- a/devel/p5-Class-Observable/Makefile
+++ b/devel/p5-Class-Observable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Observable
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Observable/pkg-plist b/devel/p5-Class-Observable/pkg-plist
index 37473c2e24f7..ac91fb76b8d4 100644
--- a/devel/p5-Class-Observable/pkg-plist
+++ b/devel/p5-Class-Observable/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Observable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Observable/.packlist
 %%PERL5_MAN3%%/Class::Observable.3.gz
diff --git a/devel/p5-Class-ParmList/Makefile b/devel/p5-Class-ParmList/Makefile
index cdf4ae6df496..4171052463f4 100644
--- a/devel/p5-Class-ParmList/Makefile
+++ b/devel/p5-Class-ParmList/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-ParmList
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Prototyped/Makefile b/devel/p5-Class-Prototyped/Makefile
index 8c3a37b275a0..7e26677d0f6b 100644
--- a/devel/p5-Class-Prototyped/Makefile
+++ b/devel/p5-Class-Prototyped/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Prototyped
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Prototyped/pkg-plist b/devel/p5-Class-Prototyped/pkg-plist
index bd64209845f9..b1f879a19fa7 100644
--- a/devel/p5-Class-Prototyped/pkg-plist
+++ b/devel/p5-Class-Prototyped/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/Class/Prototyped.pm
 %%SITE_PERL%%/Class/Prototyped/Graph.pm
 %%SITE_PERL%%/Class/Prototyped/why.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Prototyped/.packlist
 %%PERL5_MAN3%%/Class::Prototyped.3.gz
 %%PERL5_MAN3%%/Class::Prototyped::why.3.gz
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index dca427e41f95..dcd7889ddf67 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-ReturnValue
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-ReturnValue/pkg-plist b/devel/p5-Class-ReturnValue/pkg-plist
index aa7893a20429..af8de4d1e77c 100644
--- a/devel/p5-Class-ReturnValue/pkg-plist
+++ b/devel/p5-Class-ReturnValue/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::ReturnValue.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ReturnValue/.packlist
 %%SITE_PERL%%/Class/ReturnValue.pm
diff --git a/devel/p5-Class-Roles/Makefile b/devel/p5-Class-Roles/Makefile
index 0a53bae953e7..b3c1f15a7c4b 100644
--- a/devel/p5-Class-Roles/Makefile
+++ b/devel/p5-Class-Roles/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-Roles
 PORTVERSION=	0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-STL-Containers/Makefile b/devel/p5-Class-STL-Containers/Makefile
index 72e260d4b2ec..d68a6e857614 100644
--- a/devel/p5-Class-STL-Containers/Makefile
+++ b/devel/p5-Class-STL-Containers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-STL-Containers
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-STL-Containers/pkg-plist b/devel/p5-Class-STL-Containers/pkg-plist
index 06987401612b..9090d92de734 100644
--- a/devel/p5-Class-STL-Containers/pkg-plist
+++ b/devel/p5-Class-STL-Containers/pkg-plist
@@ -10,5 +10,4 @@
 %%SITE_PERL%%/Class/STL/Iterators.pm
 %%SITE_PERL%%/Class/STL/Trace.pm
 %%SITE_PERL%%/Class/STL/Utilities.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/STL/Containers/.packlist
 %%SITE_PERL%%/stl.pm
diff --git a/devel/p5-Class-Singleton/Makefile b/devel/p5-Class-Singleton/Makefile
index c456c2569758..f6e33f8a1f83 100644
--- a/devel/p5-Class-Singleton/Makefile
+++ b/devel/p5-Class-Singleton/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Singleton
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Singleton/pkg-plist b/devel/p5-Class-Singleton/pkg-plist
index c8505849fc00..dc815543fd27 100644
--- a/devel/p5-Class-Singleton/pkg-plist
+++ b/devel/p5-Class-Singleton/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Singleton.3.gz
 %%SITE_PERL%%/Class/Singleton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Singleton/.packlist
diff --git a/devel/p5-Class-Spiffy/Makefile b/devel/p5-Class-Spiffy/Makefile
index e79f158e474c..434aaea40b74 100644
--- a/devel/p5-Class-Spiffy/Makefile
+++ b/devel/p5-Class-Spiffy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Spiffy
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Spiffy/pkg-plist b/devel/p5-Class-Spiffy/pkg-plist
index 2b5232b07258..4976d5ead06c 100644
--- a/devel/p5-Class-Spiffy/pkg-plist
+++ b/devel/p5-Class-Spiffy/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Class/Spiffy.pm
 %%SITE_PERL%%/Class/Spiffy/mixin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Spiffy/.packlist
 %%PERL5_MAN3%%/Class::Spiffy.3.gz
diff --git a/devel/p5-Class-StateMachine/Makefile b/devel/p5-Class-StateMachine/Makefile
index 4635d67f6ab6..13c53a0b6230 100644
--- a/devel/p5-Class-StateMachine/Makefile
+++ b/devel/p5-Class-StateMachine/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-StateMachine
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-StateMachine/pkg-plist b/devel/p5-Class-StateMachine/pkg-plist
index d39e93d8b478..93b1be4e2c54 100644
--- a/devel/p5-Class-StateMachine/pkg-plist
+++ b/devel/p5-Class-StateMachine/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::StateMachine.3.gz
 %%SITE_PERL%%/Class/StateMachine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/StateMachine/.packlist
diff --git a/devel/p5-Class-Std-Fast/Makefile b/devel/p5-Class-Std-Fast/Makefile
index 0457e7523e81..9ac095bd1ea5 100644
--- a/devel/p5-Class-Std-Fast/Makefile
+++ b/devel/p5-Class-Std-Fast/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Class-Std-Fast
 PORTVERSION=	0.0.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Std-Fast/pkg-plist b/devel/p5-Class-Std-Fast/pkg-plist
index 1bd6cbad4a21..b449e61cc203 100644
--- a/devel/p5-Class-Std-Fast/pkg-plist
+++ b/devel/p5-Class-Std-Fast/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Class::Std::Fast::Storable.3.gz
 %%SITE_PERL%%/Class/Std/Fast.pm
 %%SITE_PERL%%/Class/Std/Fast/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Std/Fast/.packlist
diff --git a/devel/p5-Class-Std-Utils/Makefile b/devel/p5-Class-Std-Utils/Makefile
index 58b155526eb9..189273d9497a 100644
--- a/devel/p5-Class-Std-Utils/Makefile
+++ b/devel/p5-Class-Std-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Std-Utils
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Std-Utils/pkg-plist b/devel/p5-Class-Std-Utils/pkg-plist
index f9271e8c67e7..5e9fef660718 100644
--- a/devel/p5-Class-Std-Utils/pkg-plist
+++ b/devel/p5-Class-Std-Utils/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Class/Std/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Std/Utils/.packlist
 %%PERL5_MAN3%%/Class::Std::Utils.3.gz
diff --git a/devel/p5-Class-Std/Makefile b/devel/p5-Class-Std/Makefile
index 22e8b5f64016..161474d4bfb5 100644
--- a/devel/p5-Class-Std/Makefile
+++ b/devel/p5-Class-Std/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Std
 DISTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Std/pkg-plist b/devel/p5-Class-Std/pkg-plist
index f85246d41ac1..73f6d83463c5 100644
--- a/devel/p5-Class-Std/pkg-plist
+++ b/devel/p5-Class-Std/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Std/.packlist
 %%SITE_PERL%%/Class/Std.pm
 %%PERL5_MAN3%%/Class::Std.3.gz
diff --git a/devel/p5-Class-StrongSingleton/Makefile b/devel/p5-Class-StrongSingleton/Makefile
index 85cbc966ff6d..785d5cdacb50 100644
--- a/devel/p5-Class-StrongSingleton/Makefile
+++ b/devel/p5-Class-StrongSingleton/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-StrongSingleton
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-StrongSingleton/pkg-plist b/devel/p5-Class-StrongSingleton/pkg-plist
index ec6b51e685f2..50836142f769 100644
--- a/devel/p5-Class-StrongSingleton/pkg-plist
+++ b/devel/p5-Class-StrongSingleton/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::StrongSingleton.3.gz
 %%SITE_PERL%%/Class/StrongSingleton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/StrongSingleton/.packlist
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index c32f8a6ef341..d7387e981d9b 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Tangram
 PORTVERSION=	1.57
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Tangram/pkg-plist b/devel/p5-Class-Tangram/pkg-plist
index 7c9e93f4481e..b4050a7aec6d 100644
--- a/devel/p5-Class-Tangram/pkg-plist
+++ b/devel/p5-Class-Tangram/pkg-plist
@@ -5,4 +5,3 @@
 %%SITE_PERL%%/Class/Tangram/Containers.pod
 %%SITE_PERL%%/Class/Tangram/Generator.pm
 %%SITE_PERL%%/Class/Tangram/Generator/Stub.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tangram/.packlist
diff --git a/devel/p5-Class-Throwable/Makefile b/devel/p5-Class-Throwable/Makefile
index 7e0387a1c0f9..3e6a07ddbbde 100644
--- a/devel/p5-Class-Throwable/Makefile
+++ b/devel/p5-Class-Throwable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Throwable
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Throwable/pkg-plist b/devel/p5-Class-Throwable/pkg-plist
index 406809720663..19a8439bb452 100644
--- a/devel/p5-Class-Throwable/pkg-plist
+++ b/devel/p5-Class-Throwable/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Throwable.3.gz
 %%SITE_PERL%%/Class/Throwable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Throwable/.packlist
diff --git a/devel/p5-Class-Tiny/Makefile b/devel/p5-Class-Tiny/Makefile
index 46b4472cb1b2..942207f27aa8 100644
--- a/devel/p5-Class-Tiny/Makefile
+++ b/devel/p5-Class-Tiny/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Class-Tiny
 PORTVERSION=	1.000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Tiny/pkg-plist b/devel/p5-Class-Tiny/pkg-plist
index 36cbac2e3d00..43f7000561de 100644
--- a/devel/p5-Class-Tiny/pkg-plist
+++ b/devel/p5-Class-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Tiny.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tiny/.packlist
 %%SITE_PERL%%/Class/Tiny.pm
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index dcd7310e4cb9..0c3a08ff81cb 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-Tom
 PORTVERSION=	3.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Class
diff --git a/devel/p5-Class-Tom/pkg-plist b/devel/p5-Class-Tom/pkg-plist
index dcc6626b04bf..88cd8b0cbe48 100644
--- a/devel/p5-Class-Tom/pkg-plist
+++ b/devel/p5-Class-Tom/pkg-plist
@@ -2,5 +2,4 @@
 %%SITE_PERL%%/Class/Tom/Encode/Base64.pm
 %%SITE_PERL%%/Class/Tom/Code.pm
 %%SITE_PERL%%/Class/Tom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tom/.packlist
 %%PERL5_MAN3%%/Class::Tom.3.gz
diff --git a/devel/p5-Class-Trigger/Makefile b/devel/p5-Class-Trigger/Makefile
index 80b2bc7ea698..fd935a692543 100644
--- a/devel/p5-Class-Trigger/Makefile
+++ b/devel/p5-Class-Trigger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Trigger
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Trigger/pkg-plist b/devel/p5-Class-Trigger/pkg-plist
index c1beb8b8f147..ed8ced14945a 100644
--- a/devel/p5-Class-Trigger/pkg-plist
+++ b/devel/p5-Class-Trigger/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Trigger.3.gz
 %%SITE_PERL%%/Class/Trigger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Trigger/.packlist
diff --git a/devel/p5-Class-Unload/Makefile b/devel/p5-Class-Unload/Makefile
index 5ea8fc1d8d2e..64b2b19caed0 100644
--- a/devel/p5-Class-Unload/Makefile
+++ b/devel/p5-Class-Unload/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Unload
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Unload/pkg-plist b/devel/p5-Class-Unload/pkg-plist
index 4ba28c7876bd..56ce43ff8599 100644
--- a/devel/p5-Class-Unload/pkg-plist
+++ b/devel/p5-Class-Unload/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Unload.3.gz
 %%SITE_PERL%%/Class/Unload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Unload/.packlist
diff --git a/devel/p5-Class-Virtual/Makefile b/devel/p5-Class-Virtual/Makefile
index 97982025547f..9a53ddc83401 100644
--- a/devel/p5-Class-Virtual/Makefile
+++ b/devel/p5-Class-Virtual/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Virtual
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Virtual/pkg-plist b/devel/p5-Class-Virtual/pkg-plist
index 376393c627f7..9eda063bc169 100644
--- a/devel/p5-Class-Virtual/pkg-plist
+++ b/devel/p5-Class-Virtual/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Class::Virtually::Abstract.3.gz
 %%SITE_PERL%%/Class/Virtual.pm
 %%SITE_PERL%%/Class/Virtually/Abstract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Virtual/.packlist
diff --git a/devel/p5-Class-WhiteHole/Makefile b/devel/p5-Class-WhiteHole/Makefile
index 1be01ce345f6..f4f22b87e9cf 100644
--- a/devel/p5-Class-WhiteHole/Makefile
+++ b/devel/p5-Class-WhiteHole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-WhiteHole
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-WhiteHole/pkg-plist b/devel/p5-Class-WhiteHole/pkg-plist
index 23c5f0d7f925..bdea177cf064 100644
--- a/devel/p5-Class-WhiteHole/pkg-plist
+++ b/devel/p5-Class-WhiteHole/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::WhiteHole.3.gz
 %%SITE_PERL%%/Class/WhiteHole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/WhiteHole/.packlist
diff --git a/devel/p5-Class-Workflow/Makefile b/devel/p5-Class-Workflow/Makefile
index 8b4092551e3d..3ddd243fbffd 100644
--- a/devel/p5-Class-Workflow/Makefile
+++ b/devel/p5-Class-Workflow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-Workflow
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-Workflow/pkg-plist b/devel/p5-Class-Workflow/pkg-plist
index 8d1faa0518cc..85b0ce6fb946 100644
--- a/devel/p5-Class-Workflow/pkg-plist
+++ b/devel/p5-Class-Workflow/pkg-plist
@@ -38,4 +38,3 @@
 %%SITE_PERL%%/Class/Workflow/Util/Delta.pm
 %%SITE_PERL%%/Class/Workflow/YAML.pm
 %%SITE_PERL%%/Class/Workflow/YAML.pmc
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Workflow/.packlist
diff --git a/devel/p5-Class-XPath/Makefile b/devel/p5-Class-XPath/Makefile
index 5c82f5db2212..67e435a687f6 100644
--- a/devel/p5-Class-XPath/Makefile
+++ b/devel/p5-Class-XPath/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-XPath
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Class-XPath/pkg-plist b/devel/p5-Class-XPath/pkg-plist
index dee79764f9ce..89ca8fb91eac 100644
--- a/devel/p5-Class-XPath/pkg-plist
+++ b/devel/p5-Class-XPath/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::XPath.3.gz
 %%SITE_PERL%%/Class/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/XPath/.packlist
diff --git a/devel/p5-Class-XSAccessor-Array/Makefile b/devel/p5-Class-XSAccessor-Array/Makefile
index 216227e5347a..e1b891c36c41 100644
--- a/devel/p5-Class-XSAccessor-Array/Makefile
+++ b/devel/p5-Class-XSAccessor-Array/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-XSAccessor-Array
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/devel/p5-Class-XSAccessor-Array/pkg-plist b/devel/p5-Class-XSAccessor-Array/pkg-plist
index e4d810008c43..691ab13917da 100644
--- a/devel/p5-Class-XSAccessor-Array/pkg-plist
+++ b/devel/p5-Class-XSAccessor-Array/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Class::XSAccessor::Array.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/XSAccessor/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/XSAccessor/Array/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/XSAccessor/Array/Array.so
+%%SITE_ARCH%%/Class/XSAccessor/Array.pm
+%%SITE_ARCH%%/auto/Class/XSAccessor/Array/Array.so
diff --git a/devel/p5-Class-XSAccessor/Makefile b/devel/p5-Class-XSAccessor/Makefile
index 3e277a3f98e5..1dfb76361c06 100644
--- a/devel/p5-Class-XSAccessor/Makefile
+++ b/devel/p5-Class-XSAccessor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-XSAccessor
 PORTVERSION=	1.19
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Class-XSAccessor/pkg-plist b/devel/p5-Class-XSAccessor/pkg-plist
index f87a0c0c980e..96f83b6b6da8 100644
--- a/devel/p5-Class-XSAccessor/pkg-plist
+++ b/devel/p5-Class-XSAccessor/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/Class::XSAccessor.3.gz
 %%PERL5_MAN3%%/Class::XSAccessor::Array.3.gz
 %%PERL5_MAN3%%/Class::XSAccessor::Heavy.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/XSAccessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/XSAccessor/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/XSAccessor/Heavy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/XSAccessor/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/XSAccessor/XSAccessor.so
+%%SITE_ARCH%%/Class/XSAccessor.pm
+%%SITE_ARCH%%/Class/XSAccessor/Array.pm
+%%SITE_ARCH%%/Class/XSAccessor/Heavy.pm
+%%SITE_ARCH%%/auto/Class/XSAccessor/XSAccessor.so
diff --git a/devel/p5-Clone-Fast/Makefile b/devel/p5-Clone-Fast/Makefile
index b5184fce3441..e8de4c2a9250 100644
--- a/devel/p5-Clone-Fast/Makefile
+++ b/devel/p5-Clone-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Clone-Fast
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Clone-Fast/pkg-plist b/devel/p5-Clone-Fast/pkg-plist
index 771ae173fe59..67c4972a602f 100644
--- a/devel/p5-Clone-Fast/pkg-plist
+++ b/devel/p5-Clone-Fast/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Clone::Fast.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Clone/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/Fast/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/Fast/Fast.so
+%%SITE_ARCH%%/Clone/Fast.pm
+%%SITE_ARCH%%/auto/Clone/Fast/Fast.so
diff --git a/devel/p5-Clone-More/Makefile b/devel/p5-Clone-More/Makefile
index 87b8fe326e27..33e901cbc1b6 100644
--- a/devel/p5-Clone-More/Makefile
+++ b/devel/p5-Clone-More/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Clone-More
 PORTVERSION=	0.90.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Clone-More/pkg-plist b/devel/p5-Clone-More/pkg-plist
index 3c1edc820fdf..ff23864b9793 100644
--- a/devel/p5-Clone-More/pkg-plist
+++ b/devel/p5-Clone-More/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Clone/More.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/More/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/More/More.so
+%%SITE_ARCH%%/Clone/More.pm
+%%SITE_ARCH%%/auto/Clone/More/More.so
 %%PERL5_MAN3%%/Clone::More.3.gz
diff --git a/devel/p5-Clone-PP/Makefile b/devel/p5-Clone-PP/Makefile
index 47f8c79dfcaa..2acf68f30aa7 100644
--- a/devel/p5-Clone-PP/Makefile
+++ b/devel/p5-Clone-PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Clone-PP
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Clone-PP/pkg-plist b/devel/p5-Clone-PP/pkg-plist
index 4acf7e96b4ef..35340682ed02 100644
--- a/devel/p5-Clone-PP/pkg-plist
+++ b/devel/p5-Clone-PP/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Clone::PP.3.gz
 %%SITE_PERL%%/Clone/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/PP/.packlist
diff --git a/devel/p5-Clone/Makefile b/devel/p5-Clone/Makefile
index d0f7c29d8d96..714e35c2187b 100644
--- a/devel/p5-Clone/Makefile
+++ b/devel/p5-Clone/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Clone
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Clone/pkg-plist b/devel/p5-Clone/pkg-plist
index db9b1fc01ace..1a8ae06d2b92 100644
--- a/devel/p5-Clone/pkg-plist
+++ b/devel/p5-Clone/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/Clone.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Clone.pm
+%%SITE_ARCH%%/auto/Clone/Clone.so
+%%SITE_ARCH%%/auto/Clone/autosplit.ix
+%%SITE_ARCH%%/Clone.pm
 %%PERL5_MAN3%%/Clone.3.gz
diff --git a/devel/p5-Code-Perl/Makefile b/devel/p5-Code-Perl/Makefile
index c4d9ed0007d2..fa7d468bc0bf 100644
--- a/devel/p5-Code-Perl/Makefile
+++ b/devel/p5-Code-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Code-Perl
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FDALY
diff --git a/devel/p5-Code-Perl/pkg-plist b/devel/p5-Code-Perl/pkg-plist
index 65f8bc6a33a1..cadf9a8f3acb 100644
--- a/devel/p5-Code-Perl/pkg-plist
+++ b/devel/p5-Code-Perl/pkg-plist
@@ -21,4 +21,3 @@
 %%SITE_PERL%%/Code/Perl/Expr/String.pm
 %%SITE_PERL%%/Code/Perl/Expr/SubName.pm
 %%SITE_PERL%%/Code/Perl/Test/Expr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Code/Perl/.packlist
diff --git a/devel/p5-Commands-Guarded/Makefile b/devel/p5-Commands-Guarded/Makefile
index d480ebd4d7bc..5b6d2944eed9 100644
--- a/devel/p5-Commands-Guarded/Makefile
+++ b/devel/p5-Commands-Guarded/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Commands-Guarded
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Commands-Guarded/pkg-plist b/devel/p5-Commands-Guarded/pkg-plist
index 439c177a2f8c..79ee09b79297 100644
--- a/devel/p5-Commands-Guarded/pkg-plist
+++ b/devel/p5-Commands-Guarded/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Commands::Guarded.3.gz
 %%SITE_PERL%%/Commands/Guarded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Commands/Guarded/.packlist
diff --git a/devel/p5-CommitBit/Makefile b/devel/p5-CommitBit/Makefile
index 973f4b81aba3..f422b8e1b408 100644
--- a/devel/p5-CommitBit/Makefile
+++ b/devel/p5-CommitBit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CommitBit
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JESSE
diff --git a/devel/p5-CommitBit/pkg-plist b/devel/p5-CommitBit/pkg-plist
index 6a380f67b3f3..f1f4beda4281 100644
--- a/devel/p5-CommitBit/pkg-plist
+++ b/devel/p5-CommitBit/pkg-plist
@@ -21,4 +21,3 @@
 %%SITE_PERL%%/CommitBit/Notification/InviteToProject.pm
 %%SITE_PERL%%/CommitBit/Record.pm
 %%SITE_PERL%%/CommitBit/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CommitBit/.packlist
diff --git a/devel/p5-Compiler-Lexer/Makefile b/devel/p5-Compiler-Lexer/Makefile
index d4ca1eec6d3b..0240cdff4eb7 100644
--- a/devel/p5-Compiler-Lexer/Makefile
+++ b/devel/p5-Compiler-Lexer/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Compiler-Lexer
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -19,6 +20,6 @@ USES=		perl5
 USE_PERL5=	modbuild
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Compiler/Lexer/Lexer.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Compiler/Lexer/Lexer.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-Any/Makefile b/devel/p5-Config-Any/Makefile
index 287727b0c247..89eb9a711416 100644
--- a/devel/p5-Config-Any/Makefile
+++ b/devel/p5-Config-Any/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Config-Any
 PORTVERSION=	0.24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Any/pkg-plist b/devel/p5-Config-Any/pkg-plist
index d8701c0b7c44..1a4e516615f1 100644
--- a/devel/p5-Config-Any/pkg-plist
+++ b/devel/p5-Config-Any/pkg-plist
@@ -14,4 +14,3 @@
 %%SITE_PERL%%/Config/Any/Perl.pm
 %%SITE_PERL%%/Config/Any/XML.pm
 %%SITE_PERL%%/Config/Any/YAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Any/.packlist
diff --git a/devel/p5-Config-ApacheFormat/Makefile b/devel/p5-Config-ApacheFormat/Makefile
index a3b0f2f1b803..4d77eb87ba64 100644
--- a/devel/p5-Config-ApacheFormat/Makefile
+++ b/devel/p5-Config-ApacheFormat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Config-ApacheFormat
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-ApacheFormat/pkg-plist b/devel/p5-Config-ApacheFormat/pkg-plist
index 8d285786fece..91a300b1924b 100644
--- a/devel/p5-Config-ApacheFormat/pkg-plist
+++ b/devel/p5-Config-ApacheFormat/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Config::ApacheFormat.3.gz
 %%SITE_PERL%%/Config/ApacheFormat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/ApacheFormat/.packlist
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index cdc304dc748a..b64ea7b871c5 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Auto
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/devel/p5-Config-Auto/pkg-plist b/devel/p5-Config-Auto/pkg-plist
index 855c47b2f4a6..41e909ce86ca 100644
--- a/devel/p5-Config-Auto/pkg-plist
+++ b/devel/p5-Config-Auto/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/Auto.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Auto/.packlist
 %%PERL5_MAN3%%/Config::Auto.3.gz
diff --git a/devel/p5-Config-AutoConf/Makefile b/devel/p5-Config-AutoConf/Makefile
index b1c8ce612f43..64caf3178e3c 100644
--- a/devel/p5-Config-AutoConf/Makefile
+++ b/devel/p5-Config-AutoConf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-AutoConf
 PORTVERSION=	0.305
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-AutoConf/pkg-plist b/devel/p5-Config-AutoConf/pkg-plist
index fc1476721564..31177da9a3ce 100644
--- a/devel/p5-Config-AutoConf/pkg-plist
+++ b/devel/p5-Config-AutoConf/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Config::AutoConf.3.gz
 %%SITE_PERL%%/Config/AutoConf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/AutoConf/.packlist
diff --git a/devel/p5-Config-Fast/Makefile b/devel/p5-Config-Fast/Makefile
index e5eac06126bb..0762ec8397e0 100644
--- a/devel/p5-Config-Fast/Makefile
+++ b/devel/p5-Config-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Fast
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Fast/pkg-plist b/devel/p5-Config-Fast/pkg-plist
index 723a655da581..694dcc881783 100644
--- a/devel/p5-Config-Fast/pkg-plist
+++ b/devel/p5-Config-Fast/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Fast/.packlist
 %%PERL5_MAN3%%/Config::Fast.3.gz
diff --git a/devel/p5-Config-General/Makefile b/devel/p5-Config-General/Makefile
index f576098996dd..617a7443b89c 100644
--- a/devel/p5-Config-General/Makefile
+++ b/devel/p5-Config-General/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-General
 PORTVERSION=	2.56
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-General/pkg-plist b/devel/p5-Config-General/pkg-plist
index 0648b4469362..0b2f35b705eb 100644
--- a/devel/p5-Config-General/pkg-plist
+++ b/devel/p5-Config-General/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Config/General.pm
 %%SITE_PERL%%/Config/General/Extended.pm
 %%SITE_PERL%%/Config/General/Interpolated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/General/.packlist
 %%PERL5_MAN3%%/Config::General.3.gz
 %%PERL5_MAN3%%/Config::General::Extended.3.gz
 %%PERL5_MAN3%%/Config::General::Interpolated.3.gz
diff --git a/devel/p5-Config-GitLike/Makefile b/devel/p5-Config-GitLike/Makefile
index d43fd5814639..9bee34024928 100644
--- a/devel/p5-Config-GitLike/Makefile
+++ b/devel/p5-Config-GitLike/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-GitLike
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ALEXMV
diff --git a/devel/p5-Config-GitLike/pkg-plist b/devel/p5-Config-GitLike/pkg-plist
index 31096ba81d3b..29733e81f21e 100644
--- a/devel/p5-Config-GitLike/pkg-plist
+++ b/devel/p5-Config-GitLike/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Config/GitLike.pm
 %%SITE_PERL%%/Config/GitLike/Cascaded.pm
 %%SITE_PERL%%/Config/GitLike/Git.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/GitLike/.packlist
diff --git a/devel/p5-Config-Grammar/Makefile b/devel/p5-Config-Grammar/Makefile
index 4dd283d12bf1..796bd018176c 100644
--- a/devel/p5-Config-Grammar/Makefile
+++ b/devel/p5-Config-Grammar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Grammar
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DSCHWEI
diff --git a/devel/p5-Config-Grammar/pkg-plist b/devel/p5-Config-Grammar/pkg-plist
index 24f13c15190c..57f419a14437 100644
--- a/devel/p5-Config-Grammar/pkg-plist
+++ b/devel/p5-Config-Grammar/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/Config/Grammar.pm
 %%SITE_PERL%%/Config/Grammar/Document.pm
 %%SITE_PERL%%/Config/Grammar/Dynamic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Grammar/.packlist
 %%PERL5_MAN3%%/Config::Grammar.3.gz
 %%PERL5_MAN3%%/Config::Grammar::Dynamic.3.gz
diff --git a/devel/p5-Config-INI-Simple/Makefile b/devel/p5-Config-INI-Simple/Makefile
index e4b67bcfef2d..3b46e91049c2 100644
--- a/devel/p5-Config-INI-Simple/Makefile
+++ b/devel/p5-Config-INI-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-INI-Simple
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-INI-Simple/pkg-plist b/devel/p5-Config-INI-Simple/pkg-plist
index 41d7a33a9023..d07da4e699a0 100644
--- a/devel/p5-Config-INI-Simple/pkg-plist
+++ b/devel/p5-Config-INI-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/INI/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/INI/Simple/.packlist
 %%PERL5_MAN3%%/Config::INI::Simple.3.gz
diff --git a/devel/p5-Config-INI/Makefile b/devel/p5-Config-INI/Makefile
index 7c0da26befa2..da5761adc4c0 100644
--- a/devel/p5-Config-INI/Makefile
+++ b/devel/p5-Config-INI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Config-INI
 PORTVERSION=	0.024
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-INI/pkg-plist b/devel/p5-Config-INI/pkg-plist
index 7d2ebd4d0f6d..2a1882d0d763 100644
--- a/devel/p5-Config-INI/pkg-plist
+++ b/devel/p5-Config-INI/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Config/INI.pm
 %%SITE_PERL%%/Config/INI/Reader.pm
 %%SITE_PERL%%/Config/INI/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/INI/.packlist
 %%PERL5_MAN3%%/Config::INI.3.gz
 %%PERL5_MAN3%%/Config::INI::Reader.3.gz
 %%PERL5_MAN3%%/Config::INI::Writer.3.gz
diff --git a/devel/p5-Config-Identity/Makefile b/devel/p5-Config-Identity/Makefile
index 7def828f0779..a76da28bd14b 100644
--- a/devel/p5-Config-Identity/Makefile
+++ b/devel/p5-Config-Identity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Identity
 PORTVERSION=	0.0018
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Identity/pkg-plist b/devel/p5-Config-Identity/pkg-plist
index d025a67dbda4..63253511e47f 100644
--- a/devel/p5-Config-Identity/pkg-plist
+++ b/devel/p5-Config-Identity/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Config/Identity.pm
 %%SITE_PERL%%/Config/Identity/GitHub.pm
 %%SITE_PERL%%/Config/Identity/PAUSE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Identity/.packlist
 %%PERL5_MAN3%%/Config::Identity.3.gz
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 2db04a37062d..6079395b0c0b 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-IniFiles
 PORTVERSION=	2.83
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-IniFiles/pkg-plist b/devel/p5-Config-IniFiles/pkg-plist
index faf708d9ee65..b89b020f7264 100644
--- a/devel/p5-Config-IniFiles/pkg-plist
+++ b/devel/p5-Config-IniFiles/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/IniFiles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/IniFiles/.packlist
 %%PERL5_MAN3%%/Config::IniFiles.3.gz
diff --git a/devel/p5-Config-IniHash/Makefile b/devel/p5-Config-IniHash/Makefile
index 83a5d3ad9588..d6ed6053191f 100644
--- a/devel/p5-Config-IniHash/Makefile
+++ b/devel/p5-Config-IniHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-IniHash
 PORTVERSION=	3.01.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Config/JENDA
diff --git a/devel/p5-Config-IniHash/pkg-plist b/devel/p5-Config-IniHash/pkg-plist
index 8ed2e6f53392..60c5f52c1356 100644
--- a/devel/p5-Config-IniHash/pkg-plist
+++ b/devel/p5-Config-IniHash/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Config::IniHash.3.gz
 %%SITE_PERL%%/Config/IniHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/IniHash/.packlist
diff --git a/devel/p5-Config-IniRegEx/Makefile b/devel/p5-Config-IniRegEx/Makefile
index 9e65bccf0e01..62783f004c62 100644
--- a/devel/p5-Config-IniRegEx/Makefile
+++ b/devel/p5-Config-IniRegEx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-IniRegEx
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-IniRegEx/pkg-plist b/devel/p5-Config-IniRegEx/pkg-plist
index ed7baebf79f2..4941e1a2cafd 100644
--- a/devel/p5-Config-IniRegEx/pkg-plist
+++ b/devel/p5-Config-IniRegEx/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/IniRegEx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/IniRegEx/.packlist
 %%PERL5_MAN3%%/Config::IniRegEx.3.gz
diff --git a/devel/p5-Config-JFDI/Makefile b/devel/p5-Config-JFDI/Makefile
index e453f9de2858..e2ca5d6114be 100644
--- a/devel/p5-Config-JFDI/Makefile
+++ b/devel/p5-Config-JFDI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-JFDI
 PORTVERSION=	0.065
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROKR
diff --git a/devel/p5-Config-JFDI/pkg-plist b/devel/p5-Config-JFDI/pkg-plist
index a02f6a6c4706..c4132492e27f 100644
--- a/devel/p5-Config-JFDI/pkg-plist
+++ b/devel/p5-Config-JFDI/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Config/JFDI.pm
 %%SITE_PERL%%/Config/JFDI/Carp.pm
 %%SITE_PERL%%/Config/JFDI/Source/Loader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/JFDI/.packlist
diff --git a/devel/p5-Config-JSON/Makefile b/devel/p5-Config-JSON/Makefile
index c6e4c44d0b0f..b67142f705be 100644
--- a/devel/p5-Config-JSON/Makefile
+++ b/devel/p5-Config-JSON/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-JSON
 PORTVERSION=	1.5100
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-JSON/pkg-plist b/devel/p5-Config-JSON/pkg-plist
index 394d90c78c54..1acc03ad7fce 100644
--- a/devel/p5-Config-JSON/pkg-plist
+++ b/devel/p5-Config-JSON/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Config::JSON.3.gz
 %%SITE_PERL%%/Config/JSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/JSON/.packlist
diff --git a/devel/p5-Config-MVP-Reader-INI/Makefile b/devel/p5-Config-MVP-Reader-INI/Makefile
index c0aac0cf72cb..138e0ba22178 100644
--- a/devel/p5-Config-MVP-Reader-INI/Makefile
+++ b/devel/p5-Config-MVP-Reader-INI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-MVP-Reader-INI
 PORTVERSION=	2.101461
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-MVP-Reader-INI/pkg-plist b/devel/p5-Config-MVP-Reader-INI/pkg-plist
index 5aa428ac1b13..f1b929f94243 100644
--- a/devel/p5-Config-MVP-Reader-INI/pkg-plist
+++ b/devel/p5-Config-MVP-Reader-INI/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/MVP/Reader/INI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/MVP/Reader/INI/.packlist
 %%PERL5_MAN3%%/Config::MVP::Reader::INI.3.gz
diff --git a/devel/p5-Config-MVP/Makefile b/devel/p5-Config-MVP/Makefile
index 04336700cc1a..98ea05bb2de5 100644
--- a/devel/p5-Config-MVP/Makefile
+++ b/devel/p5-Config-MVP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-MVP
 PORTVERSION=	2.200008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-MVP/pkg-plist b/devel/p5-Config-MVP/pkg-plist
index f4821ed3bf37..e7da7b3ad74e 100644
--- a/devel/p5-Config-MVP/pkg-plist
+++ b/devel/p5-Config-MVP/pkg-plist
@@ -20,4 +20,3 @@
 %%SITE_PERL%%/Config/MVP/Reader/Hash.pm
 %%SITE_PERL%%/Config/MVP/Section.pm
 %%SITE_PERL%%/Config/MVP/Sequence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/MVP/.packlist
diff --git a/devel/p5-Config-Merge/Makefile b/devel/p5-Config-Merge/Makefile
index a612b62da0b5..0a81ce217c74 100644
--- a/devel/p5-Config-Merge/Makefile
+++ b/devel/p5-Config-Merge/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Merge
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Merge/pkg-plist b/devel/p5-Config-Merge/pkg-plist
index 56e08af4c929..226bd0747bd7 100644
--- a/devel/p5-Config-Merge/pkg-plist
+++ b/devel/p5-Config-Merge/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Config::Merge::Perl.3.gz
 %%SITE_PERL%%/Config/Merge.pm
 %%SITE_PERL%%/Config/Merge/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Merge/.packlist
diff --git a/devel/p5-Config-Model-Tester/Makefile b/devel/p5-Config-Model-Tester/Makefile
index 9db21b47e714..4b0d6feffcd1 100644
--- a/devel/p5-Config-Model-Tester/Makefile
+++ b/devel/p5-Config-Model-Tester/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Model-Tester
 PORTVERSION=	2.048
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index b1ee59ce97e8..051e4ba55f13 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Model
 PORTVERSION=	2.061
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DDUMONT
diff --git a/devel/p5-Config-MySQL/Makefile b/devel/p5-Config-MySQL/Makefile
index 688cf6a80482..dd0ae43f4059 100644
--- a/devel/p5-Config-MySQL/Makefile
+++ b/devel/p5-Config-MySQL/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Config-MySQL
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-MySQL/pkg-plist b/devel/p5-Config-MySQL/pkg-plist
index a71c9e96976f..94d0cf5f4dd3 100644
--- a/devel/p5-Config-MySQL/pkg-plist
+++ b/devel/p5-Config-MySQL/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/MySQL/.packlist
 %%SITE_PERL%%/Config/MySQL.pm
 %%SITE_PERL%%/Config/MySQL/Reader.pm
 %%SITE_PERL%%/Config/MySQL/Writer.pm
diff --git a/devel/p5-Config-Objective/Makefile b/devel/p5-Config-Objective/Makefile
index 237cb6625de9..8bfd5244cd0a 100644
--- a/devel/p5-Config-Objective/Makefile
+++ b/devel/p5-Config-Objective/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Config-Objective
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Objective/pkg-plist b/devel/p5-Config-Objective/pkg-plist
index abf322c8590a..55f2e3bc1864 100644
--- a/devel/p5-Config-Objective/pkg-plist
+++ b/devel/p5-Config-Objective/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/Config/Objective/Integer.pm
 %%SITE_PERL%%/Config/Objective/String.pm
 %%SITE_PERL%%/Config/Objective/DataType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Objective/.packlist
 %%PERL5_MAN3%%/Config::Objective::List.3.gz
 %%PERL5_MAN3%%/Config::Objective::Boolean.3.gz
 %%PERL5_MAN3%%/Config::Objective::Table.3.gz
diff --git a/devel/p5-Config-Options/Makefile b/devel/p5-Config-Options/Makefile
index 090d37810dc0..e0a97b6ee56f 100644
--- a/devel/p5-Config-Options/Makefile
+++ b/devel/p5-Config-Options/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Options
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Options/pkg-plist b/devel/p5-Config-Options/pkg-plist
index edd91c281829..14950b8191bb 100644
--- a/devel/p5-Config-Options/pkg-plist
+++ b/devel/p5-Config-Options/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Config/Options.pm
 %%SITE_PERL%%/Config/Options/Threaded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Options/.packlist
 %%PERL5_MAN3%%/Config::Options.3.gz
 %%PERL5_MAN3%%/Config::Options::Threaded.3.gz
diff --git a/devel/p5-Config-Perl-V/Makefile b/devel/p5-Config-Perl-V/Makefile
index 70b4034e58a8..b860dbdf1a3e 100644
--- a/devel/p5-Config-Perl-V/Makefile
+++ b/devel/p5-Config-Perl-V/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Perl-V
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HMBRAND
diff --git a/devel/p5-Config-Perl-V/pkg-plist b/devel/p5-Config-Perl-V/pkg-plist
index 076a013f5404..f7f413c5a419 100644
--- a/devel/p5-Config-Perl-V/pkg-plist
+++ b/devel/p5-Config-Perl-V/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/Perl/V.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Perl/V/.packlist
 %%PERL5_MAN3%%/Config::Perl::V.3.gz
diff --git a/devel/p5-Config-Properties/Makefile b/devel/p5-Config-Properties/Makefile
index ecf3d46302af..cb149eeb9d63 100644
--- a/devel/p5-Config-Properties/Makefile
+++ b/devel/p5-Config-Properties/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Properties
 PORTVERSION=	1.77
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Properties/pkg-plist b/devel/p5-Config-Properties/pkg-plist
index 9d90190b278d..59fc151c615c 100644
--- a/devel/p5-Config-Properties/pkg-plist
+++ b/devel/p5-Config-Properties/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Properties/.packlist
 %%SITE_PERL%%/Config/Properties.pm
 %%PERL5_MAN3%%/Config::Properties.3.gz
diff --git a/devel/p5-Config-Record/Makefile b/devel/p5-Config-Record/Makefile
index 2842d23d6e7c..f8352fb1ce68 100644
--- a/devel/p5-Config-Record/Makefile
+++ b/devel/p5-Config-Record/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Record
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Record/pkg-plist b/devel/p5-Config-Record/pkg-plist
index a573ae85c57f..15ca877bf706 100644
--- a/devel/p5-Config-Record/pkg-plist
+++ b/devel/p5-Config-Record/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Config::Record.3.gz
 %%SITE_PERL%%/Config/Record.pm
 %%SITE_PERL%%/Config/Record.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Record/.packlist
diff --git a/devel/p5-Config-Setting/Makefile b/devel/p5-Config-Setting/Makefile
index 0834eac06d5e..ee051722e59d 100644
--- a/devel/p5-Config-Setting/Makefile
+++ b/devel/p5-Config-Setting/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Config-Setting
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Simple/Makefile b/devel/p5-Config-Simple/Makefile
index 939eb72d06f5..3c45faf057ba 100644
--- a/devel/p5-Config-Simple/Makefile
+++ b/devel/p5-Config-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Simple
 PORTVERSION=	4.59
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN/Config/SHERZODR
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Simple/pkg-plist b/devel/p5-Config-Simple/pkg-plist
index 8fcd0ff5a05b..9095717bf4fa 100644
--- a/devel/p5-Config-Simple/pkg-plist
+++ b/devel/p5-Config-Simple/pkg-plist
@@ -20,4 +20,3 @@
 %%SITE_PERL%%/auto/Config/Simple/vars.al
 %%SITE_PERL%%/auto/Config/Simple/verbose.al
 %%SITE_PERL%%/auto/Config/Simple/write_string.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Simple/.packlist
diff --git a/devel/p5-Config-Std/Makefile b/devel/p5-Config-Std/Makefile
index c09bd9ae8897..6c89407cbc88 100644
--- a/devel/p5-Config-Std/Makefile
+++ b/devel/p5-Config-Std/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Std
 PORTVERSION=	0.901
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRICKER
diff --git a/devel/p5-Config-Std/pkg-plist b/devel/p5-Config-Std/pkg-plist
index 8da074a8f55b..fa15eb9c4b49 100644
--- a/devel/p5-Config-Std/pkg-plist
+++ b/devel/p5-Config-Std/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Config::Std.3.gz
 %%SITE_PERL%%/Config/Std.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Std/.packlist
diff --git a/devel/p5-Config-Tiny/Makefile b/devel/p5-Config-Tiny/Makefile
index ca2ffa68341a..1569dfd786aa 100644
--- a/devel/p5-Config-Tiny/Makefile
+++ b/devel/p5-Config-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Tiny
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Tiny/pkg-plist b/devel/p5-Config-Tiny/pkg-plist
index 9dff4e3e1e70..40578393ce30 100644
--- a/devel/p5-Config-Tiny/pkg-plist
+++ b/devel/p5-Config-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Config::Tiny.3.gz
 %%SITE_PERL%%/Config/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Tiny/.packlist
diff --git a/devel/p5-Config-Versioned/Makefile b/devel/p5-Config-Versioned/Makefile
index 6fd5e15302fa..6098bae9acc7 100644
--- a/devel/p5-Config-Versioned/Makefile
+++ b/devel/p5-Config-Versioned/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Versioned
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Versioned/pkg-plist b/devel/p5-Config-Versioned/pkg-plist
index be49e030db57..1c5c5be99e7a 100644
--- a/devel/p5-Config-Versioned/pkg-plist
+++ b/devel/p5-Config-Versioned/pkg-plist
@@ -1,4 +1,3 @@
 bin/cfgver
 %%PERL5_MAN3%%/Config::Versioned.3.gz
 %%SITE_PERL%%/Config/Versioned.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Versioned/.packlist
diff --git a/devel/p5-Config-Wrest/Makefile b/devel/p5-Config-Wrest/Makefile
index b4595562dd80..2e4ef0b9e2e1 100644
--- a/devel/p5-Config-Wrest/Makefile
+++ b/devel/p5-Config-Wrest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Config-Wrest
 PORTVERSION=	1.036
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Config
diff --git a/devel/p5-Config-Wrest/pkg-plist b/devel/p5-Config-Wrest/pkg-plist
index 4156632d294f..cc71b41e7f8a 100644
--- a/devel/p5-Config-Wrest/pkg-plist
+++ b/devel/p5-Config-Wrest/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Data::Serializer::Config::Wrest.3.gz
 %%SITE_PERL%%/Config/Wrest.pm
 %%SITE_PERL%%/Data/Serializer/Config/Wrest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Wrest/.packlist
diff --git a/devel/p5-Config-YAML/Makefile b/devel/p5-Config-YAML/Makefile
index 78949c400f81..a79a12ba15c6 100644
--- a/devel/p5-Config-YAML/Makefile
+++ b/devel/p5-Config-YAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-YAML
 PORTVERSION=	1.42
+PORTREVISION=	1
 CATEGORIES=	devel textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-YAML/pkg-plist b/devel/p5-Config-YAML/pkg-plist
index fcf8d6909c7a..4467c425e815 100644
--- a/devel/p5-Config-YAML/pkg-plist
+++ b/devel/p5-Config-YAML/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Config/YAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/YAML/.packlist
 %%PERL5_MAN3%%/Config::YAML.3.gz
diff --git a/devel/p5-ConfigReader-Simple/Makefile b/devel/p5-ConfigReader-Simple/Makefile
index 050a3b53089e..ad817c05d1d0 100644
--- a/devel/p5-ConfigReader-Simple/Makefile
+++ b/devel/p5-ConfigReader-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ConfigReader-Simple
 PORTVERSION=	1.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ConfigReader-Simple/pkg-plist b/devel/p5-ConfigReader-Simple/pkg-plist
index a3f16e71922e..d857205ed2f3 100644
--- a/devel/p5-ConfigReader-Simple/pkg-plist
+++ b/devel/p5-ConfigReader-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/ConfigReader::Simple.3.gz
 %%SITE_PERL%%/ConfigReader/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ConfigReader/Simple/.packlist
diff --git a/devel/p5-ConfigReader/Makefile b/devel/p5-ConfigReader/Makefile
index 93a4f7ff82c5..821f5f175301 100644
--- a/devel/p5-ConfigReader/Makefile
+++ b/devel/p5-ConfigReader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ConfigReader
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Connector/Makefile b/devel/p5-Connector/Makefile
index 93e9da6f5944..7a5c7dfdf85d 100644
--- a/devel/p5-Connector/Makefile
+++ b/devel/p5-Connector/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Connector
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Connector/pkg-plist b/devel/p5-Connector/pkg-plist
index 8dee301c7e05..69c4e548bab6 100644
--- a/devel/p5-Connector/pkg-plist
+++ b/devel/p5-Connector/pkg-plist
@@ -38,4 +38,3 @@
 %%SITE_PERL%%/Connector/Proxy/YAML.pm
 %%SITE_PERL%%/Connector/Types.pm
 %%SITE_PERL%%/Connector/Wrapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Connector/.packlist
diff --git a/devel/p5-Const-Fast/Makefile b/devel/p5-Const-Fast/Makefile
index 344acb7df8fe..e4b3f581c5b3 100644
--- a/devel/p5-Const-Fast/Makefile
+++ b/devel/p5-Const-Fast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Const-Fast
 PORTVERSION=	0.014
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LEONT
diff --git a/devel/p5-Const-Fast/pkg-plist b/devel/p5-Const-Fast/pkg-plist
index 999b55f189d3..61db2fa0bce2 100644
--- a/devel/p5-Const-Fast/pkg-plist
+++ b/devel/p5-Const-Fast/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Const::Fast.3.gz
 %%SITE_PERL%%/Const/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Const/Fast/.packlist
diff --git a/devel/p5-Context-Preserve/Makefile b/devel/p5-Context-Preserve/Makefile
index e5c17cf50b2a..70b471f92a2c 100644
--- a/devel/p5-Context-Preserve/Makefile
+++ b/devel/p5-Context-Preserve/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Context-Preserve
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
diff --git a/devel/p5-Context-Preserve/pkg-plist b/devel/p5-Context-Preserve/pkg-plist
index b5be6573d3b9..80b1ba0922d6 100644
--- a/devel/p5-Context-Preserve/pkg-plist
+++ b/devel/p5-Context-Preserve/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Context::Preserve.3.gz
 %%SITE_PERL%%/Context/Preserve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Context/Preserve/.packlist
diff --git a/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
index e538ed0b73bc..0cd8f81b2049 100644
--- a/devel/p5-Contextual-Return/Makefile
+++ b/devel/p5-Contextual-Return/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Contextual-Return
 PORTVERSION=	0.004.007
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DCONWAY
diff --git a/devel/p5-Contextual-Return/pkg-plist b/devel/p5-Contextual-Return/pkg-plist
index 2fbabf62d2a5..c50cc6e59556 100644
--- a/devel/p5-Contextual-Return/pkg-plist
+++ b/devel/p5-Contextual-Return/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Contextual::Return::Failure.3.gz
 %%SITE_PERL%%/Contextual/Return.pm
 %%SITE_PERL%%/Contextual/Return/Failure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Contextual/Return/.packlist
diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile
index c68dc94c61bf..0d681fe0e906 100644
--- a/devel/p5-Coro/Makefile
+++ b/devel/p5-Coro/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Coro
 PORTVERSION=	6.37
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Coro/pkg-plist b/devel/p5-Coro/pkg-plist
index 9f2ac47b8ddf..b845db33dba1 100644
--- a/devel/p5-Coro/pkg-plist
+++ b/devel/p5-Coro/pkg-plist
@@ -21,36 +21,35 @@
 %%PERL5_MAN3%%/Coro::Storable.3.gz
 %%PERL5_MAN3%%/Coro::Timer.3.gz
 %%PERL5_MAN3%%/Coro::Util.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/AIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/AnyEvent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/BDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Channel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/CoroAPI.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/EV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Intro.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/LWP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/MakeMaker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/RWLock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Select.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Semaphore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/SemaphoreSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Signal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Specific.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/State.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/jit-amd64-unix.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Coro/jit-x86-unix.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/EV/EV.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/Event/Event.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/State/State.so
+%%SITE_ARCH%%/Coro.pm
+%%SITE_ARCH%%/Coro/AIO.pm
+%%SITE_ARCH%%/Coro/AnyEvent.pm
+%%SITE_ARCH%%/Coro/BDB.pm
+%%SITE_ARCH%%/Coro/Channel.pm
+%%SITE_ARCH%%/Coro/CoroAPI.h
+%%SITE_ARCH%%/Coro/Debug.pm
+%%SITE_ARCH%%/Coro/EV.pm
+%%SITE_ARCH%%/Coro/Event.pm
+%%SITE_ARCH%%/Coro/Handle.pm
+%%SITE_ARCH%%/Coro/Intro.pod
+%%SITE_ARCH%%/Coro/LWP.pm
+%%SITE_ARCH%%/Coro/MakeMaker.pm
+%%SITE_ARCH%%/Coro/RWLock.pm
+%%SITE_ARCH%%/Coro/Select.pm
+%%SITE_ARCH%%/Coro/Semaphore.pm
+%%SITE_ARCH%%/Coro/SemaphoreSet.pm
+%%SITE_ARCH%%/Coro/Signal.pm
+%%SITE_ARCH%%/Coro/Socket.pm
+%%SITE_ARCH%%/Coro/Specific.pm
+%%SITE_ARCH%%/Coro/State.pm
+%%SITE_ARCH%%/Coro/Storable.pm
+%%SITE_ARCH%%/Coro/Timer.pm
+%%SITE_ARCH%%/Coro/Util.pm
+%%SITE_ARCH%%/Coro/jit-amd64-unix.pl
+%%SITE_ARCH%%/Coro/jit-x86-unix.pl
+%%SITE_ARCH%%/auto/Coro/EV/EV.so
+%%SITE_ARCH%%/auto/Coro/Event/Event.so
+%%SITE_ARCH%%/auto/Coro/State/State.so
 %%PORTDOCS%%%%DOCSDIR%%/cede-vs-schedule
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/attributes
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench
diff --git a/devel/p5-Curses-Application/Makefile b/devel/p5-Curses-Application/Makefile
index 72968d17aa72..5bc17f369e7c 100644
--- a/devel/p5-Curses-Application/Makefile
+++ b/devel/p5-Curses-Application/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Curses-Application
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Curses-Application/pkg-plist b/devel/p5-Curses-Application/pkg-plist
index 5c48db4bc80e..78417f3621d2 100644
--- a/devel/p5-Curses-Application/pkg-plist
+++ b/devel/p5-Curses-Application/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Curses::Application.3.gz
 %%SITE_PERL%%/Curses/Application.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Application/.packlist
diff --git a/devel/p5-Curses-Forms/Makefile b/devel/p5-Curses-Forms/Makefile
index 75aff480be9a..aea532f03308 100644
--- a/devel/p5-Curses-Forms/Makefile
+++ b/devel/p5-Curses-Forms/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Curses-Forms
 PORTVERSION=	1.997
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Curses-Forms/pkg-plist b/devel/p5-Curses-Forms/pkg-plist
index 9aac52ab68da..a8d000b39018 100644
--- a/devel/p5-Curses-Forms/pkg-plist
+++ b/devel/p5-Curses-Forms/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Curses/Forms/Dialog.pm
 %%SITE_PERL%%/Curses/Forms/Dialog/Input.pm
 %%SITE_PERL%%/Curses/Forms/Dialog/Logon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Forms/.packlist
diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile
index 05233b2b5a8c..5e3fa8063aaf 100644
--- a/devel/p5-Curses-UI/Makefile
+++ b/devel/p5-Curses-UI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Curses-UI
 PORTVERSION=	0.9609
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Curses-UI/pkg-plist b/devel/p5-Curses-UI/pkg-plist
index 50780d7133a7..3e63c53cd6b6 100644
--- a/devel/p5-Curses-UI/pkg-plist
+++ b/devel/p5-Curses-UI/pkg-plist
@@ -74,4 +74,3 @@
 %%SITE_PERL%%/Curses/UI/Tutorial.pod
 %%SITE_PERL%%/Curses/UI/Widget.pm
 %%SITE_PERL%%/Curses/UI/Window.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/UI/.packlist
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index b80bc1f5a796..266cb9b97a99 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Curses-Widgets
 PORTVERSION=	1.997
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Curses-Widgets/pkg-plist b/devel/p5-Curses-Widgets/pkg-plist
index f2b5c4da88f7..0058c19dd52a 100644
--- a/devel/p5-Curses-Widgets/pkg-plist
+++ b/devel/p5-Curses-Widgets/pkg-plist
@@ -24,4 +24,3 @@
 %%SITE_PERL%%/Curses/Widgets/TextMemo.pm
 %%SITE_PERL%%/Curses/Widgets/Tutorial.pod
 %%SITE_PERL%%/Curses/Widgets/Tutorial/Creation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Widgets/.packlist
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index b197628acacd..e1cc2fc93b9a 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Curses
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Curses/pkg-plist b/devel/p5-Curses/pkg-plist
index 50b05302a187..08904c43afd6 100644
--- a/devel/p5-Curses/pkg-plist
+++ b/devel/p5-Curses/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Curses.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Curses.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Curses.so
+%%SITE_ARCH%%/Curses.pm
+%%SITE_ARCH%%/auto/Curses/Curses.so
diff --git a/devel/p5-Cvs/Makefile b/devel/p5-Cvs/Makefile
index b1b794f8b3de..6e71d7251632 100644
--- a/devel/p5-Cvs/Makefile
+++ b/devel/p5-Cvs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Cvs
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSOLIV
diff --git a/devel/p5-Cvs/pkg-plist b/devel/p5-Cvs/pkg-plist
index 5b3a644efd1e..c23948fefd47 100644
--- a/devel/p5-Cvs/pkg-plist
+++ b/devel/p5-Cvs/pkg-plist
@@ -60,4 +60,3 @@
 %%SITE_PERL%%/Cvs/Result/StatusList.pm
 %%SITE_PERL%%/Cvs/Result/Tag.pm
 %%SITE_PERL%%/Cvs/Result/Update.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cvs/.packlist
diff --git a/devel/p5-Cwd-Guard/Makefile b/devel/p5-Cwd-Guard/Makefile
index 31413954a2ca..1fdcb9dc000b 100644
--- a/devel/p5-Cwd-Guard/Makefile
+++ b/devel/p5-Cwd-Guard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cwd-Guard
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DB_File-Lock/Makefile b/devel/p5-DB_File-Lock/Makefile
index 4e7306108e9b..8b202abbf797 100644
--- a/devel/p5-DB_File-Lock/Makefile
+++ b/devel/p5-DB_File-Lock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DB_File-Lock
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DB_File-Lock/pkg-plist b/devel/p5-DB_File-Lock/pkg-plist
index 90d4b331278a..28aa7f92ce6c 100644
--- a/devel/p5-DB_File-Lock/pkg-plist
+++ b/devel/p5-DB_File-Lock/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DB_File::Lock.3.gz
 %%SITE_PERL%%/DB_File/Lock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File/Lock/.packlist
diff --git a/devel/p5-Daemon-Control/Makefile b/devel/p5-Daemon-Control/Makefile
index 6cf572e1110c..168fd65da01d 100644
--- a/devel/p5-Daemon-Control/Makefile
+++ b/devel/p5-Daemon-Control/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Daemon-Control
 PORTVERSION=	0.001.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Daemon-Control/pkg-plist b/devel/p5-Daemon-Control/pkg-plist
index b778d6968515..fc8ea8447463 100644
--- a/devel/p5-Daemon-Control/pkg-plist
+++ b/devel/p5-Daemon-Control/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Daemon/Control.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Daemon/Control/.packlist
 %%PERL5_MAN3%%/Daemon::Control.3.gz
diff --git a/devel/p5-Dancer-Debug/Makefile b/devel/p5-Dancer-Debug/Makefile
index c3930f4a28f8..a9fc40ef874e 100644
--- a/devel/p5-Dancer-Debug/Makefile
+++ b/devel/p5-Dancer-Debug/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Debug
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FRANCKC
diff --git a/devel/p5-Dancer-Debug/pkg-plist b/devel/p5-Dancer-Debug/pkg-plist
index 296011e24148..5baba35e0793 100644
--- a/devel/p5-Dancer-Debug/pkg-plist
+++ b/devel/p5-Dancer-Debug/pkg-plist
@@ -4,7 +4,6 @@
 %%SITE_PERL%%/Plack/Middleware/Debug/Dancer/Session.pm
 %%SITE_PERL%%/Plack/Middleware/Debug/Dancer/Settings.pm
 %%SITE_PERL%%/Plack/Middleware/Debug/Dancer/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Debug/.packlist
 %%PERL5_MAN3%%/Dancer::Debug.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Debug::Dancer::Logger.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Debug::Dancer::Routes.3.gz
diff --git a/devel/p5-Danga-Socket-Callback/Makefile b/devel/p5-Danga-Socket-Callback/Makefile
index fbd4e59a76f2..7f286f096f99 100644
--- a/devel/p5-Danga-Socket-Callback/Makefile
+++ b/devel/p5-Danga-Socket-Callback/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Danga-Socket-Callback
 PORTVERSION=	0.013
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Danga-Socket/Makefile b/devel/p5-Danga-Socket/Makefile
index 638cb6dc70cc..4f17d14ecb0e 100644
--- a/devel/p5-Danga-Socket/Makefile
+++ b/devel/p5-Danga-Socket/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Danga-Socket
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	devel net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Danga-Socket/pkg-plist b/devel/p5-Danga-Socket/pkg-plist
index a386b87fe6f6..1a81435eb20f 100644
--- a/devel/p5-Danga-Socket/pkg-plist
+++ b/devel/p5-Danga-Socket/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Danga::Socket.3.gz
 %%SITE_PERL%%/Danga/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Danga/Socket/.packlist
diff --git a/devel/p5-Data-ACL/Makefile b/devel/p5-Data-ACL/Makefile
index 4c8e23d02f58..2309eeb5c26f 100644
--- a/devel/p5-Data-ACL/Makefile
+++ b/devel/p5-Data-ACL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-ACL
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-ACL/pkg-plist b/devel/p5-Data-ACL/pkg-plist
index 2847f7bb1f32..cffe069ee059 100644
--- a/devel/p5-Data-ACL/pkg-plist
+++ b/devel/p5-Data-ACL/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Data/ACL.pm
 %%SITE_PERL%%/Data/ACL/Realm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ACL/.packlist
 %%PERL5_MAN3%%/Data::ACL.3.gz
diff --git a/devel/p5-Data-Alias/Makefile b/devel/p5-Data-Alias/Makefile
index 7b4569d253f1..ed16296e6464 100644
--- a/devel/p5-Data-Alias/Makefile
+++ b/devel/p5-Data-Alias/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Alias
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Alias/pkg-plist b/devel/p5-Data-Alias/pkg-plist
index 128c7d968fdd..2f1443f2e023 100644
--- a/devel/p5-Data-Alias/pkg-plist
+++ b/devel/p5-Data-Alias/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Data::Alias.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Alias/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Alias/Alias.so
+%%SITE_ARCH%%/Data/Alias.pm
+%%SITE_ARCH%%/auto/Data/Alias/Alias.so
diff --git a/devel/p5-Data-Average/Makefile b/devel/p5-Data-Average/Makefile
index 571bfe4b41ef..73e7520ed6e2 100644
--- a/devel/p5-Data-Average/Makefile
+++ b/devel/p5-Data-Average/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-Average
 PORTVERSION=	0.03000
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Average/pkg-plist b/devel/p5-Data-Average/pkg-plist
index 0578fa8e290d..c7dfb9c9b1e5 100644
--- a/devel/p5-Data-Average/pkg-plist
+++ b/devel/p5-Data-Average/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Average/.packlist
 %%SITE_PERL%%/Data/Average/Bounded.pm
 %%SITE_PERL%%/Data/Average/BoundedExpires.pm
 %%SITE_PERL%%/Data/Average/Expires.pm
diff --git a/devel/p5-Data-Bind/Makefile b/devel/p5-Data-Bind/Makefile
index 79c3e22563cc..db55621e536c 100644
--- a/devel/p5-Data-Bind/Makefile
+++ b/devel/p5-Data-Bind/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-Bind
 PORTVERSION=	0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Bind/pkg-plist b/devel/p5-Data-Bind/pkg-plist
index dd1f77df4971..259b490f7363 100644
--- a/devel/p5-Data-Bind/pkg-plist
+++ b/devel/p5-Data-Bind/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Bind.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Bind/Bind.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Bind/.packlist
+%%SITE_ARCH%%/Data/Bind.pm
+%%SITE_ARCH%%/auto/Data/Bind/Bind.so
 %%PERL5_MAN3%%/Data::Bind.3.gz
diff --git a/devel/p5-Data-Capture/Makefile b/devel/p5-Data-Capture/Makefile
index ae3789abe926..2d0c0250d421 100644
--- a/devel/p5-Data-Capture/Makefile
+++ b/devel/p5-Data-Capture/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Capture
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/devel/p5-Data-Capture/pkg-plist b/devel/p5-Data-Capture/pkg-plist
index b6df601601ef..c9d671315906 100644
--- a/devel/p5-Data-Capture/pkg-plist
+++ b/devel/p5-Data-Capture/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Capture.3.gz
 %%SITE_PERL%%/Data/Capture.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Capture/.packlist
diff --git a/devel/p5-Data-ClearSilver-HDF/Makefile b/devel/p5-Data-ClearSilver-HDF/Makefile
index 93663ad898bb..7bdf8d6fb7af 100644
--- a/devel/p5-Data-ClearSilver-HDF/Makefile
+++ b/devel/p5-Data-ClearSilver-HDF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-ClearSilver-HDF
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-ClearSilver-HDF/pkg-plist b/devel/p5-Data-ClearSilver-HDF/pkg-plist
index 194085cb1e09..e6690f3d0a0a 100644
--- a/devel/p5-Data-ClearSilver-HDF/pkg-plist
+++ b/devel/p5-Data-ClearSilver-HDF/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ClearSilver/HDF/.packlist
 %%SITE_PERL%%/Data/ClearSilver/HDF.pm
 %%PERL5_MAN3%%/Data::ClearSilver::HDF.3.gz
 man/man1/cspage.1.gz
diff --git a/devel/p5-Data-Clone/Makefile b/devel/p5-Data-Clone/Makefile
index dc5f970d8e5b..87c542f4de52 100644
--- a/devel/p5-Data-Clone/Makefile
+++ b/devel/p5-Data-Clone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Clone
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Clone/pkg-plist b/devel/p5-Data-Clone/pkg-plist
index 505ec632ec24..3d59ec2f5fb6 100644
--- a/devel/p5-Data-Clone/pkg-plist
+++ b/devel/p5-Data-Clone/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Clone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Clone/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Clone/Clone.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Clone/data_clone.h
+%%SITE_ARCH%%/Data/Clone.pm
+%%SITE_ARCH%%/auto/Data/Clone/Clone.so
+%%SITE_ARCH%%/auto/Data/Clone/data_clone.h
 %%PERL5_MAN3%%/Data::Clone.3.gz
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index 9706c0902520..d4b0f37727fa 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Compare
 PORTVERSION=	1.2200
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DCANTRELL
diff --git a/devel/p5-Data-Compare/pkg-plist b/devel/p5-Data-Compare/pkg-plist
index e3c8b879a7a0..90db9e0d6ae5 100644
--- a/devel/p5-Data-Compare/pkg-plist
+++ b/devel/p5-Data-Compare/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Data/Compare.pm
 %%SITE_PERL%%/Data/Compare/Plugins.pod
 %%SITE_PERL%%/Data/Compare/Plugins/Scalar/Properties.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Compare/.packlist
 %%PERL5_MAN3%%/Data::Compare.3.gz
 %%PERL5_MAN3%%/Data::Compare::Plugins.3.gz
 %%PERL5_MAN3%%/Data::Compare::Plugins::Scalar::Properties.3.gz
diff --git a/devel/p5-Data-Diver/Makefile b/devel/p5-Data-Diver/Makefile
index 8135a7096a08..84d4faa40726 100644
--- a/devel/p5-Data-Diver/Makefile
+++ b/devel/p5-Data-Diver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Diver
 PORTVERSION=	1.0101
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Diver/pkg-plist b/devel/p5-Data-Diver/pkg-plist
index 7230a1713ff6..e4296bd93f46 100644
--- a/devel/p5-Data-Diver/pkg-plist
+++ b/devel/p5-Data-Diver/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Diver.3.gz
 %%SITE_PERL%%/Data/Diver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Diver/.packlist
diff --git a/devel/p5-Data-Domain/Makefile b/devel/p5-Data-Domain/Makefile
index 5ae4b5abfcea..513cb8ea0df5 100644
--- a/devel/p5-Data-Domain/Makefile
+++ b/devel/p5-Data-Domain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Domain
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile
index 008553f56f68..8bf98d2a2c41 100644
--- a/devel/p5-Data-Dump-Streamer/Makefile
+++ b/devel/p5-Data-Dump-Streamer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Dump-Streamer
 PORTVERSION=	2.38
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -24,6 +25,6 @@ USES=		perl5
 USE_PERL5=	modbuild
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Data/Dump/Streamer/Streamer.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Data/Dump/Streamer/Streamer.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Dump-Streamer/pkg-plist b/devel/p5-Data-Dump-Streamer/pkg-plist
index 6a97aa9a6aa0..1fcf9f2864b6 100644
--- a/devel/p5-Data-Dump-Streamer/pkg-plist
+++ b/devel/p5-Data-Dump-Streamer/pkg-plist
@@ -1,6 +1,6 @@
 %%PERL5_MAN3%%/DDS.3.gz
 %%PERL5_MAN3%%/Data::Dump::Streamer.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DDS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Dump/Streamer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Dump/Streamer/_/Printers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump/Streamer/Streamer.so
+%%SITE_ARCH%%/DDS.pm
+%%SITE_ARCH%%/Data/Dump/Streamer.pm
+%%SITE_ARCH%%/Data/Dump/Streamer/_/Printers.pm
+%%SITE_ARCH%%/auto/Data/Dump/Streamer/Streamer.so
diff --git a/devel/p5-Data-Dump/Makefile b/devel/p5-Data-Dump/Makefile
index 5ed798c150a8..76bb4fbb2161 100644
--- a/devel/p5-Data-Dump/Makefile
+++ b/devel/p5-Data-Dump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Dump
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Dump/pkg-plist b/devel/p5-Data-Dump/pkg-plist
index 59a4ab22c613..1b91e321c2d6 100644
--- a/devel/p5-Data-Dump/pkg-plist
+++ b/devel/p5-Data-Dump/pkg-plist
@@ -5,4 +5,3 @@
 %%SITE_PERL%%/Data/Dump/FilterContext.pm
 %%SITE_PERL%%/Data/Dump/Filtered.pm
 %%SITE_PERL%%/Data/Dump/Trace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump/.packlist
diff --git a/devel/p5-Data-DumpXML/Makefile b/devel/p5-Data-DumpXML/Makefile
index 654bb7a8cd64..c9329245ad32 100644
--- a/devel/p5-Data-DumpXML/Makefile
+++ b/devel/p5-Data-DumpXML/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-DumpXML
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-DumpXML/pkg-plist b/devel/p5-Data-DumpXML/pkg-plist
index dd993797b29a..fa27f53ec919 100644
--- a/devel/p5-Data-DumpXML/pkg-plist
+++ b/devel/p5-Data-DumpXML/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Data::DumpXML::Parser.3.gz
 %%SITE_PERL%%/Data/DumpXML.pm
 %%SITE_PERL%%/Data/DumpXML/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/DumpXML/.packlist
diff --git a/devel/p5-Data-Dumper-Concise/Makefile b/devel/p5-Data-Dumper-Concise/Makefile
index a235ebcf6a61..68b24b753504 100644
--- a/devel/p5-Data-Dumper-Concise/Makefile
+++ b/devel/p5-Data-Dumper-Concise/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Dumper-Concise
 PORTVERSION=	2.022
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FREW
diff --git a/devel/p5-Data-Dumper-Concise/pkg-plist b/devel/p5-Data-Dumper-Concise/pkg-plist
index f02b13fd86db..02666e337a3c 100644
--- a/devel/p5-Data-Dumper-Concise/pkg-plist
+++ b/devel/p5-Data-Dumper-Concise/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Data/Dumper/Concise.pm
 %%SITE_PERL%%/Data/Dumper/Concise/Sugar.pm
 %%SITE_PERL%%/Devel/Dwarn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dumper/Concise/.packlist
diff --git a/devel/p5-Data-Dumper-Perltidy/Makefile b/devel/p5-Data-Dumper-Perltidy/Makefile
index 879213658723..ec137cf62530 100644
--- a/devel/p5-Data-Dumper-Perltidy/Makefile
+++ b/devel/p5-Data-Dumper-Perltidy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Dumper-Perltidy
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Dumper-Perltidy/pkg-plist b/devel/p5-Data-Dumper-Perltidy/pkg-plist
index 6d49ec105843..f271691402f7 100644
--- a/devel/p5-Data-Dumper-Perltidy/pkg-plist
+++ b/devel/p5-Data-Dumper-Perltidy/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Dumper/Perltidy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dumper/Perltidy/.packlist
 %%PERL5_MAN3%%/Data::Dumper::Perltidy.3.gz
diff --git a/devel/p5-Data-Dumper-Simple/Makefile b/devel/p5-Data-Dumper-Simple/Makefile
index 7f9a97bf8726..1bb4edfea5c6 100644
--- a/devel/p5-Data-Dumper-Simple/Makefile
+++ b/devel/p5-Data-Dumper-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Dumper-Simple
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index 083a13e112bd..20e6e2572af4 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Dumper
 PORTVERSION=	2.154
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Dumper/pkg-plist b/devel/p5-Data-Dumper/pkg-plist
index 5f6be354cb0e..2ded43e4affe 100644
--- a/devel/p5-Data-Dumper/pkg-plist
+++ b/devel/p5-Data-Dumper/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Dumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dumper/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dumper/Dumper.so
+%%SITE_ARCH%%/Data/Dumper.pm
+%%SITE_ARCH%%/auto/Data/Dumper/Dumper.so
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index f1c883416922..b3270fb966be 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Flow
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Flow/pkg-plist b/devel/p5-Data-Flow/pkg-plist
index dddcb6b2962d..b4ca9893a8e4 100644
--- a/devel/p5-Data-Flow/pkg-plist
+++ b/devel/p5-Data-Flow/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Data/Flow.pm
 %%SITE_PERL%%/auto/Data/Flow/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Flow/.packlist
 %%PERL5_MAN3%%/Data::Flow.3.gz
diff --git a/devel/p5-Data-GUID/Makefile b/devel/p5-Data-GUID/Makefile
index a35d9f04d704..64fa8293aa5f 100644
--- a/devel/p5-Data-GUID/Makefile
+++ b/devel/p5-Data-GUID/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-GUID
 PORTVERSION=	0.047
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Data-GUID/pkg-plist b/devel/p5-Data-GUID/pkg-plist
index a2375da0fed7..b16be8a85be2 100644
--- a/devel/p5-Data-GUID/pkg-plist
+++ b/devel/p5-Data-GUID/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/GUID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/GUID/.packlist
 %%PERL5_MAN3%%/Data::GUID.3.gz
diff --git a/devel/p5-Data-Grouper/Makefile b/devel/p5-Data-Grouper/Makefile
index e8906ebeefbb..ad716a930053 100644
--- a/devel/p5-Data-Grouper/Makefile
+++ b/devel/p5-Data-Grouper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Grouper
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FERRANCE
diff --git a/devel/p5-Data-Grouper/pkg-plist b/devel/p5-Data-Grouper/pkg-plist
index a50014099554..3affbcfa3b05 100644
--- a/devel/p5-Data-Grouper/pkg-plist
+++ b/devel/p5-Data-Grouper/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Grouper.3.gz
 %%SITE_PERL%%/Data/Grouper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Grouper/.packlist
diff --git a/devel/p5-Data-HashArray/Makefile b/devel/p5-Data-HashArray/Makefile
index a0d9b05f105a..28a4b0dcd2c7 100644
--- a/devel/p5-Data-HashArray/Makefile
+++ b/devel/p5-Data-HashArray/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-HashArray
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-HashArray/pkg-plist b/devel/p5-Data-HashArray/pkg-plist
index 4591ab4b7fc9..913efe5adc47 100644
--- a/devel/p5-Data-HashArray/pkg-plist
+++ b/devel/p5-Data-HashArray/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/HashArray.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/HashArray/.packlist
 %%PERL5_MAN3%%/Data::HashArray.3.gz
diff --git a/devel/p5-Data-HexDump/Makefile b/devel/p5-Data-HexDump/Makefile
index ee1c23ac712f..7f12da8a2d97 100644
--- a/devel/p5-Data-HexDump/Makefile
+++ b/devel/p5-Data-HexDump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-HexDump
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-HexDump/pkg-plist b/devel/p5-Data-HexDump/pkg-plist
index 8733d4d5faee..f38018545f1e 100644
--- a/devel/p5-Data-HexDump/pkg-plist
+++ b/devel/p5-Data-HexDump/pkg-plist
@@ -1,4 +1,3 @@
 bin/hexdump
 %%PERL5_MAN3%%/Data::HexDump.3.gz
 %%SITE_PERL%%/Data/HexDump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/HexDump/.packlist
diff --git a/devel/p5-Data-Hexdumper/Makefile b/devel/p5-Data-Hexdumper/Makefile
index fd306ad8aab1..387d0b71820d 100644
--- a/devel/p5-Data-Hexdumper/Makefile
+++ b/devel/p5-Data-Hexdumper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Hexdumper
 PORTVERSION=	3.00.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Hexdumper/pkg-plist b/devel/p5-Data-Hexdumper/pkg-plist
index fa2dbafb1b7a..a75ebc3ea63b 100644
--- a/devel/p5-Data-Hexdumper/pkg-plist
+++ b/devel/p5-Data-Hexdumper/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Hexdumper.3.gz
 %%SITE_PERL%%/Data/Hexdumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hexdumper/.packlist
diff --git a/devel/p5-Data-Hexify/Makefile b/devel/p5-Data-Hexify/Makefile
index a6077a0024d1..1c98b9037c8c 100644
--- a/devel/p5-Data-Hexify/Makefile
+++ b/devel/p5-Data-Hexify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Hexify
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Hexify/pkg-plist b/devel/p5-Data-Hexify/pkg-plist
index eb88669c0e0a..8f67c7d60775 100644
--- a/devel/p5-Data-Hexify/pkg-plist
+++ b/devel/p5-Data-Hexify/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Hexify.pm
-%%SITE_PERL%%/mach/auto/Data/Hexify/.packlist
 %%PERL5_MAN3%%/Data::Hexify.3.gz
diff --git a/devel/p5-Data-Hierarchy/Makefile b/devel/p5-Data-Hierarchy/Makefile
index 84c8b6e88b87..2bfcb0baf332 100644
--- a/devel/p5-Data-Hierarchy/Makefile
+++ b/devel/p5-Data-Hierarchy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Hierarchy
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Hierarchy/pkg-plist b/devel/p5-Data-Hierarchy/pkg-plist
index 74bee5c26330..c213f8584c30 100644
--- a/devel/p5-Data-Hierarchy/pkg-plist
+++ b/devel/p5-Data-Hierarchy/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Hierarchy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hierarchy/.packlist
 %%PERL5_MAN3%%/Data::Hierarchy.3.gz
diff --git a/devel/p5-Data-IEEE754/Makefile b/devel/p5-Data-IEEE754/Makefile
index 46e3a81c5147..df26cd31503d 100644
--- a/devel/p5-Data-IEEE754/Makefile
+++ b/devel/p5-Data-IEEE754/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-IEEE754
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-IEEE754/pkg-plist b/devel/p5-Data-IEEE754/pkg-plist
index 48d208068a95..e3ae391a472e 100644
--- a/devel/p5-Data-IEEE754/pkg-plist
+++ b/devel/p5-Data-IEEE754/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/IEEE754.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/IEEE754/.packlist
 %%PERL5_MAN3%%/Data::IEEE754.3.gz
diff --git a/devel/p5-Data-Inherited/Makefile b/devel/p5-Data-Inherited/Makefile
index 703341e4711e..bf633bc224cb 100644
--- a/devel/p5-Data-Inherited/Makefile
+++ b/devel/p5-Data-Inherited/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Inherited
 PORTVERSION=	1.100860
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Inherited/pkg-plist b/devel/p5-Data-Inherited/pkg-plist
index c4773d559fb0..68411591c826 100644
--- a/devel/p5-Data-Inherited/pkg-plist
+++ b/devel/p5-Data-Inherited/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Inherited/.packlist
 %%SITE_PERL%%/Data/Inherited.pm
 %%PERL5_MAN3%%/Data::Inherited.3.gz
diff --git a/devel/p5-Data-Inspect/Makefile b/devel/p5-Data-Inspect/Makefile
index f64d3e8a3b1c..961354b309ca 100644
--- a/devel/p5-Data-Inspect/Makefile
+++ b/devel/p5-Data-Inspect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Inspect
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OWL
diff --git a/devel/p5-Data-Inspect/pkg-plist b/devel/p5-Data-Inspect/pkg-plist
index 7a1f5d94a4e6..3cf095306226 100644
--- a/devel/p5-Data-Inspect/pkg-plist
+++ b/devel/p5-Data-Inspect/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Inspect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Inspect/.packlist
 %%PERL5_MAN3%%/Data::Inspect.3.gz
diff --git a/devel/p5-Data-Integer/Makefile b/devel/p5-Data-Integer/Makefile
index 7b8f5ad5bb95..6ad1b7649167 100644
--- a/devel/p5-Data-Integer/Makefile
+++ b/devel/p5-Data-Integer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Integer
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-JavaScript-Anon/Makefile b/devel/p5-Data-JavaScript-Anon/Makefile
index 449057b0ed43..2fa1662af2e2 100644
--- a/devel/p5-Data-JavaScript-Anon/Makefile
+++ b/devel/p5-Data-JavaScript-Anon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-JavaScript-Anon
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Data
diff --git a/devel/p5-Data-JavaScript-Anon/pkg-plist b/devel/p5-Data-JavaScript-Anon/pkg-plist
index d7a5250d11c0..e988fafd1b38 100644
--- a/devel/p5-Data-JavaScript-Anon/pkg-plist
+++ b/devel/p5-Data-JavaScript-Anon/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::JavaScript::Anon.3.gz
 %%SITE_PERL%%/Data/JavaScript/Anon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/JavaScript/Anon/.packlist
diff --git a/devel/p5-Data-Lazy/Makefile b/devel/p5-Data-Lazy/Makefile
index 13950f62a58b..5d57922db1d4 100644
--- a/devel/p5-Data-Lazy/Makefile
+++ b/devel/p5-Data-Lazy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Lazy
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Lazy/pkg-plist b/devel/p5-Data-Lazy/pkg-plist
index d40e26a3e4fd..77b1db0a69de 100644
--- a/devel/p5-Data-Lazy/pkg-plist
+++ b/devel/p5-Data-Lazy/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Lazy.3.gz
 %%SITE_PERL%%/Data/Lazy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Lazy/.packlist
diff --git a/devel/p5-Data-Localize/Makefile b/devel/p5-Data-Localize/Makefile
index 592eb58eb607..8308d3a75014 100644
--- a/devel/p5-Data-Localize/Makefile
+++ b/devel/p5-Data-Localize/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Localize
 PORTVERSION=	0.00027
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-Data-MessagePack-Stream/Makefile b/devel/p5-Data-MessagePack-Stream/Makefile
index f9b02ce9dd57..9c5b362e5aa6 100644
--- a/devel/p5-Data-MessagePack-Stream/Makefile
+++ b/devel/p5-Data-MessagePack-Stream/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Data-MessagePack-Stream
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-MessagePack-Stream/pkg-plist b/devel/p5-Data-MessagePack-Stream/pkg-plist
index dead27ae1b52..153598b8bb6a 100644
--- a/devel/p5-Data-MessagePack-Stream/pkg-plist
+++ b/devel/p5-Data-MessagePack-Stream/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/MessagePack/Stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/Stream/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/Stream/Stream.so
+%%SITE_ARCH%%/Data/MessagePack/Stream.pm
+%%SITE_ARCH%%/auto/Data/MessagePack/Stream/Stream.so
 %%PERL5_MAN3%%/Data::MessagePack::Stream.3.gz
diff --git a/devel/p5-Data-MessagePack/Makefile b/devel/p5-Data-MessagePack/Makefile
index 9c5107505d70..2849e56a7534 100644
--- a/devel/p5-Data-MessagePack/Makefile
+++ b/devel/p5-Data-MessagePack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-MessagePack
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
diff --git a/devel/p5-Data-MessagePack/pkg-plist b/devel/p5-Data-MessagePack/pkg-plist
index 1fb2c12e48ec..fc90982699bc 100644
--- a/devel/p5-Data-MessagePack/pkg-plist
+++ b/devel/p5-Data-MessagePack/pkg-plist
@@ -1,9 +1,8 @@
 %%PERL5_MAN3%%/Data::MessagePack.3.gz
 %%PERL5_MAN3%%/Data::MessagePack::PP.3.gz
 %%PERL5_MAN3%%/Data::MessagePack::Unpacker.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/MessagePack.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/MessagePack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/MessagePack/Boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/MessagePack/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/MessagePack/Unpacker.pod
+%%SITE_ARCH%%/auto/Data/MessagePack/MessagePack.so
+%%SITE_ARCH%%/Data/MessagePack.pm
+%%SITE_ARCH%%/Data/MessagePack/Boolean.pm
+%%SITE_ARCH%%/Data/MessagePack/PP.pm
+%%SITE_ARCH%%/Data/MessagePack/Unpacker.pod
diff --git a/devel/p5-Data-Miscellany/Makefile b/devel/p5-Data-Miscellany/Makefile
index 29484a0a083c..84670c2b8f87 100644
--- a/devel/p5-Data-Miscellany/Makefile
+++ b/devel/p5-Data-Miscellany/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Miscellany
 PORTVERSION=	1.100850
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Miscellany/pkg-plist b/devel/p5-Data-Miscellany/pkg-plist
index 14700aebd2df..b242dc94aa5c 100644
--- a/devel/p5-Data-Miscellany/pkg-plist
+++ b/devel/p5-Data-Miscellany/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Miscellany.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Miscellany/.packlist
 %%PERL5_MAN3%%/Data::Miscellany.3.gz
diff --git a/devel/p5-Data-Model/Makefile b/devel/p5-Data-Model/Makefile
index fc0085d097fb..6e234b150230 100644
--- a/devel/p5-Data-Model/Makefile
+++ b/devel/p5-Data-Model/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Data-Model
 PORTVERSION=	0.00008
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Model/pkg-plist b/devel/p5-Data-Model/pkg-plist
index 3c1db0fd9bce..0274d922a7d8 100644
--- a/devel/p5-Data-Model/pkg-plist
+++ b/devel/p5-Data-Model/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Model/.packlist
 %%SITE_PERL%%/Data/Model.pm
 %%SITE_PERL%%/Data/Model/Accessor.pm
 %%SITE_PERL%%/Data/Model/Driver.pm
diff --git a/devel/p5-Data-Munge/Makefile b/devel/p5-Data-Munge/Makefile
index acc221f6e3fa..37d7987be549 100644
--- a/devel/p5-Data-Munge/Makefile
+++ b/devel/p5-Data-Munge/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Munge
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Munge/pkg-plist b/devel/p5-Data-Munge/pkg-plist
index c19b739d828d..999b3792f405 100644
--- a/devel/p5-Data-Munge/pkg-plist
+++ b/devel/p5-Data-Munge/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Munge.3.gz
 %%SITE_PERL%%/Data/Munge.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Munge/.packlist
diff --git a/devel/p5-Data-ObjectDriver/Makefile b/devel/p5-Data-ObjectDriver/Makefile
index f82f8e76fcad..cf8a4c4ee337 100644
--- a/devel/p5-Data-ObjectDriver/Makefile
+++ b/devel/p5-Data-ObjectDriver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-ObjectDriver
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-ObjectDriver/pkg-plist b/devel/p5-Data-ObjectDriver/pkg-plist
index c357039f6dfd..51f81a4bd515 100644
--- a/devel/p5-Data-ObjectDriver/pkg-plist
+++ b/devel/p5-Data-ObjectDriver/pkg-plist
@@ -40,4 +40,3 @@
 %%SITE_PERL%%/Data/ObjectDriver/ResultSet.pm
 %%SITE_PERL%%/Data/ObjectDriver/SQL.pm
 %%SITE_PERL%%/Data/ObjectDriver/SQL/Oracle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ObjectDriver/.packlist
diff --git a/devel/p5-Data-OptList/Makefile b/devel/p5-Data-OptList/Makefile
index 63db6d05bda0..5a458cab8d6d 100644
--- a/devel/p5-Data-OptList/Makefile
+++ b/devel/p5-Data-OptList/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-OptList
 PORTVERSION=	0.109
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-OptList/pkg-plist b/devel/p5-Data-OptList/pkg-plist
index 15644f3745da..ec97a718037b 100644
--- a/devel/p5-Data-OptList/pkg-plist
+++ b/devel/p5-Data-OptList/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::OptList.3.gz
 %%SITE_PERL%%/Data/OptList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/OptList/.packlist
diff --git a/devel/p5-Data-Page-NoTotalEntries/Makefile b/devel/p5-Data-Page-NoTotalEntries/Makefile
index 8214da6a9fcd..ad347bcad958 100644
--- a/devel/p5-Data-Page-NoTotalEntries/Makefile
+++ b/devel/p5-Data-Page-NoTotalEntries/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Page-NoTotalEntries
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/devel/p5-Data-Page-NoTotalEntries/pkg-plist b/devel/p5-Data-Page-NoTotalEntries/pkg-plist
index 8e206057264d..804687e52f99 100644
--- a/devel/p5-Data-Page-NoTotalEntries/pkg-plist
+++ b/devel/p5-Data-Page-NoTotalEntries/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Page/NoTotalEntries/.packlist
 %%SITE_PERL%%/Data/Page/NoTotalEntries.pm
 %%SITE_PERL%%/Data/Page/README.pod
 %%PERL5_MAN3%%/Data::Page::NoTotalEntries.3.gz
diff --git a/devel/p5-Data-ParseBinary/Makefile b/devel/p5-Data-ParseBinary/Makefile
index 88674d571634..095488695553 100644
--- a/devel/p5-Data-ParseBinary/Makefile
+++ b/devel/p5-Data-ParseBinary/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-ParseBinary
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SEMUELF
diff --git a/devel/p5-Data-ParseBinary/pkg-plist b/devel/p5-Data-ParseBinary/pkg-plist
index 7e4f122e01d4..52629198c86f 100644
--- a/devel/p5-Data-ParseBinary/pkg-plist
+++ b/devel/p5-Data-ParseBinary/pkg-plist
@@ -17,7 +17,6 @@
 %%SITE_PERL%%/Data/ParseBinary/Streams.pm
 %%SITE_PERL%%/Data/ParseBinary/Core.pm
 %%SITE_PERL%%/Data/ParseBinary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ParseBinary/.packlist
 %%PERL5_MAN3%%/Data::ParseBinary::Graphics::WMF.3.gz
 %%PERL5_MAN3%%/Data::ParseBinary::Graphics::EMF.3.gz
 %%PERL5_MAN3%%/Data::ParseBinary.3.gz
diff --git a/devel/p5-Data-Path/Makefile b/devel/p5-Data-Path/Makefile
index cbbaa2e0d7da..b0833c6d61d4 100644
--- a/devel/p5-Data-Path/Makefile
+++ b/devel/p5-Data-Path/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Path
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ZAPHAR
diff --git a/devel/p5-Data-Path/pkg-plist b/devel/p5-Data-Path/pkg-plist
index 1c3b24997b0a..5832a58ab0f7 100644
--- a/devel/p5-Data-Path/pkg-plist
+++ b/devel/p5-Data-Path/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Path.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Path/.packlist
 %%PERL5_MAN3%%/Data::Path.3.gz
diff --git a/devel/p5-Data-Peek/Makefile b/devel/p5-Data-Peek/Makefile
index baeb15ca3024..7f1b81acbf60 100644
--- a/devel/p5-Data-Peek/Makefile
+++ b/devel/p5-Data-Peek/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Peek
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -19,6 +20,6 @@ USES=		perl5 tar:tgz
 USE_PERL5=	configure
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Data/Peek/Peek.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Data/Peek/Peek.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Peek/pkg-plist b/devel/p5-Data-Peek/pkg-plist
index 797db9756136..3e3c0353f60d 100644
--- a/devel/p5-Data-Peek/pkg-plist
+++ b/devel/p5-Data-Peek/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Data::DP.3.gz
 %%PERL5_MAN3%%/Data::Peek.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Peek.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Peek/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Peek/Peek.so
+%%SITE_ARCH%%/DP.pm
+%%SITE_ARCH%%/Data/Peek.pm
+%%SITE_ARCH%%/auto/Data/Peek/Peek.so
diff --git a/devel/p5-Data-Perl/Makefile b/devel/p5-Data-Perl/Makefile
index e858b1a1ebbb..10e172808fdb 100644
--- a/devel/p5-Data-Perl/Makefile
+++ b/devel/p5-Data-Perl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Perl
 PORTVERSION=	0.002009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Perl/pkg-plist b/devel/p5-Data-Perl/pkg-plist
index 419c3741bfb1..8df092b3214c 100644
--- a/devel/p5-Data-Perl/pkg-plist
+++ b/devel/p5-Data-Perl/pkg-plist
@@ -28,4 +28,3 @@
 %%SITE_PERL%%/Data/Perl/Role/Number.pm
 %%SITE_PERL%%/Data/Perl/Role/String.pm
 %%SITE_PERL%%/Data/Perl/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Perl/.packlist
diff --git a/devel/p5-Data-Printer/Makefile b/devel/p5-Data-Printer/Makefile
index 50e41de1cf46..406e5a23eec8 100644
--- a/devel/p5-Data-Printer/Makefile
+++ b/devel/p5-Data-Printer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Printer
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Printer/pkg-plist b/devel/p5-Data-Printer/pkg-plist
index cce065f1b07e..003a51256b59 100644
--- a/devel/p5-Data-Printer/pkg-plist
+++ b/devel/p5-Data-Printer/pkg-plist
@@ -4,7 +4,6 @@
 %%SITE_PERL%%/Data/Printer/Filter/DB.pm
 %%SITE_PERL%%/Data/Printer/Filter/DateTime.pm
 %%SITE_PERL%%/Data/Printer/Filter/Digest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Printer/.packlist
 %%PERL5_MAN3%%/DDP.3.gz
 %%PERL5_MAN3%%/Data::Printer.3.gz
 %%PERL5_MAN3%%/Data::Printer::Filter.3.gz
diff --git a/devel/p5-Data-Properties/Makefile b/devel/p5-Data-Properties/Makefile
index d75d41aefbdd..1bb946a2c73e 100644
--- a/devel/p5-Data-Properties/Makefile
+++ b/devel/p5-Data-Properties/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Properties
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Properties/pkg-plist b/devel/p5-Data-Properties/pkg-plist
index 14bd24ffa880..ebba45eed6c1 100644
--- a/devel/p5-Data-Properties/pkg-plist
+++ b/devel/p5-Data-Properties/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Properties.3.gz
 %%SITE_PERL%%/Data/Properties.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Properties/.packlist
diff --git a/devel/p5-Data-Rand-Obscure/Makefile b/devel/p5-Data-Rand-Obscure/Makefile
index 75c1050ac09b..81b902c1c9ab 100644
--- a/devel/p5-Data-Rand-Obscure/Makefile
+++ b/devel/p5-Data-Rand-Obscure/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Rand-Obscure
 PORTVERSION=	0.021
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Rand-Obscure/pkg-plist b/devel/p5-Data-Rand-Obscure/pkg-plist
index 2a1e35c5e3e9..2ea925739cd1 100644
--- a/devel/p5-Data-Rand-Obscure/pkg-plist
+++ b/devel/p5-Data-Rand-Obscure/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Data/Rand/Obscure.pm
 %%SITE_PERL%%/Data/Rand/Obscure/Generator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Rand/Obscure/.packlist
 %%PERL5_MAN3%%/Data::Rand::Obscure.3.gz
 %%PERL5_MAN3%%/Data::Rand::Obscure::Generator.3.gz
diff --git a/devel/p5-Data-Rand/Makefile b/devel/p5-Data-Rand/Makefile
index 4a89f62cf824..dc9fe74e6c58 100644
--- a/devel/p5-Data-Rand/Makefile
+++ b/devel/p5-Data-Rand/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Rand
 PORTVERSION=	0.0.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Random/Makefile b/devel/p5-Data-Random/Makefile
index 9302ada42930..c018534ed1fd 100644
--- a/devel/p5-Data-Random/Makefile
+++ b/devel/p5-Data-Random/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Random
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Random/pkg-plist b/devel/p5-Data-Random/pkg-plist
index 2cc9e3365cf5..b0df9ffb150c 100644
--- a/devel/p5-Data-Random/pkg-plist
+++ b/devel/p5-Data-Random/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/Data/Random/dict
 %%PERL5_MAN3%%/Data::Random.3.gz
 %%PERL5_MAN3%%/Data::Random::WordList.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Random/.packlist
diff --git a/devel/p5-Data-Range-Compare/Makefile b/devel/p5-Data-Range-Compare/Makefile
index efd34f0b9e6a..ac1a3f58ac63 100644
--- a/devel/p5-Data-Range-Compare/Makefile
+++ b/devel/p5-Data-Range-Compare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Range-Compare
 PORTVERSION=	1.030
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Range-Compare/pkg-plist b/devel/p5-Data-Range-Compare/pkg-plist
index 6e96bcc8cf11..de61146133f4 100644
--- a/devel/p5-Data-Range-Compare/pkg-plist
+++ b/devel/p5-Data-Range-Compare/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Data/Range/Compare/Cookbook/Recipe_DateTime.pod
 %%SITE_PERL%%/Data/Range/Compare/Cookbook/Recipe_a_to_z.pod
 %%SITE_PERL%%/Data/Range/Compare/Cookbook/Recipe_subclass_a_to_z.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Range/Compare/.packlist
 %%PERL5_MAN3%%/Data::Range::Compare.3.gz
 %%PERL5_MAN3%%/Data::Range::Compare::Cookbook.3.gz
 %%PERL5_MAN3%%/Data::Range::Compare::Cookbook::Instance_and_Constants.3.gz
diff --git a/devel/p5-Data-Record/Makefile b/devel/p5-Data-Record/Makefile
index 55c2d7f55a4a..7692499bb3fa 100644
--- a/devel/p5-Data-Record/Makefile
+++ b/devel/p5-Data-Record/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Record
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Record/pkg-plist b/devel/p5-Data-Record/pkg-plist
index 27521dc691d4..7fd01682744b 100644
--- a/devel/p5-Data-Record/pkg-plist
+++ b/devel/p5-Data-Record/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Record/.packlist
 %%PERL5_MAN3%%/Data::Record.3.gz
diff --git a/devel/p5-Data-Recursive-Encode/Makefile b/devel/p5-Data-Recursive-Encode/Makefile
index f1c8709b908c..5973e587a8e3 100644
--- a/devel/p5-Data-Recursive-Encode/Makefile
+++ b/devel/p5-Data-Recursive-Encode/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Recursive-Encode
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Remember/Makefile b/devel/p5-Data-Remember/Makefile
index e685d51e3446..63bb980908c7 100644
--- a/devel/p5-Data-Remember/Makefile
+++ b/devel/p5-Data-Remember/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Remember
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Data
diff --git a/devel/p5-Data-Remember/pkg-plist b/devel/p5-Data-Remember/pkg-plist
index a6940547a23a..aaa8572f088b 100644
--- a/devel/p5-Data-Remember/pkg-plist
+++ b/devel/p5-Data-Remember/pkg-plist
@@ -4,7 +4,6 @@
 %%SITE_PERL%%/Data/Remember/Memory.pm
 %%SITE_PERL%%/Data/Remember/POE.pm
 %%SITE_PERL%%/Data/Remember/YAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Remember/.packlist
 %%PERL5_MAN3%%/Data::Remember.3.gz
 %%PERL5_MAN3%%/Data::Remember::DBM.3.gz
 %%PERL5_MAN3%%/Data::Remember::Hybrid.3.gz
diff --git a/devel/p5-Data-Rmap/Makefile b/devel/p5-Data-Rmap/Makefile
index f886e88d373f..0337d9d88e8b 100644
--- a/devel/p5-Data-Rmap/Makefile
+++ b/devel/p5-Data-Rmap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-Rmap
 PORTVERSION=	0.62
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Rmap/pkg-plist b/devel/p5-Data-Rmap/pkg-plist
index a52a903e15b5..e64f71ce7cff 100644
--- a/devel/p5-Data-Rmap/pkg-plist
+++ b/devel/p5-Data-Rmap/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Rmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Rmap/.packlist
 %%PERL5_MAN3%%/Data::Rmap.3.gz
diff --git a/devel/p5-Data-RoundRobin/Makefile b/devel/p5-Data-RoundRobin/Makefile
index ff4edad23fbd..e9050eabded1 100644
--- a/devel/p5-Data-RoundRobin/Makefile
+++ b/devel/p5-Data-RoundRobin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-RoundRobin
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-RoundRobin/pkg-plist b/devel/p5-Data-RoundRobin/pkg-plist
index cb7217378ad3..49ec5158584e 100644
--- a/devel/p5-Data-RoundRobin/pkg-plist
+++ b/devel/p5-Data-RoundRobin/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/RoundRobin/.packlist
 %%SITE_PERL%%/Data/RoundRobin.pm
 %%PERL5_MAN3%%/Data::RoundRobin.3.gz
diff --git a/devel/p5-Data-Rx/Makefile b/devel/p5-Data-Rx/Makefile
index c3b3e91bc95c..f23821e96814 100644
--- a/devel/p5-Data-Rx/Makefile
+++ b/devel/p5-Data-Rx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Rx
 PORTVERSION=	0.200006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Rx/pkg-plist b/devel/p5-Data-Rx/pkg-plist
index d6b9e0c35338..82f98f099336 100644
--- a/devel/p5-Data-Rx/pkg-plist
+++ b/devel/p5-Data-Rx/pkg-plist
@@ -46,4 +46,3 @@
 %%SITE_PERL%%/Data/Rx/TypeBundle.pm
 %%SITE_PERL%%/Data/Rx/TypeBundle/Core.pm
 %%SITE_PERL%%/Data/Rx/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Rx/.packlist
diff --git a/devel/p5-Data-SExpression/Makefile b/devel/p5-Data-SExpression/Makefile
index 6bc3f5e3c66b..0a696f5dde44 100644
--- a/devel/p5-Data-SExpression/Makefile
+++ b/devel/p5-Data-SExpression/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-SExpression
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-SExpression/pkg-plist b/devel/p5-Data-SExpression/pkg-plist
index d646f82a2247..cb2037e457b4 100644
--- a/devel/p5-Data-SExpression/pkg-plist
+++ b/devel/p5-Data-SExpression/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/SExpression/.packlist
 %%SITE_PERL%%/Data/SExpression.pm
 %%SITE_PERL%%/Data/SExpression/Cons.pm
 %%SITE_PERL%%/Data/SExpression/Parser.pm
diff --git a/devel/p5-Data-Section-Simple/Makefile b/devel/p5-Data-Section-Simple/Makefile
index c11be5809275..0f510039f3ce 100644
--- a/devel/p5-Data-Section-Simple/Makefile
+++ b/devel/p5-Data-Section-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Section-Simple
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Section-Simple/pkg-plist b/devel/p5-Data-Section-Simple/pkg-plist
index 4c0755001988..9a63946cb0f5 100644
--- a/devel/p5-Data-Section-Simple/pkg-plist
+++ b/devel/p5-Data-Section-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Section/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Section/Simple/.packlist
 %%PERL5_MAN3%%/Data::Section::Simple.3.gz
diff --git a/devel/p5-Data-Section/Makefile b/devel/p5-Data-Section/Makefile
index 0ca5848a10e8..6123567f5fad 100644
--- a/devel/p5-Data-Section/Makefile
+++ b/devel/p5-Data-Section/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Section
 PORTVERSION=	0.200006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Section/pkg-plist b/devel/p5-Data-Section/pkg-plist
index 48b655dcdad6..b9e59c8a4e16 100644
--- a/devel/p5-Data-Section/pkg-plist
+++ b/devel/p5-Data-Section/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Section.3.gz
 %%SITE_PERL%%/Data/Section.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Section/.packlist
diff --git a/devel/p5-Data-Serializer/Makefile b/devel/p5-Data-Serializer/Makefile
index f3af9d933cba..d03a50f1e24d 100644
--- a/devel/p5-Data-Serializer/Makefile
+++ b/devel/p5-Data-Serializer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Serializer
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 079c3285ebdd..5496fe41883c 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-ShowTable
 PORTVERSION=	4.6
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-ShowTable/pkg-plist b/devel/p5-Data-ShowTable/pkg-plist
index 15153611b92c..86d9d995714b 100644
--- a/devel/p5-Data-ShowTable/pkg-plist
+++ b/devel/p5-Data-ShowTable/pkg-plist
@@ -1,5 +1,4 @@
 bin/showtable
 %%SITE_PERL%%/Data/ShowTable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ShowTable/.packlist
 %%PERL5_MAN3%%/Data::ShowTable.3.gz
 man/man1/showtable.1.gz
diff --git a/devel/p5-Data-Stag/Makefile b/devel/p5-Data-Stag/Makefile
index 4b422ea895f5..f5704302124f 100644
--- a/devel/p5-Data-Stag/Makefile
+++ b/devel/p5-Data-Stag/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-Stag
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Stag/pkg-plist b/devel/p5-Data-Stag/pkg-plist
index d1d3082b139b..efef6f686f50 100644
--- a/devel/p5-Data-Stag/pkg-plist
+++ b/devel/p5-Data-Stag/pkg-plist
@@ -38,7 +38,6 @@ man/man1/stag-query.pl.1.gz
 man/man1/stag-splitter.pl.1.gz
 man/man1/stag-view.pl.1.gz
 man/man1/stag-xml2itext.pl.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/.packlist
 %%SITE_PERL%%/Data/Stag.pm
 %%SITE_PERL%%/Data/Stag/Arr2HTML.pm
 %%SITE_PERL%%/Data/Stag/Base.pm
diff --git a/devel/p5-Data-Stream-Bulk/Makefile b/devel/p5-Data-Stream-Bulk/Makefile
index 9a72f15dc70a..9d4da3319565 100644
--- a/devel/p5-Data-Stream-Bulk/Makefile
+++ b/devel/p5-Data-Stream-Bulk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Stream-Bulk
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Stream-Bulk/pkg-plist b/devel/p5-Data-Stream-Bulk/pkg-plist
index f4adcc154a7d..2bbfd3caf63c 100644
--- a/devel/p5-Data-Stream-Bulk/pkg-plist
+++ b/devel/p5-Data-Stream-Bulk/pkg-plist
@@ -24,4 +24,3 @@
 %%SITE_PERL%%/Data/Stream/Bulk/Nil.pm
 %%SITE_PERL%%/Data/Stream/Bulk/Path/Class.pm
 %%SITE_PERL%%/Data/Stream/Bulk/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Stream/Bulk/.packlist
diff --git a/devel/p5-Data-Structure-Util/Makefile b/devel/p5-Data-Structure-Util/Makefile
index 9c61b6f75720..4f5151715850 100644
--- a/devel/p5-Data-Structure-Util/Makefile
+++ b/devel/p5-Data-Structure-Util/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-Structure-Util
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Structure-Util/pkg-plist b/devel/p5-Data-Structure-Util/pkg-plist
index 20ca12ff0023..f52aa61d4f58 100644
--- a/devel/p5-Data-Structure-Util/pkg-plist
+++ b/devel/p5-Data-Structure-Util/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Structure/Util/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Structure/Util/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Structure/Util/Util.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Structure/Util.pm
+%%SITE_ARCH%%/auto/Data/Structure/Util/autosplit.ix
+%%SITE_ARCH%%/auto/Data/Structure/Util/Util.so
+%%SITE_ARCH%%/Data/Structure/Util.pm
 %%PERL5_MAN3%%/Data::Structure::Util.3.gz
diff --git a/devel/p5-Data-Swap/Makefile b/devel/p5-Data-Swap/Makefile
index 433b4e1241ae..0589c625a3a6 100644
--- a/devel/p5-Data-Swap/Makefile
+++ b/devel/p5-Data-Swap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Swap
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Swap/pkg-plist b/devel/p5-Data-Swap/pkg-plist
index 2f3dc0c99b7e..117f25950933 100644
--- a/devel/p5-Data-Swap/pkg-plist
+++ b/devel/p5-Data-Swap/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Swap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap/Swap.so
+%%SITE_ARCH%%/Data/Swap.pm
+%%SITE_ARCH%%/auto/Data/Swap/Swap.so
 %%PERL5_MAN3%%/Data::Swap.3.gz
diff --git a/devel/p5-Data-Table/Makefile b/devel/p5-Data-Table/Makefile
index 3fa968466beb..821fa3f33ddc 100644
--- a/devel/p5-Data-Table/Makefile
+++ b/devel/p5-Data-Table/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Table
 PORTVERSION=	1.68
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Table/pkg-plist b/devel/p5-Data-Table/pkg-plist
index 1a0ece5fca5e..76b2424369c8 100644
--- a/devel/p5-Data-Table/pkg-plist
+++ b/devel/p5-Data-Table/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Table/.packlist
 %%PERL5_MAN3%%/Data::Table.3.gz
diff --git a/devel/p5-Data-Taxonomy-Tags/Makefile b/devel/p5-Data-Taxonomy-Tags/Makefile
index 3952b9539da4..93934c415f7d 100644
--- a/devel/p5-Data-Taxonomy-Tags/Makefile
+++ b/devel/p5-Data-Taxonomy-Tags/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Taxonomy-Tags
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-TemporaryBag/Makefile b/devel/p5-Data-TemporaryBag/Makefile
index e9bd36767997..8fcd02ed9349 100644
--- a/devel/p5-Data-TemporaryBag/Makefile
+++ b/devel/p5-Data-TemporaryBag/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-TemporaryBag
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-TemporaryBag/pkg-plist b/devel/p5-Data-TemporaryBag/pkg-plist
index bba6708db1f4..c4b803728947 100644
--- a/devel/p5-Data-TemporaryBag/pkg-plist
+++ b/devel/p5-Data-TemporaryBag/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::TemporaryBag.3.gz
 %%SITE_PERL%%/Data/TemporaryBag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TemporaryBag/.packlist
diff --git a/devel/p5-Data-Throttler-Memcached/Makefile b/devel/p5-Data-Throttler-Memcached/Makefile
index c108a475237e..a2d1ce2fda8f 100644
--- a/devel/p5-Data-Throttler-Memcached/Makefile
+++ b/devel/p5-Data-Throttler-Memcached/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-Throttler-Memcached
 PORTVERSION=	0.00003
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Throttler-Memcached/pkg-plist b/devel/p5-Data-Throttler-Memcached/pkg-plist
index 18096cc865ae..ed3481bdc0a3 100644
--- a/devel/p5-Data-Throttler-Memcached/pkg-plist
+++ b/devel/p5-Data-Throttler-Memcached/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Throttler/Memcached/.packlist
 %%SITE_PERL%%/Data/Throttler/Memcached.pm
 %%SITE_PERL%%/Data/Throttler/BucketChain/Memcached.pm
 %%PERL5_MAN3%%/Data::Throttler::Memcached.3.gz
diff --git a/devel/p5-Data-Throttler/Makefile b/devel/p5-Data-Throttler/Makefile
index 16366a0d987e..146ae85a7bac 100644
--- a/devel/p5-Data-Throttler/Makefile
+++ b/devel/p5-Data-Throttler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Throttler
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Throttler/pkg-plist b/devel/p5-Data-Throttler/pkg-plist
index 1c07df41dbbf..2186e6558ac6 100644
--- a/devel/p5-Data-Throttler/pkg-plist
+++ b/devel/p5-Data-Throttler/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Throttler/.packlist
 %%SITE_PERL%%/Data/Throttler.pm
 %%PERL5_MAN3%%/Data::Throttler.3.gz
diff --git a/devel/p5-Data-Thunk/Makefile b/devel/p5-Data-Thunk/Makefile
index 9ea122959673..a1e4d4c2969f 100644
--- a/devel/p5-Data-Thunk/Makefile
+++ b/devel/p5-Data-Thunk/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Thunk
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/devel/p5-Data-Thunk/pkg-plist b/devel/p5-Data-Thunk/pkg-plist
index 7c4883ee948c..dff04c08f429 100644
--- a/devel/p5-Data-Thunk/pkg-plist
+++ b/devel/p5-Data-Thunk/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Data/Thunk/Code.pm
 %%SITE_PERL%%/Data/Thunk/Object.pm
 %%SITE_PERL%%/Data/Thunk/ScalarValue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Thunk/.packlist
 %%PERL5_MAN3%%/Data::Thunk.3.gz
 %%PERL5_MAN3%%/Data::Thunk::Code.3.gz
 %%PERL5_MAN3%%/Data::Thunk::Object.3.gz
diff --git a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
index ab5579f41ffe..21d6df3f8da7 100644
--- a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
+++ b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-TreeDumper-Renderer-GTK
 PORTVERSION=	0.02
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-TreeDumper-Renderer-GTK/pkg-plist b/devel/p5-Data-TreeDumper-Renderer-GTK/pkg-plist
index 27e48963ee3a..e886c2b03082 100644
--- a/devel/p5-Data-TreeDumper-Renderer-GTK/pkg-plist
+++ b/devel/p5-Data-TreeDumper-Renderer-GTK/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Data/TreeDumper/Renderer/GTK.pm
 %%SITE_PERL%%/Data/TreeDumper/Renderer/gtk_test.pl
 %%SITE_PERL%%/auto/Data/TreeDumper/Renderer/GTK/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer/GTK/.packlist
 %%PERL5_MAN3%%/Data::TreeDumper::Renderer::GTK.3.gz
diff --git a/devel/p5-Data-TreeDumper/Makefile b/devel/p5-Data-TreeDumper/Makefile
index 92a05672eb59..f708d5055035 100644
--- a/devel/p5-Data-TreeDumper/Makefile
+++ b/devel/p5-Data-TreeDumper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-TreeDumper
 PORTVERSION=	0.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-TreeDumper/pkg-plist b/devel/p5-Data-TreeDumper/pkg-plist
index 4cfd100485e2..90f4a5366aec 100644
--- a/devel/p5-Data-TreeDumper/pkg-plist
+++ b/devel/p5-Data-TreeDumper/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Data/tie_bless.pl
 %%SITE_PERL%%/Data/try_it.pl
 %%SITE_PERL%%/Data/usage.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/.packlist
diff --git a/devel/p5-Data-Types/Makefile b/devel/p5-Data-Types/Makefile
index 10256b22acbf..072caa66d23c 100644
--- a/devel/p5-Data-Types/Makefile
+++ b/devel/p5-Data-Types/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Types
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-UUID/Makefile b/devel/p5-Data-UUID/Makefile
index eea54571540c..228feb269be2 100644
--- a/devel/p5-Data-UUID/Makefile
+++ b/devel/p5-Data-UUID/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-UUID
 PORTVERSION=	1.219
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-UUID/pkg-plist b/devel/p5-Data-UUID/pkg-plist
index 3e235485eac9..cb539d4dbacc 100644
--- a/devel/p5-Data-UUID/pkg-plist
+++ b/devel/p5-Data-UUID/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Data::UUID.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/UUID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/UUID/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/UUID/UUID.so
+%%SITE_ARCH%%/Data/UUID.pm
+%%SITE_ARCH%%/auto/Data/UUID/UUID.so
diff --git a/devel/p5-Data-Uniqid/Makefile b/devel/p5-Data-Uniqid/Makefile
index 23e605fafc1a..11d343799547 100644
--- a/devel/p5-Data-Uniqid/Makefile
+++ b/devel/p5-Data-Uniqid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Uniqid
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Uniqid/pkg-plist b/devel/p5-Data-Uniqid/pkg-plist
index c4434947dbf6..67fba2159729 100644
--- a/devel/p5-Data-Uniqid/pkg-plist
+++ b/devel/p5-Data-Uniqid/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Data/Uniqid.pm
 %%SITE_PERL%%/auto/Data/Uniqid/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Uniqid/.packlist
 %%PERL5_MAN3%%/Data::Uniqid.3.gz
diff --git a/devel/p5-Data-Util/Makefile b/devel/p5-Data-Util/Makefile
index 2ebf466f2fc5..9e18b39fadcd 100644
--- a/devel/p5-Data-Util/Makefile
+++ b/devel/p5-Data-Util/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Util
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -24,6 +25,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Data/Util/Util.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Data/Util/Util.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Util/pkg-plist b/devel/p5-Data-Util/pkg-plist
index 1c463dac9a43..e9c93f52c91b 100644
--- a/devel/p5-Data-Util/pkg-plist
+++ b/devel/p5-Data-Util/pkg-plist
@@ -1,10 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Util/Curry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Util/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Util/JA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Data/Util/PurePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Util/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Util/Util.so
+%%SITE_ARCH%%/Data/Util.pm
+%%SITE_ARCH%%/Data/Util/Curry.pod
+%%SITE_ARCH%%/Data/Util/Error.pm
+%%SITE_ARCH%%/Data/Util/JA.pod
+%%SITE_ARCH%%/Data/Util/PurePerl.pm
+%%SITE_ARCH%%/auto/Data/Util/Util.so
 %%PERL5_MAN3%%/Data::Util.3.gz
 %%PERL5_MAN3%%/Data::Util::Curry.3.gz
 %%PERL5_MAN3%%/Data::Util::Error.3.gz
diff --git a/devel/p5-Data-Validate/Makefile b/devel/p5-Data-Validate/Makefile
index 319eb27730be..7cc244d03694 100644
--- a/devel/p5-Data-Validate/Makefile
+++ b/devel/p5-Data-Validate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Validate
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Validate/pkg-plist b/devel/p5-Data-Validate/pkg-plist
index 7a115565fc8e..538ea3d179ab 100644
--- a/devel/p5-Data-Validate/pkg-plist
+++ b/devel/p5-Data-Validate/pkg-plist
@@ -14,5 +14,4 @@
 %%SITE_PERL%%/auto/Data/Validate/is_printable.al
 %%SITE_PERL%%/auto/Data/Validate/length_is_between.al
 %%SITE_PERL%%/auto/Data/Validate/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/.packlist
 %%PERL5_MAN3%%/Data::Validate.3.gz
diff --git a/devel/p5-Data-Validator/Makefile b/devel/p5-Data-Validator/Makefile
index 969b3ce9702d..ea4be1696eb3 100644
--- a/devel/p5-Data-Validator/Makefile
+++ b/devel/p5-Data-Validator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Validator
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Visitor-Encode/Makefile b/devel/p5-Data-Visitor-Encode/Makefile
index 939a6e88d604..0b3b411b63f2 100644
--- a/devel/p5-Data-Visitor-Encode/Makefile
+++ b/devel/p5-Data-Visitor-Encode/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Visitor-Encode
 PORTVERSION=	0.10007
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Visitor-Encode/pkg-plist b/devel/p5-Data-Visitor-Encode/pkg-plist
index 9162a5d333bb..705b145964ea 100644
--- a/devel/p5-Data-Visitor-Encode/pkg-plist
+++ b/devel/p5-Data-Visitor-Encode/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Visitor/Encode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Visitor/Encode/.packlist
 %%PERL5_MAN3%%/Data::Visitor::Encode.3.gz
diff --git a/devel/p5-Data-Visitor/Makefile b/devel/p5-Data-Visitor/Makefile
index 691cfe19a1d9..e8e3d00ff357 100644
--- a/devel/p5-Data-Visitor/Makefile
+++ b/devel/p5-Data-Visitor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Visitor
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Data-Visitor/pkg-plist b/devel/p5-Data-Visitor/pkg-plist
index 397ca8717e24..ebec4c82f45a 100644
--- a/devel/p5-Data-Visitor/pkg-plist
+++ b/devel/p5-Data-Visitor/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Data::Visitor::Callback.3.gz
 %%SITE_PERL%%/Data/Visitor.pm
 %%SITE_PERL%%/Data/Visitor/Callback.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Visitor/.packlist
diff --git a/devel/p5-Data-Walk/Makefile b/devel/p5-Data-Walk/Makefile
index b7be0f85fcc6..90d06ff5b14b 100644
--- a/devel/p5-Data-Walk/Makefile
+++ b/devel/p5-Data-Walk/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Data-Walk
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GUIDO
diff --git a/devel/p5-Data-Walk/pkg-plist b/devel/p5-Data-Walk/pkg-plist
index 9c0bd9321c05..61b2b594250d 100644
--- a/devel/p5-Data-Walk/pkg-plist
+++ b/devel/p5-Data-Walk/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Walk.3.gz
 %%SITE_PERL%%/Data/Walk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Walk/.packlist
diff --git a/devel/p5-Date-Business/Makefile b/devel/p5-Date-Business/Makefile
index 2a19aaa6a623..5bd6c87112c7 100644
--- a/devel/p5-Date-Business/Makefile
+++ b/devel/p5-Date-Business/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Date-Business
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Business/pkg-plist b/devel/p5-Date-Business/pkg-plist
index f963b406e31d..47b243f16781 100644
--- a/devel/p5-Date-Business/pkg-plist
+++ b/devel/p5-Date-Business/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::Business.3.gz
 %%SITE_PERL%%/Date/Business.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Business/.packlist
diff --git a/devel/p5-Date-Calc-Iterator/Makefile b/devel/p5-Date-Calc-Iterator/Makefile
index 310e97740418..4f5effd2cd43 100644
--- a/devel/p5-Date-Calc-Iterator/Makefile
+++ b/devel/p5-Date-Calc-Iterator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Calc-Iterator
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Calc-Iterator/pkg-plist b/devel/p5-Date-Calc-Iterator/pkg-plist
index d84798f492d3..bf01ad70852a 100644
--- a/devel/p5-Date-Calc-Iterator/pkg-plist
+++ b/devel/p5-Date-Calc-Iterator/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::Calc::Iterator.3.gz
 %%SITE_PERL%%/Date/Calc/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/Iterator/.packlist
diff --git a/devel/p5-Date-Calc-XS/Makefile b/devel/p5-Date-Calc-XS/Makefile
index 8798d5f2bef9..7c872a56f604 100644
--- a/devel/p5-Date-Calc-XS/Makefile
+++ b/devel/p5-Date-Calc-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Calc-XS
 PORTVERSION=	6.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Calc-XS/pkg-plist b/devel/p5-Date-Calc-XS/pkg-plist
index f31fe50c1222..cc8485c90372 100644
--- a/devel/p5-Date-Calc-XS/pkg-plist
+++ b/devel/p5-Date-Calc-XS/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/XS/XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc/XS.pod
+%%SITE_ARCH%%/auto/Date/Calc/XS/XS.so
+%%SITE_ARCH%%/Date/Calc/XS.pm
+%%SITE_ARCH%%/Date/Calc/XS.pod
 %%PERL5_MAN3%%/Date::Calc::XS.3.gz
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index cfed8f315dac..01fd4f8c4c0e 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Calc
 PORTVERSION=	6.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Calc/pkg-plist b/devel/p5-Date-Calc/pkg-plist
index 66882a64822d..1f38cffb3cd3 100644
--- a/devel/p5-Date-Calc/pkg-plist
+++ b/devel/p5-Date-Calc/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/Date/Calendar/Profiles.pod
 %%SITE_PERL%%/Date/Calendar/Year.pm
 %%SITE_PERL%%/Date/Calendar/Year.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/.packlist
diff --git a/devel/p5-Date-DayOfWeek/Makefile b/devel/p5-Date-DayOfWeek/Makefile
index d88b9321b6af..5008b5e93130 100644
--- a/devel/p5-Date-DayOfWeek/Makefile
+++ b/devel/p5-Date-DayOfWeek/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-DayOfWeek
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-DayOfWeek/pkg-plist b/devel/p5-Date-DayOfWeek/pkg-plist
index 944b204a9897..68e9c4194986 100644
--- a/devel/p5-Date-DayOfWeek/pkg-plist
+++ b/devel/p5-Date-DayOfWeek/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Date/DayOfWeek/Birthday.pm
 %%SITE_PERL%%/Date/DayOfWeek/Nails.pm
 %%SITE_PERL%%/Date/DayOfWeek/Sneeze.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/DayOfWeek/.packlist
 %%PERL5_MAN3%%/Date::DayOfWeek.3.gz
 %%PERL5_MAN3%%/Date::DayOfWeek::Birthday.3.gz
 %%PERL5_MAN3%%/Date::DayOfWeek::Nails.3.gz
diff --git a/devel/p5-Date-Easter/Makefile b/devel/p5-Date-Easter/Makefile
index 6013533da45f..6d1e5773b0f7 100644
--- a/devel/p5-Date-Easter/Makefile
+++ b/devel/p5-Date-Easter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Easter
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Easter/pkg-plist b/devel/p5-Date-Easter/pkg-plist
index 34f32d3f8026..15c9825075e2 100644
--- a/devel/p5-Date-Easter/pkg-plist
+++ b/devel/p5-Date-Easter/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Date/Easter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Easter/.packlist
 %%PERL5_MAN3%%/Date::Easter.3.gz
diff --git a/devel/p5-Date-Extract/Makefile b/devel/p5-Date-Extract/Makefile
index 44e90288cebe..b25ed735db76 100644
--- a/devel/p5-Date-Extract/Makefile
+++ b/devel/p5-Date-Extract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Extract
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Extract/pkg-plist b/devel/p5-Date-Extract/pkg-plist
index 426307dfd667..21a8fff372f0 100644
--- a/devel/p5-Date-Extract/pkg-plist
+++ b/devel/p5-Date-Extract/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::Extract.3.gz
 %%SITE_PERL%%/Date/Extract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Extract/.packlist
diff --git a/devel/p5-Date-EzDate/Makefile b/devel/p5-Date-EzDate/Makefile
index 6a70859f0699..63ff72c6e0c7 100644
--- a/devel/p5-Date-EzDate/Makefile
+++ b/devel/p5-Date-EzDate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-EzDate
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-EzDate/pkg-plist b/devel/p5-Date-EzDate/pkg-plist
index a6496e42af62..8255488f9197 100644
--- a/devel/p5-Date-EzDate/pkg-plist
+++ b/devel/p5-Date-EzDate/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Date::EzDate.3.gz
 %%SITE_PERL%%/Date/EzDate.pm
 %%SITE_PERL%%/Date/EzDate.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/EzDate/.packlist
diff --git a/devel/p5-Date-Holidays-DK/Makefile b/devel/p5-Date-Holidays-DK/Makefile
index e8feacb74123..b8a44e6ba331 100644
--- a/devel/p5-Date-Holidays-DK/Makefile
+++ b/devel/p5-Date-Holidays-DK/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Holidays-DK
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Holidays-DK/pkg-plist b/devel/p5-Date-Holidays-DK/pkg-plist
index 096c306ecbee..b78b69698e52 100644
--- a/devel/p5-Date-Holidays-DK/pkg-plist
+++ b/devel/p5-Date-Holidays-DK/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Date/Holidays/DK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Holidays/DK/.packlist
 %%PERL5_MAN3%%/Date::Holidays::DK.3.gz
diff --git a/devel/p5-Date-ICal/Makefile b/devel/p5-Date-ICal/Makefile
index 26f9f9fde46b..1a2d05607bea 100644
--- a/devel/p5-Date-ICal/Makefile
+++ b/devel/p5-Date-ICal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-ICal
 PORTVERSION=	2.678
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-ICal/pkg-plist b/devel/p5-Date-ICal/pkg-plist
index c140ec3cc891..9e542ce73216 100644
--- a/devel/p5-Date-ICal/pkg-plist
+++ b/devel/p5-Date-ICal/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Date::ICal::Duration.3.gz
 %%SITE_PERL%%/Date/ICal.pm
 %%SITE_PERL%%/Date/ICal/Duration.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ICal/.packlist
diff --git a/devel/p5-Date-ISO/Makefile b/devel/p5-Date-ISO/Makefile
index 1c3633d6a1b4..48cf8379ffd2 100644
--- a/devel/p5-Date-ISO/Makefile
+++ b/devel/p5-Date-ISO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-ISO
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-ISO/pkg-plist b/devel/p5-Date-ISO/pkg-plist
index 4c82d81fb95e..568bfd94452e 100644
--- a/devel/p5-Date-ISO/pkg-plist
+++ b/devel/p5-Date-ISO/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::ISO.3.gz
 %%SITE_PERL%%/Date/ISO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ISO/.packlist
diff --git a/devel/p5-Date-Leapyear/Makefile b/devel/p5-Date-Leapyear/Makefile
index 7ca57781db8b..3f10f241c32a 100644
--- a/devel/p5-Date-Leapyear/Makefile
+++ b/devel/p5-Date-Leapyear/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Leapyear
 PORTVERSION=	1.72
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Leapyear/pkg-plist b/devel/p5-Date-Leapyear/pkg-plist
index ba27e6fcd659..56b6164a1b5b 100644
--- a/devel/p5-Date-Leapyear/pkg-plist
+++ b/devel/p5-Date-Leapyear/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Date/Leapyear.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Leapyear/.packlist
 %%PERL5_MAN3%%/Date::Leapyear.3.gz
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index d302ab3feafe..956e2058af84 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Manip
 PORTVERSION=	6.46
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SBECK
diff --git a/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist
index 9cfe383dcfd4..3e489defca09 100644
--- a/devel/p5-Date-Manip/pkg-plist
+++ b/devel/p5-Date-Manip/pkg-plist
@@ -1033,6 +1033,5 @@ bin/dm_zdump
 %%SITE_PERL%%/Date/Manip/TZdata.pod
 %%SITE_PERL%%/Date/Manip/Zones.pm
 %%SITE_PERL%%/Date/Manip/Zones.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Manip/.packlist
 man/man1/dm_date.1.gz
 man/man1/dm_zdump.1.gz
diff --git a/devel/p5-Date-Pcalc/Makefile b/devel/p5-Date-Pcalc/Makefile
index 297416681607..e09edf5d0775 100644
--- a/devel/p5-Date-Pcalc/Makefile
+++ b/devel/p5-Date-Pcalc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Pcalc
 PORTVERSION=	6.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STBEY
diff --git a/devel/p5-Date-Pcalc/pkg-plist b/devel/p5-Date-Pcalc/pkg-plist
index d09843c90083..6685f24a272f 100644
--- a/devel/p5-Date-Pcalc/pkg-plist
+++ b/devel/p5-Date-Pcalc/pkg-plist
@@ -3,15 +3,14 @@
 %%PERL5_MAN3%%/Date::Pcalendar.3.gz
 %%PERL5_MAN3%%/Date::Pcalendar::Profiles.3.gz
 %%PERL5_MAN3%%/Date::Pcalendar::Year.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalc.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalc/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalc/Object.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalendar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalendar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalendar/Profiles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalendar/Profiles.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalendar/Year.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Pcalendar/Year.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc/Pcalc.so
+%%SITE_ARCH%%/Date/Pcalc.pm
+%%SITE_ARCH%%/Date/Pcalc.pod
+%%SITE_ARCH%%/Date/Pcalc/Object.pm
+%%SITE_ARCH%%/Date/Pcalc/Object.pod
+%%SITE_ARCH%%/Date/Pcalendar.pm
+%%SITE_ARCH%%/Date/Pcalendar.pod
+%%SITE_ARCH%%/Date/Pcalendar/Profiles.pm
+%%SITE_ARCH%%/Date/Pcalendar/Profiles.pod
+%%SITE_ARCH%%/Date/Pcalendar/Year.pm
+%%SITE_ARCH%%/Date/Pcalendar/Year.pod
+%%SITE_ARCH%%/auto/Date/Pcalc/Pcalc.so
diff --git a/devel/p5-Date-Piece/Makefile b/devel/p5-Date-Piece/Makefile
index ed690af57156..af26e4912683 100644
--- a/devel/p5-Date-Piece/Makefile
+++ b/devel/p5-Date-Piece/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Piece
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EWILHELM
diff --git a/devel/p5-Date-Range/Makefile b/devel/p5-Date-Range/Makefile
index cbdabc10e21e..5dd8f43003b9 100644
--- a/devel/p5-Date-Range/Makefile
+++ b/devel/p5-Date-Range/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Range
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Range/pkg-plist b/devel/p5-Date-Range/pkg-plist
index 0dfa0b660c9e..18871748c435 100644
--- a/devel/p5-Date-Range/pkg-plist
+++ b/devel/p5-Date-Range/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::Range.3.gz
 %%SITE_PERL%%/Date/Range.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Range/.packlist
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 9c1a52f22053..0118629130e1 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Roman
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Date-Roman/pkg-plist b/devel/p5-Date-Roman/pkg-plist
index ee696764b1c8..fbc6d3f33f4d 100644
--- a/devel/p5-Date-Roman/pkg-plist
+++ b/devel/p5-Date-Roman/pkg-plist
@@ -1,5 +1,4 @@
 bin/RomanDate
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Roman/.packlist
 %%SITE_PERL%%/Date/Roman.pm
 man/man1/RomanDate.1.gz
 %%PERL5_MAN3%%/Date::Roman.3.gz
diff --git a/devel/p5-Date-Simple/Makefile b/devel/p5-Date-Simple/Makefile
index 3f9073e4abbe..e72bcb814a73 100644
--- a/devel/p5-Date-Simple/Makefile
+++ b/devel/p5-Date-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Date-Simple
 PORTVERSION=		3.03
+PORTREVISION=	1
 CATEGORIES=		devel perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/devel/p5-Date-Simple/pkg-plist b/devel/p5-Date-Simple/pkg-plist
index cd2fdd535f20..62c7241c1099 100644
--- a/devel/p5-Date-Simple/pkg-plist
+++ b/devel/p5-Date-Simple/pkg-plist
@@ -3,10 +3,9 @@
 %%PERL5_MAN3%%/Date::Simple::Fmt.3.gz
 %%PERL5_MAN3%%/Date::Simple::ISO.3.gz
 %%PERL5_MAN3%%/Date::Simple::NoXS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple/NoXS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple/ISO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple/D8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple/Fmt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple/Simple.so
+%%SITE_ARCH%%/Date/Simple.pm
+%%SITE_ARCH%%/Date/Simple/NoXS.pm
+%%SITE_ARCH%%/Date/Simple/ISO.pm
+%%SITE_ARCH%%/Date/Simple/D8.pm
+%%SITE_ARCH%%/Date/Simple/Fmt.pm
+%%SITE_ARCH%%/auto/Date/Simple/Simple.so
diff --git a/devel/p5-DateConvert/Makefile b/devel/p5-DateConvert/Makefile
index 4ac8aef67753..1191d424275a 100644
--- a/devel/p5-DateConvert/Makefile
+++ b/devel/p5-DateConvert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateConvert
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Date
diff --git a/devel/p5-DateConvert/pkg-plist b/devel/p5-DateConvert/pkg-plist
index 258485951d9e..c1f1630abebc 100644
--- a/devel/p5-DateConvert/pkg-plist
+++ b/devel/p5-DateConvert/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::Convert.3.gz
 %%SITE_PERL%%/Date/Convert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Convert/.packlist
diff --git a/devel/p5-DateTime-Astro/Makefile b/devel/p5-DateTime-Astro/Makefile
index ba2eab6b16b4..c07254204fc5 100644
--- a/devel/p5-DateTime-Astro/Makefile
+++ b/devel/p5-DateTime-Astro/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Astro
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-DateTime-Astro/pkg-plist b/devel/p5-DateTime-Astro/pkg-plist
index eb11c4e3766f..ab459d98f8c4 100644
--- a/devel/p5-DateTime-Astro/pkg-plist
+++ b/devel/p5-DateTime-Astro/pkg-plist
@@ -1,8 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/Astro.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/AstroPP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/AstroXS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/Event/SolarTerm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Astro/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Astro/Astro.so
+%%SITE_ARCH%%/DateTime/Astro.pm
+%%SITE_ARCH%%/DateTime/AstroPP.pm
+%%SITE_ARCH%%/DateTime/AstroXS.pm
+%%SITE_ARCH%%/DateTime/Event/SolarTerm.pm
+%%SITE_ARCH%%/auto/DateTime/Astro/Astro.so
 %%PERL5_MAN3%%/DateTime::Astro.3.gz
 %%PERL5_MAN3%%/DateTime::Event::SolarTerm.3.gz
diff --git a/devel/p5-DateTime-Calendar-Chinese/Makefile b/devel/p5-DateTime-Calendar-Chinese/Makefile
index ca1c8f84bc8c..c003aae963b7 100644
--- a/devel/p5-DateTime-Calendar-Chinese/Makefile
+++ b/devel/p5-DateTime-Calendar-Chinese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Chinese
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-DateTime-Calendar-Chinese/pkg-plist b/devel/p5-DateTime-Calendar-Chinese/pkg-plist
index 3ac50ab3177d..41a80f17370c 100644
--- a/devel/p5-DateTime-Calendar-Chinese/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Chinese/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Chinese/.packlist
 %%SITE_PERL%%/DateTime/Calendar/Chinese.pm
 %%PERL5_MAN3%%/DateTime::Calendar::Chinese.3.gz
diff --git a/devel/p5-DateTime-Calendar-Christian/Makefile b/devel/p5-DateTime-Calendar-Christian/Makefile
index b82dc264179e..96e57c539532 100644
--- a/devel/p5-DateTime-Calendar-Christian/Makefile
+++ b/devel/p5-DateTime-Calendar-Christian/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Christian
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Calendar-Christian/pkg-plist b/devel/p5-DateTime-Calendar-Christian/pkg-plist
index 9d83007b6c7d..9849023974ca 100644
--- a/devel/p5-DateTime-Calendar-Christian/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Christian/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Calendar::Christian.3.gz
 %%SITE_PERL%%/DateTime/Calendar/Christian.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Christian/.packlist
diff --git a/devel/p5-DateTime-Calendar-Discordian/Makefile b/devel/p5-DateTime-Calendar-Discordian/Makefile
index e2bb7526c012..70270114bc51 100644
--- a/devel/p5-DateTime-Calendar-Discordian/Makefile
+++ b/devel/p5-DateTime-Calendar-Discordian/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Discordian
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Calendar-Discordian/pkg-plist b/devel/p5-DateTime-Calendar-Discordian/pkg-plist
index 7d35dde9757c..18b78135d9bc 100644
--- a/devel/p5-DateTime-Calendar-Discordian/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Discordian/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Discordian/.packlist
 %%SITE_PERL%%/DateTime/Calendar/Discordian.pm
 %%PERL5_MAN3%%/DateTime::Calendar::Discordian.3.gz
diff --git a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
index 4c7aaed7f2c7..71da0f3b92ae 100644
--- a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
+++ b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-FrenchRevolutionary
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Calendar-Hebrew/Makefile b/devel/p5-DateTime-Calendar-Hebrew/Makefile
index b9e7dde0f49a..a25d35087e48 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/Makefile
+++ b/devel/p5-DateTime-Calendar-Hebrew/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Hebrew
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Calendar-Hebrew/pkg-plist b/devel/p5-DateTime-Calendar-Hebrew/pkg-plist
index b6596bd9fb30..aa1aca551ce0 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Hebrew/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Calendar::Hebrew.3.gz
 %%SITE_PERL%%/DateTime/Calendar/Hebrew.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Hebrew/.packlist
diff --git a/devel/p5-DateTime-Calendar-Japanese/Makefile b/devel/p5-DateTime-Calendar-Japanese/Makefile
index 8ba919c5abe6..e23c8403ed74 100644
--- a/devel/p5-DateTime-Calendar-Japanese/Makefile
+++ b/devel/p5-DateTime-Calendar-Japanese/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Japanese
 PORTVERSION=	0.06001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-DateTime-Calendar-Japanese/pkg-plist b/devel/p5-DateTime-Calendar-Japanese/pkg-plist
index 880c46ca9855..005b3f8f351a 100644
--- a/devel/p5-DateTime-Calendar-Japanese/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Japanese/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Japanese/.packlist
 %%SITE_PERL%%/DateTime/Calendar/Japanese.pm
 %%PERL5_MAN3%%/DateTime::Calendar::Japanese.3.gz
diff --git a/devel/p5-DateTime-Calendar-Julian/Makefile b/devel/p5-DateTime-Calendar-Julian/Makefile
index 048a41fa32c2..ffa8b3a19169 100644
--- a/devel/p5-DateTime-Calendar-Julian/Makefile
+++ b/devel/p5-DateTime-Calendar-Julian/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Julian
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Calendar-Julian/pkg-plist b/devel/p5-DateTime-Calendar-Julian/pkg-plist
index 85137a2aa28f..29bf78ccfedc 100644
--- a/devel/p5-DateTime-Calendar-Julian/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Julian/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Calendar::Julian.3.gz
 %%SITE_PERL%%/DateTime/Calendar/Julian.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Julian/.packlist
diff --git a/devel/p5-DateTime-Calendar-Mayan/Makefile b/devel/p5-DateTime-Calendar-Mayan/Makefile
index 19c126729322..1d6978daddd9 100644
--- a/devel/p5-DateTime-Calendar-Mayan/Makefile
+++ b/devel/p5-DateTime-Calendar-Mayan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Mayan
 PORTVERSION=	0.06.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/Makefile b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
index 48ca202df418..13bd6c32b46e 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/Makefile
+++ b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Pataphysical
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist b/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist
index 16864e08fe1c..40637bd79dbb 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Calendar::Pataphysical.3.gz
 %%SITE_PERL%%/DateTime/Calendar/Pataphysical.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Pataphysical/.packlist
diff --git a/devel/p5-DateTime-Cron-Simple/Makefile b/devel/p5-DateTime-Cron-Simple/Makefile
index 0cfe788fbdc5..f7396573a678 100644
--- a/devel/p5-DateTime-Cron-Simple/Makefile
+++ b/devel/p5-DateTime-Cron-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Cron-Simple
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Cron-Simple/pkg-plist b/devel/p5-DateTime-Cron-Simple/pkg-plist
index 70a1b0836fe0..21ed8f153ef4 100644
--- a/devel/p5-DateTime-Cron-Simple/pkg-plist
+++ b/devel/p5-DateTime-Cron-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Cron::Simple.3.gz
 %%SITE_PERL%%/DateTime/Cron/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Cron/Simple/.packlist
diff --git a/devel/p5-DateTime-Event-Chinese/Makefile b/devel/p5-DateTime-Event-Chinese/Makefile
index c9dd18d664fd..c39c3642fb19 100644
--- a/devel/p5-DateTime-Event-Chinese/Makefile
+++ b/devel/p5-DateTime-Event-Chinese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Chinese
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-DateTime-Event-Chinese/pkg-plist b/devel/p5-DateTime-Event-Chinese/pkg-plist
index 61e294776d1f..0fa10a2fb270 100644
--- a/devel/p5-DateTime-Event-Chinese/pkg-plist
+++ b/devel/p5-DateTime-Event-Chinese/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Chinese/.packlist
 %%SITE_PERL%%/DateTime/Event/Chinese.pm
 %%PERL5_MAN3%%/DateTime::Event::Chinese.3.gz
diff --git a/devel/p5-DateTime-Event-Cron/Makefile b/devel/p5-DateTime-Event-Cron/Makefile
index 8cb2bbe90d39..9e5ff252e5fb 100644
--- a/devel/p5-DateTime-Event-Cron/Makefile
+++ b/devel/p5-DateTime-Event-Cron/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Cron
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Event-Cron/pkg-plist b/devel/p5-DateTime-Event-Cron/pkg-plist
index 7a2e07bafb7c..ea8d3a4aa037 100644
--- a/devel/p5-DateTime-Event-Cron/pkg-plist
+++ b/devel/p5-DateTime-Event-Cron/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Event::Cron.3.gz
 %%SITE_PERL%%/DateTime/Event/Cron.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Cron/.packlist
diff --git a/devel/p5-DateTime-Event-Easter/Makefile b/devel/p5-DateTime-Event-Easter/Makefile
index 0d60afce26ed..89b791fcdeae 100644
--- a/devel/p5-DateTime-Event-Easter/Makefile
+++ b/devel/p5-DateTime-Event-Easter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Easter
 PORTVERSION=	1.04
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-DateTime-Event-Easter/pkg-plist b/devel/p5-DateTime-Event-Easter/pkg-plist
index 391f71569bf8..4102caf892c5 100644
--- a/devel/p5-DateTime-Event-Easter/pkg-plist
+++ b/devel/p5-DateTime-Event-Easter/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Event::Easter.3.gz
 %%SITE_PERL%%/DateTime/Event/Easter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Easter/.packlist
diff --git a/devel/p5-DateTime-Event-ICal/Makefile b/devel/p5-DateTime-Event-ICal/Makefile
index c95300459899..c9ded663d65f 100644
--- a/devel/p5-DateTime-Event-ICal/Makefile
+++ b/devel/p5-DateTime-Event-ICal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-ICal
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Event-ICal/pkg-plist b/devel/p5-DateTime-Event-ICal/pkg-plist
index 2bb7569a280f..e555865a3da1 100644
--- a/devel/p5-DateTime-Event-ICal/pkg-plist
+++ b/devel/p5-DateTime-Event-ICal/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Event::ICal.3.gz
 %%SITE_PERL%%/DateTime/Event/ICal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/ICal/.packlist
diff --git a/devel/p5-DateTime-Event-Lunar/Makefile b/devel/p5-DateTime-Event-Lunar/Makefile
index f7ed71320f93..863c7c5d0fce 100644
--- a/devel/p5-DateTime-Event-Lunar/Makefile
+++ b/devel/p5-DateTime-Event-Lunar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Lunar
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-DateTime-Event-Lunar/pkg-plist b/devel/p5-DateTime-Event-Lunar/pkg-plist
index 61d055c74213..a38b2548d348 100644
--- a/devel/p5-DateTime-Event-Lunar/pkg-plist
+++ b/devel/p5-DateTime-Event-Lunar/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Lunar/.packlist
 %%SITE_PERL%%/DateTime/Event/Lunar.pm
 %%PERL5_MAN3%%/DateTime::Event::Lunar.3.gz
diff --git a/devel/p5-DateTime-Event-NameDay/Makefile b/devel/p5-DateTime-Event-NameDay/Makefile
index 4debfc755334..e90816fd7e1c 100644
--- a/devel/p5-DateTime-Event-NameDay/Makefile
+++ b/devel/p5-DateTime-Event-NameDay/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Event-NameDay
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Event-Random/Makefile b/devel/p5-DateTime-Event-Random/Makefile
index cc843a813515..b31e0cb6a7f8 100644
--- a/devel/p5-DateTime-Event-Random/Makefile
+++ b/devel/p5-DateTime-Event-Random/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Random
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Event-Random/pkg-plist b/devel/p5-DateTime-Event-Random/pkg-plist
index 28767fe6bf05..1ec23b562e12 100644
--- a/devel/p5-DateTime-Event-Random/pkg-plist
+++ b/devel/p5-DateTime-Event-Random/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Event::Random.3.gz
 %%SITE_PERL%%/DateTime/Event/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Random/.packlist
diff --git a/devel/p5-DateTime-Event-Recurrence/Makefile b/devel/p5-DateTime-Event-Recurrence/Makefile
index f128db02eab7..2318efe26f23 100644
--- a/devel/p5-DateTime-Event-Recurrence/Makefile
+++ b/devel/p5-DateTime-Event-Recurrence/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Recurrence
 DISTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Event-Recurrence/pkg-plist b/devel/p5-DateTime-Event-Recurrence/pkg-plist
index 55143ec99eac..4a65e73160e9 100644
--- a/devel/p5-DateTime-Event-Recurrence/pkg-plist
+++ b/devel/p5-DateTime-Event-Recurrence/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Event::Recurrence.3.gz
 %%SITE_PERL%%/DateTime/Event/Recurrence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Recurrence/.packlist
diff --git a/devel/p5-DateTime-Event-SolarTerm/Makefile b/devel/p5-DateTime-Event-SolarTerm/Makefile
index 3481d24034f8..5f2ecb754da6 100644
--- a/devel/p5-DateTime-Event-SolarTerm/Makefile
+++ b/devel/p5-DateTime-Event-SolarTerm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-SolarTerm
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-DateTime-Event-SolarTerm/pkg-plist b/devel/p5-DateTime-Event-SolarTerm/pkg-plist
index eeb390743f2f..7b1ce0028a44 100644
--- a/devel/p5-DateTime-Event-SolarTerm/pkg-plist
+++ b/devel/p5-DateTime-Event-SolarTerm/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/SolarTerm/.packlist
 %%SITE_PERL%%/DateTime/Event/SolarTerm.pm
 %%PERL5_MAN3%%/DateTime::Event::SolarTerm.3.gz
diff --git a/devel/p5-DateTime-Event-Sunrise/Makefile b/devel/p5-DateTime-Event-Sunrise/Makefile
index 192019c09faf..f4b6c73cfbd9 100644
--- a/devel/p5-DateTime-Event-Sunrise/Makefile
+++ b/devel/p5-DateTime-Event-Sunrise/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Sunrise
 PORTVERSION=	0.05.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/devel/p5-DateTime-Event-Sunrise/pkg-plist b/devel/p5-DateTime-Event-Sunrise/pkg-plist
index 13fb0bbf1a2a..61d6a5c66906 100644
--- a/devel/p5-DateTime-Event-Sunrise/pkg-plist
+++ b/devel/p5-DateTime-Event-Sunrise/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DateTime/Event/Sunrise.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Sunrise/.packlist
 %%PERL5_MAN3%%/DateTime::Event::Sunrise.3.gz
diff --git a/devel/p5-DateTime-Event-Zodiac/Makefile b/devel/p5-DateTime-Event-Zodiac/Makefile
index f74b4df05913..34010befdb73 100644
--- a/devel/p5-DateTime-Event-Zodiac/Makefile
+++ b/devel/p5-DateTime-Event-Zodiac/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Event-Zodiac
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Event-Zodiac/pkg-plist b/devel/p5-DateTime-Event-Zodiac/pkg-plist
index 4e2aca11e183..b5203d4fa64b 100644
--- a/devel/p5-DateTime-Event-Zodiac/pkg-plist
+++ b/devel/p5-DateTime-Event-Zodiac/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Event::Zodiac.3.gz
 %%SITE_PERL%%/DateTime/Event/Zodiac.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Zodiac/.packlist
diff --git a/devel/p5-DateTime-Fiscal-Year/Makefile b/devel/p5-DateTime-Fiscal-Year/Makefile
index 1f89f4a777c3..4768a5377322 100644
--- a/devel/p5-DateTime-Fiscal-Year/Makefile
+++ b/devel/p5-DateTime-Fiscal-Year/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Fiscal-Year
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Baby/Makefile b/devel/p5-DateTime-Format-Baby/Makefile
index 7d6d705f7280..15afb1f912a8 100644
--- a/devel/p5-DateTime-Format-Baby/Makefile
+++ b/devel/p5-DateTime-Format-Baby/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Baby
 PORTVERSION=	1.0100
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Baby/pkg-plist b/devel/p5-DateTime-Format-Baby/pkg-plist
index af5bc1a64548..f1b14d65e127 100644
--- a/devel/p5-DateTime-Format-Baby/pkg-plist
+++ b/devel/p5-DateTime-Format-Baby/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Format::Baby.3.gz
 %%SITE_PERL%%/DateTime/Format/Baby.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Baby/.packlist
diff --git a/devel/p5-DateTime-Format-Bork/Makefile b/devel/p5-DateTime-Format-Bork/Makefile
index 7586ba22ed00..014a081e9c7f 100644
--- a/devel/p5-DateTime-Format-Bork/Makefile
+++ b/devel/p5-DateTime-Format-Bork/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Format-Bork
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index a4be2ea80096..513d61a7a50a 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Builder
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Builder/pkg-plist b/devel/p5-DateTime-Format-Builder/pkg-plist
index 96059c232f59..b557f0fa3200 100644
--- a/devel/p5-DateTime-Format-Builder/pkg-plist
+++ b/devel/p5-DateTime-Format-Builder/pkg-plist
@@ -14,4 +14,3 @@
 %%SITE_PERL%%/DateTime/Format/Builder/Parser/Strptime.pm
 %%SITE_PERL%%/DateTime/Format/Builder/Parser/generic.pm
 %%SITE_PERL%%/DateTime/Format/Builder/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Builder/.packlist
diff --git a/devel/p5-DateTime-Format-DBI/Makefile b/devel/p5-DateTime-Format-DBI/Makefile
index 20cfb18c9f3b..adc26e4f9b65 100644
--- a/devel/p5-DateTime-Format-DBI/Makefile
+++ b/devel/p5-DateTime-Format-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-DBI
 PORTVERSION=	0.041
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-DateManip/Makefile b/devel/p5-DateTime-Format-DateManip/Makefile
index 1710e466b201..7ada363ba807 100644
--- a/devel/p5-DateTime-Format-DateManip/Makefile
+++ b/devel/p5-DateTime-Format-DateManip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-DateManip
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-DateParse/Makefile b/devel/p5-DateTime-Format-DateParse/Makefile
index 435f8420b40c..3d16b6b92eaa 100644
--- a/devel/p5-DateTime-Format-DateParse/Makefile
+++ b/devel/p5-DateTime-Format-DateParse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Format-DateParse
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DateTime
diff --git a/devel/p5-DateTime-Format-Duration/Makefile b/devel/p5-DateTime-Format-Duration/Makefile
index a5533f964dbb..5c2d1470cdf7 100644
--- a/devel/p5-DateTime-Format-Duration/Makefile
+++ b/devel/p5-DateTime-Format-Duration/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Duration
 PORTVERSION=	1.03a
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Duration/pkg-plist b/devel/p5-DateTime-Format-Duration/pkg-plist
index 205b2456cb3e..ea7cd459c32c 100644
--- a/devel/p5-DateTime-Format-Duration/pkg-plist
+++ b/devel/p5-DateTime-Format-Duration/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Format::Duration.3.gz
 %%SITE_PERL%%/DateTime/Format/Duration.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Duration/.packlist
diff --git a/devel/p5-DateTime-Format-Epoch/Makefile b/devel/p5-DateTime-Format-Epoch/Makefile
index b801bd41cd4c..7488c0997c33 100644
--- a/devel/p5-DateTime-Format-Epoch/Makefile
+++ b/devel/p5-DateTime-Format-Epoch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Format-Epoch
 PORTVERSION=	0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Excel/Makefile b/devel/p5-DateTime-Format-Excel/Makefile
index 0f611f749cb5..19a3b08e68ef 100644
--- a/devel/p5-DateTime-Format-Excel/Makefile
+++ b/devel/p5-DateTime-Format-Excel/Makefile
@@ -3,7 +3,9 @@
 
 PORTNAME=	DateTime-Format-Excel
 PORTVERSION=	0.31.00
+PORTREVISION=	1
 DISTVERSION=	${PORTVERSION:C/\.(..)$//}
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Flexible/Makefile b/devel/p5-DateTime-Format-Flexible/Makefile
index 0a3977970222..0995135b8bc7 100644
--- a/devel/p5-DateTime-Format-Flexible/Makefile
+++ b/devel/p5-DateTime-Format-Flexible/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Format-Flexible
 PORTVERSION=	0.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Flexible/pkg-plist b/devel/p5-DateTime-Format-Flexible/pkg-plist
index c91376eafc1a..c303ee39d22b 100644
--- a/devel/p5-DateTime-Format-Flexible/pkg-plist
+++ b/devel/p5-DateTime-Format-Flexible/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/DateTime/Format/Flexible/lang/de.pm
 %%SITE_PERL%%/DateTime/Format/Flexible/lang/en.pm
 %%SITE_PERL%%/DateTime/Format/Flexible/lang/es.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Flexible/.packlist
diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile
index f15816a08bed..c86ffed645ea 100644
--- a/devel/p5-DateTime-Format-HTTP/Makefile
+++ b/devel/p5-DateTime-Format-HTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-HTTP
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-IBeat/Makefile b/devel/p5-DateTime-Format-IBeat/Makefile
index 1f5012690d0b..55ca702b7ccd 100644
--- a/devel/p5-DateTime-Format-IBeat/Makefile
+++ b/devel/p5-DateTime-Format-IBeat/Makefile
@@ -3,7 +3,9 @@
 
 PORTNAME=	DateTime-Format-IBeat
 PORTVERSION=	0.16.1
+PORTREVISION=	1
 DISTVERSION=	${PORTVERSION:C/\.(.)$/\1/}
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-IBeat/pkg-plist b/devel/p5-DateTime-Format-IBeat/pkg-plist
index b6920de82952..42a5fc027cd2 100644
--- a/devel/p5-DateTime-Format-IBeat/pkg-plist
+++ b/devel/p5-DateTime-Format-IBeat/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Format::IBeat.3.gz
 %%SITE_PERL%%/DateTime/Format/IBeat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/IBeat/.packlist
diff --git a/devel/p5-DateTime-Format-ICal/Makefile b/devel/p5-DateTime-Format-ICal/Makefile
index 2ff14e556147..92b26a3b5143 100644
--- a/devel/p5-DateTime-Format-ICal/Makefile
+++ b/devel/p5-DateTime-Format-ICal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-ICal
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-ISO8601/Makefile b/devel/p5-DateTime-Format-ISO8601/Makefile
index 6c3b65a241da..3bdae2e85e50 100644
--- a/devel/p5-DateTime-Format-ISO8601/Makefile
+++ b/devel/p5-DateTime-Format-ISO8601/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-ISO8601
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Mail/Makefile b/devel/p5-DateTime-Format-Mail/Makefile
index 68d93fad9911..f1415ce6ef4e 100644
--- a/devel/p5-DateTime-Format-Mail/Makefile
+++ b/devel/p5-DateTime-Format-Mail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Mail
 PORTVERSION=	0.30.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-MySQL/Makefile b/devel/p5-DateTime-Format-MySQL/Makefile
index 51ab7d71cbc2..c2d70434c0a6 100644
--- a/devel/p5-DateTime-Format-MySQL/Makefile
+++ b/devel/p5-DateTime-Format-MySQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-MySQL
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Natural/Makefile b/devel/p5-DateTime-Format-Natural/Makefile
index 35eb61339c38..c1a1eff402b1 100644
--- a/devel/p5-DateTime-Format-Natural/Makefile
+++ b/devel/p5-DateTime-Format-Natural/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Format-Natural
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Oracle/Makefile b/devel/p5-DateTime-Format-Oracle/Makefile
index 7a566555a3d4..a18ee416a9a7 100644
--- a/devel/p5-DateTime-Format-Oracle/Makefile
+++ b/devel/p5-DateTime-Format-Oracle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Oracle
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Oracle/pkg-plist b/devel/p5-DateTime-Format-Oracle/pkg-plist
index dd8ef814cb33..cf761e4917b2 100644
--- a/devel/p5-DateTime-Format-Oracle/pkg-plist
+++ b/devel/p5-DateTime-Format-Oracle/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DateTime/Format/Oracle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Oracle/.packlist
 %%PERL5_MAN3%%/DateTime::Format::Oracle.3.gz
diff --git a/devel/p5-DateTime-Format-Pg/Makefile b/devel/p5-DateTime-Format-Pg/Makefile
index 2d0be8cc2c35..201deeed17a9 100644
--- a/devel/p5-DateTime-Format-Pg/Makefile
+++ b/devel/p5-DateTime-Format-Pg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Pg
 PORTVERSION=	0.16.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-RFC3339/Makefile b/devel/p5-DateTime-Format-RFC3339/Makefile
index 2e03b90be9e0..ed4eebe2d6c3 100644
--- a/devel/p5-DateTime-Format-RFC3339/Makefile
+++ b/devel/p5-DateTime-Format-RFC3339/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-RFC3339
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-RFC3339/pkg-plist b/devel/p5-DateTime-Format-RFC3339/pkg-plist
index 889df2748bdd..0a42b4d1f316 100644
--- a/devel/p5-DateTime-Format-RFC3339/pkg-plist
+++ b/devel/p5-DateTime-Format-RFC3339/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DateTime/Format/RFC3339.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/RFC3339/.packlist
 %%PERL5_MAN3%%/DateTime::Format::RFC3339.3.gz
diff --git a/devel/p5-DateTime-Format-RSS/Makefile b/devel/p5-DateTime-Format-RSS/Makefile
index 9b779c3a57f0..1d5d6583777b 100644
--- a/devel/p5-DateTime-Format-RSS/Makefile
+++ b/devel/p5-DateTime-Format-RSS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-RSS
 PORTVERSION=	0.03000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-RSS/pkg-plist b/devel/p5-DateTime-Format-RSS/pkg-plist
index a27c89bad69c..09b6f4740204 100644
--- a/devel/p5-DateTime-Format-RSS/pkg-plist
+++ b/devel/p5-DateTime-Format-RSS/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Format::RSS.3.gz
 %%SITE_PERL%%/DateTime/Format/RSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/RSS/.packlist
diff --git a/devel/p5-DateTime-Format-Roman/Makefile b/devel/p5-DateTime-Format-Roman/Makefile
index 26665a73767b..3a34b6b5c5d3 100644
--- a/devel/p5-DateTime-Format-Roman/Makefile
+++ b/devel/p5-DateTime-Format-Roman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Roman
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-Roman/pkg-plist b/devel/p5-DateTime-Format-Roman/pkg-plist
index e11ef397d7fe..719f63e1f38d 100644
--- a/devel/p5-DateTime-Format-Roman/pkg-plist
+++ b/devel/p5-DateTime-Format-Roman/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Format::Roman.3.gz
 %%SITE_PERL%%/DateTime/Format/Roman.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Roman/.packlist
diff --git a/devel/p5-DateTime-Format-SQLite/Makefile b/devel/p5-DateTime-Format-SQLite/Makefile
index fbf0e2076b19..b092b4e26ffd 100644
--- a/devel/p5-DateTime-Format-SQLite/Makefile
+++ b/devel/p5-DateTime-Format-SQLite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-SQLite
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-SQLite/pkg-plist b/devel/p5-DateTime-Format-SQLite/pkg-plist
index 2db921355498..3dd6403fd3bf 100644
--- a/devel/p5-DateTime-Format-SQLite/pkg-plist
+++ b/devel/p5-DateTime-Format-SQLite/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Format::SQLite.3.gz
 %%SITE_PERL%%/DateTime/Format/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/SQLite/.packlist
diff --git a/devel/p5-DateTime-Format-Strptime/Makefile b/devel/p5-DateTime-Format-Strptime/Makefile
index 64f472e9f15e..c19f0129775d 100644
--- a/devel/p5-DateTime-Format-Strptime/Makefile
+++ b/devel/p5-DateTime-Format-Strptime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Strptime
 PORTVERSION=	1.55
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-DateTime-Format-Strptime/pkg-plist b/devel/p5-DateTime-Format-Strptime/pkg-plist
index 12ed6e9cda49..c83ba708990b 100644
--- a/devel/p5-DateTime-Format-Strptime/pkg-plist
+++ b/devel/p5-DateTime-Format-Strptime/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Format::Strptime.3.gz
 %%SITE_PERL%%/DateTime/Format/Strptime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Strptime/.packlist
diff --git a/devel/p5-DateTime-Format-W3CDTF/Makefile b/devel/p5-DateTime-Format-W3CDTF/Makefile
index a525e343c26e..9bf33c7ce89e 100644
--- a/devel/p5-DateTime-Format-W3CDTF/Makefile
+++ b/devel/p5-DateTime-Format-W3CDTF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-W3CDTF
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-W3CDTF/pkg-plist b/devel/p5-DateTime-Format-W3CDTF/pkg-plist
index 0a44a8d47f6b..e5d6c4050e58 100644
--- a/devel/p5-DateTime-Format-W3CDTF/pkg-plist
+++ b/devel/p5-DateTime-Format-W3CDTF/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DateTime/Format/W3CDTF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/W3CDTF/.packlist
 %%PERL5_MAN3%%/DateTime::Format::W3CDTF.3.gz
diff --git a/devel/p5-DateTime-Format-XSD/Makefile b/devel/p5-DateTime-Format-XSD/Makefile
index 1250bd591965..8a9d860f7f3c 100644
--- a/devel/p5-DateTime-Format-XSD/Makefile
+++ b/devel/p5-DateTime-Format-XSD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-XSD
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Format-XSD/pkg-plist b/devel/p5-DateTime-Format-XSD/pkg-plist
index 65fa88b2f935..f43b3d511265 100644
--- a/devel/p5-DateTime-Format-XSD/pkg-plist
+++ b/devel/p5-DateTime-Format-XSD/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DateTime/Format/XSD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/XSD/.packlist
 %%PERL5_MAN3%%/DateTime::Format::XSD.3.gz
diff --git a/devel/p5-DateTime-Functions/Makefile b/devel/p5-DateTime-Functions/Makefile
index 47ef5041df72..6b3fd6acafed 100644
--- a/devel/p5-DateTime-Functions/Makefile
+++ b/devel/p5-DateTime-Functions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Functions
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Functions/pkg-plist b/devel/p5-DateTime-Functions/pkg-plist
index 31cd98163d87..e29d76c4ea14 100644
--- a/devel/p5-DateTime-Functions/pkg-plist
+++ b/devel/p5-DateTime-Functions/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Functions.3.gz
 %%SITE_PERL%%/DateTime/Functions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Functions/.packlist
diff --git a/devel/p5-DateTime-HiRes/Makefile b/devel/p5-DateTime-HiRes/Makefile
index 9c69fa8811bc..a5f4adb22797 100644
--- a/devel/p5-DateTime-HiRes/Makefile
+++ b/devel/p5-DateTime-HiRes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-HiRes
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Incomplete/Makefile b/devel/p5-DateTime-Incomplete/Makefile
index 4828f3a493d7..6226179a6926 100644
--- a/devel/p5-DateTime-Incomplete/Makefile
+++ b/devel/p5-DateTime-Incomplete/Makefile
@@ -3,7 +3,9 @@
 
 PORTNAME=	DateTime-Incomplete
 PORTVERSION=	0.07.00
+PORTREVISION=	1
 DISTVERSION=	${PORTVERSION:C/\.(..)$//}
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Incomplete/pkg-plist b/devel/p5-DateTime-Incomplete/pkg-plist
index 0276a3547648..75563162d867 100644
--- a/devel/p5-DateTime-Incomplete/pkg-plist
+++ b/devel/p5-DateTime-Incomplete/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::Incomplete.3.gz
 %%SITE_PERL%%/DateTime/Incomplete.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Incomplete/.packlist
diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile
index b5cbc6f743e2..e292a0dc7bc6 100644
--- a/devel/p5-DateTime-Locale/Makefile
+++ b/devel/p5-DateTime-Locale/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Locale
 PORTVERSION=	0.45
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Precise/Makefile b/devel/p5-DateTime-Precise/Makefile
index a83dd4a3fce9..c7f70b88a112 100644
--- a/devel/p5-DateTime-Precise/Makefile
+++ b/devel/p5-DateTime-Precise/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Precise
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Precise/pkg-plist b/devel/p5-DateTime-Precise/pkg-plist
index af36e3f30f22..75e3c6318043 100644
--- a/devel/p5-DateTime-Precise/pkg-plist
+++ b/devel/p5-DateTime-Precise/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/DateTime/Math/bigfloat.pl
 %%SITE_PERL%%/DateTime/Math/bigint.pl
 %%SITE_PERL%%/DateTime/Precise.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Precise/.packlist
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index 91efdd5f3bc6..d7f672e671ea 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Set
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Set/pkg-plist b/devel/p5-DateTime-Set/pkg-plist
index d2241e1019eb..0bf10622f42d 100644
--- a/devel/p5-DateTime-Set/pkg-plist
+++ b/devel/p5-DateTime-Set/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/DateTime/Span.pm
 %%SITE_PERL%%/DateTime/SpanSet.pm
 %%SITE_PERL%%/Set/Infinite/_recurrence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Set/.packlist
 %%PERL5_MAN3%%/DateTime::Set.3.gz
 %%PERL5_MAN3%%/DateTime::Span.3.gz
 %%PERL5_MAN3%%/DateTime::SpanSet.3.gz
diff --git a/devel/p5-DateTime-TimeZone-Alias/Makefile b/devel/p5-DateTime-TimeZone-Alias/Makefile
index 816be1017da8..bd480d8596cc 100644
--- a/devel/p5-DateTime-TimeZone-Alias/Makefile
+++ b/devel/p5-DateTime-TimeZone-Alias/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-TimeZone-Alias
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-TimeZone-LMT/Makefile b/devel/p5-DateTime-TimeZone-LMT/Makefile
index e1cf6f0b9302..a6d58ffa86d3 100644
--- a/devel/p5-DateTime-TimeZone-LMT/Makefile
+++ b/devel/p5-DateTime-TimeZone-LMT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-TimeZone-LMT
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-TimeZone-LMT/pkg-plist b/devel/p5-DateTime-TimeZone-LMT/pkg-plist
index 3770cb729f7b..b52e3b35874d 100644
--- a/devel/p5-DateTime-TimeZone-LMT/pkg-plist
+++ b/devel/p5-DateTime-TimeZone-LMT/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DateTime::TimeZone::LMT.3.gz
 %%SITE_PERL%%/DateTime/TimeZone/LMT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/TimeZone/LMT/.packlist
diff --git a/devel/p5-DateTime-TimeZone/Makefile b/devel/p5-DateTime-TimeZone/Makefile
index 9c9fc4fc5288..f3a6e9378336 100644
--- a/devel/p5-DateTime-TimeZone/Makefile
+++ b/devel/p5-DateTime-TimeZone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-TimeZone
 PORTVERSION=	1.81
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-TimeZone/pkg-plist b/devel/p5-DateTime-TimeZone/pkg-plist
index d068c19b088e..3de6636cacb3 100644
--- a/devel/p5-DateTime-TimeZone/pkg-plist
+++ b/devel/p5-DateTime-TimeZone/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/TimeZone/.packlist
 %%SITE_PERL%%/DateTime/TimeZone.pm
 %%SITE_PERL%%/DateTime/TimeZone/Africa/Abidjan.pm
 %%SITE_PERL%%/DateTime/TimeZone/Africa/Accra.pm
diff --git a/devel/p5-DateTime-Util-Astro/Makefile b/devel/p5-DateTime-Util-Astro/Makefile
index 431611300d53..2faffcd71a65 100644
--- a/devel/p5-DateTime-Util-Astro/Makefile
+++ b/devel/p5-DateTime-Util-Astro/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Util-Astro
 PORTVERSION=	0.12000
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Util-Astro/pkg-plist b/devel/p5-DateTime-Util-Astro/pkg-plist
index e4368d80d028..3be2f54b7337 100644
--- a/devel/p5-DateTime-Util-Astro/pkg-plist
+++ b/devel/p5-DateTime-Util-Astro/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Util/Astro/.packlist
 %%SITE_PERL%%/DateTime/Util/Astro/Common.pm
 %%SITE_PERL%%/DateTime/Util/Astro/Moon.pm
 %%SITE_PERL%%/DateTime/Util/Astro/Sun.pm
diff --git a/devel/p5-DateTime-Util-Calc/Makefile b/devel/p5-DateTime-Util-Calc/Makefile
index 7b5bdd890a6c..5ccc9f81ccd5 100644
--- a/devel/p5-DateTime-Util-Calc/Makefile
+++ b/devel/p5-DateTime-Util-Calc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Util-Calc
 PORTVERSION=	0.13002
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Util-Calc/pkg-plist b/devel/p5-DateTime-Util-Calc/pkg-plist
index 13cd90d542e1..4d1df7c412f2 100644
--- a/devel/p5-DateTime-Util-Calc/pkg-plist
+++ b/devel/p5-DateTime-Util-Calc/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Util/Calc/.packlist
 %%SITE_PERL%%/DateTime/Util/Calc.pm
 %%PERL5_MAN3%%/DateTime::Util::Calc.3.gz
diff --git a/devel/p5-DateTime/Makefile b/devel/p5-DateTime/Makefile
index ca6c2ddc5bfe..9637a41fa52e 100644
--- a/devel/p5-DateTime/Makefile
+++ b/devel/p5-DateTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
@@ -29,7 +30,7 @@ USE_PERL5=	modbuild
 PORTDOCS=	CREDITS Changes TODO
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DateTime/DateTime.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DateTime/DateTime.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
diff --git a/devel/p5-DateTime/pkg-plist b/devel/p5-DateTime/pkg-plist
index 775909c2d564..08e1d19b37fd 100644
--- a/devel/p5-DateTime/pkg-plist
+++ b/devel/p5-DateTime/pkg-plist
@@ -2,11 +2,11 @@
 %%PERL5_MAN3%%/DateTime::Duration.3.gz
 %%PERL5_MAN3%%/DateTime::Infinite.3.gz
 %%PERL5_MAN3%%/DateTime::LeapSecond.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/Duration.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/Helpers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/Infinite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTime/LeapSecond.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTimePP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DateTimePPExtra.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/DateTime.so
+%%SITE_ARCH%%/DateTime.pm
+%%SITE_ARCH%%/DateTime/Duration.pm
+%%SITE_ARCH%%/DateTime/Helpers.pm
+%%SITE_ARCH%%/DateTime/Infinite.pm
+%%SITE_ARCH%%/DateTime/LeapSecond.pm
+%%SITE_ARCH%%/DateTimePP.pm
+%%SITE_ARCH%%/DateTimePPExtra.pm
+%%SITE_ARCH%%/auto/DateTime/DateTime.so
diff --git a/devel/p5-DateTimeX-Easy/Makefile b/devel/p5-DateTimeX-Easy/Makefile
index c98438fc9893..dc8b13b3735b 100644
--- a/devel/p5-DateTimeX-Easy/Makefile
+++ b/devel/p5-DateTimeX-Easy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTimeX-Easy
 PORTVERSION=	0.089
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTimeX-Easy/pkg-plist b/devel/p5-DateTimeX-Easy/pkg-plist
index 62ae4af72827..10052b1651bf 100644
--- a/devel/p5-DateTimeX-Easy/pkg-plist
+++ b/devel/p5-DateTimeX-Easy/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/DateTimeX/Easy.pm
 %%SITE_PERL%%/DateTimeX/Easy/DateParse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTimeX/Easy/.packlist
 %%PERL5_MAN3%%/DateTimeX::Easy.3.gz
 %%PERL5_MAN3%%/DateTimeX::Easy::DateParse.3.gz
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index 45e9f6fe7121..1daf4ee04619 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Debug-Client
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Debug-Client/pkg-plist b/devel/p5-Debug-Client/pkg-plist
index 5f3b89964ca6..463ac737b133 100644
--- a/devel/p5-Debug-Client/pkg-plist
+++ b/devel/p5-Debug-Client/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Debug/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Debug/Client/.packlist
 %%PERL5_MAN3%%/Debug::Client.3.gz
diff --git a/devel/p5-Decision-ACL/Makefile b/devel/p5-Decision-ACL/Makefile
index 05232aac89bc..61dd835fce52 100644
--- a/devel/p5-Decision-ACL/Makefile
+++ b/devel/p5-Decision-ACL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Decision-ACL
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Decision-ACL/pkg-plist b/devel/p5-Decision-ACL/pkg-plist
index 2d237fcdc878..f8b6c7290e46 100644
--- a/devel/p5-Decision-ACL/pkg-plist
+++ b/devel/p5-Decision-ACL/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/Decision/ACL.pod
 %%SITE_PERL%%/Decision/ACL/Constants.pm
 %%SITE_PERL%%/Decision/ACL/Rule.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Decision/ACL/.packlist
diff --git a/devel/p5-Declare-Constraints-Simple/Makefile b/devel/p5-Declare-Constraints-Simple/Makefile
index b883f8851502..2a9c40bc5ddf 100644
--- a/devel/p5-Declare-Constraints-Simple/Makefile
+++ b/devel/p5-Declare-Constraints-Simple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Declare-Constraints-Simple
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PHAYLON
diff --git a/devel/p5-Declare-Constraints-Simple/pkg-plist b/devel/p5-Declare-Constraints-Simple/pkg-plist
index 87e2ff9f0055..73ad11fffa58 100644
--- a/devel/p5-Declare-Constraints-Simple/pkg-plist
+++ b/devel/p5-Declare-Constraints-Simple/pkg-plist
@@ -24,4 +24,3 @@
 %%SITE_PERL%%/Declare/Constraints/Simple/Library/Referencial.pm
 %%SITE_PERL%%/Declare/Constraints/Simple/Library/Scalar.pm
 %%SITE_PERL%%/Declare/Constraints/Simple/Result.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Declare/Constraints/Simple/.packlist
diff --git a/devel/p5-Devel-ArgNames/Makefile b/devel/p5-Devel-ArgNames/Makefile
index 13b583dd447d..c343e7305e29 100644
--- a/devel/p5-Devel-ArgNames/Makefile
+++ b/devel/p5-Devel-ArgNames/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-ArgNames
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-ArgNames/pkg-plist b/devel/p5-Devel-ArgNames/pkg-plist
index 49764088cc5b..70636e8e708a 100644
--- a/devel/p5-Devel-ArgNames/pkg-plist
+++ b/devel/p5-Devel-ArgNames/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::ArgNames.3.gz
 %%SITE_PERL%%/Devel/ArgNames.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ArgNames/.packlist
diff --git a/devel/p5-Devel-Autoflush/Makefile b/devel/p5-Devel-Autoflush/Makefile
index 9502171d7cf5..96f6877a07e9 100644
--- a/devel/p5-Devel-Autoflush/Makefile
+++ b/devel/p5-Devel-Autoflush/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Autoflush
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Devel-Autoflush/pkg-plist b/devel/p5-Devel-Autoflush/pkg-plist
index b28418a09e96..3de6d2d0b478 100644
--- a/devel/p5-Devel-Autoflush/pkg-plist
+++ b/devel/p5-Devel-Autoflush/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/Autoflush.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Autoflush/.packlist
 %%PERL5_MAN3%%/Devel::Autoflush.3.gz
diff --git a/devel/p5-Devel-Backtrace/Makefile b/devel/p5-Devel-Backtrace/Makefile
index 527426b64f35..d086069cb2c3 100644
--- a/devel/p5-Devel-Backtrace/Makefile
+++ b/devel/p5-Devel-Backtrace/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Backtrace
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Backtrace/pkg-plist b/devel/p5-Devel-Backtrace/pkg-plist
index 50c8846a4c09..2463fcdbbb1a 100644
--- a/devel/p5-Devel-Backtrace/pkg-plist
+++ b/devel/p5-Devel-Backtrace/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Devel/Backtrace.pm
 %%SITE_PERL%%/Devel/Backtrace/Point.pm
 %%SITE_PERL%%/Devel/DollarAt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Backtrace/.packlist
diff --git a/devel/p5-Devel-BeginLift/Makefile b/devel/p5-Devel-BeginLift/Makefile
index 8a3b11d3e9b2..453b827bbc73 100644
--- a/devel/p5-Devel-BeginLift/Makefile
+++ b/devel/p5-Devel-BeginLift/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-BeginLift
 PORTVERSION=	0.001003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-BeginLift/pkg-plist b/devel/p5-Devel-BeginLift/pkg-plist
index 9e3240744f47..71d8af415604 100644
--- a/devel/p5-Devel-BeginLift/pkg-plist
+++ b/devel/p5-Devel-BeginLift/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/BeginLift.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/BeginLift/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/BeginLift/BeginLift.so
+%%SITE_ARCH%%/Devel/BeginLift.pm
+%%SITE_ARCH%%/auto/Devel/BeginLift/BeginLift.so
 %%PERL5_MAN3%%/Devel::BeginLift.3.gz
diff --git a/devel/p5-Devel-CallChecker/Makefile b/devel/p5-Devel-CallChecker/Makefile
index 5a27bbe6d3ce..edaa22e58d1c 100644
--- a/devel/p5-Devel-CallChecker/Makefile
+++ b/devel/p5-Devel-CallChecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-CallChecker
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-CallChecker/pkg-plist b/devel/p5-Devel-CallChecker/pkg-plist
index ab999c630fd5..c1ef16e7bff6 100644
--- a/devel/p5-Devel-CallChecker/pkg-plist
+++ b/devel/p5-Devel-CallChecker/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/CallChecker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/CallChecker/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/CallChecker/CallChecker.so
+%%SITE_ARCH%%/Devel/CallChecker.pm
+%%SITE_ARCH%%/auto/Devel/CallChecker/CallChecker.so
 %%PERL5_MAN3%%/Devel::CallChecker.3.gz
diff --git a/devel/p5-Devel-Caller-IgnoreNamespaces/Makefile b/devel/p5-Devel-Caller-IgnoreNamespaces/Makefile
index c9d9091283be..7e599d3a0556 100644
--- a/devel/p5-Devel-Caller-IgnoreNamespaces/Makefile
+++ b/devel/p5-Devel-Caller-IgnoreNamespaces/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Caller-IgnoreNamespaces
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:DCANTRELL
diff --git a/devel/p5-Devel-Caller-IgnoreNamespaces/pkg-plist b/devel/p5-Devel-Caller-IgnoreNamespaces/pkg-plist
index 1c1881d331a7..ad655d9fd6ac 100644
--- a/devel/p5-Devel-Caller-IgnoreNamespaces/pkg-plist
+++ b/devel/p5-Devel-Caller-IgnoreNamespaces/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Caller::IgnoreNamespaces.3.gz
 %%SITE_PERL%%/Devel/Caller/IgnoreNamespaces.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Caller/IgnoreNamespaces/.packlist
diff --git a/devel/p5-Devel-Caller-Perl/Makefile b/devel/p5-Devel-Caller-Perl/Makefile
index 906bb7201b38..7a7981d1a790 100644
--- a/devel/p5-Devel-Caller-Perl/Makefile
+++ b/devel/p5-Devel-Caller-Perl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-Caller-Perl
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Caller/Makefile b/devel/p5-Devel-Caller/Makefile
index e40bb575596b..00f01bea023c 100644
--- a/devel/p5-Devel-Caller/Makefile
+++ b/devel/p5-Devel-Caller/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Caller
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Caller/pkg-plist b/devel/p5-Devel-Caller/pkg-plist
index 2ca99525f61a..7a724b86b448 100644
--- a/devel/p5-Devel-Caller/pkg-plist
+++ b/devel/p5-Devel-Caller/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Devel::Caller.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Caller.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Caller/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Caller/Caller.so
+%%SITE_ARCH%%/Devel/Caller.pm
+%%SITE_ARCH%%/auto/Devel/Caller/Caller.so
diff --git a/devel/p5-Devel-Callsite/Makefile b/devel/p5-Devel-Callsite/Makefile
index b5e98581d425..dce385e00103 100644
--- a/devel/p5-Devel-Callsite/Makefile
+++ b/devel/p5-Devel-Callsite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-Callsite
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Devel
diff --git a/devel/p5-Devel-Callsite/pkg-plist b/devel/p5-Devel-Callsite/pkg-plist
index 741f43f04ab5..e03bdefd25d5 100644
--- a/devel/p5-Devel-Callsite/pkg-plist
+++ b/devel/p5-Devel-Callsite/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Callsite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Callsite/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Callsite/Callsite.so
+%%SITE_ARCH%%/Devel/Callsite.pm
+%%SITE_ARCH%%/auto/Devel/Callsite/Callsite.so
 %%PERL5_MAN3%%/Devel::Callsite.3.gz
diff --git a/devel/p5-Devel-CheckBin/Makefile b/devel/p5-Devel-CheckBin/Makefile
index 42bce2794ba6..ac6046585a97 100644
--- a/devel/p5-Devel-CheckBin/Makefile
+++ b/devel/p5-Devel-CheckBin/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-CheckBin
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-CheckBin/pkg-plist b/devel/p5-Devel-CheckBin/pkg-plist
index 64d918f0ceb2..971e3a113229 100644
--- a/devel/p5-Devel-CheckBin/pkg-plist
+++ b/devel/p5-Devel-CheckBin/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::CheckBin.3.gz
 %%SITE_PERL%%/Devel/CheckBin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/CheckBin/.packlist
diff --git a/devel/p5-Devel-CheckCompiler/Makefile b/devel/p5-Devel-CheckCompiler/Makefile
index 740a35b49359..b08602f7c577 100644
--- a/devel/p5-Devel-CheckCompiler/Makefile
+++ b/devel/p5-Devel-CheckCompiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-CheckCompiler
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-CheckLib/Makefile b/devel/p5-Devel-CheckLib/Makefile
index f8457d6a9bf6..296d41b0f4a3 100644
--- a/devel/p5-Devel-CheckLib/Makefile
+++ b/devel/p5-Devel-CheckLib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-CheckLib
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-CheckLib/pkg-plist b/devel/p5-Devel-CheckLib/pkg-plist
index 33dab1e98dd9..0a23277475a9 100644
--- a/devel/p5-Devel-CheckLib/pkg-plist
+++ b/devel/p5-Devel-CheckLib/pkg-plist
@@ -1,5 +1,4 @@
 bin/use-devel-checklib
 %%SITE_PERL%%/Devel/CheckLib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/CheckLib/.packlist
 %%PERL5_MAN3%%/Devel::CheckLib.3.gz
 man/man1/use-devel-checklib.1.gz
diff --git a/devel/p5-Devel-CheckOS/Makefile b/devel/p5-Devel-CheckOS/Makefile
index a72ea97cd4e6..c282bba7da53 100644
--- a/devel/p5-Devel-CheckOS/Makefile
+++ b/devel/p5-Devel-CheckOS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-CheckOS
 PORTVERSION=	1.73
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-CheckOS/pkg-plist b/devel/p5-Devel-CheckOS/pkg-plist
index aad95e70174d..894b9862bca0 100644
--- a/devel/p5-Devel-CheckOS/pkg-plist
+++ b/devel/p5-Devel-CheckOS/pkg-plist
@@ -123,4 +123,3 @@ man/man1/use-devel-assertos.1.gz
 %%SITE_PERL%%/Devel/AssertOS/VOS.pm
 %%SITE_PERL%%/Devel/CheckOS.pm
 %%SITE_PERL%%/Devel/CheckOS/Families.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/CheckOS/.packlist
diff --git a/devel/p5-Devel-Constants/Makefile b/devel/p5-Devel-Constants/Makefile
index 56aeffefa453..49754e5c3abe 100644
--- a/devel/p5-Devel-Constants/Makefile
+++ b/devel/p5-Devel-Constants/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Constants
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Constants/pkg-plist b/devel/p5-Devel-Constants/pkg-plist
index 50ccdd18eb94..a1703744df5f 100644
--- a/devel/p5-Devel-Constants/pkg-plist
+++ b/devel/p5-Devel-Constants/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Constants.3.gz
 %%SITE_PERL%%/Devel/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Constants/.packlist
diff --git a/devel/p5-Devel-CoreStack/Makefile b/devel/p5-Devel-CoreStack/Makefile
index 83a8899c1e73..919fa0ec12cc 100644
--- a/devel/p5-Devel-CoreStack/Makefile
+++ b/devel/p5-Devel-CoreStack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-CoreStack
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-CoreStack/pkg-plist b/devel/p5-Devel-CoreStack/pkg-plist
index adf884950014..6ff8efe40099 100644
--- a/devel/p5-Devel-CoreStack/pkg-plist
+++ b/devel/p5-Devel-CoreStack/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/CoreStack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/CoreStack/.packlist
 %%PERL5_MAN3%%/Devel::CoreStack.3.gz
diff --git a/devel/p5-Devel-Cover-Report-Clover/Makefile b/devel/p5-Devel-Cover-Report-Clover/Makefile
index 2ef0e42b7925..34d5f2136b70 100644
--- a/devel/p5-Devel-Cover-Report-Clover/Makefile
+++ b/devel/p5-Devel-Cover-Report-Clover/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-Cover-Report-Clover
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Cover-Report-Clover/pkg-plist b/devel/p5-Devel-Cover-Report-Clover/pkg-plist
index 2bf43692dd0a..d2dece3634a3 100644
--- a/devel/p5-Devel-Cover-Report-Clover/pkg-plist
+++ b/devel/p5-Devel-Cover-Report-Clover/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cover/Report/Clover/.packlist
 %%SITE_PERL%%/Devel/Cover/Report/Clover.pm
 %%SITE_PERL%%/Devel/Cover/Report/Clover/Builder.pm
 %%SITE_PERL%%/Devel/Cover/Report/Clover/Class.pm
diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile
index db1fb06d94ff..4b8aed688cf8 100644
--- a/devel/p5-Devel-Cover/Makefile
+++ b/devel/p5-Devel-Cover/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Cover
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -29,7 +30,7 @@ PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Devel/Cover/Cover.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/Cover/Cover.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 
diff --git a/devel/p5-Devel-Cover/pkg-plist b/devel/p5-Devel-Cover/pkg-plist
index 51f445099450..754acb92142c 100644
--- a/devel/p5-Devel-Cover/pkg-plist
+++ b/devel/p5-Devel-Cover/pkg-plist
@@ -44,52 +44,51 @@ bin/gcov2perl
 %%PERL5_MAN3%%/Devel::Cover::Tutorial.3.gz
 %%PERL5_MAN3%%/Devel::Cover::Util.3.gz
 %%PERL5_MAN3%%/Devel::Cover::Web.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Annotation/Git.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Annotation/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Annotation/Svk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Branch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Collection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Condition.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Condition_and_2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Condition_and_3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Condition_or_2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Condition_or_3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Condition_xor_4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Criterion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB/Digests.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB/IO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB/IO/JSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB/IO/Sereal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB/IO/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB/Structure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Dumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Html_Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Inc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Op.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Pod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Compilation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Html.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Html_basic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Html_minimal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Html_subtle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Json.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Text2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report/Vim.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Statement.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Subroutine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Time.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Truth_Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Web.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cover/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cover/Cover.so
+%%SITE_ARCH%%/Devel/Cover.pm
+%%SITE_ARCH%%/Devel/Cover/Annotation/Git.pm
+%%SITE_ARCH%%/Devel/Cover/Annotation/Random.pm
+%%SITE_ARCH%%/Devel/Cover/Annotation/Svk.pm
+%%SITE_ARCH%%/Devel/Cover/Branch.pm
+%%SITE_ARCH%%/Devel/Cover/Collection.pm
+%%SITE_ARCH%%/Devel/Cover/Condition.pm
+%%SITE_ARCH%%/Devel/Cover/Condition_and_2.pm
+%%SITE_ARCH%%/Devel/Cover/Condition_and_3.pm
+%%SITE_ARCH%%/Devel/Cover/Condition_or_2.pm
+%%SITE_ARCH%%/Devel/Cover/Condition_or_3.pm
+%%SITE_ARCH%%/Devel/Cover/Condition_xor_4.pm
+%%SITE_ARCH%%/Devel/Cover/Criterion.pm
+%%SITE_ARCH%%/Devel/Cover/DB.pm
+%%SITE_ARCH%%/Devel/Cover/DB/Digests.pm
+%%SITE_ARCH%%/Devel/Cover/DB/File.pm
+%%SITE_ARCH%%/Devel/Cover/DB/IO.pm
+%%SITE_ARCH%%/Devel/Cover/DB/IO/JSON.pm
+%%SITE_ARCH%%/Devel/Cover/DB/IO/Sereal.pm
+%%SITE_ARCH%%/Devel/Cover/DB/IO/Storable.pm
+%%SITE_ARCH%%/Devel/Cover/DB/Structure.pm
+%%SITE_ARCH%%/Devel/Cover/Dumper.pm
+%%SITE_ARCH%%/Devel/Cover/Html_Common.pm
+%%SITE_ARCH%%/Devel/Cover/Inc.pm
+%%SITE_ARCH%%/Devel/Cover/Op.pm
+%%SITE_ARCH%%/Devel/Cover/Pod.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Compilation.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Html.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Html_basic.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Html_minimal.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Html_subtle.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Json.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Sort.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Text.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Text2.pm
+%%SITE_ARCH%%/Devel/Cover/Report/Vim.pm
+%%SITE_ARCH%%/Devel/Cover/Statement.pm
+%%SITE_ARCH%%/Devel/Cover/Subroutine.pm
+%%SITE_ARCH%%/Devel/Cover/Test.pm
+%%SITE_ARCH%%/Devel/Cover/Time.pm
+%%SITE_ARCH%%/Devel/Cover/Truth_Table.pm
+%%SITE_ARCH%%/Devel/Cover/Tutorial.pod
+%%SITE_ARCH%%/Devel/Cover/Util.pm
+%%SITE_ARCH%%/Devel/Cover/Web.pm
+%%SITE_ARCH%%/auto/Devel/Cover/Cover.so
 man/man1/cover.1.gz
 man/man1/cpancover.1.gz
 man/man1/gcov2perl.1.gz
diff --git a/devel/p5-Devel-Cycle/Makefile b/devel/p5-Devel-Cycle/Makefile
index fbbf6a04558a..4f9f2245e0bf 100644
--- a/devel/p5-Devel-Cycle/Makefile
+++ b/devel/p5-Devel-Cycle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Cycle
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Cycle/pkg-plist b/devel/p5-Devel-Cycle/pkg-plist
index 80a8d5ab13a9..85e0ff1c28a0 100644
--- a/devel/p5-Devel-Cycle/pkg-plist
+++ b/devel/p5-Devel-Cycle/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Cycle.3.gz
 %%SITE_PERL%%/Devel/Cycle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cycle/.packlist
diff --git a/devel/p5-Devel-DProfPP/Makefile b/devel/p5-Devel-DProfPP/Makefile
index 955ac29ff963..e6d9093624bb 100644
--- a/devel/p5-Devel-DProfPP/Makefile
+++ b/devel/p5-Devel-DProfPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-DProfPP
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-DProfPP/pkg-plist b/devel/p5-Devel-DProfPP/pkg-plist
index c38e95ae1976..22355c14e0a4 100644
--- a/devel/p5-Devel-DProfPP/pkg-plist
+++ b/devel/p5-Devel-DProfPP/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::DProfPP.3.gz
 %%SITE_PERL%%/Devel/DProfPP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProfPP/.packlist
diff --git a/devel/p5-Devel-Declare-Parser/Makefile b/devel/p5-Devel-Declare-Parser/Makefile
index 3c01b4cf49df..a4ab7d33d63d 100644
--- a/devel/p5-Devel-Declare-Parser/Makefile
+++ b/devel/p5-Devel-Declare-Parser/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-Declare-Parser
 PORTVERSION=	0.017
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Declare/Makefile b/devel/p5-Devel-Declare/Makefile
index 2a713e301570..89df7e9cc1de 100644
--- a/devel/p5-Devel-Declare/Makefile
+++ b/devel/p5-Devel-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Declare
 PORTVERSION=	0.006017
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -24,6 +25,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/Devel/Declare/Declare.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/Declare/Declare.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Declare/pkg-plist b/devel/p5-Devel-Declare/pkg-plist
index 1d71cacf7f89..445353cc805c 100644
--- a/devel/p5-Devel-Declare/pkg-plist
+++ b/devel/p5-Devel-Declare/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Declare/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Declare/Declare.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Declare/Context/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Declare/MethodInstaller/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Declare.pm
+%%SITE_ARCH%%/auto/Devel/Declare/Declare.so
+%%SITE_ARCH%%/Devel/Declare/Context/Simple.pm
+%%SITE_ARCH%%/Devel/Declare/MethodInstaller/Simple.pm
+%%SITE_ARCH%%/Devel/Declare.pm
 %%PERL5_MAN3%%/Devel::Declare.3.gz
diff --git a/devel/p5-Devel-Diagram/Makefile b/devel/p5-Devel-Diagram/Makefile
index accbe687159f..44b949fd7e95 100644
--- a/devel/p5-Devel-Diagram/Makefile
+++ b/devel/p5-Devel-Diagram/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Diagram
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Diagram/pkg-plist b/devel/p5-Devel-Diagram/pkg-plist
index f295ffa1ab99..7a8a11c17f26 100644
--- a/devel/p5-Devel-Diagram/pkg-plist
+++ b/devel/p5-Devel-Diagram/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Devel/Diagram.pm
 %%SITE_PERL%%/Devel/Diagram/Render/UXF20.pm
 %%SITE_PERL%%/Devel/Diagram/xsl/uxf20toHtml.xsl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Diagram/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ClassDiagram.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cd-CGI.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cd-CPAN.html
diff --git a/devel/p5-Devel-Ditto/Makefile b/devel/p5-Devel-Ditto/Makefile
index 1787349ba8b7..da67ab3b9418 100644
--- a/devel/p5-Devel-Ditto/Makefile
+++ b/devel/p5-Devel-Ditto/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Ditto
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Dumpvar/Makefile b/devel/p5-Devel-Dumpvar/Makefile
index d00c1bef2a34..18fdf4c7fb22 100644
--- a/devel/p5-Devel-Dumpvar/Makefile
+++ b/devel/p5-Devel-Dumpvar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Dumpvar
 PORTVERSION=	1.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Dumpvar/pkg-plist b/devel/p5-Devel-Dumpvar/pkg-plist
index 3b1be59be171..14f0a50e1d7e 100644
--- a/devel/p5-Devel-Dumpvar/pkg-plist
+++ b/devel/p5-Devel-Dumpvar/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Dumpvar.3.gz
 %%SITE_PERL%%/Devel/Dumpvar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Dumpvar/.packlist
diff --git a/devel/p5-Devel-EvalContext/Makefile b/devel/p5-Devel-EvalContext/Makefile
index 6a8559c0f4bd..19aa3d47cddf 100644
--- a/devel/p5-Devel-EvalContext/Makefile
+++ b/devel/p5-Devel-EvalContext/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-EvalContext
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-EvalContext/pkg-plist b/devel/p5-Devel-EvalContext/pkg-plist
index 3c6d810840b0..90e961ab98c9 100644
--- a/devel/p5-Devel-EvalContext/pkg-plist
+++ b/devel/p5-Devel-EvalContext/pkg-plist
@@ -1,4 +1,3 @@
 bin/perl5i.pl
 %%PERL5_MAN3%%/Devel::EvalContext.3.gz
 %%SITE_PERL%%/Devel/EvalContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/EvalContext/.packlist
diff --git a/devel/p5-Devel-Events-Objects/Makefile b/devel/p5-Devel-Events-Objects/Makefile
index e9637eda7d54..7dd2ce1a9837 100644
--- a/devel/p5-Devel-Events-Objects/Makefile
+++ b/devel/p5-Devel-Events-Objects/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Events-Objects
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Events-Objects/pkg-plist b/devel/p5-Devel-Events-Objects/pkg-plist
index 02937295827b..fdf3deb74aa1 100644
--- a/devel/p5-Devel-Events-Objects/pkg-plist
+++ b/devel/p5-Devel-Events-Objects/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Devel/Events/Generator/Objects.pm
 %%SITE_PERL%%/Devel/Events/Handler/ObjectTracker.pm
 %%SITE_PERL%%/Devel/Events/Objects.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Events/Objects/.packlist
 %%PERL5_MAN3%%/Devel::Events::Generator::Objects.3.gz
 %%PERL5_MAN3%%/Devel::Events::Handler::ObjectTracker.3.gz
 %%PERL5_MAN3%%/Devel::Events::Objects.3.gz
diff --git a/devel/p5-Devel-Events/Makefile b/devel/p5-Devel-Events/Makefile
index 7997248e529b..ef3fd12710f6 100644
--- a/devel/p5-Devel-Events/Makefile
+++ b/devel/p5-Devel-Events/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Events
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Events/pkg-plist b/devel/p5-Devel-Events/pkg-plist
index 392af7474cf4..940284529cd3 100644
--- a/devel/p5-Devel-Events/pkg-plist
+++ b/devel/p5-Devel-Events/pkg-plist
@@ -16,7 +16,6 @@
 %%SITE_PERL%%/Devel/Events/Handler/Log/Memory.pm
 %%SITE_PERL%%/Devel/Events/Handler/Multiplex.pm
 %%SITE_PERL%%/Devel/Events/Match.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Events/.packlist
 %%PERL5_MAN3%%/Devel::Events.3.gz
 %%PERL5_MAN3%%/Devel::Events::Filter.3.gz
 %%PERL5_MAN3%%/Devel::Events::Filter::Callback.3.gz
diff --git a/devel/p5-Devel-FindPerl/Makefile b/devel/p5-Devel-FindPerl/Makefile
index 984b05363164..6790aafe4299 100644
--- a/devel/p5-Devel-FindPerl/Makefile
+++ b/devel/p5-Devel-FindPerl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-FindPerl
 PORTVERSION=	0.012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-FindPerl/pkg-plist b/devel/p5-Devel-FindPerl/pkg-plist
index b052c474f64c..872937e7f6da 100644
--- a/devel/p5-Devel-FindPerl/pkg-plist
+++ b/devel/p5-Devel-FindPerl/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/FindPerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/FindPerl/.packlist
 %%PERL5_MAN3%%/Devel::FindPerl.3.gz
diff --git a/devel/p5-Devel-Gladiator/Makefile b/devel/p5-Devel-Gladiator/Makefile
index 0eba471b5912..c9a19fc87f4c 100644
--- a/devel/p5-Devel-Gladiator/Makefile
+++ b/devel/p5-Devel-Gladiator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Gladiator
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Gladiator/pkg-plist b/devel/p5-Devel-Gladiator/pkg-plist
index d66d82d8c3d4..2aa7739923bf 100644
--- a/devel/p5-Devel-Gladiator/pkg-plist
+++ b/devel/p5-Devel-Gladiator/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Gladiator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Gladiator/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Gladiator/Gladiator.so
+%%SITE_ARCH%%/Devel/Gladiator.pm
+%%SITE_ARCH%%/auto/Devel/Gladiator/Gladiator.so
 %%PERL5_MAN3%%/Devel::Gladiator.3.gz
diff --git a/devel/p5-Devel-GlobalDestruction-XS/Makefile b/devel/p5-Devel-GlobalDestruction-XS/Makefile
index 56d2a7d070df..e09400bc1044 100644
--- a/devel/p5-Devel-GlobalDestruction-XS/Makefile
+++ b/devel/p5-Devel-GlobalDestruction-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-GlobalDestruction-XS
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-GlobalDestruction-XS/pkg-plist b/devel/p5-Devel-GlobalDestruction-XS/pkg-plist
index 5e3f2c25e9ab..7c4860e3a475 100644
--- a/devel/p5-Devel-GlobalDestruction-XS/pkg-plist
+++ b/devel/p5-Devel-GlobalDestruction-XS/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/GlobalDestruction/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/GlobalDestruction/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/GlobalDestruction/XS/XS.so
+%%SITE_ARCH%%/Devel/GlobalDestruction/XS.pm
+%%SITE_ARCH%%/auto/Devel/GlobalDestruction/XS/XS.so
 %%PERL5_MAN3%%/Devel::GlobalDestruction::XS.3.gz
diff --git a/devel/p5-Devel-GlobalDestruction/Makefile b/devel/p5-Devel-GlobalDestruction/Makefile
index e9df33d3e6ba..d91336988ee9 100644
--- a/devel/p5-Devel-GlobalDestruction/Makefile
+++ b/devel/p5-Devel-GlobalDestruction/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-GlobalDestruction
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-GlobalDestruction/pkg-plist b/devel/p5-Devel-GlobalDestruction/pkg-plist
index bd6c012cf519..5d74fa115084 100644
--- a/devel/p5-Devel-GlobalDestruction/pkg-plist
+++ b/devel/p5-Devel-GlobalDestruction/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::GlobalDestruction.3.gz
 %%SITE_PERL%%/Devel/GlobalDestruction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/GlobalDestruction/.packlist
diff --git a/devel/p5-Devel-Hide/Makefile b/devel/p5-Devel-Hide/Makefile
index a818bffe1ced..0e2cac9726d9 100644
--- a/devel/p5-Devel-Hide/Makefile
+++ b/devel/p5-Devel-Hide/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Hide
 PORTVERSION=	0.0009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Hide/pkg-plist b/devel/p5-Devel-Hide/pkg-plist
index e57168b06eb6..a73908ac606c 100644
--- a/devel/p5-Devel-Hide/pkg-plist
+++ b/devel/p5-Devel-Hide/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/Hide.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Hide/.packlist
 %%PERL5_MAN3%%/Devel::Hide.3.gz
diff --git a/devel/p5-Devel-KYTProf/Makefile b/devel/p5-Devel-KYTProf/Makefile
index 4ad3630ac6e1..84c6378614ec 100644
--- a/devel/p5-Devel-KYTProf/Makefile
+++ b/devel/p5-Devel-KYTProf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-KYTProf
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-KYTProf/pkg-plist b/devel/p5-Devel-KYTProf/pkg-plist
index f2a349985dc4..70b5cb8cc0b5 100644
--- a/devel/p5-Devel-KYTProf/pkg-plist
+++ b/devel/p5-Devel-KYTProf/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/KYTProf/.packlist
 %%SITE_PERL%%/Devel/KYTProf.pm
 %%SITE_PERL%%/Devel/KYTProf/Logger/LTSV.pm
 %%SITE_PERL%%/Devel/KYTProf/Logger/LTSV.pod
diff --git a/devel/p5-Devel-Leak-Cb/Makefile b/devel/p5-Devel-Leak-Cb/Makefile
index 8f902e5538a7..fbebf9067412 100644
--- a/devel/p5-Devel-Leak-Cb/Makefile
+++ b/devel/p5-Devel-Leak-Cb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Leak-Cb
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Leak-Cb/pkg-plist b/devel/p5-Devel-Leak-Cb/pkg-plist
index 13cb2075b309..a2b084632648 100644
--- a/devel/p5-Devel-Leak-Cb/pkg-plist
+++ b/devel/p5-Devel-Leak-Cb/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Leak::Cb.3.gz
 %%SITE_PERL%%/Devel/Leak/Cb.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Cb/.packlist
diff --git a/devel/p5-Devel-Leak-Object/Makefile b/devel/p5-Devel-Leak-Object/Makefile
index a85c344770aa..72932e6be17f 100644
--- a/devel/p5-Devel-Leak-Object/Makefile
+++ b/devel/p5-Devel-Leak-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Leak-Object
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Leak-Object/pkg-plist b/devel/p5-Devel-Leak-Object/pkg-plist
index d34378711a11..242afe35f308 100644
--- a/devel/p5-Devel-Leak-Object/pkg-plist
+++ b/devel/p5-Devel-Leak-Object/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Leak::Object.3.gz
 %%SITE_PERL%%/Devel/Leak/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Object/.packlist
diff --git a/devel/p5-Devel-Leak/Makefile b/devel/p5-Devel-Leak/Makefile
index 1a1e2b805338..ede8398badf9 100644
--- a/devel/p5-Devel-Leak/Makefile
+++ b/devel/p5-Devel-Leak/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Leak
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Leak/pkg-plist b/devel/p5-Devel-Leak/pkg-plist
index 7fe2e6a6afa3..a8385096fbc3 100644
--- a/devel/p5-Devel-Leak/pkg-plist
+++ b/devel/p5-Devel-Leak/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Devel::Leak.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Leak.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Leak.so
+%%SITE_ARCH%%/Devel/Leak.pm
+%%SITE_ARCH%%/auto/Devel/Leak/Leak.so
diff --git a/devel/p5-Devel-LeakGuard-Object/Makefile b/devel/p5-Devel-LeakGuard-Object/Makefile
index 2a025f6b4f85..3e0592a01768 100644
--- a/devel/p5-Devel-LeakGuard-Object/Makefile
+++ b/devel/p5-Devel-LeakGuard-Object/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-LeakGuard-Object
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile
index 48f8743fa353..d152e9aa2b6b 100644
--- a/devel/p5-Devel-LeakTrace/Makefile
+++ b/devel/p5-Devel-LeakTrace/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-LeakTrace
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-LeakTrace/pkg-plist b/devel/p5-Devel-LeakTrace/pkg-plist
index b7aa780850e6..05f1b76f0aa2 100644
--- a/devel/p5-Devel-LeakTrace/pkg-plist
+++ b/devel/p5-Devel-LeakTrace/pkg-plist
@@ -1,3 +1,3 @@
 %%PERL5_MAN3%%/Devel::LeakTrace.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/LeakTrace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/LeakTrace/LeakTrace.so
+%%SITE_ARCH%%/Devel/LeakTrace.pm
+%%SITE_ARCH%%/auto/Devel/LeakTrace/LeakTrace.so
diff --git a/devel/p5-Devel-LexAlias/Makefile b/devel/p5-Devel-LexAlias/Makefile
index fecf18a9ae78..535b5c38b560 100644
--- a/devel/p5-Devel-LexAlias/Makefile
+++ b/devel/p5-Devel-LexAlias/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-LexAlias
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-LexAlias/pkg-plist b/devel/p5-Devel-LexAlias/pkg-plist
index a4ac8b05640a..d88100e98f6a 100644
--- a/devel/p5-Devel-LexAlias/pkg-plist
+++ b/devel/p5-Devel-LexAlias/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/LexAlias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/LexAlias/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/LexAlias/LexAlias.so
+%%SITE_ARCH%%/Devel/LexAlias.pm
+%%SITE_ARCH%%/auto/Devel/LexAlias/LexAlias.so
 %%PERL5_MAN3%%/Devel::LexAlias.3.gz
diff --git a/devel/p5-Devel-MAT/Makefile b/devel/p5-Devel-MAT/Makefile
index c49817aa647f..a56f478ee033 100644
--- a/devel/p5-Devel-MAT/Makefile
+++ b/devel/p5-Devel-MAT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-MAT
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-MAT/pkg-plist b/devel/p5-Devel-MAT/pkg-plist
index 4128d6a19148..be9183a20c50 100644
--- a/devel/p5-Devel-MAT/pkg-plist
+++ b/devel/p5-Devel-MAT/pkg-plist
@@ -9,51 +9,51 @@ bin/pmat-list-dangling-ptrs
 bin/pmat-list-orphans
 bin/pmat-show-sv
 bin/pmat-sizes
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Dumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Dumpfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/SV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Tool.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Tool/Count.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Tool/Inrefs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Tool/Reachability.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/Tool/Sizes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MAT/UI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/MAT/Dumper/Dumper.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/MAT/MAT.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-internal.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-lexical.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-none.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-padlist.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-symtab.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-user.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-yes.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/refs-All.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/refs-Direct.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/refs-Strong.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/size-Owned.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/size-SV.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/size-Structure.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-indirect.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-inferred.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-strong.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-weak.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-ARRAY.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-CODE.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-FORMAT.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-GLOB.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-HASH.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-INVLIST.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-IO.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-LVALUE.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-PAD.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-PADLIST.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-PADNAMES.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-REF.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-REGEXP.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-SCALAR.svg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-STASH.svg
+%%SITE_ARCH%%/Devel/MAT.pm
+%%SITE_ARCH%%/Devel/MAT/Context.pm
+%%SITE_ARCH%%/Devel/MAT/Dumper.pm
+%%SITE_ARCH%%/Devel/MAT/Dumpfile.pm
+%%SITE_ARCH%%/Devel/MAT/SV.pm
+%%SITE_ARCH%%/Devel/MAT/Tool.pod
+%%SITE_ARCH%%/Devel/MAT/Tool/Count.pm
+%%SITE_ARCH%%/Devel/MAT/Tool/Inrefs.pm
+%%SITE_ARCH%%/Devel/MAT/Tool/Reachability.pm
+%%SITE_ARCH%%/Devel/MAT/Tool/Sizes.pm
+%%SITE_ARCH%%/Devel/MAT/UI.pod
+%%SITE_ARCH%%/auto/Devel/MAT/Dumper/Dumper.so
+%%SITE_ARCH%%/auto/Devel/MAT/MAT.so
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-internal.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-lexical.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-none.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-padlist.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-symtab.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-user.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/reachable-yes.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/refs-All.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/refs-Direct.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/refs-Strong.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/size-Owned.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/size-SV.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/size-Structure.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-indirect.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-inferred.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-strong.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/strength-weak.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-ARRAY.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-CODE.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-FORMAT.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-GLOB.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-HASH.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-INVLIST.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-IO.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-LVALUE.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-PAD.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-PADLIST.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-PADNAMES.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-REF.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-REGEXP.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-SCALAR.svg
+%%SITE_ARCH%%/auto/share/module/Devel-MAT-UI/icons/type-STASH.svg
 %%PERL5_MAN3%%/Devel::MAT.3.gz
 %%PERL5_MAN3%%/Devel::MAT::Context.3.gz
 %%PERL5_MAN3%%/Devel::MAT::Dumper.3.gz
diff --git a/devel/p5-Devel-Messenger/Makefile b/devel/p5-Devel-Messenger/Makefile
index 6e4a7f894189..473160131d87 100644
--- a/devel/p5-Devel-Messenger/Makefile
+++ b/devel/p5-Devel-Messenger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Messenger
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Messenger/pkg-plist b/devel/p5-Devel-Messenger/pkg-plist
index 367c7601df42..35b980200439 100644
--- a/devel/p5-Devel-Messenger/pkg-plist
+++ b/devel/p5-Devel-Messenger/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Messenger.3.gz
 %%SITE_PERL%%/Devel/Messenger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Messenger/.packlist
diff --git a/devel/p5-Devel-Modlist/Makefile b/devel/p5-Devel-Modlist/Makefile
index e5cab4111d4c..53940f21ba8a 100644
--- a/devel/p5-Devel-Modlist/Makefile
+++ b/devel/p5-Devel-Modlist/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Modlist
 PORTVERSION=	0.801
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Modlist/pkg-plist b/devel/p5-Devel-Modlist/pkg-plist
index 4c1f36086283..b736e55304d1 100644
--- a/devel/p5-Devel-Modlist/pkg-plist
+++ b/devel/p5-Devel-Modlist/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Modlist.3.gz
 %%SITE_PERL%%/Devel/Modlist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Modlist/.packlist
diff --git a/devel/p5-Devel-NYTProf/Makefile b/devel/p5-Devel-NYTProf/Makefile
index e5b08f79c4ba..e764004afea1 100644
--- a/devel/p5-Devel-NYTProf/Makefile
+++ b/devel/p5-Devel-NYTProf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-NYTProf
 PORTVERSION=	5.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -21,7 +22,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/Devel/NYTProf/NYTProf.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/Devel/auto/Devel/NYTProf/NYTProf.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/NYTProf/NYTProf.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/Devel/auto/Devel/NYTProf/NYTProf.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-NYTProf/pkg-plist b/devel/p5-Devel-NYTProf/pkg-plist
index 95168a392d12..2cddc98af9e9 100644
--- a/devel/p5-Devel-NYTProf/pkg-plist
+++ b/devel/p5-Devel-NYTProf/pkg-plist
@@ -4,39 +4,38 @@ bin/nytprofcg
 bin/nytprofcsv
 bin/nytprofhtml
 bin/nytprofmerge
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/auto/Devel/NYTProf/NYTProf.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/MemoryProfiling.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Apache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Data.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/FileHandle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/FileInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/ReadStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Reader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Run.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/SubCallInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/SubInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/asc.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/bg.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/desc.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/gradient.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/gradient40.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/gradient50.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/jit-yc.js
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/jit.js
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/gradient-cushion1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/gradient20.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/gradient30.png
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jit/Treemap.css
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jquery-min.js
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/jquery-tablesorter-min.js
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/NYTProf/js/style-tablesorter.css
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/NYTProf/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/NYTProf/NYTProf.so
+%%SITE_ARCH%%/Devel/auto/Devel/NYTProf/NYTProf.so
+%%SITE_ARCH%%/Devel/MemoryProfiling.pod
+%%SITE_ARCH%%/Devel/NYTProf.pm
+%%SITE_ARCH%%/Devel/NYTProf/Apache.pm
+%%SITE_ARCH%%/Devel/NYTProf/Constants.pm
+%%SITE_ARCH%%/Devel/NYTProf/Core.pm
+%%SITE_ARCH%%/Devel/NYTProf/Data.pm
+%%SITE_ARCH%%/Devel/NYTProf/FileHandle.pm
+%%SITE_ARCH%%/Devel/NYTProf/FileInfo.pm
+%%SITE_ARCH%%/Devel/NYTProf/ReadStream.pm
+%%SITE_ARCH%%/Devel/NYTProf/Reader.pm
+%%SITE_ARCH%%/Devel/NYTProf/Run.pm
+%%SITE_ARCH%%/Devel/NYTProf/SubCallInfo.pm
+%%SITE_ARCH%%/Devel/NYTProf/SubInfo.pm
+%%SITE_ARCH%%/Devel/NYTProf/Test.pm
+%%SITE_ARCH%%/Devel/NYTProf/Util.pm
+%%SITE_ARCH%%/Devel/NYTProf/js/asc.png
+%%SITE_ARCH%%/Devel/NYTProf/js/bg.png
+%%SITE_ARCH%%/Devel/NYTProf/js/desc.png
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/gradient.png
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/gradient40.png
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/gradient50.png
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/jit-yc.js
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/jit.js
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/gradient-cushion1.png
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/gradient20.png
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/gradient30.png
+%%SITE_ARCH%%/Devel/NYTProf/js/jit/Treemap.css
+%%SITE_ARCH%%/Devel/NYTProf/js/jquery-min.js
+%%SITE_ARCH%%/Devel/NYTProf/js/jquery-tablesorter-min.js
+%%SITE_ARCH%%/Devel/NYTProf/js/style-tablesorter.css
+%%SITE_ARCH%%/auto/Devel/NYTProf/NYTProf.so
 %%PERL5_MAN3%%/Devel::MemoryProfiling.3.gz
 %%PERL5_MAN3%%/Devel::NYTProf.3.gz
 %%PERL5_MAN3%%/Devel::NYTProf::Apache.3.gz
diff --git a/devel/p5-Devel-PPPort/Makefile b/devel/p5-Devel-PPPort/Makefile
index 59a00f8f3fe9..5257076db287 100644
--- a/devel/p5-Devel-PPPort/Makefile
+++ b/devel/p5-Devel-PPPort/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-PPPort
 DISTVERSION=	3.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-PPPort/pkg-plist b/devel/p5-Devel-PPPort/pkg-plist
index 513cb95ff238..ef34d186cb58 100644
--- a/devel/p5-Devel-PPPort/pkg-plist
+++ b/devel/p5-Devel-PPPort/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Devel::PPPort.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/PPPort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PPPort/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PPPort/PPPort.so
+%%SITE_ARCH%%/Devel/PPPort.pm
+%%SITE_ARCH%%/auto/Devel/PPPort/PPPort.so
diff --git a/devel/p5-Devel-PackagePath/Makefile b/devel/p5-Devel-PackagePath/Makefile
index 289b740536d7..90dc7e2ec00c 100644
--- a/devel/p5-Devel-PackagePath/Makefile
+++ b/devel/p5-Devel-PackagePath/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-PackagePath
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-PackagePath/pkg-plist b/devel/p5-Devel-PackagePath/pkg-plist
index e3304e14008c..300f79ba530f 100644
--- a/devel/p5-Devel-PackagePath/pkg-plist
+++ b/devel/p5-Devel-PackagePath/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/PackagePath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PackagePath/.packlist
 %%PERL5_MAN3%%/Devel::PackagePath.3.gz
diff --git a/devel/p5-Devel-PartialDump/Makefile b/devel/p5-Devel-PartialDump/Makefile
index 84259d1a59b9..ad43d82c1c07 100644
--- a/devel/p5-Devel-PartialDump/Makefile
+++ b/devel/p5-Devel-PartialDump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-PartialDump
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-PartialDump/pkg-plist b/devel/p5-Devel-PartialDump/pkg-plist
index 808e68784066..673aa97b8e3a 100644
--- a/devel/p5-Devel-PartialDump/pkg-plist
+++ b/devel/p5-Devel-PartialDump/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::PartialDump.3.gz
 %%SITE_PERL%%/Devel/PartialDump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PartialDump/.packlist
diff --git a/devel/p5-Devel-PatchPerl/Makefile b/devel/p5-Devel-PatchPerl/Makefile
index 837f5eb48e78..9461ed0d4932 100644
--- a/devel/p5-Devel-PatchPerl/Makefile
+++ b/devel/p5-Devel-PatchPerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-PatchPerl
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/devel/p5-Devel-PatchPerl/pkg-plist b/devel/p5-Devel-PatchPerl/pkg-plist
index c3b8ee3b4e22..0a379a4bf9c3 100644
--- a/devel/p5-Devel-PatchPerl/pkg-plist
+++ b/devel/p5-Devel-PatchPerl/pkg-plist
@@ -2,7 +2,6 @@ bin/patchperl
 %%SITE_PERL%%/Devel/PatchPerl.pm
 %%SITE_PERL%%/Devel/PatchPerl/Hints.pm
 %%SITE_PERL%%/Devel/PatchPerl/Plugin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PatchPerl/.packlist
 %%PERL5_MAN3%%/Devel::PatchPerl.3.gz
 %%PERL5_MAN3%%/Devel::PatchPerl::Hints.3.gz
 %%PERL5_MAN3%%/Devel::PatchPerl::Plugin.3.gz
diff --git a/devel/p5-Devel-Pointer/Makefile b/devel/p5-Devel-Pointer/Makefile
index 3098601634e6..4cf94266278e 100644
--- a/devel/p5-Devel-Pointer/Makefile
+++ b/devel/p5-Devel-Pointer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Pointer
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Pointer/pkg-plist b/devel/p5-Devel-Pointer/pkg-plist
index f08be4e311b0..18cf3a7c989a 100644
--- a/devel/p5-Devel-Pointer/pkg-plist
+++ b/devel/p5-Devel-Pointer/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Devel::Pointer.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Pointer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Pointer/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Pointer/Pointer.so
+%%SITE_ARCH%%/Devel/Pointer.pm
+%%SITE_ARCH%%/auto/Devel/Pointer/Pointer.so
diff --git a/devel/p5-Devel-Profile/Makefile b/devel/p5-Devel-Profile/Makefile
index 12bea52519e3..3a91ed2ddc3b 100644
--- a/devel/p5-Devel-Profile/Makefile
+++ b/devel/p5-Devel-Profile/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Profile
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Profile/pkg-plist b/devel/p5-Devel-Profile/pkg-plist
index 47202cc12dc9..968d2e372711 100644
--- a/devel/p5-Devel-Profile/pkg-plist
+++ b/devel/p5-Devel-Profile/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Profile.3.gz
 %%SITE_PERL%%/Devel/Profile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Profile/.packlist
diff --git a/devel/p5-Devel-Profiler/Makefile b/devel/p5-Devel-Profiler/Makefile
index 15fc8da9dd2d..2a0848d2366f 100644
--- a/devel/p5-Devel-Profiler/Makefile
+++ b/devel/p5-Devel-Profiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Profiler
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Profiler/pkg-plist b/devel/p5-Devel-Profiler/pkg-plist
index 1a9c04a814b3..e96b8e92cb72 100644
--- a/devel/p5-Devel-Profiler/pkg-plist
+++ b/devel/p5-Devel-Profiler/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Profiler/.packlist
 %%SITE_PERL%%/Devel/Profiler.pm
 %%SITE_PERL%%/Devel/Profiler/Apache.pm
 %%SITE_PERL%%/Devel/Profiler/Test.pm
diff --git a/devel/p5-Devel-REPL/Makefile b/devel/p5-Devel-REPL/Makefile
index 07c6ea5eb055..55c8154af0c2 100644
--- a/devel/p5-Devel-REPL/Makefile
+++ b/devel/p5-Devel-REPL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-REPL
 PORTVERSION=	1.003025
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-REPL/pkg-plist b/devel/p5-Devel-REPL/pkg-plist
index f85d1374ce30..5d4512dd060d 100644
--- a/devel/p5-Devel-REPL/pkg-plist
+++ b/devel/p5-Devel-REPL/pkg-plist
@@ -38,7 +38,6 @@ bin/re.pl
 %%SITE_PERL%%/Devel/REPL/Profile/Minimal.pm
 %%SITE_PERL%%/Devel/REPL/Profile/Standard.pm
 %%SITE_PERL%%/Devel/REPL/Script.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/REPL/.packlist
 %%PERL5_MAN3%%/Devel::REPL.3.gz
 %%PERL5_MAN3%%/Devel::REPL::Overview.3.gz
 %%PERL5_MAN3%%/Devel::REPL::Plugin::B::Concise.3.gz
diff --git a/devel/p5-Devel-Refactor/Makefile b/devel/p5-Devel-Refactor/Makefile
index 007f0e16ae3f..7cd6c49f3209 100644
--- a/devel/p5-Devel-Refactor/Makefile
+++ b/devel/p5-Devel-Refactor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Refactor
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Refactor/pkg-plist b/devel/p5-Devel-Refactor/pkg-plist
index 69b8ba0de351..4c71eaf34d34 100644
--- a/devel/p5-Devel-Refactor/pkg-plist
+++ b/devel/p5-Devel-Refactor/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Refactor.3.gz
 %%SITE_PERL%%/Devel/Refactor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Refactor/.packlist
diff --git a/devel/p5-Devel-Refcount/Makefile b/devel/p5-Devel-Refcount/Makefile
index 7b40a626e266..21f6a8fc803d 100644
--- a/devel/p5-Devel-Refcount/Makefile
+++ b/devel/p5-Devel-Refcount/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-Refcount
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/devel/p5-Devel-Refcount/pkg-plist b/devel/p5-Devel-Refcount/pkg-plist
index 7c242faf84e9..70bb93e68b0a 100644
--- a/devel/p5-Devel-Refcount/pkg-plist
+++ b/devel/p5-Devel-Refcount/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Refcount/Refcount.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Refcount.pm
+%%SITE_ARCH%%/auto/Devel/Refcount/Refcount.so
+%%SITE_ARCH%%/Devel/Refcount.pm
 %%PERL5_MAN3%%/Devel::Refcount.3.gz
diff --git a/devel/p5-Devel-Required/Makefile b/devel/p5-Devel-Required/Makefile
index 90b519d78e1d..9d544526a316 100644
--- a/devel/p5-Devel-Required/Makefile
+++ b/devel/p5-Devel-Required/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Required
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Required/pkg-plist b/devel/p5-Devel-Required/pkg-plist
index 971fd790d640..3d66c5918f02 100644
--- a/devel/p5-Devel-Required/pkg-plist
+++ b/devel/p5-Devel-Required/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::Required.3.gz
 %%SITE_PERL%%/Devel/Required.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Required/.packlist
diff --git a/devel/p5-Devel-RingBuffer/Makefile b/devel/p5-Devel-RingBuffer/Makefile
index 743b68c22c21..d7c504256a95 100644
--- a/devel/p5-Devel-RingBuffer/Makefile
+++ b/devel/p5-Devel-RingBuffer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-RingBuffer
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-RingBuffer/pkg-plist b/devel/p5-Devel-RingBuffer/pkg-plist
index db0d7ca8d4e4..573f482521d2 100644
--- a/devel/p5-Devel-RingBuffer/pkg-plist
+++ b/devel/p5-Devel-RingBuffer/pkg-plist
@@ -1,9 +1,8 @@
 %%PERL5_MAN3%%/Devel::RingBuffer.3.gz
 %%PERL5_MAN3%%/Devel::RingBuffer::Ring.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/RingBuffer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/RingBuffer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/RingBuffer/Ring.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/RingBuffer/Ring.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/RingBuffer/ThreadFacade.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/RingBuffer/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/RingBuffer/RingBuffer.so
+%%SITE_ARCH%%/Devel/RingBuffer.pm
+%%SITE_ARCH%%/Devel/RingBuffer.pod
+%%SITE_ARCH%%/Devel/RingBuffer/Ring.pm
+%%SITE_ARCH%%/Devel/RingBuffer/Ring.pod
+%%SITE_ARCH%%/Devel/RingBuffer/ThreadFacade.pm
+%%SITE_ARCH%%/auto/Devel/RingBuffer/RingBuffer.so
diff --git a/devel/p5-Devel-STrace/Makefile b/devel/p5-Devel-STrace/Makefile
index 8f2db8e95878..a1e67fad81eb 100644
--- a/devel/p5-Devel-STrace/Makefile
+++ b/devel/p5-Devel-STrace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-STrace
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-STrace/pkg-plist b/devel/p5-Devel-STrace/pkg-plist
index 138dbe3c4176..4879f2ec9a8f 100644
--- a/devel/p5-Devel-STrace/pkg-plist
+++ b/devel/p5-Devel-STrace/pkg-plist
@@ -5,4 +5,3 @@ bin/plstrace
 %%SITE_PERL%%/Devel/STrace.pod
 %%SITE_PERL%%/Devel/STrace/Monitor.pm
 %%SITE_PERL%%/Devel/STrace/Monitor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/STrace/.packlist
diff --git a/devel/p5-Devel-SimpleTrace/Makefile b/devel/p5-Devel-SimpleTrace/Makefile
index 7814722f8867..2e88384b0f9d 100644
--- a/devel/p5-Devel-SimpleTrace/Makefile
+++ b/devel/p5-Devel-SimpleTrace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-SimpleTrace
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-SimpleTrace/pkg-plist b/devel/p5-Devel-SimpleTrace/pkg-plist
index fd1e1dcbd99c..4362b0a40347 100644
--- a/devel/p5-Devel-SimpleTrace/pkg-plist
+++ b/devel/p5-Devel-SimpleTrace/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/SimpleTrace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/SimpleTrace/.packlist
 %%PERL5_MAN3%%/Devel::SimpleTrace.3.gz
diff --git a/devel/p5-Devel-Size-Report/Makefile b/devel/p5-Devel-Size-Report/Makefile
index 5c3072b9f281..fb29d4483834 100644
--- a/devel/p5-Devel-Size-Report/Makefile
+++ b/devel/p5-Devel-Size-Report/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Size-Report
 PORTVERSION=	0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Size-Report/pkg-plist b/devel/p5-Devel-Size-Report/pkg-plist
index b335c0d00bed..fd7c0c2b4dde 100644
--- a/devel/p5-Devel-Size-Report/pkg-plist
+++ b/devel/p5-Devel-Size-Report/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/Size/Report.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Size/Report/.packlist
 %%PERL5_MAN3%%/Devel::Size::Report.3.gz
diff --git a/devel/p5-Devel-Size/Makefile b/devel/p5-Devel-Size/Makefile
index 29013e3777a8..585b308f8a68 100644
--- a/devel/p5-Devel-Size/Makefile
+++ b/devel/p5-Devel-Size/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Size
 PORTVERSION=	0.79
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Size/pkg-plist b/devel/p5-Devel-Size/pkg-plist
index e7cd2a6f0440..5a127b4960a0 100644
--- a/devel/p5-Devel-Size/pkg-plist
+++ b/devel/p5-Devel-Size/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Devel::Size.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Size.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Size/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Size/Size.so
+%%SITE_ARCH%%/Devel/Size.pm
+%%SITE_ARCH%%/auto/Devel/Size/Size.so
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 8ecb9ee9ba70..4f596a11ad42 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-SmallProf
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-SmallProf/pkg-plist b/devel/p5-Devel-SmallProf/pkg-plist
index f15823aea3ba..6b9155486c70 100644
--- a/devel/p5-Devel-SmallProf/pkg-plist
+++ b/devel/p5-Devel-SmallProf/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::SmallProf.3.gz
 %%SITE_PERL%%/Devel/SmallProf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/SmallProf/.packlist
diff --git a/devel/p5-Devel-StackTrace-AsHTML/Makefile b/devel/p5-Devel-StackTrace-AsHTML/Makefile
index e3e751f19522..f66da2083b42 100644
--- a/devel/p5-Devel-StackTrace-AsHTML/Makefile
+++ b/devel/p5-Devel-StackTrace-AsHTML/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-StackTrace-AsHTML
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-Devel-StackTrace-AsHTML/pkg-plist b/devel/p5-Devel-StackTrace-AsHTML/pkg-plist
index 3c7942546265..2e349fe4b157 100644
--- a/devel/p5-Devel-StackTrace-AsHTML/pkg-plist
+++ b/devel/p5-Devel-StackTrace-AsHTML/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StackTrace/AsHTML/.packlist
 %%SITE_PERL%%/Devel/StackTrace/AsHTML.pm
 %%PERL5_MAN3%%/Devel::StackTrace::AsHTML.3.gz
diff --git a/devel/p5-Devel-StackTrace-WithLexicals/Makefile b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
index ad4d2e7cee78..4ded082358ce 100644
--- a/devel/p5-Devel-StackTrace-WithLexicals/Makefile
+++ b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Devel-StackTrace-WithLexicals
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-StackTrace-WithLexicals/pkg-plist b/devel/p5-Devel-StackTrace-WithLexicals/pkg-plist
index eced590f7f63..3bce9233c494 100644
--- a/devel/p5-Devel-StackTrace-WithLexicals/pkg-plist
+++ b/devel/p5-Devel-StackTrace-WithLexicals/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StackTrace/WithLexicals/.packlist
 %%SITE_PERL%%/Devel/StackTrace/WithLexicals.pm
 %%SITE_PERL%%/Devel/StackTrace/WithLexicals/Frame.pm
 %%PERL5_MAN3%%/Devel::StackTrace::WithLexicals.3.gz
diff --git a/devel/p5-Devel-StackTrace/Makefile b/devel/p5-Devel-StackTrace/Makefile
index 1255e4128c6f..5189f13c208a 100644
--- a/devel/p5-Devel-StackTrace/Makefile
+++ b/devel/p5-Devel-StackTrace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-StackTrace
 PORTVERSION=	1.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-StackTrace/pkg-plist b/devel/p5-Devel-StackTrace/pkg-plist
index 02a17409f06c..3dab1781870e 100644
--- a/devel/p5-Devel-StackTrace/pkg-plist
+++ b/devel/p5-Devel-StackTrace/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Devel::StackTrace::Frame.3.gz
 %%SITE_PERL%%/Devel/StackTrace.pm
 %%SITE_PERL%%/Devel/StackTrace/Frame.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StackTrace/.packlist
diff --git a/devel/p5-Devel-StealthDebug/Makefile b/devel/p5-Devel-StealthDebug/Makefile
index 87fdb382c80a..8c2bfad844ca 100644
--- a/devel/p5-Devel-StealthDebug/Makefile
+++ b/devel/p5-Devel-StealthDebug/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-StealthDebug
 PORTVERSION=	1.008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-StealthDebug/pkg-plist b/devel/p5-Devel-StealthDebug/pkg-plist
index 16b890a0f180..de344b842a93 100644
--- a/devel/p5-Devel-StealthDebug/pkg-plist
+++ b/devel/p5-Devel-StealthDebug/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::StealthDebug.3.gz
 %%SITE_PERL%%/Devel/StealthDebug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StealthDebug/.packlist
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index 6b460b8c2d5e..8c362e9b5f3e 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Symdump
 PORTVERSION=	2.1000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Symdump/pkg-plist b/devel/p5-Devel-Symdump/pkg-plist
index b43fa82c4c8a..97d4d8e991db 100644
--- a/devel/p5-Devel-Symdump/pkg-plist
+++ b/devel/p5-Devel-Symdump/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Devel::Symdump.3.gz
 %%SITE_PERL%%/Devel/Symdump.pm
 %%SITE_PERL%%/Devel/Symdump/Export.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Symdump/.packlist
diff --git a/devel/p5-Devel-Timer/Makefile b/devel/p5-Devel-Timer/Makefile
index 5eaddbba52ef..51edcb127393 100644
--- a/devel/p5-Devel-Timer/Makefile
+++ b/devel/p5-Devel-Timer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-Timer
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Timer/pkg-plist b/devel/p5-Devel-Timer/pkg-plist
index a73d48f5d2ff..4bfcbb598375 100644
--- a/devel/p5-Devel-Timer/pkg-plist
+++ b/devel/p5-Devel-Timer/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Devel/Timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Timer/.packlist
 %%PERL5_MAN3%%/Devel::Timer.3.gz
diff --git a/devel/p5-Devel-Trace/Makefile b/devel/p5-Devel-Trace/Makefile
index c4b151b88969..26da2c327fbb 100644
--- a/devel/p5-Devel-Trace/Makefile
+++ b/devel/p5-Devel-Trace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-Trace
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Trace/pkg-plist b/devel/p5-Devel-Trace/pkg-plist
index bdaaf4ba81eb..732f2540b830 100644
--- a/devel/p5-Devel-Trace/pkg-plist
+++ b/devel/p5-Devel-Trace/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Devel::Trace.3.gz
 %%SITE_PERL%%/Devel/Trace.pm
 %%SITE_PERL%%/Devel/demo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Trace/.packlist
diff --git a/devel/p5-Devel-TraceCalls/Makefile b/devel/p5-Devel-TraceCalls/Makefile
index 247c4aa579f0..856f7e934bab 100644
--- a/devel/p5-Devel-TraceCalls/Makefile
+++ b/devel/p5-Devel-TraceCalls/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-TraceCalls
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-TraceCalls/pkg-plist b/devel/p5-Devel-TraceCalls/pkg-plist
index 1ce2441f63c0..9de6663b6f56 100644
--- a/devel/p5-Devel-TraceCalls/pkg-plist
+++ b/devel/p5-Devel-TraceCalls/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceCalls/.packlist
 %%SITE_PERL%%/Devel/TraceCalls.pm
 %%PERL5_MAN3%%/Devel::TraceCalls.3.gz
diff --git a/devel/p5-Devel-TraceUse/Makefile b/devel/p5-Devel-TraceUse/Makefile
index 00d0b413fbe5..4f2ed0be14c6 100644
--- a/devel/p5-Devel-TraceUse/Makefile
+++ b/devel/p5-Devel-TraceUse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-TraceUse
 PORTVERSION=	2.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-ebug/Makefile b/devel/p5-Devel-ebug/Makefile
index a68736eddeb2..6d85ba49bd92 100644
--- a/devel/p5-Devel-ebug/Makefile
+++ b/devel/p5-Devel-ebug/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-ebug
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Devel
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index afcbbaa734fd..3d2843d4f9bf 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Devel-ptkdb
 PORTVERSION=	1.1091
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-ptkdb/pkg-plist b/devel/p5-Devel-ptkdb/pkg-plist
index 44f6e4ee88c1..064f15f42713 100644
--- a/devel/p5-Devel-ptkdb/pkg-plist
+++ b/devel/p5-Devel-ptkdb/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::ptkdb.3.gz
 %%SITE_PERL%%/Devel/ptkdb.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ptkdb/.packlist
diff --git a/devel/p5-Device-USB/Makefile b/devel/p5-Device-USB/Makefile
index 02bb95ae4b2e..b5ce22cf31ce 100644
--- a/devel/p5-Device-USB/Makefile
+++ b/devel/p5-Device-USB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Device-USB
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN \
 		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
diff --git a/devel/p5-Device-USB/pkg-plist b/devel/p5-Device-USB/pkg-plist
index 0465ea263c8c..1539a379cd78 100644
--- a/devel/p5-Device-USB/pkg-plist
+++ b/devel/p5-Device-USB/pkg-plist
@@ -1,13 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/Bus.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevEndpoint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevInterface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/Device.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Device/dump_usb.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/USB.so
+%%SITE_ARCH%%/Device/USB.pm
+%%SITE_ARCH%%/Device/USB/Bus.pm
+%%SITE_ARCH%%/Device/USB/DevConfig.pm
+%%SITE_ARCH%%/Device/USB/DevEndpoint.pm
+%%SITE_ARCH%%/Device/USB/DevInterface.pm
+%%SITE_ARCH%%/Device/USB/Device.pm
+%%SITE_ARCH%%/Device/USB/FAQ.pod
+%%SITE_ARCH%%/Device/dump_usb.pl
+%%SITE_ARCH%%/auto/Device/USB/USB.so
 %%PERL5_MAN3%%/Device::USB.3.gz
 %%PERL5_MAN3%%/Device::USB::Bus.3.gz
 %%PERL5_MAN3%%/Device::USB::DevConfig.3.gz
diff --git a/devel/p5-Digest-TransformPath/Makefile b/devel/p5-Digest-TransformPath/Makefile
index d7decc2d3082..32297697bf70 100644
--- a/devel/p5-Digest-TransformPath/Makefile
+++ b/devel/p5-Digest-TransformPath/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Digest-TransformPath
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Digest-TransformPath/pkg-plist b/devel/p5-Digest-TransformPath/pkg-plist
index 6307eb9e99b5..29b71e4d880f 100644
--- a/devel/p5-Digest-TransformPath/pkg-plist
+++ b/devel/p5-Digest-TransformPath/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Digest/TransformPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/TransformPath/.packlist
 %%PERL5_MAN3%%/Digest::TransformPath.3.gz
diff --git a/devel/p5-Dir-Project/Makefile b/devel/p5-Dir-Project/Makefile
index a7803511b61b..c3ee5b94fe2d 100644
--- a/devel/p5-Dir-Project/Makefile
+++ b/devel/p5-Dir-Project/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dir-Project
 PORTVERSION=	3.025
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Dir-Project/pkg-plist b/devel/p5-Dir-Project/pkg-plist
index e39b294262fe..fb56e5a697b2 100644
--- a/devel/p5-Dir-Project/pkg-plist
+++ b/devel/p5-Dir-Project/pkg-plist
@@ -2,7 +2,6 @@ bin/project_bin
 bin/project_dir
 %%PERL5_MAN3%%/Dir::Project.3.gz
 %%SITE_PERL%%/Dir/Project.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dir/Project/.packlist
 lib/project_dir.mk
 man/man1/project_bin.1.gz
 man/man1/project_dir.1.gz
diff --git a/devel/p5-Dir-Self/Makefile b/devel/p5-Dir-Self/Makefile
index 69ac747466ac..6f72cecab5d0 100644
--- a/devel/p5-Dir-Self/Makefile
+++ b/devel/p5-Dir-Self/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dir-Self
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAUKE
diff --git a/devel/p5-Dir-Self/pkg-plist b/devel/p5-Dir-Self/pkg-plist
index ebd73417ccdc..a7398abe2d1e 100644
--- a/devel/p5-Dir-Self/pkg-plist
+++ b/devel/p5-Dir-Self/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Dir/Self.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dir/Self/.packlist
 %%PERL5_MAN3%%/Dir::Self.3.gz
diff --git a/devel/p5-Dir-Watch/Makefile b/devel/p5-Dir-Watch/Makefile
index 4b9203d737d7..cdb91fe8e2b8 100644
--- a/devel/p5-Dir-Watch/Makefile
+++ b/devel/p5-Dir-Watch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dir-Watch
 PORTVERSION=	0.0.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/devel/p5-Dir-Watch/pkg-plist b/devel/p5-Dir-Watch/pkg-plist
index 43edc2519d42..c0c2f481eb4d 100644
--- a/devel/p5-Dir-Watch/pkg-plist
+++ b/devel/p5-Dir-Watch/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Dir/Watch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dir/Watch/.packlist
 %%PERL5_MAN3%%/Dir::Watch.3.gz
diff --git a/devel/p5-Directory-Queue/Makefile b/devel/p5-Directory-Queue/Makefile
index eda7945c8a86..cf68b23fa504 100644
--- a/devel/p5-Directory-Queue/Makefile
+++ b/devel/p5-Directory-Queue/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Directory-Queue
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LCONS
diff --git a/devel/p5-Directory-Queue/pkg-plist b/devel/p5-Directory-Queue/pkg-plist
index 76f13b57fb4b..8a4129fcd7e7 100644
--- a/devel/p5-Directory-Queue/pkg-plist
+++ b/devel/p5-Directory-Queue/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Directory/Queue/.packlist
 %%SITE_PERL%%/Directory/Queue.pm
 %%SITE_PERL%%/Directory/Queue/Normal.pm
 %%SITE_PERL%%/Directory/Queue/Null.pm
diff --git a/devel/p5-Directory-Scratch-Structured/Makefile b/devel/p5-Directory-Scratch-Structured/Makefile
index ce9e7b054e85..827b2407092a 100644
--- a/devel/p5-Directory-Scratch-Structured/Makefile
+++ b/devel/p5-Directory-Scratch-Structured/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Directory-Scratch-Structured
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Directory-Scratch/Makefile b/devel/p5-Directory-Scratch/Makefile
index ed474e33495d..f18a7ee363f0 100644
--- a/devel/p5-Directory-Scratch/Makefile
+++ b/devel/p5-Directory-Scratch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Directory-Scratch
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Directory-Scratch/pkg-plist b/devel/p5-Directory-Scratch/pkg-plist
index 734d522fad8a..8db26026cbc5 100644
--- a/devel/p5-Directory-Scratch/pkg-plist
+++ b/devel/p5-Directory-Scratch/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Directory/Scratch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Directory/Scratch/.packlist
 %%PERL5_MAN3%%/Directory::Scratch.3.gz
diff --git a/devel/p5-Dist-CheckConflicts/Makefile b/devel/p5-Dist-CheckConflicts/Makefile
index 6e7d465ab04a..97faecddd327 100644
--- a/devel/p5-Dist-CheckConflicts/Makefile
+++ b/devel/p5-Dist-CheckConflicts/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Dist-CheckConflicts
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/devel/p5-Dist-CheckConflicts/pkg-plist b/devel/p5-Dist-CheckConflicts/pkg-plist
index 40e066577b5c..f8ec242a86d1 100644
--- a/devel/p5-Dist-CheckConflicts/pkg-plist
+++ b/devel/p5-Dist-CheckConflicts/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Dist/CheckConflicts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dist/CheckConflicts/.packlist
 %%PERL5_MAN3%%/Dist::CheckConflicts.3.gz
diff --git a/devel/p5-Dist-Joseki/Makefile b/devel/p5-Dist-Joseki/Makefile
index 9dd13866ca69..e9367d1c9e81 100644
--- a/devel/p5-Dist-Joseki/Makefile
+++ b/devel/p5-Dist-Joseki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dist-Joseki
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Dist-Joseki/pkg-plist b/devel/p5-Dist-Joseki/pkg-plist
index 7bdd8148bb4b..2b9fc0cbbe8b 100644
--- a/devel/p5-Dist-Joseki/pkg-plist
+++ b/devel/p5-Dist-Joseki/pkg-plist
@@ -17,7 +17,6 @@ bin/distfind
 %%SITE_PERL%%/Dist/Joseki/DistType/ModuleBuild.pm
 %%SITE_PERL%%/Dist/Joseki/Find.pm
 %%SITE_PERL%%/Dist/Joseki/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dist/Joseki/.packlist
 %%PERL5_MAN3%%/Dist::Joseki.3.gz
 %%PERL5_MAN3%%/Dist::Joseki::Base.3.gz
 %%PERL5_MAN3%%/Dist::Joseki::Cmd.3.gz
diff --git a/devel/p5-Dist-Metadata/Makefile b/devel/p5-Dist-Metadata/Makefile
index 7c95bec47aa9..ae7473fa7b29 100644
--- a/devel/p5-Dist-Metadata/Makefile
+++ b/devel/p5-Dist-Metadata/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Dist-Metadata
 PORTVERSION=	0.925
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Dist-Metadata/pkg-plist b/devel/p5-Dist-Metadata/pkg-plist
index 97b688a19ec2..27c0e31ccf86 100644
--- a/devel/p5-Dist-Metadata/pkg-plist
+++ b/devel/p5-Dist-Metadata/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dist/Metadata/.packlist
 %%SITE_PERL%%/Dist/Metadata.pm
 %%SITE_PERL%%/Dist/Metadata/Archive.pm
 %%SITE_PERL%%/Dist/Metadata/Dir.pm
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 1494c663fbde..88f3a5a8afba 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Dist-Zilla
 PORTVERSION=	4.300030
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Dist
diff --git a/devel/p5-Dist-Zilla/pkg-plist b/devel/p5-Dist-Zilla/pkg-plist
index 6bc00690d389..f5b16082aa77 100644
--- a/devel/p5-Dist-Zilla/pkg-plist
+++ b/devel/p5-Dist-Zilla/pkg-plist
@@ -133,7 +133,6 @@ man/man1/dzil.1.gz
 %%SITE_PERL%%/Test/DZil.pm
 %%SITE_PERL%%/auto/share/module/Dist-Zilla-MintingProfile-Default/default/extra-dist.ini
 %%SITE_PERL%%/auto/share/module/Dist-Zilla-MintingProfile-Default/default/profile.ini
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dist/Zilla/.packlist
 %%PERL5_MAN3%%/Dist::Zilla.3.gz
 %%PERL5_MAN3%%/Dist::Zilla::App.3.gz
 %%PERL5_MAN3%%/Dist::Zilla::App::Command.3.gz
diff --git a/devel/p5-Doxygen-Filter-Perl/Makefile b/devel/p5-Doxygen-Filter-Perl/Makefile
index 47538a3b3f33..4f87c4485556 100644
--- a/devel/p5-Doxygen-Filter-Perl/Makefile
+++ b/devel/p5-Doxygen-Filter-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Doxygen-Filter-Perl
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Doxygen-Filter-Perl/pkg-plist b/devel/p5-Doxygen-Filter-Perl/pkg-plist
index edee98fdc229..efcd18bc42f3 100644
--- a/devel/p5-Doxygen-Filter-Perl/pkg-plist
+++ b/devel/p5-Doxygen-Filter-Perl/pkg-plist
@@ -4,4 +4,3 @@ bin/doxygen-filter-perl
 %%SITE_PERL%%/Doxygen/Filter.pm
 %%SITE_PERL%%/Doxygen/Filter/Perl.pm
 %%SITE_PERL%%/Doxygen/Filter/Perl/POD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Doxygen/Filter/Perl/.packlist
diff --git a/devel/p5-DynaLoader-Functions/Makefile b/devel/p5-DynaLoader-Functions/Makefile
index 95165eb345a3..44231c997822 100644
--- a/devel/p5-DynaLoader-Functions/Makefile
+++ b/devel/p5-DynaLoader-Functions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DynaLoader-Functions
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DynaLoader-Functions/pkg-plist b/devel/p5-DynaLoader-Functions/pkg-plist
index 2d7fca51e162..f20ebb4519f7 100644
--- a/devel/p5-DynaLoader-Functions/pkg-plist
+++ b/devel/p5-DynaLoader-Functions/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/DynaLoader/Functions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DynaLoader/Functions/.packlist
 %%PERL5_MAN3%%/DynaLoader::Functions.3.gz
diff --git a/devel/p5-EV/Makefile b/devel/p5-EV/Makefile
index c8df16d3fc78..cc8940ea79b6 100644
--- a/devel/p5-EV/Makefile
+++ b/devel/p5-EV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	EV
 PORTVERSION=	4.15
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-EV/pkg-plist b/devel/p5-EV/pkg-plist
index b81df2f0236d..3b54e642c94e 100644
--- a/devel/p5-EV/pkg-plist
+++ b/devel/p5-EV/pkg-plist
@@ -1,10 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/EV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/EV/EVAPI.h
-%%SITE_PERL%%/%%PERL_ARCH%%/EV/MakeMaker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/EV/ev.h
-%%SITE_PERL%%/%%PERL_ARCH%%/EV/libev.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/EV/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/EV/EV.so
+%%SITE_ARCH%%/EV.pm
+%%SITE_ARCH%%/EV/EVAPI.h
+%%SITE_ARCH%%/EV/MakeMaker.pm
+%%SITE_ARCH%%/EV/ev.h
+%%SITE_ARCH%%/EV/libev.pod
+%%SITE_ARCH%%/auto/EV/EV.so
 %%PERL5_MAN3%%/EV.3.gz
 %%PERL5_MAN3%%/EV::MakeMaker.3.gz
 %%PERL5_MAN3%%/EV::libev.3.gz
diff --git a/devel/p5-Env-PS1/Makefile b/devel/p5-Env-PS1/Makefile
index 34e199152591..1afa96f353ba 100644
--- a/devel/p5-Env-PS1/Makefile
+++ b/devel/p5-Env-PS1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Env-PS1
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Env-Path/Makefile b/devel/p5-Env-Path/Makefile
index afc103e784e7..453dc3409a07 100644
--- a/devel/p5-Env-Path/Makefile
+++ b/devel/p5-Env-Path/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Env-Path
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Env-Path/pkg-plist b/devel/p5-Env-Path/pkg-plist
index c798938d6077..1ea629ec1c91 100644
--- a/devel/p5-Env-Path/pkg-plist
+++ b/devel/p5-Env-Path/pkg-plist
@@ -1,5 +1,4 @@
 bin/envpath
 %%PERL5_MAN3%%/Env::Path.3.gz
 %%SITE_PERL%%/Env/Path.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Env/Path/.packlist
 man/man1/envpath.1.gz
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index d9926751f87a..c8054dd57b42 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Errno
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Errno/pkg-plist b/devel/p5-Errno/pkg-plist
index 2d5cc433ef46..4a0b1eee7476 100644
--- a/devel/p5-Errno/pkg-plist
+++ b/devel/p5-Errno/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Errno.3.gz
 %%SITE_PERL%%/Errno.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Errno/.packlist
diff --git a/devel/p5-Error-Helper/Makefile b/devel/p5-Error-Helper/Makefile
index 79b40e9e4689..0c44622b3948 100644
--- a/devel/p5-Error-Helper/Makefile
+++ b/devel/p5-Error-Helper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Error-Helper
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Error-Helper/pkg-plist b/devel/p5-Error-Helper/pkg-plist
index e1ef686e5603..a95153cf4d25 100644
--- a/devel/p5-Error-Helper/pkg-plist
+++ b/devel/p5-Error-Helper/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Error/Helper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error/Helper/.packlist
 %%PERL5_MAN3%%/Error::Helper.3.gz
diff --git a/devel/p5-Eval-Closure/Makefile b/devel/p5-Eval-Closure/Makefile
index 0cdc32996229..85cda7e392ac 100644
--- a/devel/p5-Eval-Closure/Makefile
+++ b/devel/p5-Eval-Closure/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Eval-Closure
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/devel/p5-Eval-Closure/pkg-plist b/devel/p5-Eval-Closure/pkg-plist
index 8171940b0ef5..9d4143250561 100644
--- a/devel/p5-Eval-Closure/pkg-plist
+++ b/devel/p5-Eval-Closure/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Eval::Closure.3.gz
 %%SITE_PERL%%/Eval/Closure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Eval/Closure/.packlist
diff --git a/devel/p5-Eval-Context/Makefile b/devel/p5-Eval-Context/Makefile
index 682de7bce22d..0834e92219b7 100644
--- a/devel/p5-Eval-Context/Makefile
+++ b/devel/p5-Eval-Context/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Eval-Context
 PORTVERSION=	0.09.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NKH
diff --git a/devel/p5-Eval-LineNumbers/Makefile b/devel/p5-Eval-LineNumbers/Makefile
index 474170eaf068..9f2ed7fb3703 100644
--- a/devel/p5-Eval-LineNumbers/Makefile
+++ b/devel/p5-Eval-LineNumbers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Eval-LineNumbers
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MUIR/modules
diff --git a/devel/p5-Eval-LineNumbers/pkg-plist b/devel/p5-Eval-LineNumbers/pkg-plist
index f01356b58bb5..c67af908129a 100644
--- a/devel/p5-Eval-LineNumbers/pkg-plist
+++ b/devel/p5-Eval-LineNumbers/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Eval/LineNumbers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Eval/LineNumbers/.packlist
 %%PERL5_MAN3%%/Eval::LineNumbers.3.gz
diff --git a/devel/p5-Eval-WithLexicals/Makefile b/devel/p5-Eval-WithLexicals/Makefile
index d0ec2410b200..21dfba801daa 100644
--- a/devel/p5-Eval-WithLexicals/Makefile
+++ b/devel/p5-Eval-WithLexicals/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Eval-WithLexicals
 PORTVERSION=	1.003001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
diff --git a/devel/p5-Eval-WithLexicals/pkg-plist b/devel/p5-Eval-WithLexicals/pkg-plist
index 94b63adc5457..e9fd7567f83c 100644
--- a/devel/p5-Eval-WithLexicals/pkg-plist
+++ b/devel/p5-Eval-WithLexicals/pkg-plist
@@ -1,5 +1,4 @@
 bin/tinyrepl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Eval/WithLexicals/.packlist
 %%SITE_PERL%%/Eval/WithLexicals.pm
 %%SITE_PERL%%/Eval/WithLexicals/WithHintPersistence.pm
 man/man1/tinyrepl.1.gz
diff --git a/devel/p5-Event-ExecFlow/Makefile b/devel/p5-Event-ExecFlow/Makefile
index d3624524e214..d8b991bb8915 100644
--- a/devel/p5-Event-ExecFlow/Makefile
+++ b/devel/p5-Event-ExecFlow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Event-ExecFlow
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	devel net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Event-ExecFlow/pkg-plist b/devel/p5-Event-ExecFlow/pkg-plist
index 5e8da0532c3e..cbaa6c52e3e1 100644
--- a/devel/p5-Event-ExecFlow/pkg-plist
+++ b/devel/p5-Event-ExecFlow/pkg-plist
@@ -18,4 +18,3 @@ bin/execflow
 %%SITE_PERL%%/Event/ExecFlow/Job/Group.pm
 %%SITE_PERL%%/Event/ExecFlow/Scheduler.pm
 %%SITE_PERL%%/Event/ExecFlow/Scheduler/SimpleMax.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/ExecFlow/.packlist
diff --git a/devel/p5-Event-Join/Makefile b/devel/p5-Event-Join/Makefile
index 76158f79edff..e0e23965f79f 100644
--- a/devel/p5-Event-Join/Makefile
+++ b/devel/p5-Event-Join/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Event-Join
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Event-Join/pkg-plist b/devel/p5-Event-Join/pkg-plist
index a348c9725901..23f2481339f1 100644
--- a/devel/p5-Event-Join/pkg-plist
+++ b/devel/p5-Event-Join/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Join/.packlist
 %%PERL5_MAN3%%/Event::Join.3.gz
 %%SITE_PERL%%/Event/Join.pm
diff --git a/devel/p5-Event-Lib/Makefile b/devel/p5-Event-Lib/Makefile
index abdc1adb7f5b..8278a7a8d2a4 100644
--- a/devel/p5-Event-Lib/Makefile
+++ b/devel/p5-Event-Lib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Event-Lib
 PORTVERSION=	1.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Event-Lib/pkg-plist b/devel/p5-Event-Lib/pkg-plist
index 25c988620faf..8d4d1a2cd8ac 100644
--- a/devel/p5-Event-Lib/pkg-plist
+++ b/devel/p5-Event-Lib/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/Lib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Lib/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Lib/Lib.so
+%%SITE_ARCH%%/Event/Lib.pm
+%%SITE_ARCH%%/auto/Event/Lib/Lib.so
 %%PERL5_MAN3%%/Event::Lib.3.gz
diff --git a/devel/p5-Event-Notify/Makefile b/devel/p5-Event-Notify/Makefile
index d72abb784770..9c801fd6c581 100644
--- a/devel/p5-Event-Notify/Makefile
+++ b/devel/p5-Event-Notify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Event-Notify
 PORTVERSION=	0.00004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Event
diff --git a/devel/p5-Event-Notify/pkg-plist b/devel/p5-Event-Notify/pkg-plist
index 3e3a51d263be..bef8d2d17af5 100644
--- a/devel/p5-Event-Notify/pkg-plist
+++ b/devel/p5-Event-Notify/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Notify/.packlist
 %%SITE_PERL%%/Event/Notify.pm
 %%PERL5_MAN3%%/Event::Notify.3.gz
diff --git a/devel/p5-Event-RPC/Makefile b/devel/p5-Event-RPC/Makefile
index f4801f1bc516..639dd18b9aca 100644
--- a/devel/p5-Event-RPC/Makefile
+++ b/devel/p5-Event-RPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Event-RPC
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Event-RPC/pkg-plist b/devel/p5-Event-RPC/pkg-plist
index 2964ca7cacaa..0da2ab3535cb 100644
--- a/devel/p5-Event-RPC/pkg-plist
+++ b/devel/p5-Event-RPC/pkg-plist
@@ -10,7 +10,6 @@
 %%SITE_PERL%%/Event/RPC/Loop/Glib.pm
 %%SITE_PERL%%/Event/RPC/Message.pm
 %%SITE_PERL%%/Event/RPC/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/RPC/.packlist
 %%PERL5_MAN3%%/Event::RPC.3.gz
 %%PERL5_MAN3%%/Event::RPC::Client.3.gz
 %%PERL5_MAN3%%/Event::RPC::Connection.3.gz
diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile
index bd1295d9da0a..53d767e2761b 100644
--- a/devel/p5-Event/Makefile
+++ b/devel/p5-Event/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Event
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Event/pkg-plist b/devel/p5-Event/pkg-plist
index 188e072b779c..a0684a06ce34 100644
--- a/devel/p5-Event/pkg-plist
+++ b/devel/p5-Event/pkg-plist
@@ -1,20 +1,19 @@
 %%PERL5_MAN3%%/Event.3.gz
 %%PERL5_MAN3%%/Event::MakeMaker.3.gz
 %%PERL5_MAN3%%/Event::generic.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/EventAPI.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/MakeMaker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/Watcher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/generic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/generic.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/group.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/idle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/io.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/signal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/type.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Event/var.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Event.so
+%%SITE_ARCH%%/Event.pm
+%%SITE_ARCH%%/Event.pod
+%%SITE_ARCH%%/Event/EventAPI.h
+%%SITE_ARCH%%/Event/MakeMaker.pm
+%%SITE_ARCH%%/Event/Watcher.pm
+%%SITE_ARCH%%/Event/generic.pm
+%%SITE_ARCH%%/Event/generic.pod
+%%SITE_ARCH%%/Event/group.pm
+%%SITE_ARCH%%/Event/idle.pm
+%%SITE_ARCH%%/Event/io.pm
+%%SITE_ARCH%%/Event/signal.pm
+%%SITE_ARCH%%/Event/timer.pm
+%%SITE_ARCH%%/Event/type.pm
+%%SITE_ARCH%%/Event/typemap
+%%SITE_ARCH%%/Event/var.pm
+%%SITE_ARCH%%/auto/Event/Event.so
diff --git a/devel/p5-Every/Makefile b/devel/p5-Every/Makefile
index 5bd0f1037985..2250afe680df 100644
--- a/devel/p5-Every/Makefile
+++ b/devel/p5-Every/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Every
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEODOR
diff --git a/devel/p5-Every/pkg-plist b/devel/p5-Every/pkg-plist
index 507e546ddafd..ac07d43008c9 100644
--- a/devel/p5-Every/pkg-plist
+++ b/devel/p5-Every/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Every.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Every/.packlist
 %%PERL5_MAN3%%/Every.3.gz
diff --git a/devel/p5-Exception-Class-TryCatch/Makefile b/devel/p5-Exception-Class-TryCatch/Makefile
index 4fd3c56d7a33..2f77210574fa 100644
--- a/devel/p5-Exception-Class-TryCatch/Makefile
+++ b/devel/p5-Exception-Class-TryCatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exception-Class-TryCatch
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exception-Class-TryCatch/pkg-plist b/devel/p5-Exception-Class-TryCatch/pkg-plist
index 421fca8b9b6e..eacc680d40b9 100644
--- a/devel/p5-Exception-Class-TryCatch/pkg-plist
+++ b/devel/p5-Exception-Class-TryCatch/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exception/Class/TryCatch/.packlist
 %%SITE_PERL%%/Exception/Class/TryCatch.pm
 %%SITE_PERL%%/Exception/Class/TryCatch.pod
 %%PERL5_MAN3%%/Exception::Class::TryCatch.3.gz
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index d87a01d5e91d..8b61d4c9e343 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Exception-Class
 PORTVERSION=	1.38
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exception-Class/pkg-plist b/devel/p5-Exception-Class/pkg-plist
index d651fc9e1b04..0bed01b29c89 100644
--- a/devel/p5-Exception-Class/pkg-plist
+++ b/devel/p5-Exception-Class/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Exception::Class::Base.3.gz
 %%SITE_PERL%%/Exception/Class.pm
 %%SITE_PERL%%/Exception/Class/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exception/Class/.packlist
diff --git a/devel/p5-Exception-Handler/Makefile b/devel/p5-Exception-Handler/Makefile
index 0c1f70a73b69..ec8568f573f7 100644
--- a/devel/p5-Exception-Handler/Makefile
+++ b/devel/p5-Exception-Handler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exception-Handler
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exception-Handler/pkg-plist b/devel/p5-Exception-Handler/pkg-plist
index 61a421b6ecd7..f90d3598317b 100644
--- a/devel/p5-Exception-Handler/pkg-plist
+++ b/devel/p5-Exception-Handler/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Exception::Handler.3.gz
 %%SITE_PERL%%/Exception/Handler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exception/Handler/.packlist
diff --git a/devel/p5-Expect-Simple/Makefile b/devel/p5-Expect-Simple/Makefile
index c7aeb5e58cfd..0539425dd270 100644
--- a/devel/p5-Expect-Simple/Makefile
+++ b/devel/p5-Expect-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Expect-Simple
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Expect-Simple/pkg-plist b/devel/p5-Expect-Simple/pkg-plist
index 8f902a70f6b4..b6173b1cee2f 100644
--- a/devel/p5-Expect-Simple/pkg-plist
+++ b/devel/p5-Expect-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Expect::Simple.3.gz
 %%SITE_PERL%%/Expect/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect/Simple/.packlist
diff --git a/devel/p5-Exporter-Declare/Makefile b/devel/p5-Exporter-Declare/Makefile
index 9d5ed90df290..759f3983f84a 100644
--- a/devel/p5-Exporter-Declare/Makefile
+++ b/devel/p5-Exporter-Declare/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Exporter-Declare
 PORTVERSION=	0.113
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
diff --git a/devel/p5-Exporter-Easy/Makefile b/devel/p5-Exporter-Easy/Makefile
index 25a2058ef6aa..b50aefe316e1 100644
--- a/devel/p5-Exporter-Easy/Makefile
+++ b/devel/p5-Exporter-Easy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exporter-Easy
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exporter-Easy/pkg-plist b/devel/p5-Exporter-Easy/pkg-plist
index 4b53beb965da..e1ea53de0716 100644
--- a/devel/p5-Exporter-Easy/pkg-plist
+++ b/devel/p5-Exporter-Easy/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Exporter/Easy.pm
 %%SITE_PERL%%/Exporter/Easiest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Easy/.packlist
 %%PERL5_MAN3%%/Exporter::Easy.3.gz
 %%PERL5_MAN3%%/Exporter::Easiest.3.gz
diff --git a/devel/p5-Exporter-Lite/Makefile b/devel/p5-Exporter-Lite/Makefile
index 9b21e18103fd..07d523fb51cf 100644
--- a/devel/p5-Exporter-Lite/Makefile
+++ b/devel/p5-Exporter-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exporter-Lite
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exporter-Lite/pkg-plist b/devel/p5-Exporter-Lite/pkg-plist
index 6602c63c2176..1c56750c68c9 100644
--- a/devel/p5-Exporter-Lite/pkg-plist
+++ b/devel/p5-Exporter-Lite/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Exporter::Lite.3.gz
 %%SITE_PERL%%/Exporter/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Lite/.packlist
diff --git a/devel/p5-Exporter-Tidy/Makefile b/devel/p5-Exporter-Tidy/Makefile
index bfc471ad4c44..1594aafac0d1 100644
--- a/devel/p5-Exporter-Tidy/Makefile
+++ b/devel/p5-Exporter-Tidy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exporter-Tidy
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exporter-Tidy/pkg-plist b/devel/p5-Exporter-Tidy/pkg-plist
index 71ed002fbaff..73adfe020692 100644
--- a/devel/p5-Exporter-Tidy/pkg-plist
+++ b/devel/p5-Exporter-Tidy/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Exporter::Tidy.3.gz
 %%SITE_PERL%%/Exporter/Tidy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Tidy/.packlist
diff --git a/devel/p5-Exporter-Tiny/Makefile b/devel/p5-Exporter-Tiny/Makefile
index 20cffa03599b..b1415e9366b6 100644
--- a/devel/p5-Exporter-Tiny/Makefile
+++ b/devel/p5-Exporter-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exporter-Tiny
 PORTVERSION=	0.042
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exporter-Tiny/pkg-plist b/devel/p5-Exporter-Tiny/pkg-plist
index 788f6cb7a41e..c77bb8cbd17b 100644
--- a/devel/p5-Exporter-Tiny/pkg-plist
+++ b/devel/p5-Exporter-Tiny/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Exporter/Shiny.pm
 %%SITE_PERL%%/Exporter/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Tiny/.packlist
 %%PERL5_MAN3%%/Exporter::Shiny.3.gz
 %%PERL5_MAN3%%/Exporter::Tiny.3.gz
diff --git a/devel/p5-Exporter/Makefile b/devel/p5-Exporter/Makefile
index b182f24552ca..efd92dc54b35 100644
--- a/devel/p5-Exporter/Makefile
+++ b/devel/p5-Exporter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Exporter
 PORTVERSION=	5.68
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Exporter/pkg-plist b/devel/p5-Exporter/pkg-plist
index 48f538579e04..db84ead7cfa9 100644
--- a/devel/p5-Exporter/pkg-plist
+++ b/devel/p5-Exporter/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Exporter.pm
 %%SITE_PERL%%/Exporter/Heavy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/.packlist
 %%PERL5_MAN3%%/Exporter.3.gz
 %%PERL5_MAN3%%/Exporter::Heavy.3.gz
diff --git a/devel/p5-ExtUtils-AutoInstall/Makefile b/devel/p5-ExtUtils-AutoInstall/Makefile
index 71a9e38c47bb..76aecf800d34 100644
--- a/devel/p5-ExtUtils-AutoInstall/Makefile
+++ b/devel/p5-ExtUtils-AutoInstall/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ExtUtils-AutoInstall
 PORTVERSION=	0.63
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-AutoInstall/pkg-plist b/devel/p5-ExtUtils-AutoInstall/pkg-plist
index 3361dc3d0ad2..2e2418e2e26d 100644
--- a/devel/p5-ExtUtils-AutoInstall/pkg-plist
+++ b/devel/p5-ExtUtils-AutoInstall/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/ExtUtils::AutoInstall.3.gz
 %%SITE_PERL%%/ExtUtils/AutoInstall.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/AutoInstall/.packlist
diff --git a/devel/p5-ExtUtils-CBuilder/Makefile b/devel/p5-ExtUtils-CBuilder/Makefile
index 5d25fd51925c..2aedd5aea0c1 100644
--- a/devel/p5-ExtUtils-CBuilder/Makefile
+++ b/devel/p5-ExtUtils-CBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-CBuilder
 PORTVERSION=	0.2802.12
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-ExtUtils-CBuilder/pkg-plist b/devel/p5-ExtUtils-CBuilder/pkg-plist
index adc1370fc0b9..21f4c2dca92d 100644
--- a/devel/p5-ExtUtils-CBuilder/pkg-plist
+++ b/devel/p5-ExtUtils-CBuilder/pkg-plist
@@ -13,4 +13,3 @@
 %%SITE_PERL%%/ExtUtils/CBuilder/Platform/darwin.pm
 %%SITE_PERL%%/ExtUtils/CBuilder/Platform/dec_osf.pm
 %%SITE_PERL%%/ExtUtils/CBuilder/Platform/os2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/CBuilder/.packlist
diff --git a/devel/p5-ExtUtils-CChecker/Makefile b/devel/p5-ExtUtils-CChecker/Makefile
index 59d84a6bea39..0fbebf9f1b66 100644
--- a/devel/p5-ExtUtils-CChecker/Makefile
+++ b/devel/p5-ExtUtils-CChecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-CChecker
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-CChecker/pkg-plist b/devel/p5-ExtUtils-CChecker/pkg-plist
index 50506a541b50..a19e68e9923b 100644
--- a/devel/p5-ExtUtils-CChecker/pkg-plist
+++ b/devel/p5-ExtUtils-CChecker/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ExtUtils/CChecker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/CChecker/.packlist
 %%PERL5_MAN3%%/ExtUtils::CChecker.3.gz
diff --git a/devel/p5-ExtUtils-Command/Makefile b/devel/p5-ExtUtils-Command/Makefile
index 3416abb91220..799ba83932cf 100644
--- a/devel/p5-ExtUtils-Command/Makefile
+++ b/devel/p5-ExtUtils-Command/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-Command
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-Command/pkg-plist b/devel/p5-ExtUtils-Command/pkg-plist
index dea570960059..dc15f1d3adba 100644
--- a/devel/p5-ExtUtils-Command/pkg-plist
+++ b/devel/p5-ExtUtils-Command/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/ExtUtils::Command.3.gz
 %%SITE_PERL%%/ExtUtils/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Command/.packlist
diff --git a/devel/p5-ExtUtils-Config/Makefile b/devel/p5-ExtUtils-Config/Makefile
index 1e792dae79d2..c3c548181abe 100644
--- a/devel/p5-ExtUtils-Config/Makefile
+++ b/devel/p5-ExtUtils-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-Config
 PORTVERSION=	0.008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-Config/pkg-plist b/devel/p5-ExtUtils-Config/pkg-plist
index 42cf548cd0da..2a11143a809c 100644
--- a/devel/p5-ExtUtils-Config/pkg-plist
+++ b/devel/p5-ExtUtils-Config/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ExtUtils/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Config/.packlist
 %%PERL5_MAN3%%/ExtUtils::Config.3.gz
diff --git a/devel/p5-ExtUtils-Constant/Makefile b/devel/p5-ExtUtils-Constant/Makefile
index 269c17d99bde..30488c6a6d3e 100644
--- a/devel/p5-ExtUtils-Constant/Makefile
+++ b/devel/p5-ExtUtils-Constant/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-Constant
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-Constant/pkg-plist b/devel/p5-ExtUtils-Constant/pkg-plist
index 3b88c6709d2e..34e5642d804d 100644
--- a/devel/p5-ExtUtils-Constant/pkg-plist
+++ b/devel/p5-ExtUtils-Constant/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/ExtUtils/Constant/ProxySubs.pm
 %%SITE_PERL%%/ExtUtils/Constant/Utils.pm
 %%SITE_PERL%%/ExtUtils/Constant/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Constant/.packlist
diff --git a/devel/p5-ExtUtils-Depends/Makefile b/devel/p5-ExtUtils-Depends/Makefile
index afd16ba1ef39..502742a699ba 100644
--- a/devel/p5-ExtUtils-Depends/Makefile
+++ b/devel/p5-ExtUtils-Depends/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-Depends
 PORTVERSION=	0.400
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TSCH
diff --git a/devel/p5-ExtUtils-Depends/pkg-plist b/devel/p5-ExtUtils-Depends/pkg-plist
index fab14ea8a4ee..c8af079cefbd 100644
--- a/devel/p5-ExtUtils-Depends/pkg-plist
+++ b/devel/p5-ExtUtils-Depends/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ExtUtils/Depends.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Depends/.packlist
 %%PERL5_MAN3%%/ExtUtils::Depends.3.gz
diff --git a/devel/p5-ExtUtils-Helpers/Makefile b/devel/p5-ExtUtils-Helpers/Makefile
index 108575cf9f4e..2058dbfc1d85 100644
--- a/devel/p5-ExtUtils-Helpers/Makefile
+++ b/devel/p5-ExtUtils-Helpers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-Helpers
 PORTVERSION=	0.022
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-Helpers/pkg-plist b/devel/p5-ExtUtils-Helpers/pkg-plist
index 4219c6600c10..f5fbf0453db1 100644
--- a/devel/p5-ExtUtils-Helpers/pkg-plist
+++ b/devel/p5-ExtUtils-Helpers/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/ExtUtils/Helpers/Unix.pm
 %%SITE_PERL%%/ExtUtils/Helpers/VMS.pm
 %%SITE_PERL%%/ExtUtils/Helpers/Windows.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Helpers/.packlist
 %%PERL5_MAN3%%/ExtUtils::Helpers.3.gz
 %%PERL5_MAN3%%/ExtUtils::Helpers::Unix.3.gz
 %%PERL5_MAN3%%/ExtUtils::Helpers::VMS.3.gz
diff --git a/devel/p5-ExtUtils-Install/Makefile b/devel/p5-ExtUtils-Install/Makefile
index c0066447eb5e..ad3e609bb270 100644
--- a/devel/p5-ExtUtils-Install/Makefile
+++ b/devel/p5-ExtUtils-Install/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ExtUtils-Install
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-Install/pkg-plist b/devel/p5-ExtUtils-Install/pkg-plist
index 4abce7d07c9e..d77af7d1e8a5 100644
--- a/devel/p5-ExtUtils-Install/pkg-plist
+++ b/devel/p5-ExtUtils-Install/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Install/.packlist
 %%SITE_PERL%%/ExtUtils/Install.pm
 %%SITE_PERL%%/ExtUtils/Installed.pm
 %%SITE_PERL%%/ExtUtils/Packlist.pm
diff --git a/devel/p5-ExtUtils-InstallPaths/Makefile b/devel/p5-ExtUtils-InstallPaths/Makefile
index 8d4fde8d6d5f..ceade29f9f1d 100644
--- a/devel/p5-ExtUtils-InstallPaths/Makefile
+++ b/devel/p5-ExtUtils-InstallPaths/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-InstallPaths
 PORTVERSION=	0.010
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-InstallPaths/pkg-plist b/devel/p5-ExtUtils-InstallPaths/pkg-plist
index 90dbfc6c8849..93965861e950 100644
--- a/devel/p5-ExtUtils-InstallPaths/pkg-plist
+++ b/devel/p5-ExtUtils-InstallPaths/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ExtUtils/InstallPaths.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/InstallPaths/.packlist
 %%PERL5_MAN3%%/ExtUtils::InstallPaths.3.gz
diff --git a/devel/p5-ExtUtils-LibBuilder/Makefile b/devel/p5-ExtUtils-LibBuilder/Makefile
index 9baa35c99ec7..c7a0718d7ae1 100644
--- a/devel/p5-ExtUtils-LibBuilder/Makefile
+++ b/devel/p5-ExtUtils-LibBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-LibBuilder
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
index b42c84c65d02..a607a4b415db 100644
--- a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-MakeMaker-CPANfile
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-MakeMaker-CPANfile/pkg-plist b/devel/p5-ExtUtils-MakeMaker-CPANfile/pkg-plist
index 4c37d3dd00c8..b5e06a99691d 100644
--- a/devel/p5-ExtUtils-MakeMaker-CPANfile/pkg-plist
+++ b/devel/p5-ExtUtils-MakeMaker-CPANfile/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ExtUtils/MakeMaker/CPANfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker/CPANfile/.packlist
 %%PERL5_MAN3%%/ExtUtils::MakeMaker::CPANfile.3.gz
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
index af9996b1140a..f6330c9fba07 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-MakeMaker-Coverage
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist b/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist
index 0dc2bd381898..1056d213de1f 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist
@@ -1,4 +1,3 @@
 bin/testcover
 %%PERL5_MAN3%%/ExtUtils::MakeMaker::Coverage.3.gz
 %%SITE_PERL%%/ExtUtils/MakeMaker/Coverage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker/Coverage/.packlist
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index 10887f152eeb..e7b4ae8e57aa 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-MakeMaker
 PORTVERSION=	6.98
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-MakeMaker/pkg-plist b/devel/p5-ExtUtils-MakeMaker/pkg-plist
index 79d18a586657..7c27ee96c4e1 100644
--- a/devel/p5-ExtUtils-MakeMaker/pkg-plist
+++ b/devel/p5-ExtUtils-MakeMaker/pkg-plist
@@ -26,7 +26,6 @@
 %%SITE_PERL%%/ExtUtils/Mkbootstrap.pm
 %%SITE_PERL%%/ExtUtils/Mksymlists.pm
 %%SITE_PERL%%/ExtUtils/testlib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker/.packlist
 %%PERL5_MAN3%%/ExtUtils::Command::MM.3.gz
 %%PERL5_MAN3%%/ExtUtils::Liblist.3.gz
 %%PERL5_MAN3%%/ExtUtils::MM.3.gz
diff --git a/devel/p5-ExtUtils-Manifest/Makefile b/devel/p5-ExtUtils-Manifest/Makefile
index 18c407eafe60..fd4d76aae874 100644
--- a/devel/p5-ExtUtils-Manifest/Makefile
+++ b/devel/p5-ExtUtils-Manifest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-Manifest
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/devel/p5-ExtUtils-Manifest/pkg-plist b/devel/p5-ExtUtils-Manifest/pkg-plist
index 7719183e7067..8a10aa3b2511 100644
--- a/devel/p5-ExtUtils-Manifest/pkg-plist
+++ b/devel/p5-ExtUtils-Manifest/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Manifest/.packlist
 %%SITE_PERL%%/ExtUtils/MANIFEST.SKIP
 %%SITE_PERL%%/ExtUtils/Manifest.pm
 %%PERL5_MAN3%%/ExtUtils::Manifest.3.gz
diff --git a/devel/p5-ExtUtils-ParseXS/Makefile b/devel/p5-ExtUtils-ParseXS/Makefile
index 6dba3a2773f3..cbf607e9057c 100644
--- a/devel/p5-ExtUtils-ParseXS/Makefile
+++ b/devel/p5-ExtUtils-ParseXS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-ParseXS
 PORTVERSION=	3.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/devel/p5-ExtUtils-ParseXS/pkg-plist b/devel/p5-ExtUtils-ParseXS/pkg-plist
index 35c7daeeb4ac..e3515e8ca9ec 100644
--- a/devel/p5-ExtUtils-ParseXS/pkg-plist
+++ b/devel/p5-ExtUtils-ParseXS/pkg-plist
@@ -19,4 +19,3 @@
 %%SITE_PERL%%/ExtUtils/Typemaps/InputMap.pm
 %%SITE_PERL%%/ExtUtils/Typemaps/OutputMap.pm
 %%SITE_PERL%%/ExtUtils/Typemaps/Type.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/ParseXS/.packlist
diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile
index fbae5cbdbd12..cc12bd6ac492 100644
--- a/devel/p5-ExtUtils-PkgConfig/Makefile
+++ b/devel/p5-ExtUtils-PkgConfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-PkgConfig
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-PkgConfig/pkg-plist b/devel/p5-ExtUtils-PkgConfig/pkg-plist
index 37b8217031a2..59557fb18def 100644
--- a/devel/p5-ExtUtils-PkgConfig/pkg-plist
+++ b/devel/p5-ExtUtils-PkgConfig/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/PkgConfig/.packlist
 %%SITE_PERL%%/ExtUtils/PkgConfig.pm
 %%PERL5_MAN3%%/ExtUtils::PkgConfig.3.gz
diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile
index 2cdeecc0bb76..52ec04c4ab9d 100644
--- a/devel/p5-ExtUtils-XSBuilder/Makefile
+++ b/devel/p5-ExtUtils-XSBuilder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ExtUtils-XSBuilder
 PORTVERSION=	0.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-XSBuilder/pkg-plist b/devel/p5-ExtUtils-XSBuilder/pkg-plist
index b60105fdec09..82cc34056121 100644
--- a/devel/p5-ExtUtils-XSBuilder/pkg-plist
+++ b/devel/p5-ExtUtils-XSBuilder/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/ExtUtils/XSBuilder/TypeMap.pm
 %%SITE_PERL%%/ExtUtils/XSBuilder/WrapXS.pm
 %%SITE_PERL%%/ExtUtils/xsbuilder.osc2002.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/XSBuilder/.packlist
diff --git a/devel/p5-ExtUtils-XSpp/Makefile b/devel/p5-ExtUtils-XSpp/Makefile
index fc3485d35b4d..db7c72b02cff 100644
--- a/devel/p5-ExtUtils-XSpp/Makefile
+++ b/devel/p5-ExtUtils-XSpp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ExtUtils-XSpp
 PORTVERSION=	0.16.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index 553feb3b2056..9ef200e86877 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FSA-Rules
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DWHEELER
diff --git a/devel/p5-FSA-Rules/pkg-plist b/devel/p5-FSA-Rules/pkg-plist
index 959ba9b53acc..93212bb19c5f 100644
--- a/devel/p5-FSA-Rules/pkg-plist
+++ b/devel/p5-FSA-Rules/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/FSA/Rules.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FSA/Rules/.packlist
 %%PERL5_MAN3%%/FSA::Rules.3.gz
diff --git a/devel/p5-Fennec-Lite/Makefile b/devel/p5-Fennec-Lite/Makefile
index 747d10c644f3..073f8d08f336 100644
--- a/devel/p5-Fennec-Lite/Makefile
+++ b/devel/p5-Fennec-Lite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Fennec-Lite
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Append-TempFile/Makefile b/devel/p5-File-Append-TempFile/Makefile
index 55adb4488a21..baa621910b4e 100644
--- a/devel/p5-File-Append-TempFile/Makefile
+++ b/devel/p5-File-Append-TempFile/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Append-TempFile
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Append-TempFile/pkg-plist b/devel/p5-File-Append-TempFile/pkg-plist
index 66698137e2a0..e2405421237e 100644
--- a/devel/p5-File-Append-TempFile/pkg-plist
+++ b/devel/p5-File-Append-TempFile/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Append/TempFile/.packlist
 %%SITE_PERL%%/File/Append/TempFile.pm
 %%PERL5_MAN3%%/File::Append::TempFile.3.gz
diff --git a/devel/p5-File-Assets/Makefile b/devel/p5-File-Assets/Makefile
index 54596542c6ea..baa568d1872d 100644
--- a/devel/p5-File-Assets/Makefile
+++ b/devel/p5-File-Assets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Assets
 PORTVERSION=	0.064
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RKRIMEN
diff --git a/devel/p5-File-Assets/pkg-plist b/devel/p5-File-Assets/pkg-plist
index 3eecbf6455d6..d5469520d5bc 100644
--- a/devel/p5-File-Assets/pkg-plist
+++ b/devel/p5-File-Assets/pkg-plist
@@ -20,6 +20,5 @@
 %%SITE_PERL%%/File/Assets/Util.pm
 %%SITE_PERL%%/File/Assets/Bucket.pm
 %%SITE_PERL%%/File/Assets.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Assets/.packlist
 %%PERL5_MAN3%%/File::Assets.3.gz
 %%PERL5_MAN3%%/File::Assets::Asset.3.gz
diff --git a/devel/p5-File-Attributes-Recursive/Makefile b/devel/p5-File-Attributes-Recursive/Makefile
index 6485308423a6..69a3b79a2eba 100644
--- a/devel/p5-File-Attributes-Recursive/Makefile
+++ b/devel/p5-File-Attributes-Recursive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Attributes-Recursive
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Attributes-Recursive/pkg-plist b/devel/p5-File-Attributes-Recursive/pkg-plist
index 611b6ef8d6b3..79079db584d3 100644
--- a/devel/p5-File-Attributes-Recursive/pkg-plist
+++ b/devel/p5-File-Attributes-Recursive/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Attributes/Recursive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Attributes/Recursive/.packlist
 %%PERL5_MAN3%%/File::Attributes::Recursive.3.gz
diff --git a/devel/p5-File-Attributes/Makefile b/devel/p5-File-Attributes/Makefile
index 960e0b4046ee..9ec93b18c012 100644
--- a/devel/p5-File-Attributes/Makefile
+++ b/devel/p5-File-Attributes/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Attributes
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Attributes/pkg-plist b/devel/p5-File-Attributes/pkg-plist
index 8b5e7a34b874..29739e2728d1 100644
--- a/devel/p5-File-Attributes/pkg-plist
+++ b/devel/p5-File-Attributes/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/File/Attributes.pm
 %%SITE_PERL%%/File/Attributes/Base.pm
 %%SITE_PERL%%/File/Attributes/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Attributes/.packlist
 %%PERL5_MAN3%%/File::Attributes.3.gz
 %%PERL5_MAN3%%/File::Attributes::Base.3.gz
 %%PERL5_MAN3%%/File::Attributes::Simple.3.gz
diff --git a/devel/p5-File-BOM/Makefile b/devel/p5-File-BOM/Makefile
index b4fd4c4ab3da..d89627fa0f03 100644
--- a/devel/p5-File-BOM/Makefile
+++ b/devel/p5-File-BOM/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-BOM
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-BOM/pkg-plist b/devel/p5-File-BOM/pkg-plist
index 1dc8aba67b37..099d80b7ee26 100644
--- a/devel/p5-File-BOM/pkg-plist
+++ b/devel/p5-File-BOM/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::BOM.3.gz
 %%SITE_PERL%%/File/BOM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BOM/.packlist
diff --git a/devel/p5-File-BaseDir/Makefile b/devel/p5-File-BaseDir/Makefile
index d878ed9e3486..a82be8b8c3eb 100644
--- a/devel/p5-File-BaseDir/Makefile
+++ b/devel/p5-File-BaseDir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-BaseDir
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index d3de787a1cc3..d61793489cee 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-BasicFlock
 PORTVERSION=	98.1202
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-BasicFlock/pkg-plist b/devel/p5-File-BasicFlock/pkg-plist
index 09078d8b58d1..dddfb1e15686 100644
--- a/devel/p5-File-BasicFlock/pkg-plist
+++ b/devel/p5-File-BasicFlock/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::BasicFlock.3.gz
 %%SITE_PERL%%/File/BasicFlock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BasicFlock/.packlist
diff --git a/devel/p5-File-Binary/Makefile b/devel/p5-File-Binary/Makefile
index c25a16cb0167..91f08113e2b4 100644
--- a/devel/p5-File-Binary/Makefile
+++ b/devel/p5-File-Binary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Binary
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Binary/pkg-plist b/devel/p5-File-Binary/pkg-plist
index 4a9b3593deae..9798168a75b0 100644
--- a/devel/p5-File-Binary/pkg-plist
+++ b/devel/p5-File-Binary/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Binary.3.gz
 %%SITE_PERL%%/File/Binary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Binary/.packlist
diff --git a/devel/p5-File-Cache/Makefile b/devel/p5-File-Cache/Makefile
index 2f02acd6f5e2..5379e08e3db6 100644
--- a/devel/p5-File-Cache/Makefile
+++ b/devel/p5-File-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Cache
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Cache/pkg-plist b/devel/p5-File-Cache/pkg-plist
index 15d540619a0a..c411ea40d32d 100644
--- a/devel/p5-File-Cache/pkg-plist
+++ b/devel/p5-File-Cache/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Cache.3.gz
 %%SITE_PERL%%/File/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cache/.packlist
diff --git a/devel/p5-File-Cat/Makefile b/devel/p5-File-Cat/Makefile
index 78c970eb33ed..8bc6faabc994 100644
--- a/devel/p5-File-Cat/Makefile
+++ b/devel/p5-File-Cat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Cat
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Cat/pkg-plist b/devel/p5-File-Cat/pkg-plist
index 79881d9fb141..056b10eb3782 100644
--- a/devel/p5-File-Cat/pkg-plist
+++ b/devel/p5-File-Cat/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Cat.3.gz
 %%SITE_PERL%%/File/Cat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cat/.packlist
diff --git a/devel/p5-File-ChangeNotify/Makefile b/devel/p5-File-ChangeNotify/Makefile
index a0e9c748b2c3..ac0bacbf9586 100644
--- a/devel/p5-File-ChangeNotify/Makefile
+++ b/devel/p5-File-ChangeNotify/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-ChangeNotify
 PORTVERSION=	0.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ConfigDir/Makefile b/devel/p5-File-ConfigDir/Makefile
index 1dee4432594d..852101f97c37 100644
--- a/devel/p5-File-ConfigDir/Makefile
+++ b/devel/p5-File-ConfigDir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-ConfigDir
 PORTVERSION=	0.014
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ConfigDir/pkg-plist b/devel/p5-File-ConfigDir/pkg-plist
index f15757982366..167ca2fa5a0e 100644
--- a/devel/p5-File-ConfigDir/pkg-plist
+++ b/devel/p5-File-ConfigDir/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/ConfigDir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ConfigDir/.packlist
 %%PERL5_MAN3%%/File::ConfigDir.3.gz
diff --git a/devel/p5-File-Copy-Recursive/Makefile b/devel/p5-File-Copy-Recursive/Makefile
index df244a5f6040..e2a70043b346 100644
--- a/devel/p5-File-Copy-Recursive/Makefile
+++ b/devel/p5-File-Copy-Recursive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Copy-Recursive
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Copy-Recursive/pkg-plist b/devel/p5-File-Copy-Recursive/pkg-plist
index f15ace391aef..658b98ca87da 100644
--- a/devel/p5-File-Copy-Recursive/pkg-plist
+++ b/devel/p5-File-Copy-Recursive/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Copy::Recursive.3.gz
 %%SITE_PERL%%/File/Copy/Recursive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Copy/Recursive/.packlist
diff --git a/devel/p5-File-CountLines/Makefile b/devel/p5-File-CountLines/Makefile
index ec016bae5049..64e797f9cf08 100644
--- a/devel/p5-File-CountLines/Makefile
+++ b/devel/p5-File-CountLines/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-CountLines
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-CountLines/pkg-plist b/devel/p5-File-CountLines/pkg-plist
index a836cef46278..2d9d50e03739 100644
--- a/devel/p5-File-CountLines/pkg-plist
+++ b/devel/p5-File-CountLines/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::CountLines.3.gz
 %%SITE_PERL%%/File/CountLines.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CountLines/.packlist
diff --git a/devel/p5-File-CreationTime/Makefile b/devel/p5-File-CreationTime/Makefile
index 3bfacfaffd62..1de5ac050d0e 100644
--- a/devel/p5-File-CreationTime/Makefile
+++ b/devel/p5-File-CreationTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-CreationTime
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-CreationTime/pkg-plist b/devel/p5-File-CreationTime/pkg-plist
index c73c3cec6595..eecd554f4288 100644
--- a/devel/p5-File-CreationTime/pkg-plist
+++ b/devel/p5-File-CreationTime/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/CreationTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CreationTime/.packlist
 %%PERL5_MAN3%%/File::CreationTime.3.gz
diff --git a/devel/p5-File-DesktopEntry/Makefile b/devel/p5-File-DesktopEntry/Makefile
index 24ef24837829..81bd2d84c052 100644
--- a/devel/p5-File-DesktopEntry/Makefile
+++ b/devel/p5-File-DesktopEntry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-DesktopEntry
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Dir-Dumper/Makefile b/devel/p5-File-Dir-Dumper/Makefile
index 5eb2ee8fd5ea..0b9ff4d6953d 100644
--- a/devel/p5-File-Dir-Dumper/Makefile
+++ b/devel/p5-File-Dir-Dumper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Dir-Dumper
 PORTVERSION=	0.0.8
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-DirSync/Makefile b/devel/p5-File-DirSync/Makefile
index 55dc2fde42e9..aa077df07a88 100644
--- a/devel/p5-File-DirSync/Makefile
+++ b/devel/p5-File-DirSync/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-DirSync
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-DirSync/pkg-plist b/devel/p5-File-DirSync/pkg-plist
index bd1aaad50ec2..34d1e78a4cc7 100644
--- a/devel/p5-File-DirSync/pkg-plist
+++ b/devel/p5-File-DirSync/pkg-plist
@@ -2,4 +2,3 @@ bin/dirsync
 man/man1/dirsync.1.gz
 %%PERL5_MAN3%%/File::DirSync.3.gz
 %%SITE_PERL%%/File/DirSync.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirSync/.packlist
diff --git a/devel/p5-File-ExtAttr/Makefile b/devel/p5-File-ExtAttr/Makefile
index b3bb12138602..aaa772a0876e 100644
--- a/devel/p5-File-ExtAttr/Makefile
+++ b/devel/p5-File-ExtAttr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-ExtAttr
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ExtAttr/pkg-plist b/devel/p5-File-ExtAttr/pkg-plist
index 967ff2ed3b76..7840b5fbd217 100644
--- a/devel/p5-File-ExtAttr/pkg-plist
+++ b/devel/p5-File-ExtAttr/pkg-plist
@@ -1,7 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/File/ExtAttr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/ExtAttr/Tie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ExtAttr/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ExtAttr/ExtAttr.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ExtAttr/autosplit.ix
+%%SITE_ARCH%%/File/ExtAttr.pm
+%%SITE_ARCH%%/File/ExtAttr/Tie.pm
+%%SITE_ARCH%%/auto/File/ExtAttr/ExtAttr.so
+%%SITE_ARCH%%/auto/File/ExtAttr/autosplit.ix
 %%PERL5_MAN3%%/File::ExtAttr.3.gz
 %%PERL5_MAN3%%/File::ExtAttr::Tie.3.gz
diff --git a/devel/p5-File-FcntlLock/Makefile b/devel/p5-File-FcntlLock/Makefile
index 90728a90446a..9f31c3cb4af6 100644
--- a/devel/p5-File-FcntlLock/Makefile
+++ b/devel/p5-File-FcntlLock/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-FcntlLock
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-FcntlLock/pkg-plist b/devel/p5-File-FcntlLock/pkg-plist
index aecbdf02e691..4a23517d20a4 100644
--- a/devel/p5-File-FcntlLock/pkg-plist
+++ b/devel/p5-File-FcntlLock/pkg-plist
@@ -1,15 +1,14 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FcntlLock/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FcntlLock/FcntlLock.so
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Errors.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Inline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Inline.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Pure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Pure.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/XS.pod
+%%SITE_ARCH%%/File/FcntlLock.pm
+%%SITE_ARCH%%/auto/File/FcntlLock/FcntlLock.so
+%%SITE_ARCH%%/File/FcntlLock.pod
+%%SITE_ARCH%%/File/FcntlLock/Core.pm
+%%SITE_ARCH%%/File/FcntlLock/Errors.pm
+%%SITE_ARCH%%/File/FcntlLock/Inline.pm
+%%SITE_ARCH%%/File/FcntlLock/Inline.pod
+%%SITE_ARCH%%/File/FcntlLock/Pure.pm
+%%SITE_ARCH%%/File/FcntlLock/Pure.pod
+%%SITE_ARCH%%/File/FcntlLock/XS.pm
+%%SITE_ARCH%%/File/FcntlLock/XS.pod
 %%PERL5_MAN3%%/File::FcntlLock.3.gz
 %%PERL5_MAN3%%/File::FcntlLock::Inline.3.gz
 %%PERL5_MAN3%%/File::FcntlLock::Pure.3.gz
diff --git a/devel/p5-File-Find-Closures/Makefile b/devel/p5-File-Find-Closures/Makefile
index a7c6a7779703..3b470cebbc1f 100644
--- a/devel/p5-File-Find-Closures/Makefile
+++ b/devel/p5-File-Find-Closures/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Find-Closures
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Find-Closures/pkg-plist b/devel/p5-File-Find-Closures/pkg-plist
index 16ac9a153096..c31a8d9333ee 100644
--- a/devel/p5-File-Find-Closures/pkg-plist
+++ b/devel/p5-File-Find-Closures/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Find/Closures.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Find/Closures/.packlist
 %%PERL5_MAN3%%/File::Find::Closures.3.gz
diff --git a/devel/p5-File-Find-Object/Makefile b/devel/p5-File-Find-Object/Makefile
index 3f57b67c6cda..05b8fde536c4 100644
--- a/devel/p5-File-Find-Object/Makefile
+++ b/devel/p5-File-Find-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Find-Object
 PORTVERSION=	0.2.11
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-File-Find-Object/pkg-plist b/devel/p5-File-Find-Object/pkg-plist
index f8cce218eea9..fefee25a780a 100644
--- a/devel/p5-File-Find-Object/pkg-plist
+++ b/devel/p5-File-Find-Object/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/File/Find/Object/Base.pm
 %%SITE_PERL%%/File/Find/Object/PathComp.pm
 %%SITE_PERL%%/File/Find/Object/Result.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Find/Object/.packlist
diff --git a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
index 2c8b9e04d541..ffbc40bca49c 100644
--- a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
+++ b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Find-Rule-Filesys-Virtual
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Find-Rule-Filesys-Virtual/pkg-plist b/devel/p5-File-Find-Rule-Filesys-Virtual/pkg-plist
index 1fc795c01010..40d8fd5b5864 100644
--- a/devel/p5-File-Find-Rule-Filesys-Virtual/pkg-plist
+++ b/devel/p5-File-Find-Rule-Filesys-Virtual/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Find/Rule/Filesys/Virtual.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Find/Rule/Filesys/Virtual/.packlist
 %%PERL5_MAN3%%/File::Find::Rule::Filesys::Virtual.3.gz
diff --git a/devel/p5-File-Find-Rule-Perl/Makefile b/devel/p5-File-Find-Rule-Perl/Makefile
index f4c6465dd284..c1ad30f33ada 100644
--- a/devel/p5-File-Find-Rule-Perl/Makefile
+++ b/devel/p5-File-Find-Rule-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Find-Rule-Perl
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	File
diff --git a/devel/p5-File-Find-Rule-Perl/pkg-plist b/devel/p5-File-Find-Rule-Perl/pkg-plist
index 7ea35bfae04f..778084355786 100644
--- a/devel/p5-File-Find-Rule-Perl/pkg-plist
+++ b/devel/p5-File-Find-Rule-Perl/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Find/Rule/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Find/Rule/Perl/.packlist
 %%PERL5_MAN3%%/File::Find::Rule::Perl.3.gz
diff --git a/devel/p5-File-Find-Rule-VCS/Makefile b/devel/p5-File-Find-Rule-VCS/Makefile
index 992990b1667d..415408116491 100644
--- a/devel/p5-File-Find-Rule-VCS/Makefile
+++ b/devel/p5-File-Find-Rule-VCS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Find-Rule-VCS
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Find-Rule-VCS/pkg-plist b/devel/p5-File-Find-Rule-VCS/pkg-plist
index 7a1150444af1..09e7c4cf8007 100644
--- a/devel/p5-File-Find-Rule-VCS/pkg-plist
+++ b/devel/p5-File-Find-Rule-VCS/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Find::Rule::VCS.3.gz
 %%SITE_PERL%%/File/Find/Rule/VCS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Find/Rule/VCS/.packlist
diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile
index a0345ee32a18..dabff7acb8cb 100644
--- a/devel/p5-File-Find-Rule/Makefile
+++ b/devel/p5-File-Find-Rule/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Find-Rule
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Find-Rule/pkg-plist b/devel/p5-File-Find-Rule/pkg-plist
index 662732ce2495..7db258065c7e 100644
--- a/devel/p5-File-Find-Rule/pkg-plist
+++ b/devel/p5-File-Find-Rule/pkg-plist
@@ -5,5 +5,4 @@ bin/findrule
 %%SITE_PERL%%/File/Find/Rule.pm
 %%SITE_PERL%%/File/Find/Rule/Extending.pod
 %%SITE_PERL%%/File/Find/Rule/Procedural.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Find/Rule/.packlist
 man/man1/findrule.1.gz
diff --git a/devel/p5-File-Finder/Makefile b/devel/p5-File-Finder/Makefile
index b2ae756a70de..da74adefbded 100644
--- a/devel/p5-File-Finder/Makefile
+++ b/devel/p5-File-Finder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Finder
 PORTVERSION=	0.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	File
diff --git a/devel/p5-File-Finder/pkg-plist b/devel/p5-File-Finder/pkg-plist
index e40af989e008..570ba25f4619 100644
--- a/devel/p5-File-Finder/pkg-plist
+++ b/devel/p5-File-Finder/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/File/Finder.pm
 %%SITE_PERL%%/File/Finder/Steps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Finder/.packlist
 %%PERL5_MAN3%%/File::Finder.3.gz
 %%PERL5_MAN3%%/File::Finder::Steps.3.gz
diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile
index c31d24aae8ca..fb9323a8aa35 100644
--- a/devel/p5-File-Flat/Makefile
+++ b/devel/p5-File-Flat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Flat
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Flat/pkg-plist b/devel/p5-File-Flat/pkg-plist
index 9e5081c09d22..3e3da7009c3e 100644
--- a/devel/p5-File-Flat/pkg-plist
+++ b/devel/p5-File-Flat/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Flat.3.gz
 %%SITE_PERL%%/File/Flat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flat/.packlist
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index 52f81dc0b71f..dd45fd851df9 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Flock
 PORTVERSION=	2014.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Flock/pkg-plist b/devel/p5-File-Flock/pkg-plist
index f339223c7295..23f32540c738 100644
--- a/devel/p5-File-Flock/pkg-plist
+++ b/devel/p5-File-Flock/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/File/Flock.pm
 %%SITE_PERL%%/File/Flock/Forking.pm
 %%SITE_PERL%%/File/Flock/Subprocess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flock/.packlist
diff --git a/devel/p5-File-FnMatch/Makefile b/devel/p5-File-FnMatch/Makefile
index 4512dccc420d..48dfee8d3916 100644
--- a/devel/p5-File-FnMatch/Makefile
+++ b/devel/p5-File-FnMatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-FnMatch
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-FnMatch/pkg-plist b/devel/p5-File-FnMatch/pkg-plist
index f582f69a2535..ea21cceb76fb 100644
--- a/devel/p5-File-FnMatch/pkg-plist
+++ b/devel/p5-File-FnMatch/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/File::FnMatch.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/File/FnMatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FnMatch/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FnMatch/FnMatch.so
+%%SITE_ARCH%%/File/FnMatch.pm
+%%SITE_ARCH%%/auto/File/FnMatch/FnMatch.so
diff --git a/devel/p5-File-Grep/Makefile b/devel/p5-File-Grep/Makefile
index 53ff69a275d8..df67f9d0e2e1 100644
--- a/devel/p5-File-Grep/Makefile
+++ b/devel/p5-File-Grep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Grep
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Grep/pkg-plist b/devel/p5-File-Grep/pkg-plist
index 5bb5894fd4b4..2b58f3e3834b 100644
--- a/devel/p5-File-Grep/pkg-plist
+++ b/devel/p5-File-Grep/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Grep.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Grep/.packlist
 %%PERL5_MAN3%%/File::Grep.3.gz
diff --git a/devel/p5-File-HStore/Makefile b/devel/p5-File-HStore/Makefile
index 91cb443afa25..494a69bfb990 100644
--- a/devel/p5-File-HStore/Makefile
+++ b/devel/p5-File-HStore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-HStore
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-HStore/pkg-plist b/devel/p5-File-HStore/pkg-plist
index d2f7116b3843..033672cd82e9 100644
--- a/devel/p5-File-HStore/pkg-plist
+++ b/devel/p5-File-HStore/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/HStore/.packlist
 %%SITE_PERL%%/File/HStore.pm
 %%SITE_PERL%%/auto/File/HStore/autosplit.ix
 %%PERL5_MAN3%%/File::HStore.3.gz
diff --git a/devel/p5-File-HomeDir-PathClass/Makefile b/devel/p5-File-HomeDir-PathClass/Makefile
index 0876b0811942..6fbe8c346707 100644
--- a/devel/p5-File-HomeDir-PathClass/Makefile
+++ b/devel/p5-File-HomeDir-PathClass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-HomeDir-PathClass
 PORTVERSION=	1.112.060
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-HomeDir/Makefile b/devel/p5-File-HomeDir/Makefile
index 6e5ecf3fef83..a00393e461a4 100644
--- a/devel/p5-File-HomeDir/Makefile
+++ b/devel/p5-File-HomeDir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-HomeDir
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-HomeDir/pkg-plist b/devel/p5-File-HomeDir/pkg-plist
index 65c7824b8e70..0720e1dfacbf 100644
--- a/devel/p5-File-HomeDir/pkg-plist
+++ b/devel/p5-File-HomeDir/pkg-plist
@@ -18,4 +18,3 @@
 %%SITE_PERL%%/File/HomeDir/Test.pm
 %%SITE_PERL%%/File/HomeDir/Unix.pm
 %%SITE_PERL%%/File/HomeDir/Windows.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/HomeDir/.packlist
diff --git a/devel/p5-File-Iterator/Makefile b/devel/p5-File-Iterator/Makefile
index 76f9a7cde736..bddfa5203087 100644
--- a/devel/p5-File-Iterator/Makefile
+++ b/devel/p5-File-Iterator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Iterator
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Iterator/pkg-plist b/devel/p5-File-Iterator/pkg-plist
index 0fe9e8b0159f..354d45c69795 100644
--- a/devel/p5-File-Iterator/pkg-plist
+++ b/devel/p5-File-Iterator/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Iterator.3.gz
 %%SITE_PERL%%/File/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Iterator/.packlist
diff --git a/devel/p5-File-LibMagic/Makefile b/devel/p5-File-LibMagic/Makefile
index 2c9b289d7b9b..cb0f4b7412b1 100644
--- a/devel/p5-File-LibMagic/Makefile
+++ b/devel/p5-File-LibMagic/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-LibMagic
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-LibMagic/pkg-plist b/devel/p5-File-LibMagic/pkg-plist
index 81fcadc87d95..b43bafca1579 100644
--- a/devel/p5-File-LibMagic/pkg-plist
+++ b/devel/p5-File-LibMagic/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/File/LibMagic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/LibMagic/LibMagic.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/LibMagic/.packlist
+%%SITE_ARCH%%/File/LibMagic.pm
+%%SITE_ARCH%%/auto/File/LibMagic/LibMagic.so
 %%PERL5_MAN3%%/File::LibMagic.3.gz
diff --git a/devel/p5-File-MMagic-XS/Makefile b/devel/p5-File-MMagic-XS/Makefile
index 7f28d0674c6e..9334ffbab9f6 100644
--- a/devel/p5-File-MMagic-XS/Makefile
+++ b/devel/p5-File-MMagic-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-MMagic-XS
 PORTVERSION=	0.09008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-MMagic-XS/pkg-plist b/devel/p5-File-MMagic-XS/pkg-plist
index 7b34f71c2ac0..0b1275d18628 100644
--- a/devel/p5-File-MMagic-XS/pkg-plist
+++ b/devel/p5-File-MMagic-XS/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic/benchmark.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic/magic
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/XS/XS.so
+%%SITE_ARCH%%/File/MMagic/XS.pm
+%%SITE_ARCH%%/File/MMagic/benchmark.pl
+%%SITE_ARCH%%/File/MMagic/magic
+%%SITE_ARCH%%/auto/File/MMagic/XS/XS.so
 %%PERL5_MAN3%%/File::MMagic::XS.3.gz
diff --git a/devel/p5-File-MMagic/Makefile b/devel/p5-File-MMagic/Makefile
index fd329d43cb55..c3c8d169e1a5 100644
--- a/devel/p5-File-MMagic/Makefile
+++ b/devel/p5-File-MMagic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-MMagic
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-MMagic/pkg-plist b/devel/p5-File-MMagic/pkg-plist
index 2131ba677a12..b9bb0d0cb046 100644
--- a/devel/p5-File-MMagic/pkg-plist
+++ b/devel/p5-File-MMagic/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::MMagic.3.gz
 %%SITE_PERL%%/File/MMagic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/.packlist
diff --git a/devel/p5-File-Map/Makefile b/devel/p5-File-Map/Makefile
index a52221cf6ef8..6019088574f8 100644
--- a/devel/p5-File-Map/Makefile
+++ b/devel/p5-File-Map/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-Map
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LEONT
@@ -24,6 +25,6 @@ USES=		perl5
 USE_PERL5=	modbuild
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/File/Map/Map.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/File/Map/Map.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Map/pkg-plist b/devel/p5-File-Map/pkg-plist
index 86435f4c1d0d..f890a509f742 100644
--- a/devel/p5-File-Map/pkg-plist
+++ b/devel/p5-File-Map/pkg-plist
@@ -1,3 +1,3 @@
 %%PERL5_MAN3%%/File::Map.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Map.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Map/Map.so
+%%SITE_ARCH%%/File/Map.pm
+%%SITE_ARCH%%/auto/File/Map/Map.so
diff --git a/devel/p5-File-MimeInfo/Makefile b/devel/p5-File-MimeInfo/Makefile
index d742b558f1e6..fcc069a6d75d 100644
--- a/devel/p5-File-MimeInfo/Makefile
+++ b/devel/p5-File-MimeInfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-MimeInfo
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-MimeInfo/pkg-plist b/devel/p5-File-MimeInfo/pkg-plist
index 05022eacd985..33f2c21d164c 100644
--- a/devel/p5-File-MimeInfo/pkg-plist
+++ b/devel/p5-File-MimeInfo/pkg-plist
@@ -7,7 +7,6 @@ man/man1/mimetype.1.gz
 %%SITE_PERL%%/File/MimeInfo/Cookbook.pod
 %%SITE_PERL%%/File/MimeInfo/Magic.pm
 %%SITE_PERL%%/File/MimeInfo/Rox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MimeInfo/.packlist
 %%PERL5_MAN3%%/File::MimeInfo.3.gz
 %%PERL5_MAN3%%/File::MimeInfo::Applications.3.gz
 %%PERL5_MAN3%%/File::MimeInfo::Cookbook.3.gz
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index 51ed4c4a1588..2df030e7b3a6 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Modified
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Modified/pkg-plist b/devel/p5-File-Modified/pkg-plist
index 610218ab4ee3..b27fe5e0a395 100644
--- a/devel/p5-File-Modified/pkg-plist
+++ b/devel/p5-File-Modified/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/File::Modified.3.gz
 %%SITE_PERL%%/File/Modified.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Modified/.packlist
 %%PORTDOCS%%%%EXAMPLESDIR%%/1.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/Export.cfg
 %%PORTDOCS%%%%EXAMPLESDIR%%/Import.cfg
diff --git a/devel/p5-File-Monitor/Makefile b/devel/p5-File-Monitor/Makefile
index 3043ad8f55c6..b4fd39113039 100644
--- a/devel/p5-File-Monitor/Makefile
+++ b/devel/p5-File-Monitor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Monitor
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Monitor/pkg-plist b/devel/p5-File-Monitor/pkg-plist
index d9177b34583b..0d088ece1170 100644
--- a/devel/p5-File-Monitor/pkg-plist
+++ b/devel/p5-File-Monitor/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Monitor/.packlist
 %%SITE_PERL%%/File/Monitor.pm
 %%SITE_PERL%%/File/Monitor/Base.pm
 %%SITE_PERL%%/File/Monitor/Delta.pm
diff --git a/devel/p5-File-NCopy/Makefile b/devel/p5-File-NCopy/Makefile
index 272278c030a3..8c89e42c8e70 100644
--- a/devel/p5-File-NCopy/Makefile
+++ b/devel/p5-File-NCopy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-NCopy
 PORTVERSION=	0.36
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHORNY
diff --git a/devel/p5-File-NCopy/pkg-plist b/devel/p5-File-NCopy/pkg-plist
index 3d13179beef9..cbeede4d3437 100644
--- a/devel/p5-File-NCopy/pkg-plist
+++ b/devel/p5-File-NCopy/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::NCopy.3.gz
 %%SITE_PERL%%/File/NCopy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NCopy/.packlist
diff --git a/devel/p5-File-NFSLock/Makefile b/devel/p5-File-NFSLock/Makefile
index be2837eb79a2..041ffc12a567 100644
--- a/devel/p5-File-NFSLock/Makefile
+++ b/devel/p5-File-NFSLock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-NFSLock
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-NFSLock/pkg-plist b/devel/p5-File-NFSLock/pkg-plist
index 6e75d348e874..b53e84f44bf7 100644
--- a/devel/p5-File-NFSLock/pkg-plist
+++ b/devel/p5-File-NFSLock/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NFSLock/.packlist
 %%SITE_PERL%%/File/NFSLock.pm
 %%PERL5_MAN3%%/File::NFSLock.3.gz
diff --git a/devel/p5-File-Path-Expand/Makefile b/devel/p5-File-Path-Expand/Makefile
index 853e03c6af75..703516cb2eeb 100644
--- a/devel/p5-File-Path-Expand/Makefile
+++ b/devel/p5-File-Path-Expand/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Path-Expand
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Path-Expand/pkg-plist b/devel/p5-File-Path-Expand/pkg-plist
index b6a7aea8bdeb..b64fa76c0082 100644
--- a/devel/p5-File-Path-Expand/pkg-plist
+++ b/devel/p5-File-Path-Expand/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Path/Expand.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Path/Expand/.packlist
 %%PERL5_MAN3%%/File::Path::Expand.3.gz
diff --git a/devel/p5-File-Path-Tiny/Makefile b/devel/p5-File-Path-Tiny/Makefile
index 518dcd15e68e..a7541484184c 100644
--- a/devel/p5-File-Path-Tiny/Makefile
+++ b/devel/p5-File-Path-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Path-Tiny
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Path-Tiny/pkg-plist b/devel/p5-File-Path-Tiny/pkg-plist
index f94b6f6ed5fe..b59fb54cb262 100644
--- a/devel/p5-File-Path-Tiny/pkg-plist
+++ b/devel/p5-File-Path-Tiny/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/File/Path/Tiny.pm
 %%SITE_PERL%%/File/Path/Tiny.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Path/Tiny/.packlist
 %%PERL5_MAN3%%/File::Path::Tiny.3.gz
diff --git a/devel/p5-File-Path/Makefile b/devel/p5-File-Path/Makefile
index 69616f82f0cf..4241b3ff9350 100644
--- a/devel/p5-File-Path/Makefile
+++ b/devel/p5-File-Path/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Path
 PORTVERSION=	2.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Path/pkg-plist b/devel/p5-File-Path/pkg-plist
index af1ed00f66b8..b5cfcab6ac39 100644
--- a/devel/p5-File-Path/pkg-plist
+++ b/devel/p5-File-Path/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Path.3.gz
 %%SITE_PERL%%/File/Path.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Path/.packlist
diff --git a/devel/p5-File-PathConvert/Makefile b/devel/p5-File-PathConvert/Makefile
index dd487d7d4d98..0b4b5b781f22 100644
--- a/devel/p5-File-PathConvert/Makefile
+++ b/devel/p5-File-PathConvert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-PathConvert
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-PathConvert/pkg-plist b/devel/p5-File-PathConvert/pkg-plist
index 06a5745a79d1..4051a43b3232 100644
--- a/devel/p5-File-PathConvert/pkg-plist
+++ b/devel/p5-File-PathConvert/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::PathConvert.3.gz
 %%SITE_PERL%%/File/PathConvert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/PathConvert/.packlist
diff --git a/devel/p5-File-Pid-Quick/Makefile b/devel/p5-File-Pid-Quick/Makefile
index a03822146830..8b5938bd8d67 100644
--- a/devel/p5-File-Pid-Quick/Makefile
+++ b/devel/p5-File-Pid-Quick/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Pid-Quick
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Pid-Quick/pkg-plist b/devel/p5-File-Pid-Quick/pkg-plist
index ad3b9e43c191..71840d4e5d05 100644
--- a/devel/p5-File-Pid-Quick/pkg-plist
+++ b/devel/p5-File-Pid-Quick/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Pid::Quick.3.gz
 %%SITE_PERL%%/File/Pid/Quick.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Pid/Quick/.packlist
diff --git a/devel/p5-File-Pid/Makefile b/devel/p5-File-Pid/Makefile
index 8a473a9e1961..7018519e4e69 100644
--- a/devel/p5-File-Pid/Makefile
+++ b/devel/p5-File-Pid/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Pid
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Pid/pkg-plist b/devel/p5-File-Pid/pkg-plist
index 80f4c63d320e..6fbc2d062fb9 100644
--- a/devel/p5-File-Pid/pkg-plist
+++ b/devel/p5-File-Pid/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Pid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Pid/.packlist
 %%PERL5_MAN3%%/File::Pid.3.gz
diff --git a/devel/p5-File-Policy/Makefile b/devel/p5-File-Policy/Makefile
index 9682375d4b1a..b83e504a53da 100644
--- a/devel/p5-File-Policy/Makefile
+++ b/devel/p5-File-Policy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Policy
 PORTVERSION=	1.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Policy/pkg-plist b/devel/p5-File-Policy/pkg-plist
index 6a5fa4790c63..64907d37f126 100644
--- a/devel/p5-File-Policy/pkg-plist
+++ b/devel/p5-File-Policy/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/File/Policy.pm
 %%SITE_PERL%%/File/Policy/Default.pm
 %%SITE_PERL%%/File/Slurp/WithinPolicy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Policy/.packlist
diff --git a/devel/p5-File-Random/Makefile b/devel/p5-File-Random/Makefile
index b51f1f293e44..f463d4e9d565 100644
--- a/devel/p5-File-Random/Makefile
+++ b/devel/p5-File-Random/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Random
 PORTVERSION=	0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Random/pkg-plist b/devel/p5-File-Random/pkg-plist
index 14e6afe8e6d0..6df4ac9585cb 100644
--- a/devel/p5-File-Random/pkg-plist
+++ b/devel/p5-File-Random/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Random.3.gz
 %%SITE_PERL%%/File/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Random/.packlist
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index b8fb6fa514b5..b7274d8a4fd0 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-ReadBackwards
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ReadBackwards/pkg-plist b/devel/p5-File-ReadBackwards/pkg-plist
index acf3a9c8506b..9822ea3252d2 100644
--- a/devel/p5-File-ReadBackwards/pkg-plist
+++ b/devel/p5-File-ReadBackwards/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ReadBackwards/.packlist
 %%SITE_PERL%%/File/ReadBackwards.pm
 %%PERL5_MAN3%%/File::ReadBackwards.3.gz
diff --git a/devel/p5-File-Remove/Makefile b/devel/p5-File-Remove/Makefile
index e24a1323e70c..e2eaf4b6bd00 100644
--- a/devel/p5-File-Remove/Makefile
+++ b/devel/p5-File-Remove/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Remove
 PORTVERSION=	1.52
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/devel/p5-File-Remove/pkg-plist b/devel/p5-File-Remove/pkg-plist
index 78c081245f34..96366c3d028f 100644
--- a/devel/p5-File-Remove/pkg-plist
+++ b/devel/p5-File-Remove/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Remove.3.gz
 %%SITE_PERL%%/File/Remove.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Remove/.packlist
diff --git a/devel/p5-File-SafeDO/Makefile b/devel/p5-File-SafeDO/Makefile
index c85f9f0692e9..2622a6f2d5a4 100644
--- a/devel/p5-File-SafeDO/Makefile
+++ b/devel/p5-File-SafeDO/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-SafeDO
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-SafeDO/pkg-plist b/devel/p5-File-SafeDO/pkg-plist
index 6d39bbb5a161..2cfab68a5e3b 100644
--- a/devel/p5-File-SafeDO/pkg-plist
+++ b/devel/p5-File-SafeDO/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::SafeDO.3.gz
 %%SITE_PERL%%/File/SafeDO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/SafeDO/.packlist
diff --git a/devel/p5-File-SearchPath/Makefile b/devel/p5-File-SearchPath/Makefile
index ebf253a187ab..ba853e1ee370 100644
--- a/devel/p5-File-SearchPath/Makefile
+++ b/devel/p5-File-SearchPath/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-SearchPath
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ShareDir-Install/Makefile b/devel/p5-File-ShareDir-Install/Makefile
index b4883214d7dc..e23bc8447a8e 100644
--- a/devel/p5-File-ShareDir-Install/Makefile
+++ b/devel/p5-File-ShareDir-Install/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-ShareDir-Install
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ShareDir-Install/pkg-plist b/devel/p5-File-ShareDir-Install/pkg-plist
index 4e8c95ac8c81..44c758f66460 100644
--- a/devel/p5-File-ShareDir-Install/pkg-plist
+++ b/devel/p5-File-ShareDir-Install/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::ShareDir::Install.3.gz
 %%SITE_PERL%%/File/ShareDir/Install.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ShareDir/Install/.packlist
diff --git a/devel/p5-File-ShareDir-PAR/Makefile b/devel/p5-File-ShareDir-PAR/Makefile
index bdf61dc1dc12..f420540ed920 100644
--- a/devel/p5-File-ShareDir-PAR/Makefile
+++ b/devel/p5-File-ShareDir-PAR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-ShareDir-PAR
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ShareDir-PAR/pkg-plist b/devel/p5-File-ShareDir-PAR/pkg-plist
index ba9d549e66b7..215d7a10821a 100644
--- a/devel/p5-File-ShareDir-PAR/pkg-plist
+++ b/devel/p5-File-ShareDir-PAR/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/auto/share/dist/File-ShareDir-PAR/sample.txt
 %%SITE_PERL%%/auto/share/dist/File-ShareDir-PAR/subdir/sample.txt
 %%SITE_PERL%%/auto/share/module/File-ShareDir-PAR/test_file.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ShareDir/PAR/.packlist
diff --git a/devel/p5-File-ShareDir-PathClass/Makefile b/devel/p5-File-ShareDir-PathClass/Makefile
index d647ed6ebc28..2e2ebd64c157 100644
--- a/devel/p5-File-ShareDir-PathClass/Makefile
+++ b/devel/p5-File-ShareDir-PathClass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-ShareDir-PathClass
 PORTVERSION=	1.112440
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ShareDir-ProjectDistDir/Makefile b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
index a3af05b0757e..7d06bf069f48 100644
--- a/devel/p5-File-ShareDir-ProjectDistDir/Makefile
+++ b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-ShareDir-ProjectDistDir
 PORTVERSION=	1.000004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ShareDir-ProjectDistDir/pkg-plist b/devel/p5-File-ShareDir-ProjectDistDir/pkg-plist
index 66127d0db4c6..816dba80db4a 100644
--- a/devel/p5-File-ShareDir-ProjectDistDir/pkg-plist
+++ b/devel/p5-File-ShareDir-ProjectDistDir/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_ARCH%%/auto/File/ShareDir/ProjectDistDir/.packlist
 %%PERL5_MAN3%%/File::ShareDir::ProjectDistDir.3.gz
 %%SITE_PERL%%/File/ShareDir/ProjectDistDir.pm
diff --git a/devel/p5-File-ShareDir/Makefile b/devel/p5-File-ShareDir/Makefile
index 525d5a04f13e..acf81ed4b4fd 100644
--- a/devel/p5-File-ShareDir/Makefile
+++ b/devel/p5-File-ShareDir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-ShareDir
 PORTVERSION=	1.102
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-ShareDir/pkg-plist b/devel/p5-File-ShareDir/pkg-plist
index db6c0ee3602f..24c87932212d 100644
--- a/devel/p5-File-ShareDir/pkg-plist
+++ b/devel/p5-File-ShareDir/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/auto/share/dist/File-ShareDir/sample.txt
 %%SITE_PERL%%/auto/share/dist/File-ShareDir/subdir/sample.txt
 %%SITE_PERL%%/auto/share/module/File-ShareDir/test_file.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ShareDir/.packlist
diff --git a/devel/p5-File-Slurp-Tiny/Makefile b/devel/p5-File-Slurp-Tiny/Makefile
index 0ff3de0a12d3..46a3000968bb 100644
--- a/devel/p5-File-Slurp-Tiny/Makefile
+++ b/devel/p5-File-Slurp-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Slurp-Tiny
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Slurp-Tiny/pkg-plist b/devel/p5-File-Slurp-Tiny/pkg-plist
index d757c47af01b..2e7bc1a46c64 100644
--- a/devel/p5-File-Slurp-Tiny/pkg-plist
+++ b/devel/p5-File-Slurp-Tiny/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/File/Slurp/Tiny.pm
 %%SITE_PERL%%/File/Slurp/benchmark.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Slurp/Tiny/.packlist
 %%PERL5_MAN3%%/File::Slurp::Tiny.3.gz
diff --git a/devel/p5-File-Slurp-Tree/Makefile b/devel/p5-File-Slurp-Tree/Makefile
index 9bee3da6bc0e..8c430af2bb93 100644
--- a/devel/p5-File-Slurp-Tree/Makefile
+++ b/devel/p5-File-Slurp-Tree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Slurp-Tree
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Slurp-Tree/pkg-plist b/devel/p5-File-Slurp-Tree/pkg-plist
index 9ed6ed48337e..6983c610cef7 100644
--- a/devel/p5-File-Slurp-Tree/pkg-plist
+++ b/devel/p5-File-Slurp-Tree/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Slurp/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Slurp/Tree/.packlist
 %%PERL5_MAN3%%/File::Slurp::Tree.3.gz
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index be59689b0223..987445f860ac 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Slurp
 PORTVERSION=	9999.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:URI
diff --git a/devel/p5-File-Slurp/pkg-plist b/devel/p5-File-Slurp/pkg-plist
index af3ccf5c49c3..84b8c8320cc5 100644
--- a/devel/p5-File-Slurp/pkg-plist
+++ b/devel/p5-File-Slurp/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Slurp.3.gz
 %%SITE_PERL%%/File/Slurp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Slurp/.packlist
diff --git a/devel/p5-File-Spec-Native/Makefile b/devel/p5-File-Spec-Native/Makefile
index f5d42e3cba0e..eba210a8d28b 100644
--- a/devel/p5-File-Spec-Native/Makefile
+++ b/devel/p5-File-Spec-Native/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-Spec-Native
 PORTVERSION=	1.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Spec-Native/pkg-plist b/devel/p5-File-Spec-Native/pkg-plist
index 48af4aeb7a73..311026c351ed 100644
--- a/devel/p5-File-Spec-Native/pkg-plist
+++ b/devel/p5-File-Spec-Native/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec/Native/.packlist
 %%SITE_PERL%%/File/Spec/Native.pm
 %%PERL5_MAN3%%/File::Spec::Native.3.gz
diff --git a/devel/p5-File-Stream/Makefile b/devel/p5-File-Stream/Makefile
index bb2cad1dbacf..eb5d82d8a6d5 100644
--- a/devel/p5-File-Stream/Makefile
+++ b/devel/p5-File-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Stream
 PORTVERSION=	2.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index a007402545c4..68ea74c4a40e 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Sync
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Sync/pkg-plist b/devel/p5-File-Sync/pkg-plist
index 137522d9b415..8351607decde 100644
--- a/devel/p5-File-Sync/pkg-plist
+++ b/devel/p5-File-Sync/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Sync.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/Sync.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/.packlist
+%%SITE_ARCH%%/File/Sync.pm
+%%SITE_ARCH%%/auto/File/Sync/autosplit.ix
+%%SITE_ARCH%%/auto/File/Sync/Sync.so
 %%PERL5_MAN3%%/File::Sync.3.gz
diff --git a/devel/p5-File-Tail-Dir/Makefile b/devel/p5-File-Tail-Dir/Makefile
index 55578bcb18a0..03693280d111 100644
--- a/devel/p5-File-Tail-Dir/Makefile
+++ b/devel/p5-File-Tail-Dir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Tail-Dir
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	File
diff --git a/devel/p5-File-Tail-Dir/pkg-plist b/devel/p5-File-Tail-Dir/pkg-plist
index 906d3eb162ea..1c1c5c0704e4 100644
--- a/devel/p5-File-Tail-Dir/pkg-plist
+++ b/devel/p5-File-Tail-Dir/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tail/Dir/.packlist
 %%SITE_PERL%%/File/Tail/Dir.pm
 %%PERL5_MAN3%%/File::Tail::Dir.3.gz
diff --git a/devel/p5-File-Tail-Scribe/Makefile b/devel/p5-File-Tail-Scribe/Makefile
index 4deb79c85fb7..301042299498 100644
--- a/devel/p5-File-Tail-Scribe/Makefile
+++ b/devel/p5-File-Tail-Scribe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Tail-Scribe
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Tail-Scribe/pkg-plist b/devel/p5-File-Tail-Scribe/pkg-plist
index 2565f073ee7b..743994151a61 100644
--- a/devel/p5-File-Tail-Scribe/pkg-plist
+++ b/devel/p5-File-Tail-Scribe/pkg-plist
@@ -1,5 +1,4 @@
 bin/tail_to_scribe.pl
 %%SITE_PERL%%/File/Tail/Scribe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tail/Scribe/.packlist
 %%PERL5_MAN3%%/File::Tail::Scribe.3.gz
 man/man1/tail_to_scribe.pl.1.gz
diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile
index c4b7846b4ca2..d922085ab778 100644
--- a/devel/p5-File-Tail/Makefile
+++ b/devel/p5-File-Tail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Tail
 PORTVERSION=	0.99.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Tail/pkg-plist b/devel/p5-File-Tail/pkg-plist
index 794f7a6256d0..0eb0b7b6d0a5 100644
--- a/devel/p5-File-Tail/pkg-plist
+++ b/devel/p5-File-Tail/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Tail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tail/.packlist
 %%PERL5_MAN3%%/File::Tail.3.gz
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index d0a05437763e..e77af695891e 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Temp
 PORTVERSION=	0.23.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Temp/pkg-plist b/devel/p5-File-Temp/pkg-plist
index ba1fc29dac77..00f25e475281 100644
--- a/devel/p5-File-Temp/pkg-plist
+++ b/devel/p5-File-Temp/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Temp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Temp/.packlist
 %%PERL5_MAN3%%/File::Temp.3.gz
diff --git a/devel/p5-File-Tempdir/Makefile b/devel/p5-File-Tempdir/Makefile
index 1601a3a82278..0eeed3d64af2 100644
--- a/devel/p5-File-Tempdir/Makefile
+++ b/devel/p5-File-Tempdir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Tempdir
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Tempdir/pkg-plist b/devel/p5-File-Tempdir/pkg-plist
index 8e9b56d06a8c..e62312975b09 100644
--- a/devel/p5-File-Tempdir/pkg-plist
+++ b/devel/p5-File-Tempdir/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Tempdir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tempdir/.packlist
 %%PERL5_MAN3%%/File::Tempdir.3.gz
diff --git a/devel/p5-File-Touch/Makefile b/devel/p5-File-Touch/Makefile
index c50d739b2412..824b26d09269 100644
--- a/devel/p5-File-Touch/Makefile
+++ b/devel/p5-File-Touch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Touch
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Touch/pkg-plist b/devel/p5-File-Touch/pkg-plist
index eb0f177fbb60..a8e3e72cb2e4 100644
--- a/devel/p5-File-Touch/pkg-plist
+++ b/devel/p5-File-Touch/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::Touch.3.gz
 %%SITE_PERL%%/File/Touch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Touch/.packlist
diff --git a/devel/p5-File-Type/Makefile b/devel/p5-File-Type/Makefile
index 8ad1ea90eb03..eda242cee04d 100644
--- a/devel/p5-File-Type/Makefile
+++ b/devel/p5-File-Type/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Type
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Type/pkg-plist b/devel/p5-File-Type/pkg-plist
index be129628bf3e..f57466ef6533 100644
--- a/devel/p5-File-Type/pkg-plist
+++ b/devel/p5-File-Type/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/File::Type::Builder.3.gz
 %%SITE_PERL%%/File/Type.pm
 %%SITE_PERL%%/File/Type/Builder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Type/.packlist
diff --git a/devel/p5-File-Util/Makefile b/devel/p5-File-Util/Makefile
index e06966914bfa..32a43406ae3d 100644
--- a/devel/p5-File-Util/Makefile
+++ b/devel/p5-File-Util/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Util
 PORTVERSION=	3.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-Util/pkg-plist b/devel/p5-File-Util/pkg-plist
index 884cdc7e432d..eb38502eea8b 100644
--- a/devel/p5-File-Util/pkg-plist
+++ b/devel/p5-File-Util/pkg-plist
@@ -29,5 +29,4 @@
 %%SITE_PERL%%/auto/File/Util/trunc.al
 %%SITE_PERL%%/auto/File/Util/unlock_open_handle.al
 %%SITE_PERL%%/auto/File/Util/use_flock.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Util/.packlist
 %%PERL5_MAN3%%/File::Util.3.gz
diff --git a/devel/p5-File-chdir/Makefile b/devel/p5-File-chdir/Makefile
index c3a532cb03cf..216b08c872b8 100644
--- a/devel/p5-File-chdir/Makefile
+++ b/devel/p5-File-chdir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-chdir
 PORTVERSION=	0.1009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-chdir/pkg-plist b/devel/p5-File-chdir/pkg-plist
index cdbe9fb4922d..000e065f936e 100644
--- a/devel/p5-File-chdir/pkg-plist
+++ b/devel/p5-File-chdir/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/File::chdir.3.gz
 %%SITE_PERL%%/File/chdir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/chdir/.packlist
diff --git a/devel/p5-File-chmod/Makefile b/devel/p5-File-chmod/Makefile
index 62bfaa884efe..4f7a97896e29 100644
--- a/devel/p5-File-chmod/Makefile
+++ b/devel/p5-File-chmod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-chmod
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-chmod/pkg-plist b/devel/p5-File-chmod/pkg-plist
index 97b1a720d891..1a6a9eba7144 100644
--- a/devel/p5-File-chmod/pkg-plist
+++ b/devel/p5-File-chmod/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/chmod/.packlist
 %%SITE_PERL%%/File/chmod.pm
 %%PERL5_MAN3%%/File::chmod.3.gz
diff --git a/devel/p5-File-pushd/Makefile b/devel/p5-File-pushd/Makefile
index 9645faa162d5..8972086df52c 100644
--- a/devel/p5-File-pushd/Makefile
+++ b/devel/p5-File-pushd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	File-pushd
 PORTVERSION=	1.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-File-pushd/pkg-plist b/devel/p5-File-pushd/pkg-plist
index 41cbc813231c..a7a85f05f857 100644
--- a/devel/p5-File-pushd/pkg-plist
+++ b/devel/p5-File-pushd/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/pushd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/pushd/.packlist
 %%PERL5_MAN3%%/File::pushd.3.gz
diff --git a/devel/p5-FileHandle-Fmode/Makefile b/devel/p5-FileHandle-Fmode/Makefile
index edb8d7fc04f3..ee1299d6012c 100644
--- a/devel/p5-FileHandle-Fmode/Makefile
+++ b/devel/p5-FileHandle-Fmode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FileHandle-Fmode
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-FileHandle-Fmode/pkg-plist b/devel/p5-FileHandle-Fmode/pkg-plist
index 26368cad3f63..0d0e05c582a8 100644
--- a/devel/p5-FileHandle-Fmode/pkg-plist
+++ b/devel/p5-FileHandle-Fmode/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/FileHandle/Fmode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FileHandle/Fmode/Fmode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FileHandle/Fmode/.packlist
+%%SITE_ARCH%%/FileHandle/Fmode.pm
+%%SITE_ARCH%%/auto/FileHandle/Fmode/Fmode.so
 %%PERL5_MAN3%%/FileHandle::Fmode.3.gz
diff --git a/devel/p5-FileHandle-Unget/Makefile b/devel/p5-FileHandle-Unget/Makefile
index 3e1a1520df9b..8152d2f2446e 100644
--- a/devel/p5-FileHandle-Unget/Makefile
+++ b/devel/p5-FileHandle-Unget/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FileHandle-Unget
 PORTVERSION=	0.1623
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-FileHandle-Unget/pkg-plist b/devel/p5-FileHandle-Unget/pkg-plist
index 54dba80cf289..c46a0dc76edf 100644
--- a/devel/p5-FileHandle-Unget/pkg-plist
+++ b/devel/p5-FileHandle-Unget/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/FileHandle::Unget.3.gz
 %%SITE_PERL%%/FileHandle/Unget.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FileHandle/Unget/.packlist
diff --git a/devel/p5-Filesys-Notify-KQueue/Makefile b/devel/p5-Filesys-Notify-KQueue/Makefile
index f4a99e85c36b..204fb29c9789 100644
--- a/devel/p5-Filesys-Notify-KQueue/Makefile
+++ b/devel/p5-Filesys-Notify-KQueue/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Filesys-Notify-KQueue
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Filesys-Notify-Simple/Makefile b/devel/p5-Filesys-Notify-Simple/Makefile
index 3dda02b85b33..d1fb44aa1a7e 100644
--- a/devel/p5-Filesys-Notify-Simple/Makefile
+++ b/devel/p5-Filesys-Notify-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Filesys-Notify-Simple
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-Filesys-Notify-Simple/pkg-plist b/devel/p5-Filesys-Notify-Simple/pkg-plist
index 1729a3829763..2bcf963f7c50 100644
--- a/devel/p5-Filesys-Notify-Simple/pkg-plist
+++ b/devel/p5-Filesys-Notify-Simple/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Notify/Simple/.packlist
 %%SITE_PERL%%/Filesys/Notify/Simple.pm
 %%PERL5_MAN3%%/Filesys::Notify::Simple.3.gz
diff --git a/devel/p5-Filesys-Virtual-Plain/Makefile b/devel/p5-Filesys-Virtual-Plain/Makefile
index 9a76b98eb9a9..0e0af5f9e244 100644
--- a/devel/p5-Filesys-Virtual-Plain/Makefile
+++ b/devel/p5-Filesys-Virtual-Plain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-Virtual-Plain
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Filesys-Virtual-Plain/pkg-plist b/devel/p5-Filesys-Virtual-Plain/pkg-plist
index 9e632aa6e174..67217b6dfbb1 100644
--- a/devel/p5-Filesys-Virtual-Plain/pkg-plist
+++ b/devel/p5-Filesys-Virtual-Plain/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Filesys/Virtual/Plain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual/Plain/.packlist
 %%PERL5_MAN3%%/Filesys::Virtual::Plain.3.gz
diff --git a/devel/p5-Filesys-Virtual/Makefile b/devel/p5-Filesys-Virtual/Makefile
index 9d945cd4b7c2..94c884ea8665 100644
--- a/devel/p5-Filesys-Virtual/Makefile
+++ b/devel/p5-Filesys-Virtual/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-Virtual
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Filesys-Virtual/pkg-plist b/devel/p5-Filesys-Virtual/pkg-plist
index 1a75f8168e9b..68c9c96e169c 100644
--- a/devel/p5-Filesys-Virtual/pkg-plist
+++ b/devel/p5-Filesys-Virtual/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Filesys/Virtual.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual/.packlist
 %%PERL5_MAN3%%/Filesys::Virtual.3.gz
diff --git a/devel/p5-Filter-Template/Makefile b/devel/p5-Filter-Template/Makefile
index 763b2ebcbc5e..da7e7ab0d46f 100644
--- a/devel/p5-Filter-Template/Makefile
+++ b/devel/p5-Filter-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filter-Template
 PORTVERSION=	1.043
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Filter-Template/pkg-plist b/devel/p5-Filter-Template/pkg-plist
index 817eefb6b600..6620b7451380 100644
--- a/devel/p5-Filter-Template/pkg-plist
+++ b/devel/p5-Filter-Template/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Filter::Template::UseBytes.3.gz
 %%SITE_PERL%%/Filter/Template.pm
 %%SITE_PERL%%/Filter/Template/UseBytes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Template/.packlist
diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index 3c19c80285af..5985b24d6d11 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filter
 PORTVERSION=	1.50
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RURBAN
diff --git a/devel/p5-Filter/pkg-plist b/devel/p5-Filter/pkg-plist
index fdb9d0ec89a5..042ec7afedd5 100644
--- a/devel/p5-Filter/pkg-plist
+++ b/devel/p5-Filter/pkg-plist
@@ -6,17 +6,16 @@
 %%PERL5_MAN3%%/Filter::exec.3.gz
 %%PERL5_MAN3%%/Filter::sh.3.gz
 %%PERL5_MAN3%%/Filter::tee.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/Util/Call.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/Util/Exec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/Util/filter-util.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/Util/perlfilter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/cpp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/decrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/exec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/sh.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/tee.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Util/Call/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Util/Call/Call.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Util/Exec/Exec.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/decrypt/decrypt.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/tee/tee.so
+%%SITE_ARCH%%/Filter/Util/Call.pm
+%%SITE_ARCH%%/Filter/Util/Exec.pm
+%%SITE_ARCH%%/Filter/Util/filter-util.pl
+%%SITE_ARCH%%/Filter/Util/perlfilter.pod
+%%SITE_ARCH%%/Filter/cpp.pm
+%%SITE_ARCH%%/Filter/decrypt.pm
+%%SITE_ARCH%%/Filter/exec.pm
+%%SITE_ARCH%%/Filter/sh.pm
+%%SITE_ARCH%%/Filter/tee.pm
+%%SITE_ARCH%%/auto/Filter/Util/Call/Call.so
+%%SITE_ARCH%%/auto/Filter/Util/Exec/Exec.so
+%%SITE_ARCH%%/auto/Filter/decrypt/decrypt.so
+%%SITE_ARCH%%/auto/Filter/tee/tee.so
diff --git a/devel/p5-Find-Lib/Makefile b/devel/p5-Find-Lib/Makefile
index 954b44316c61..4d04c1cb5ae4 100644
--- a/devel/p5-Find-Lib/Makefile
+++ b/devel/p5-Find-Lib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Find-Lib
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Find-Lib/pkg-plist b/devel/p5-Find-Lib/pkg-plist
index fa7db4253ca2..e7c1243b0d6e 100644
--- a/devel/p5-Find-Lib/pkg-plist
+++ b/devel/p5-Find-Lib/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Find/Lib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Find/Lib/.packlist
 %%PERL5_MAN3%%/Find::Lib.3.gz
diff --git a/devel/p5-FindBin-libs/Makefile b/devel/p5-FindBin-libs/Makefile
index 6f757c35a1ce..b126f3ce06f4 100644
--- a/devel/p5-FindBin-libs/Makefile
+++ b/devel/p5-FindBin-libs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	FindBin-libs
 PORTVERSION=	2.1100
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LEMBARK
diff --git a/devel/p5-FindBin-libs/pkg-plist b/devel/p5-FindBin-libs/pkg-plist
index 589cc65c9e1d..60815fff310a 100644
--- a/devel/p5-FindBin-libs/pkg-plist
+++ b/devel/p5-FindBin-libs/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_ARCH%%/auto/FindBin/libs/.packlist
 %%SITE_PERL%%/FindBin/libs.pm
 %%PERL5_MAN3%%/FindBin::libs.3.gz
diff --git a/devel/p5-Forest/Makefile b/devel/p5-Forest/Makefile
index 9d1b0724b00b..efc4fe4b267b 100644
--- a/devel/p5-Forest/Makefile
+++ b/devel/p5-Forest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Forest
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STEVAN
diff --git a/devel/p5-Forest/pkg-plist b/devel/p5-Forest/pkg-plist
index 488f6f196d90..51c73a8ddf17 100644
--- a/devel/p5-Forest/pkg-plist
+++ b/devel/p5-Forest/pkg-plist
@@ -40,4 +40,3 @@
 %%SITE_PERL%%/Forest/Tree/Writer/ASCIIWithBranches.pm
 %%SITE_PERL%%/Forest/Tree/Writer/SimpleASCII.pm
 %%SITE_PERL%%/Forest/Tree/Writer/SimpleHTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Forest/.packlist
diff --git a/devel/p5-Form-Sensible/Makefile b/devel/p5-Form-Sensible/Makefile
index 2a515c6279ab..e323d26f9583 100644
--- a/devel/p5-Form-Sensible/Makefile
+++ b/devel/p5-Form-Sensible/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Form-Sensible
 PORTVERSION=	0.20.023
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Form-Sensible/pkg-plist b/devel/p5-Form-Sensible/pkg-plist
index d58c1127ce31..19d81e8b39a6 100644
--- a/devel/p5-Form-Sensible/pkg-plist
+++ b/devel/p5-Form-Sensible/pkg-plist
@@ -46,7 +46,6 @@
 %%SITE_PERL%%/auto/share/dist/Form-Sensible/templates/table/subform_end.tt
 %%SITE_PERL%%/auto/share/dist/Form-Sensible/templates/table/subform_messages.tt
 %%SITE_PERL%%/auto/share/dist/Form-Sensible/templates/table/subform_start.tt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Form/Sensible/.packlist
 %%PERL5_MAN3%%/Form::Sensible.3.gz
 %%PERL5_MAN3%%/Form::Sensible::DelegateConnection.3.gz
 %%PERL5_MAN3%%/Form::Sensible::Delegation.3.gz
diff --git a/devel/p5-FreeBSD-i386-Ptrace/Makefile b/devel/p5-FreeBSD-i386-Ptrace/Makefile
index 56578f4627d2..d5ec9c2da3f7 100644
--- a/devel/p5-FreeBSD-i386-Ptrace/Makefile
+++ b/devel/p5-FreeBSD-i386-Ptrace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-i386-Ptrace
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-FreeBSD-i386-Ptrace/pkg-plist b/devel/p5-FreeBSD-i386-Ptrace/pkg-plist
index 23bafbbd272e..c4b3411e1ed4 100644
--- a/devel/p5-FreeBSD-i386-Ptrace/pkg-plist
+++ b/devel/p5-FreeBSD-i386-Ptrace/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/FreeBSD/i386/Ptrace/Syscall.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreeBSD/i386/Ptrace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/i386/Ptrace/Ptrace.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/i386/Ptrace/.packlist
+%%SITE_ARCH%%/FreeBSD/i386/Ptrace/Syscall.pm
+%%SITE_ARCH%%/FreeBSD/i386/Ptrace.pm
+%%SITE_ARCH%%/auto/FreeBSD/i386/Ptrace/Ptrace.so
 %%PERL5_MAN3%%/FreeBSD::i386::Ptrace.3.gz
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index 406a25541cdf..3aa4d12f6943 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreezeThaw
 PORTVERSION=	0.50.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-FreezeThaw/pkg-plist b/devel/p5-FreezeThaw/pkg-plist
index f5297f442dc5..28646be094ee 100644
--- a/devel/p5-FreezeThaw/pkg-plist
+++ b/devel/p5-FreezeThaw/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/FreezeThaw.3.gz
 %%SITE_PERL%%/FreezeThaw.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreezeThaw/.packlist
diff --git a/devel/p5-Function-Parameters/Makefile b/devel/p5-Function-Parameters/Makefile
index 5173f8a1e00d..42c801dbd475 100644
--- a/devel/p5-Function-Parameters/Makefile
+++ b/devel/p5-Function-Parameters/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Function-Parameters
 PORTVERSION=	1.04.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAUKE
diff --git a/devel/p5-Function-Parameters/pkg-plist b/devel/p5-Function-Parameters/pkg-plist
index a3afa26b4492..81453a3ff383 100644
--- a/devel/p5-Function-Parameters/pkg-plist
+++ b/devel/p5-Function-Parameters/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Function/Parameters.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Function/Parameters/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Function/Parameters/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Function/Parameters/Parameters.so
+%%SITE_ARCH%%/Function/Parameters.pm
+%%SITE_ARCH%%/Function/Parameters/Info.pm
+%%SITE_ARCH%%/auto/Function/Parameters/Parameters.so
 %%PERL5_MAN3%%/Function::Parameters.3.gz
 %%PERL5_MAN3%%/Function::Parameters::Info.3.gz
diff --git a/devel/p5-Future/Makefile b/devel/p5-Future/Makefile
index 3edd77595910..800e7f9d3f79 100644
--- a/devel/p5-Future/Makefile
+++ b/devel/p5-Future/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Future
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/devel/p5-Future/pkg-plist b/devel/p5-Future/pkg-plist
index 754bc4d1d418..0424f2b1c1b7 100644
--- a/devel/p5-Future/pkg-plist
+++ b/devel/p5-Future/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Future/Phrasebook.pod
 %%SITE_PERL%%/Future/Utils.pm
 %%SITE_PERL%%/Test/Future.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Future/.packlist
 %%PERL5_MAN3%%/Future.3.gz
 %%PERL5_MAN3%%/Future::Phrasebook.3.gz
 %%PERL5_MAN3%%/Future::Utils.3.gz
diff --git a/devel/p5-Gearman-Client-Async/Makefile b/devel/p5-Gearman-Client-Async/Makefile
index 828a4df32488..3bf717e81070 100644
--- a/devel/p5-Gearman-Client-Async/Makefile
+++ b/devel/p5-Gearman-Client-Async/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gearman-Client-Async
 PORTVERSION=	0.94
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
diff --git a/devel/p5-Gearman-Client-Async/pkg-plist b/devel/p5-Gearman-Client-Async/pkg-plist
index dc3229c246b8..9e25d303a0ab 100644
--- a/devel/p5-Gearman-Client-Async/pkg-plist
+++ b/devel/p5-Gearman-Client-Async/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Gearman::Client::Async.3.gz
 %%SITE_PERL%%/Gearman/Client/Async.pm
 %%SITE_PERL%%/Gearman/Client/Async/Connection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gearman/Client/Async/.packlist
diff --git a/devel/p5-Gearman-Server/Makefile b/devel/p5-Gearman-Server/Makefile
index 6959ccadc54b..46175be28fcd 100644
--- a/devel/p5-Gearman-Server/Makefile
+++ b/devel/p5-Gearman-Server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gearman-Server
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DORMANDO
diff --git a/devel/p5-Gearman-Server/pkg-plist b/devel/p5-Gearman-Server/pkg-plist
index ce4002b37faa..39874e723960 100644
--- a/devel/p5-Gearman-Server/pkg-plist
+++ b/devel/p5-Gearman-Server/pkg-plist
@@ -4,6 +4,5 @@ man/man1/gearmand.1.gz
 %%SITE_PERL%%/Gearman/Server/Client.pm
 %%SITE_PERL%%/Gearman/Server/Listener.pm
 %%SITE_PERL%%/Gearman/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gearman/Server/.packlist
 %%PERL5_MAN3%%/Gearman::Server.3.gz
 %%PERL5_MAN3%%/Gearman::Server::Client.3.gz
diff --git a/devel/p5-Gearman-XS/Makefile b/devel/p5-Gearman-XS/Makefile
index 6c47f1c01c42..ac4df476f9d3 100644
--- a/devel/p5-Gearman-XS/Makefile
+++ b/devel/p5-Gearman-XS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gearman-XS
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DSCHOEN
diff --git a/devel/p5-Gearman-XS/pkg-plist b/devel/p5-Gearman-XS/pkg-plist
index cbe3412c1130..817f8a3ae489 100644
--- a/devel/p5-Gearman-XS/pkg-plist
+++ b/devel/p5-Gearman-XS/pkg-plist
@@ -1,10 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gearman/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gearman/XS/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gearman/XS/Job.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gearman/XS/Task.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gearman/XS/Worker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gearman/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gearman/XS/XS.so
+%%SITE_ARCH%%/Gearman/XS.pm
+%%SITE_ARCH%%/Gearman/XS/Client.pm
+%%SITE_ARCH%%/Gearman/XS/Job.pm
+%%SITE_ARCH%%/Gearman/XS/Task.pm
+%%SITE_ARCH%%/Gearman/XS/Worker.pm
+%%SITE_ARCH%%/auto/Gearman/XS/XS.so
 %%PERL5_MAN3%%/Gearman::XS.3.gz
 %%PERL5_MAN3%%/Gearman::XS::Client.3.gz
 %%PERL5_MAN3%%/Gearman::XS::Job.3.gz
diff --git a/devel/p5-Gearman/Makefile b/devel/p5-Gearman/Makefile
index 1f226874d3bf..c1dcd6757d3f 100644
--- a/devel/p5-Gearman/Makefile
+++ b/devel/p5-Gearman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gearman
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DORMANDO
@@ -25,12 +26,8 @@ PLIST_FILES=	%%SITE_PERL%%/Gearman/Client.pm \
 		%%SITE_PERL%%/Gearman/Taskset.pm \
 		%%SITE_PERL%%/Gearman/Util.pm \
 		%%SITE_PERL%%/Gearman/Worker.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gearman/.packlist \
 		%%PERL5_MAN3%%/Gearman::Client.3.gz \
 		%%PERL5_MAN3%%/Gearman::Task.3.gz \
 		%%PERL5_MAN3%%/Gearman::Worker.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gearman \
-		%%SITE_PERL%%/Gearman/ResponseParser \
-		%%SITE_PERL%%/Gearman
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Geo-JSON/Makefile b/devel/p5-Geo-JSON/Makefile
index fd6c9f3ddbf2..62c22ee7c423 100644
--- a/devel/p5-Geo-JSON/Makefile
+++ b/devel/p5-Geo-JSON/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-JSON
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Geo-JSON/pkg-plist b/devel/p5-Geo-JSON/pkg-plist
index 01043224b2d5..0ca4169ae3dc 100644
--- a/devel/p5-Geo-JSON/pkg-plist
+++ b/devel/p5-Geo-JSON/pkg-plist
@@ -14,7 +14,6 @@
 %%SITE_PERL%%/Geo/JSON/Role/ToJson.pm
 %%SITE_PERL%%/Geo/JSON/Types.pm
 %%SITE_PERL%%/Geo/JSON/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/JSON/.packlist
 %%PERL5_MAN3%%/Geo::JSON.3.gz
 %%PERL5_MAN3%%/Geo::JSON::Base.3.gz
 %%PERL5_MAN3%%/Geo::JSON::CRS.3.gz
diff --git a/devel/p5-Geo-ShapeFile/Makefile b/devel/p5-Geo-ShapeFile/Makefile
index 57f799e40245..b33dd0f8273b 100644
--- a/devel/p5-Geo-ShapeFile/Makefile
+++ b/devel/p5-Geo-ShapeFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-ShapeFile
 PORTVERSION=	2.52
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Geo-ShapeFile/pkg-plist b/devel/p5-Geo-ShapeFile/pkg-plist
index 065891171437..3827f866b9f9 100644
--- a/devel/p5-Geo-ShapeFile/pkg-plist
+++ b/devel/p5-Geo-ShapeFile/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Geo/ShapeFile.pm
 %%SITE_PERL%%/Geo/ShapeFile/Point.pm
 %%SITE_PERL%%/Geo/ShapeFile/Shape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/ShapeFile/.packlist
 %%PERL5_MAN3%%/Geo::ShapeFile.3.gz
 %%PERL5_MAN3%%/Geo::ShapeFile::Point.3.gz
 %%PERL5_MAN3%%/Geo::ShapeFile::Shape.3.gz
diff --git a/devel/p5-Getargs-Long/Makefile b/devel/p5-Getargs-Long/Makefile
index a765dd4fe905..34269309e106 100644
--- a/devel/p5-Getargs-Long/Makefile
+++ b/devel/p5-Getargs-Long/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getargs-Long
 PORTVERSION=	1.1003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getargs-Long/pkg-plist b/devel/p5-Getargs-Long/pkg-plist
index 573086f87356..c2ac5332382c 100644
--- a/devel/p5-Getargs-Long/pkg-plist
+++ b/devel/p5-Getargs-Long/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Getargs::Long.3.gz
 %%SITE_PERL%%/Getargs/Long.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs/Long/.packlist
diff --git a/devel/p5-Getopt-ArgvFile/Makefile b/devel/p5-Getopt-ArgvFile/Makefile
index e9d307036f86..7eeac998b21c 100644
--- a/devel/p5-Getopt-ArgvFile/Makefile
+++ b/devel/p5-Getopt-ArgvFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-ArgvFile
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-ArgvFile/pkg-plist b/devel/p5-Getopt-ArgvFile/pkg-plist
index cbf4077d6d5d..c58665083b8f 100644
--- a/devel/p5-Getopt-ArgvFile/pkg-plist
+++ b/devel/p5-Getopt-ArgvFile/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Getopt::ArgvFile.3.gz
 %%SITE_PERL%%/Getopt/ArgvFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/ArgvFile/.packlist
diff --git a/devel/p5-Getopt-Attribute/Makefile b/devel/p5-Getopt-Attribute/Makefile
index 7dd8063d582c..568dd4b62937 100644
--- a/devel/p5-Getopt-Attribute/Makefile
+++ b/devel/p5-Getopt-Attribute/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Attribute
 PORTVERSION=	2.101700
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-Attribute/pkg-plist b/devel/p5-Getopt-Attribute/pkg-plist
index 7fe70c7a30ad..5672d85f92fc 100644
--- a/devel/p5-Getopt-Attribute/pkg-plist
+++ b/devel/p5-Getopt-Attribute/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Getopt/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Attribute/.packlist
 %%PERL5_MAN3%%/Getopt::Attribute.3.gz
diff --git a/devel/p5-Getopt-Compact-WithCmd/Makefile b/devel/p5-Getopt-Compact-WithCmd/Makefile
index 083ff6609048..26843d9d7fb6 100644
--- a/devel/p5-Getopt-Compact-WithCmd/Makefile
+++ b/devel/p5-Getopt-Compact-WithCmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Compact-WithCmd
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-Compact/Makefile b/devel/p5-Getopt-Compact/Makefile
index 079cfa705ae6..61785971ac41 100644
--- a/devel/p5-Getopt-Compact/Makefile
+++ b/devel/p5-Getopt-Compact/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Compact
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-Compact/pkg-plist b/devel/p5-Getopt-Compact/pkg-plist
index eaec48de017b..0b9efcaf738f 100644
--- a/devel/p5-Getopt-Compact/pkg-plist
+++ b/devel/p5-Getopt-Compact/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Getopt::Compact::PodMunger.3.gz
 %%SITE_PERL%%/Getopt/Compact.pm
 %%SITE_PERL%%/Getopt/Compact/PodMunger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Compact/.packlist
diff --git a/devel/p5-Getopt-Declare/Makefile b/devel/p5-Getopt-Declare/Makefile
index 6f2355fdfbad..aeede656b72b 100644
--- a/devel/p5-Getopt-Declare/Makefile
+++ b/devel/p5-Getopt-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Declare
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-Declare/pkg-plist b/devel/p5-Getopt-Declare/pkg-plist
index aca82f8fbe45..af57a7692200 100644
--- a/devel/p5-Getopt-Declare/pkg-plist
+++ b/devel/p5-Getopt-Declare/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Declare/.packlist
 %%SITE_PERL%%/Getopt/Declare.pm
 %%PERL5_MAN3%%/Getopt::Declare.3.gz
diff --git a/devel/p5-Getopt-Euclid/Makefile b/devel/p5-Getopt-Euclid/Makefile
index 99f4f69ee751..673855ecafda 100644
--- a/devel/p5-Getopt-Euclid/Makefile
+++ b/devel/p5-Getopt-Euclid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Euclid
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-Euclid/pkg-plist b/devel/p5-Getopt-Euclid/pkg-plist
index 0c5e08f08118..716ed4989b23 100644
--- a/devel/p5-Getopt-Euclid/pkg-plist
+++ b/devel/p5-Getopt-Euclid/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Getopt::Euclid.3.gz
 %%SITE_PERL%%/Getopt/Euclid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Euclid/.packlist
diff --git a/devel/p5-Getopt-GUI-Long/Makefile b/devel/p5-Getopt-GUI-Long/Makefile
index ac49cd5a9e8e..409fe8aab718 100644
--- a/devel/p5-Getopt-GUI-Long/Makefile
+++ b/devel/p5-Getopt-GUI-Long/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-GUI-Long
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-GUI-Long/pkg-plist b/devel/p5-Getopt-GUI-Long/pkg-plist
index b2574258b280..686914b5c446 100644
--- a/devel/p5-Getopt-GUI-Long/pkg-plist
+++ b/devel/p5-Getopt-GUI-Long/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Getopt/GUI/Long.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/GUI/Long/.packlist
 %%PERL5_MAN3%%/Getopt::GUI::Long.3.gz
diff --git a/devel/p5-Getopt-Long-Descriptive/Makefile b/devel/p5-Getopt-Long-Descriptive/Makefile
index 549c028cb185..d7da08364907 100644
--- a/devel/p5-Getopt-Long-Descriptive/Makefile
+++ b/devel/p5-Getopt-Long-Descriptive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Long-Descriptive
 PORTVERSION=	0.097
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-Long-Descriptive/pkg-plist b/devel/p5-Getopt-Long-Descriptive/pkg-plist
index d60cf30f0a0a..f5f20204f23b 100644
--- a/devel/p5-Getopt-Long-Descriptive/pkg-plist
+++ b/devel/p5-Getopt-Long-Descriptive/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Getopt/Long/Descriptive.pm
 %%SITE_PERL%%/Getopt/Long/Descriptive/Opts.pm
 %%SITE_PERL%%/Getopt/Long/Descriptive/Usage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Long/Descriptive/.packlist
 %%PERL5_MAN3%%/Getopt::Long::Descriptive.3.gz
 %%PERL5_MAN3%%/Getopt::Long::Descriptive::Opts.3.gz
 %%PERL5_MAN3%%/Getopt::Long::Descriptive::Usage.3.gz
diff --git a/devel/p5-Getopt-Long/Makefile b/devel/p5-Getopt-Long/Makefile
index 5f82bcf74e8a..159e2b2d5f43 100644
--- a/devel/p5-Getopt-Long/Makefile
+++ b/devel/p5-Getopt-Long/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Long
 PORTVERSION=	2.39
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Getopt-Long/pkg-plist b/devel/p5-Getopt-Long/pkg-plist
index 3cd3eaf8c00e..3dc1e88d028e 100644
--- a/devel/p5-Getopt-Long/pkg-plist
+++ b/devel/p5-Getopt-Long/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Getopt::Long.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Long/.packlist
 %%SITE_PERL%%/newgetopt.pl
 %%SITE_PERL%%/Getopt/Long.pm
diff --git a/devel/p5-Git-PurePerl/Makefile b/devel/p5-Git-PurePerl/Makefile
index 54b4267cb0ee..61df85d5769a 100644
--- a/devel/p5-Git-PurePerl/Makefile
+++ b/devel/p5-Git-PurePerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Git-PurePerl
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BROQ
diff --git a/devel/p5-Git-PurePerl/pkg-plist b/devel/p5-Git-PurePerl/pkg-plist
index d4e69fcc4f8e..9e059d8dcc0c 100644
--- a/devel/p5-Git-PurePerl/pkg-plist
+++ b/devel/p5-Git-PurePerl/pkg-plist
@@ -25,4 +25,3 @@
 %%SITE_PERL%%/Git/PurePerl/Protocol/File.pm
 %%SITE_PERL%%/Git/PurePerl/Protocol/Git.pm
 %%SITE_PERL%%/Git/PurePerl/Protocol/SSH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/PurePerl/.packlist
diff --git a/devel/p5-Git-Repository-Plugin-Log/Makefile b/devel/p5-Git-Repository-Plugin-Log/Makefile
index 833f15c2c9f3..2a8b127534ab 100644
--- a/devel/p5-Git-Repository-Plugin-Log/Makefile
+++ b/devel/p5-Git-Repository-Plugin-Log/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Git-Repository-Plugin-Log
 PORTVERSION=	1.312
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Git-Repository-Plugin-Log/pkg-plist b/devel/p5-Git-Repository-Plugin-Log/pkg-plist
index ea7e67ac2dc7..b4d18d826237 100644
--- a/devel/p5-Git-Repository-Plugin-Log/pkg-plist
+++ b/devel/p5-Git-Repository-Plugin-Log/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Git/Repository/Log.pm
 %%SITE_PERL%%/Git/Repository/Log/Iterator.pm
 %%SITE_PERL%%/Git/Repository/Plugin/Log.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/Repository/Plugin/Log/.packlist
 %%PERL5_MAN3%%/Git::Repository::Log.3.gz
 %%PERL5_MAN3%%/Git::Repository::Log::Iterator.3.gz
 %%PERL5_MAN3%%/Git::Repository::Plugin::Log.3.gz
diff --git a/devel/p5-Git-Repository/Makefile b/devel/p5-Git-Repository/Makefile
index 9c6d8bd04709..764c727d72c6 100644
--- a/devel/p5-Git-Repository/Makefile
+++ b/devel/p5-Git-Repository/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Git-Repository
 PORTVERSION=	1.312
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOOK
diff --git a/devel/p5-Git-Repository/pkg-plist b/devel/p5-Git-Repository/pkg-plist
index d06c2a1c8420..dfe094903a60 100644
--- a/devel/p5-Git-Repository/pkg-plist
+++ b/devel/p5-Git-Repository/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Git/Repository/Plugin.pm
 %%SITE_PERL%%/Git/Repository/Tutorial.pod
 %%SITE_PERL%%/Test/Git.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/Repository/.packlist
diff --git a/devel/p5-Git-Sub/Makefile b/devel/p5-Git-Sub/Makefile
index 4f147f724ceb..a942b0fdfcc7 100644
--- a/devel/p5-Git-Sub/Makefile
+++ b/devel/p5-Git-Sub/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Git-Sub
 PORTVERSION=	0.130270
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Git-Sub/pkg-plist b/devel/p5-Git-Sub/pkg-plist
index a14513452e83..b29e4dbca9b5 100644
--- a/devel/p5-Git-Sub/pkg-plist
+++ b/devel/p5-Git-Sub/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Git/Sub.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/Sub/.packlist
 %%PERL5_MAN3%%/Git::Sub.3.gz
diff --git a/devel/p5-Git-Wrapper/Makefile b/devel/p5-Git-Wrapper/Makefile
index 3a3e50a750de..5eae7fbeb3ff 100644
--- a/devel/p5-Git-Wrapper/Makefile
+++ b/devel/p5-Git-Wrapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Git-Wrapper
 PORTVERSION=	0.038
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Git-Wrapper/pkg-plist b/devel/p5-Git-Wrapper/pkg-plist
index 649ade46bc2c..48c3c7f9f2ca 100644
--- a/devel/p5-Git-Wrapper/pkg-plist
+++ b/devel/p5-Git-Wrapper/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/Git/Wrapper/Log.pm
 %%SITE_PERL%%/Git/Wrapper/Status.pm
 %%SITE_PERL%%/Git/Wrapper/Statuses.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/Wrapper/.packlist
diff --git a/devel/p5-Glib-Object-Introspection/Makefile b/devel/p5-Glib-Object-Introspection/Makefile
index e591ef8e6860..7e8f9e3c9e3b 100644
--- a/devel/p5-Glib-Object-Introspection/Makefile
+++ b/devel/p5-Glib-Object-Introspection/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Glib-Object-Introspection
 PORTVERSION=	0.025
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -32,8 +33,8 @@ TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics
 			${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20
 
 post-install:
-	${CHMOD} u+w ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Glib/Object/Introspection/Introspection.so
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Glib/Object/Introspection/Introspection.so
-	${CHMOD} u-w ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Glib/Object/Introspection/Introspection.so
+	${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Glib/Object/Introspection/Introspection.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Glib/Object/Introspection/Introspection.so
+	${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Glib/Object/Introspection/Introspection.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Glib-Object-Introspection/pkg-plist b/devel/p5-Glib-Object-Introspection/pkg-plist
index b8b095c898cc..9f2f30858828 100644
--- a/devel/p5-Glib-Object-Introspection/pkg-plist
+++ b/devel/p5-Glib-Object-Introspection/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Object/Introspection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Object/Introspection/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Glib/Object/Introspection/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Glib/Object/Introspection/Introspection.so
+%%SITE_ARCH%%/Glib/Object/Introspection.pm
+%%SITE_ARCH%%/Glib/Object/Introspection/Install/Files.pm
+%%SITE_ARCH%%/auto/Glib/Object/Introspection/Introspection.so
 %%PERL5_MAN3%%/Glib::Object::Introspection.3.gz
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index 63ae0877975d..564a836f4b4c 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Glib
 PORTVERSION=	1.305
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN/${PORTNAME} SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Glib2/pkg-plist b/devel/p5-Glib2/pkg-plist
index 4521f2491882..bdde93ffbc57 100644
--- a/devel/p5-Glib2/pkg-plist
+++ b/devel/p5-Glib2/pkg-plist
@@ -1,43 +1,42 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/BookmarkFile.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Boxed.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/CodeGen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Flags.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/GenPod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Install/gperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Install/gperl_marshal.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Install/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/KeyFile.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Log.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/MainLoop.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/MakeHelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Markup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Object.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Object/Subclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/OptionGroup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/OptionContext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/Double.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/Enum.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/Flags.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/GType.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/Int.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/Int64.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/UInt.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param/UInt64.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/ParamSpec.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/ParseXSDoc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Signal.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Type.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Utils.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/devel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Glib/xsapi.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Glib/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Glib/Glib.so
+%%SITE_ARCH%%/Glib.pm
+%%SITE_ARCH%%/Glib/BookmarkFile.pod
+%%SITE_ARCH%%/Glib/Boxed.pod
+%%SITE_ARCH%%/Glib/CodeGen.pm
+%%SITE_ARCH%%/Glib/Error.pod
+%%SITE_ARCH%%/Glib/Flags.pod
+%%SITE_ARCH%%/Glib/GenPod.pm
+%%SITE_ARCH%%/Glib/Install/Files.pm
+%%SITE_ARCH%%/Glib/Install/doctypes
+%%SITE_ARCH%%/Glib/Install/gperl.h
+%%SITE_ARCH%%/Glib/Install/gperl_marshal.h
+%%SITE_ARCH%%/Glib/Install/typemap
+%%SITE_ARCH%%/Glib/KeyFile.pod
+%%SITE_ARCH%%/Glib/Log.pod
+%%SITE_ARCH%%/Glib/MainLoop.pod
+%%SITE_ARCH%%/Glib/MakeHelper.pm
+%%SITE_ARCH%%/Glib/Markup.pod
+%%SITE_ARCH%%/Glib/Object.pod
+%%SITE_ARCH%%/Glib/Object/Subclass.pm
+%%SITE_ARCH%%/Glib/OptionGroup.pod
+%%SITE_ARCH%%/Glib/OptionContext.pod
+%%SITE_ARCH%%/Glib/Param/Double.pod
+%%SITE_ARCH%%/Glib/Param/Enum.pod
+%%SITE_ARCH%%/Glib/Param/Flags.pod
+%%SITE_ARCH%%/Glib/Param/GType.pod
+%%SITE_ARCH%%/Glib/Param/Int.pod
+%%SITE_ARCH%%/Glib/Param/Int64.pod
+%%SITE_ARCH%%/Glib/Param/UInt.pod
+%%SITE_ARCH%%/Glib/Param/UInt64.pod
+%%SITE_ARCH%%/Glib/ParamSpec.pod
+%%SITE_ARCH%%/Glib/ParseXSDoc.pm
+%%SITE_ARCH%%/Glib/Signal.pod
+%%SITE_ARCH%%/Glib/Type.pod
+%%SITE_ARCH%%/Glib/Utils.pod
+%%SITE_ARCH%%/Glib/devel.pod
+%%SITE_ARCH%%/Glib/index.pod
+%%SITE_ARCH%%/Glib/version.pod
+%%SITE_ARCH%%/Glib/xsapi.pod
+%%SITE_ARCH%%/auto/Glib/Glib.so
 %%PERL5_MAN3%%/Glib.3.gz
 %%PERL5_MAN3%%/Glib::BookmarkFile.3.gz
 %%PERL5_MAN3%%/Glib::Boxed.3.gz
diff --git a/devel/p5-Gnome2-GConf/Makefile b/devel/p5-Gnome2-GConf/Makefile
index 4c3f7f56d498..b02ba383e051 100644
--- a/devel/p5-Gnome2-GConf/Makefile
+++ b/devel/p5-Gnome2-GConf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gnome2-GConf
 PORTVERSION=	1.044
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Gnome2-GConf/pkg-plist b/devel/p5-Gnome2-GConf/pkg-plist
index 5ffdf268b3a6..45b2cd9e7fe7 100644
--- a/devel/p5-Gnome2-GConf/pkg-plist
+++ b/devel/p5-Gnome2-GConf/pkg-plist
@@ -8,22 +8,21 @@
 %%PERL5_MAN3%%/Gnome2::GConf::index.3.gz
 %%PERL5_MAN3%%/Gnome2::GConf::main.3.gz
 %%PERL5_MAN3%%/Gnome2::GConf::version.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/ChangeSet.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Client.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Engine.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Entry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install/gconf.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install/gconfperl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install/gconfperl-version.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install/gconfperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install/gconfperl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Schema.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Value.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/main.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/GConf/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/GConf/GConf.so
+%%SITE_ARCH%%/Gnome2/GConf.pm
+%%SITE_ARCH%%/Gnome2/GConf/ChangeSet.pod
+%%SITE_ARCH%%/Gnome2/GConf/Client.pod
+%%SITE_ARCH%%/Gnome2/GConf/Engine.pod
+%%SITE_ARCH%%/Gnome2/GConf/Entry.pod
+%%SITE_ARCH%%/Gnome2/GConf/Install/Files.pm
+%%SITE_ARCH%%/Gnome2/GConf/Install/doctypes
+%%SITE_ARCH%%/Gnome2/GConf/Install/gconf.typemap
+%%SITE_ARCH%%/Gnome2/GConf/Install/gconfperl-autogen.h
+%%SITE_ARCH%%/Gnome2/GConf/Install/gconfperl-version.h
+%%SITE_ARCH%%/Gnome2/GConf/Install/gconfperl.h
+%%SITE_ARCH%%/Gnome2/GConf/Install/gconfperl.typemap
+%%SITE_ARCH%%/Gnome2/GConf/Schema.pod
+%%SITE_ARCH%%/Gnome2/GConf/Value.pod
+%%SITE_ARCH%%/Gnome2/GConf/index.pod
+%%SITE_ARCH%%/Gnome2/GConf/main.pod
+%%SITE_ARCH%%/Gnome2/GConf/version.pod
+%%SITE_ARCH%%/auto/Gnome2/GConf/GConf.so
diff --git a/devel/p5-Goo-Canvas/Makefile b/devel/p5-Goo-Canvas/Makefile
index 4f4fd8d55ecf..af62ac26ec33 100644
--- a/devel/p5-Goo-Canvas/Makefile
+++ b/devel/p5-Goo-Canvas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Goo-Canvas
 PORTVERSION=	0.06
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Goo-Canvas/pkg-plist b/devel/p5-Goo-Canvas/pkg-plist
index 032e5cc123f1..eed843a87650 100644
--- a/devel/p5-Goo-Canvas/pkg-plist
+++ b/devel/p5-Goo-Canvas/pkg-plist
@@ -2,43 +2,42 @@ bin/perlmine.pl
 bin/perltetris.pl
 man/man1/perlmine.pl.1.gz
 man/man1/perltetris.pl.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Cairo/Matrix.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Cairo/Pattern.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Bounds.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Ellipse.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/EllipseModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Group.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/GroupModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Image.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/ImageModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Install/goocanvas-perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Install/goocanvas-perl-version.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Install/goocanvas-perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Install/goocanvas-perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Install/goocanvas.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Item.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/ItemModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/ItemSimple.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/LineDash.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Path.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/PathModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Points.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Polyline.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/PolylineModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Rect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/RectModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Style.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Table.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/TableModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Text.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/TextModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/Widget.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Goo/Canvas/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Goo/Canvas/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Goo/Canvas/Canvas.so
+%%SITE_ARCH%%/Goo/Cairo/Matrix.pod
+%%SITE_ARCH%%/Goo/Cairo/Pattern.pod
+%%SITE_ARCH%%/Goo/Canvas.pm
+%%SITE_ARCH%%/Goo/Canvas.pod
+%%SITE_ARCH%%/Goo/Canvas/Bounds.pod
+%%SITE_ARCH%%/Goo/Canvas/Ellipse.pod
+%%SITE_ARCH%%/Goo/Canvas/EllipseModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Group.pod
+%%SITE_ARCH%%/Goo/Canvas/GroupModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Image.pod
+%%SITE_ARCH%%/Goo/Canvas/ImageModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Install/Files.pm
+%%SITE_ARCH%%/Goo/Canvas/Install/goocanvas-perl-autogen.h
+%%SITE_ARCH%%/Goo/Canvas/Install/goocanvas-perl-version.h
+%%SITE_ARCH%%/Goo/Canvas/Install/goocanvas-perl.h
+%%SITE_ARCH%%/Goo/Canvas/Install/goocanvas-perl.typemap
+%%SITE_ARCH%%/Goo/Canvas/Install/goocanvas.typemap
+%%SITE_ARCH%%/Goo/Canvas/Item.pod
+%%SITE_ARCH%%/Goo/Canvas/ItemModel.pod
+%%SITE_ARCH%%/Goo/Canvas/ItemSimple.pod
+%%SITE_ARCH%%/Goo/Canvas/LineDash.pod
+%%SITE_ARCH%%/Goo/Canvas/Path.pod
+%%SITE_ARCH%%/Goo/Canvas/PathModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Points.pod
+%%SITE_ARCH%%/Goo/Canvas/Polyline.pod
+%%SITE_ARCH%%/Goo/Canvas/PolylineModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Rect.pod
+%%SITE_ARCH%%/Goo/Canvas/RectModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Style.pod
+%%SITE_ARCH%%/Goo/Canvas/Table.pod
+%%SITE_ARCH%%/Goo/Canvas/TableModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Text.pod
+%%SITE_ARCH%%/Goo/Canvas/TextModel.pod
+%%SITE_ARCH%%/Goo/Canvas/Widget.pod
+%%SITE_ARCH%%/Goo/Canvas/index.pod
+%%SITE_ARCH%%/auto/Goo/Canvas/Canvas.so
 %%PERL5_MAN3%%/Goo::Cairo::Matrix.3.gz
 %%PERL5_MAN3%%/Goo::Cairo::Pattern.3.gz
 %%PERL5_MAN3%%/Goo::Canvas.3.gz
diff --git a/devel/p5-Google-Checkout/Makefile b/devel/p5-Google-Checkout/Makefile
index f97e71614d2f..42cfc2aa49e7 100644
--- a/devel/p5-Google-Checkout/Makefile
+++ b/devel/p5-Google-Checkout/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Google-Checkout
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	devel www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Google-Checkout/pkg-plist b/devel/p5-Google-Checkout/pkg-plist
index 5f44ebf17716..4df8d16e3969 100644
--- a/devel/p5-Google-Checkout/pkg-plist
+++ b/devel/p5-Google-Checkout/pkg-plist
@@ -91,4 +91,3 @@
 %%SITE_PERL%%/Google/Checkout/XML/Constants.pm
 %%SITE_PERL%%/Google/Checkout/XML/NotificationResponseXmlWriter.pm
 %%SITE_PERL%%/Google/Checkout/XML/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google-Checkout/.packlist
diff --git a/devel/p5-Google-ProtocolBuffers/Makefile b/devel/p5-Google-ProtocolBuffers/Makefile
index 5f8ed0a6855b..2b778ece2d99 100644
--- a/devel/p5-Google-ProtocolBuffers/Makefile
+++ b/devel/p5-Google-ProtocolBuffers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Google-ProtocolBuffers
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Google-ProtocolBuffers/pkg-plist b/devel/p5-Google-ProtocolBuffers/pkg-plist
index 4f1ffcf12683..12a5aa5a5dc2 100644
--- a/devel/p5-Google-ProtocolBuffers/pkg-plist
+++ b/devel/p5-Google-ProtocolBuffers/pkg-plist
@@ -6,5 +6,4 @@ bin/protoc-perl
 %%SITE_PERL%%/Google/ProtocolBuffers/CodecIV64.pm
 %%SITE_PERL%%/Google/ProtocolBuffers/Compiler.pm
 %%SITE_PERL%%/Google/ProtocolBuffers/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/ProtocolBuffers/.packlist
 %%PERL5_MAN3%%/Google::ProtocolBuffers.3.gz
diff --git a/devel/p5-Gravatar-URL/Makefile b/devel/p5-Gravatar-URL/Makefile
index d80d93b49c8e..6c104e78ca75 100644
--- a/devel/p5-Gravatar-URL/Makefile
+++ b/devel/p5-Gravatar-URL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gravatar-URL
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSCHWERN
diff --git a/devel/p5-Gtk2-Notify/Makefile b/devel/p5-Gtk2-Notify/Makefile
index 28568ee04841..7e3f2fbc16fa 100644
--- a/devel/p5-Gtk2-Notify/Makefile
+++ b/devel/p5-Gtk2-Notify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gtk2-Notify
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Gtk2-Notify/pkg-plist b/devel/p5-Gtk2-Notify/pkg-plist
index 87899650050c..0021534375b0 100644
--- a/devel/p5-Gtk2-Notify/pkg-plist
+++ b/devel/p5-Gtk2-Notify/pkg-plist
@@ -1,10 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Notify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Notify.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Notify/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Notify/Install/notify-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Notify/Install/notify.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Notify/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Notify/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Notify/Notify.so
+%%SITE_ARCH%%/Gtk2/Notify.pm
+%%SITE_ARCH%%/Gtk2/Notify.pod
+%%SITE_ARCH%%/Gtk2/Notify/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/Notify/Install/notify-autogen.h
+%%SITE_ARCH%%/Gtk2/Notify/Install/notify.typemap
+%%SITE_ARCH%%/Gtk2/Notify/index.pod
+%%SITE_ARCH%%/auto/Gtk2/Notify/Notify.so
 %%PERL5_MAN3%%/Gtk2::Notify.3.gz
 %%PERL5_MAN3%%/Gtk2::Notify::index.3.gz
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index 0c5aa65eb6bd..d362ca40d480 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gtk2-Spell
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	SF/gtk2-perl/Gtk2_Spell/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Gtk2-Spell/pkg-plist b/devel/p5-Gtk2-Spell/pkg-plist
index d5d7d4dbda80..d49d3040db66 100644
--- a/devel/p5-Gtk2-Spell/pkg-plist
+++ b/devel/p5-Gtk2-Spell/pkg-plist
@@ -1,7 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Spell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Spell/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Spell/Install/gtk2spellperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Spell/Install/gtkspell.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Spell/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Spell/Spell.so
+%%SITE_ARCH%%/Gtk2/Spell.pm
+%%SITE_ARCH%%/Gtk2/Spell/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/Spell/Install/gtk2spellperl.h
+%%SITE_ARCH%%/Gtk2/Spell/Install/gtkspell.typemap
+%%SITE_ARCH%%/auto/Gtk2/Spell/Spell.so
 %%PERL5_MAN3%%/Gtk2::Spell.3.gz
diff --git a/devel/p5-Guard/Makefile b/devel/p5-Guard/Makefile
index 73741acfea3b..212cbeeb94dd 100644
--- a/devel/p5-Guard/Makefile
+++ b/devel/p5-Guard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Guard
 PORTVERSION=	1.022
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MLEHMANN
diff --git a/devel/p5-Guard/pkg-plist b/devel/p5-Guard/pkg-plist
index 1ce520c10f06..874c62d5b329 100644
--- a/devel/p5-Guard/pkg-plist
+++ b/devel/p5-Guard/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Guard.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Guard.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Guard/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Guard/Guard.so
+%%SITE_ARCH%%/Guard.pm
+%%SITE_ARCH%%/auto/Guard/Guard.so
diff --git a/devel/p5-HOP-Lexer/Makefile b/devel/p5-HOP-Lexer/Makefile
index 481249fc69ac..4cd73ddba7f3 100644
--- a/devel/p5-HOP-Lexer/Makefile
+++ b/devel/p5-HOP-Lexer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HOP-Lexer
 PORTVERSION=	0.032
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OVID
diff --git a/devel/p5-HOP-Stream/Makefile b/devel/p5-HOP-Stream/Makefile
index 18e872ab0059..a5638dbf829b 100644
--- a/devel/p5-HOP-Stream/Makefile
+++ b/devel/p5-HOP-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HOP-Stream
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OVID
diff --git a/devel/p5-Hash-AsObject/Makefile b/devel/p5-Hash-AsObject/Makefile
index 4714beaaec60..8deda0d0a7f8 100644
--- a/devel/p5-Hash-AsObject/Makefile
+++ b/devel/p5-Hash-AsObject/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-AsObject
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-AsObject/pkg-plist b/devel/p5-Hash-AsObject/pkg-plist
index 3cfe38f68f87..f629959cbc38 100644
--- a/devel/p5-Hash-AsObject/pkg-plist
+++ b/devel/p5-Hash-AsObject/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Hash::AsObject.3.gz
 %%SITE_PERL%%/Hash/AsObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/AsObject/.packlist
diff --git a/devel/p5-Hash-AutoHash-Args/Makefile b/devel/p5-Hash-AutoHash-Args/Makefile
index bde382696b1b..271e4ac341a9 100644
--- a/devel/p5-Hash-AutoHash-Args/Makefile
+++ b/devel/p5-Hash-AutoHash-Args/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-AutoHash-Args
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-AutoHash/Makefile b/devel/p5-Hash-AutoHash/Makefile
index 1661df1cdab1..e1a857a5f2de 100644
--- a/devel/p5-Hash-AutoHash/Makefile
+++ b/devel/p5-Hash-AutoHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-AutoHash
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-Case/Makefile b/devel/p5-Hash-Case/Makefile
index 4c31ff807590..85a1d8ee13cb 100644
--- a/devel/p5-Hash-Case/Makefile
+++ b/devel/p5-Hash-Case/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-Case
 PORTVERSION=	1.020
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARKOV
diff --git a/devel/p5-Hash-Case/pkg-plist b/devel/p5-Hash-Case/pkg-plist
index ad63514ed2d5..16e1dc34b9a8 100644
--- a/devel/p5-Hash-Case/pkg-plist
+++ b/devel/p5-Hash-Case/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/Hash/Case/Preserve.pod
 %%SITE_PERL%%/Hash/Case/Upper.pm
 %%SITE_PERL%%/Hash/Case/Upper.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Case/.packlist
diff --git a/devel/p5-Hash-Diff/Makefile b/devel/p5-Hash-Diff/Makefile
index 2326775975d9..e9d2bfe53790 100644
--- a/devel/p5-Hash-Diff/Makefile
+++ b/devel/p5-Hash-Diff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-Diff
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-Diff/pkg-plist b/devel/p5-Hash-Diff/pkg-plist
index 3f93a8e1eaa4..f7d81b953ed3 100644
--- a/devel/p5-Hash-Diff/pkg-plist
+++ b/devel/p5-Hash-Diff/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Diff/.packlist
 %%SITE_PERL%%/Hash/Diff.pm
 %%PERL5_MAN3%%/Hash::Diff.3.gz
diff --git a/devel/p5-Hash-FieldHash/Makefile b/devel/p5-Hash-FieldHash/Makefile
index be2a052eeff6..90c7d49dde91 100644
--- a/devel/p5-Hash-FieldHash/Makefile
+++ b/devel/p5-Hash-FieldHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-FieldHash
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-FieldHash/pkg-plist b/devel/p5-Hash-FieldHash/pkg-plist
index b0a25a9e565d..b2373d205009 100644
--- a/devel/p5-Hash-FieldHash/pkg-plist
+++ b/devel/p5-Hash-FieldHash/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Hash/FieldHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/FieldHash/FieldHash.so
+%%SITE_ARCH%%/Hash/FieldHash.pm
+%%SITE_ARCH%%/auto/Hash/FieldHash/FieldHash.so
 %%PERL5_MAN3%%/Hash::FieldHash.3.gz
diff --git a/devel/p5-Hash-Flatten/Makefile b/devel/p5-Hash-Flatten/Makefile
index 739fa4684489..281af1955b27 100644
--- a/devel/p5-Hash-Flatten/Makefile
+++ b/devel/p5-Hash-Flatten/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Hash-Flatten
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-Flatten/pkg-plist b/devel/p5-Hash-Flatten/pkg-plist
index 34b1dbbfa1c9..8b4bf6a2e0d8 100644
--- a/devel/p5-Hash-Flatten/pkg-plist
+++ b/devel/p5-Hash-Flatten/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Hash/Flatten.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Flatten/.packlist
 %%PERL5_MAN3%%/Hash::Flatten.3.gz
diff --git a/devel/p5-Hash-Merge-Simple/Makefile b/devel/p5-Hash-Merge-Simple/Makefile
index 4208b4e12887..ca06c64ef275 100644
--- a/devel/p5-Hash-Merge-Simple/Makefile
+++ b/devel/p5-Hash-Merge-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-Merge-Simple
 PORTVERSION=	0.051
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-Merge-Simple/pkg-plist b/devel/p5-Hash-Merge-Simple/pkg-plist
index bbfbf6d8d7b0..e2172ebfd503 100644
--- a/devel/p5-Hash-Merge-Simple/pkg-plist
+++ b/devel/p5-Hash-Merge-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Hash::Merge::Simple.3.gz
 %%SITE_PERL%%/Hash/Merge/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Merge/Simple/.packlist
diff --git a/devel/p5-Hash-MoreUtils/Makefile b/devel/p5-Hash-MoreUtils/Makefile
index 6de25d955ea8..1c6b79641cde 100644
--- a/devel/p5-Hash-MoreUtils/Makefile
+++ b/devel/p5-Hash-MoreUtils/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Hash-MoreUtils
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-MultiKey/Makefile b/devel/p5-Hash-MultiKey/Makefile
index 7e8651e55c17..393dc294e761 100644
--- a/devel/p5-Hash-MultiKey/Makefile
+++ b/devel/p5-Hash-MultiKey/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-MultiKey
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-MultiKey/pkg-plist b/devel/p5-Hash-MultiKey/pkg-plist
index 0ac90890a184..f8b8f3e9fce1 100644
--- a/devel/p5-Hash-MultiKey/pkg-plist
+++ b/devel/p5-Hash-MultiKey/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Hash/MultiKey.pm
 %%PERL5_MAN3%%/Hash::MultiKey.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/MultiKey/.packlist
diff --git a/devel/p5-Hash-MultiValue/Makefile b/devel/p5-Hash-MultiValue/Makefile
index 4e6c99729644..9bf9e1977be6 100644
--- a/devel/p5-Hash-MultiValue/Makefile
+++ b/devel/p5-Hash-MultiValue/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Hash-MultiValue
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-MultiValue/pkg-plist b/devel/p5-Hash-MultiValue/pkg-plist
index 71be0d748b9e..f65c1301cd0e 100644
--- a/devel/p5-Hash-MultiValue/pkg-plist
+++ b/devel/p5-Hash-MultiValue/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Hash::MultiValue.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/MultiValue/.packlist
 %%SITE_PERL%%/Hash/MultiValue.pm
diff --git a/devel/p5-Hash-NoRef/Makefile b/devel/p5-Hash-NoRef/Makefile
index 4e23e1577d56..c3f0e265c047 100644
--- a/devel/p5-Hash-NoRef/Makefile
+++ b/devel/p5-Hash-NoRef/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-NoRef
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-NoRef/pkg-plist b/devel/p5-Hash-NoRef/pkg-plist
index 19860deb990d..40fb46bce7a8 100644
--- a/devel/p5-Hash-NoRef/pkg-plist
+++ b/devel/p5-Hash-NoRef/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Hash/NoRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/NoRef/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/NoRef/NoRef.so
+%%SITE_ARCH%%/Hash/NoRef.pm
+%%SITE_ARCH%%/auto/Hash/NoRef/NoRef.so
 %%PERL5_MAN3%%/Hash::NoRef.3.gz
diff --git a/devel/p5-Hash-Union/Makefile b/devel/p5-Hash-Union/Makefile
index acfee6d93f8a..e0276cae7f9f 100644
--- a/devel/p5-Hash-Union/Makefile
+++ b/devel/p5-Hash-Union/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-Union
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-Union/pkg-plist b/devel/p5-Hash-Union/pkg-plist
index d2c32b2297f7..f50b8c56dba0 100644
--- a/devel/p5-Hash-Union/pkg-plist
+++ b/devel/p5-Hash-Union/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Hash/Union.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Union/.packlist
 %%PERL5_MAN3%%/Hash::Union.3.gz
diff --git a/devel/p5-Hash-Util-FieldHash-Compat/Makefile b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
index 1d7ee1c22e00..01ff5ab6ce2a 100644
--- a/devel/p5-Hash-Util-FieldHash-Compat/Makefile
+++ b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-Util-FieldHash-Compat
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hash-Util-FieldHash-Compat/pkg-plist b/devel/p5-Hash-Util-FieldHash-Compat/pkg-plist
index 9fedc2cbe964..ca8bcbf830c9 100644
--- a/devel/p5-Hash-Util-FieldHash-Compat/pkg-plist
+++ b/devel/p5-Hash-Util-FieldHash-Compat/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Hash::Util::FieldHash::Compat::Heavy.3.gz
 %%SITE_PERL%%/Hash/Util/FieldHash/Compat.pm
 %%SITE_PERL%%/Hash/Util/FieldHash/Compat/Heavy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Util/FieldHash/Compat/.packlist
diff --git a/devel/p5-Hash-WithDefaults/Makefile b/devel/p5-Hash-WithDefaults/Makefile
index 58fca7857751..0b261174851f 100644
--- a/devel/p5-Hash-WithDefaults/Makefile
+++ b/devel/p5-Hash-WithDefaults/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-WithDefaults
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JENDA
diff --git a/devel/p5-Hash-WithDefaults/pkg-plist b/devel/p5-Hash-WithDefaults/pkg-plist
index 5d1061fd4f6d..8cf4328d9cb6 100644
--- a/devel/p5-Hash-WithDefaults/pkg-plist
+++ b/devel/p5-Hash-WithDefaults/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Hash/WithDefaults.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/WithDefaults/.packlist
 %%PERL5_MAN3%%/Hash::WithDefaults.3.gz
diff --git a/devel/p5-Heap-Simple-Perl/Makefile b/devel/p5-Heap-Simple-Perl/Makefile
index b3ed5c540468..7530e9e876ff 100644
--- a/devel/p5-Heap-Simple-Perl/Makefile
+++ b/devel/p5-Heap-Simple-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Heap-Simple-Perl
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Heap-Simple-Perl/pkg-plist b/devel/p5-Heap-Simple-Perl/pkg-plist
index 5bb6f801c8d2..8dd3657ca639 100644
--- a/devel/p5-Heap-Simple-Perl/pkg-plist
+++ b/devel/p5-Heap-Simple-Perl/pkg-plist
@@ -35,4 +35,3 @@
 %%SITE_PERL%%/auto/Heap/Simple/Perl/top_key.al
 %%SITE_PERL%%/auto/Heap/Simple/Perl/user_data.al
 %%SITE_PERL%%/auto/Heap/Simple/Perl/values.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/Perl/.packlist
diff --git a/devel/p5-Heap-Simple-XS/Makefile b/devel/p5-Heap-Simple-XS/Makefile
index 3ab01bc29e5a..8609b191a356 100644
--- a/devel/p5-Heap-Simple-XS/Makefile
+++ b/devel/p5-Heap-Simple-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Heap-Simple-XS
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Heap-Simple-XS/pkg-plist b/devel/p5-Heap-Simple-XS/pkg-plist
index 6b18fcf175ec..ce2a780cbdf5 100644
--- a/devel/p5-Heap-Simple-XS/pkg-plist
+++ b/devel/p5-Heap-Simple-XS/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Heap::Simple::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Heap/Simple/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Heap/Simple/XS/Package.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/XS/XS.so
+%%SITE_ARCH%%/Heap/Simple/XS.pm
+%%SITE_ARCH%%/Heap/Simple/XS/Package.pm
+%%SITE_ARCH%%/auto/Heap/Simple/XS/XS.so
diff --git a/devel/p5-Heap-Simple/Makefile b/devel/p5-Heap-Simple/Makefile
index cbc0a06e0ea9..01ed665c34d9 100644
--- a/devel/p5-Heap-Simple/Makefile
+++ b/devel/p5-Heap-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Heap-Simple
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Heap-Simple/pkg-plist b/devel/p5-Heap-Simple/pkg-plist
index f4b7a8912cf9..9c286dff1844 100644
--- a/devel/p5-Heap-Simple/pkg-plist
+++ b/devel/p5-Heap-Simple/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Heap::Simple.3.gz
 %%SITE_PERL%%/Heap/Simple.pm
 %%SITE_PERL%%/Heap/Simple/Package.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/.packlist
diff --git a/devel/p5-Heap/Makefile b/devel/p5-Heap/Makefile
index 3fc9eab3df6a..5dbecba82427 100644
--- a/devel/p5-Heap/Makefile
+++ b/devel/p5-Heap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Heap
 PORTVERSION=	0.80
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Heap/pkg-plist b/devel/p5-Heap/pkg-plist
index 7724a7d83b5c..a5ad0111e7a0 100644
--- a/devel/p5-Heap/pkg-plist
+++ b/devel/p5-Heap/pkg-plist
@@ -20,4 +20,3 @@
 %%SITE_PERL%%/Heap/Elem/Str.pm
 %%SITE_PERL%%/Heap/Elem/StrRev.pm
 %%SITE_PERL%%/Heap/Fibonacci.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/.packlist
diff --git a/devel/p5-Hook-LexWrap/Makefile b/devel/p5-Hook-LexWrap/Makefile
index ff3e8b1972f3..18db936a2570 100644
--- a/devel/p5-Hook-LexWrap/Makefile
+++ b/devel/p5-Hook-LexWrap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hook-LexWrap
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Hook-LexWrap/pkg-plist b/devel/p5-Hook-LexWrap/pkg-plist
index 3e7f03d75e81..0f7178177144 100644
--- a/devel/p5-Hook-LexWrap/pkg-plist
+++ b/devel/p5-Hook-LexWrap/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Hook::LexWrap.3.gz
 %%SITE_PERL%%/Hook/LexWrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hook/LexWrap/.packlist
diff --git a/devel/p5-IO-AIO/Makefile b/devel/p5-IO-AIO/Makefile
index a507fab542bd..6feb549996f1 100644
--- a/devel/p5-IO-AIO/Makefile
+++ b/devel/p5-IO-AIO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-AIO
 PORTVERSION=	4.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-AIO/pkg-plist b/devel/p5-IO-AIO/pkg-plist
index 32da4b87a814..62deb4bae240 100644
--- a/devel/p5-IO-AIO/pkg-plist
+++ b/devel/p5-IO-AIO/pkg-plist
@@ -1,5 +1,4 @@
 bin/treescan
 %%PERL5_MAN3%%/IO::AIO.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/AIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/AIO/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/AIO/AIO.so
+%%SITE_ARCH%%/IO/AIO.pm
+%%SITE_ARCH%%/auto/IO/AIO/AIO.so
diff --git a/devel/p5-IO-All-LWP/Makefile b/devel/p5-IO-All-LWP/Makefile
index b6b21f948db3..b0ed8063b618 100644
--- a/devel/p5-IO-All-LWP/Makefile
+++ b/devel/p5-IO-All-LWP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-All-LWP
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-All-LWP/pkg-plist b/devel/p5-IO-All-LWP/pkg-plist
index 293edc851ef8..033a16a3220a 100644
--- a/devel/p5-IO-All-LWP/pkg-plist
+++ b/devel/p5-IO-All-LWP/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/IO/All/HTTPS.pm
 %%SITE_PERL%%/IO/All/LWP.pm
 %%SITE_PERL%%/IO/All/iocp.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/All/LWP/.packlist
 %%PERL5_MAN3%%/IO::All::FTP.3.gz
 %%PERL5_MAN3%%/IO::All::HTTP.3.gz
 %%PERL5_MAN3%%/IO::All::HTTPS.3.gz
diff --git a/devel/p5-IO-All/Makefile b/devel/p5-IO-All/Makefile
index 13f6b4833101..445a995ceead 100644
--- a/devel/p5-IO-All/Makefile
+++ b/devel/p5-IO-All/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-All
 PORTVERSION=	0.79
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-All/pkg-plist b/devel/p5-IO-All/pkg-plist
index a1843a5a68a6..cd4e50533277 100644
--- a/devel/p5-IO-All/pkg-plist
+++ b/devel/p5-IO-All/pkg-plist
@@ -23,7 +23,6 @@
 %%SITE_PERL%%/IO/All/String.pod
 %%SITE_PERL%%/IO/All/Temp.pm
 %%SITE_PERL%%/IO/All/Temp.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/All/.packlist
 %%PERL5_MAN3%%/IO::All.3.gz
 %%PERL5_MAN3%%/IO::All::DBM.3.gz
 %%PERL5_MAN3%%/IO::All::Dir.3.gz
diff --git a/devel/p5-IO-Any/Makefile b/devel/p5-IO-Any/Makefile
index 8943098bc030..a4faf02014ca 100644
--- a/devel/p5-IO-Any/Makefile
+++ b/devel/p5-IO-Any/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Any
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Async/Makefile b/devel/p5-IO-Async/Makefile
index a5b099cab2ed..e926596e7d2e 100644
--- a/devel/p5-IO-Async/Makefile
+++ b/devel/p5-IO-Async/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Async
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/devel/p5-IO-Async/pkg-plist b/devel/p5-IO-Async/pkg-plist
index d456e54f9b34..36330f39fb00 100644
--- a/devel/p5-IO-Async/pkg-plist
+++ b/devel/p5-IO-Async/pkg-plist
@@ -34,7 +34,6 @@
 %%SITE_PERL%%/IO/Async/Timer/Absolute.pm
 %%SITE_PERL%%/IO/Async/Timer/Countdown.pm
 %%SITE_PERL%%/IO/Async/Timer/Periodic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Async/.packlist
 %%PERL5_MAN3%%/IO::Async.3.gz
 %%PERL5_MAN3%%/IO::Async::Channel.3.gz
 %%PERL5_MAN3%%/IO::Async::ChildManager.3.gz
diff --git a/devel/p5-IO-BufferedSelect/Makefile b/devel/p5-IO-BufferedSelect/Makefile
index 1cbafaddf0d7..01a62f289dd8 100644
--- a/devel/p5-IO-BufferedSelect/Makefile
+++ b/devel/p5-IO-BufferedSelect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-BufferedSelect
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-BufferedSelect/pkg-plist b/devel/p5-IO-BufferedSelect/pkg-plist
index b0ad8092a07d..204a7a07ade7 100644
--- a/devel/p5-IO-BufferedSelect/pkg-plist
+++ b/devel/p5-IO-BufferedSelect/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IO::BufferedSelect.3.gz
 %%SITE_PERL%%/IO/BufferedSelect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/BufferedSelect/.packlist
diff --git a/devel/p5-IO-Callback/Makefile b/devel/p5-IO-Callback/Makefile
index e8e51741ca47..eeeed3762097 100644
--- a/devel/p5-IO-Callback/Makefile
+++ b/devel/p5-IO-Callback/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	IO-Callback
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Capture/Makefile b/devel/p5-IO-Capture/Makefile
index 3ff0f240271f..27b13ca1693d 100644
--- a/devel/p5-IO-Capture/Makefile
+++ b/devel/p5-IO-Capture/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Capture
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Capture/pkg-plist b/devel/p5-IO-Capture/pkg-plist
index d5646fe8b462..2c17a90e2e52 100644
--- a/devel/p5-IO-Capture/pkg-plist
+++ b/devel/p5-IO-Capture/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/IO/Capture/Stderr.pm
 %%SITE_PERL%%/IO/Capture/Stdout.pm
 %%SITE_PERL%%/IO/Capture/Tie_STDx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Capture/.packlist
 %%PERL5_MAN3%%/IO::Capture.3.gz
 %%PERL5_MAN3%%/IO::Capture::Overview.3.gz
 %%PERL5_MAN3%%/IO::Capture::Stderr.3.gz
diff --git a/devel/p5-IO-CaptureOutput/Makefile b/devel/p5-IO-CaptureOutput/Makefile
index 5de9db3d58a0..7ddad7b3d144 100644
--- a/devel/p5-IO-CaptureOutput/Makefile
+++ b/devel/p5-IO-CaptureOutput/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-CaptureOutput
 PORTVERSION=	1.11.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-CaptureOutput/pkg-plist b/devel/p5-IO-CaptureOutput/pkg-plist
index 6993d4770fca..1e8c17d2e7a9 100644
--- a/devel/p5-IO-CaptureOutput/pkg-plist
+++ b/devel/p5-IO-CaptureOutput/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/IO/CaptureOutput.pm
 %%SITE_PERL%%/IO/CaptureOutput.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CaptureOutput/.packlist
 %%PERL5_MAN3%%/IO::CaptureOutput.3.gz
diff --git a/devel/p5-IO-Detect/Makefile b/devel/p5-IO-Detect/Makefile
index a44309c0ce25..ae6134ccd415 100644
--- a/devel/p5-IO-Detect/Makefile
+++ b/devel/p5-IO-Detect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Detect
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Detect/pkg-plist b/devel/p5-IO-Detect/pkg-plist
index 0552225decec..732a052bf193 100644
--- a/devel/p5-IO-Detect/pkg-plist
+++ b/devel/p5-IO-Detect/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Detect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Detect/.packlist
 %%PERL5_MAN3%%/IO::Detect.3.gz
diff --git a/devel/p5-IO-Digest/Makefile b/devel/p5-IO-Digest/Makefile
index 28b9a2f02c57..1ca105c58790 100644
--- a/devel/p5-IO-Digest/Makefile
+++ b/devel/p5-IO-Digest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Digest
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Digest/pkg-plist b/devel/p5-IO-Digest/pkg-plist
index a266c1e3588e..91420a404a3e 100644
--- a/devel/p5-IO-Digest/pkg-plist
+++ b/devel/p5-IO-Digest/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Digest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Digest/.packlist
 %%PERL5_MAN3%%/IO::Digest.3.gz
diff --git a/devel/p5-IO-Event/Makefile b/devel/p5-IO-Event/Makefile
index f79f41f18732..b84b5c5e7787 100644
--- a/devel/p5-IO-Event/Makefile
+++ b/devel/p5-IO-Event/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Event
 PORTVERSION=	0.813
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Event/pkg-plist b/devel/p5-IO-Event/pkg-plist
index 691bcf952399..640eca72f924 100644
--- a/devel/p5-IO-Event/pkg-plist
+++ b/devel/p5-IO-Event/pkg-plist
@@ -4,6 +4,5 @@
 %%SITE_PERL%%/IO/Event/Callback.pm
 %%SITE_PERL%%/IO/Event/Emulate.pm
 %%SITE_PERL%%/IO/Event/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Event/.packlist
 %%PERL5_MAN3%%/IO::Event.3.gz
 %%PERL5_MAN3%%/IO::Event::Callback.3.gz
diff --git a/devel/p5-IO-FDPass/Makefile b/devel/p5-IO-FDPass/Makefile
index d3052a79e289..446184f047ac 100644
--- a/devel/p5-IO-FDPass/Makefile
+++ b/devel/p5-IO-FDPass/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	IO-FDPass
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-FDPass/pkg-plist b/devel/p5-IO-FDPass/pkg-plist
index 52991f3045e1..68323582879b 100644
--- a/devel/p5-IO-FDPass/pkg-plist
+++ b/devel/p5-IO-FDPass/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/FDPass/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/FDPass/FDPass.so
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/FDPass.pm
+%%SITE_ARCH%%/auto/IO/FDPass/FDPass.so
+%%SITE_ARCH%%/IO/FDPass.pm
 %%PERL5_MAN3%%/IO::FDPass.3.gz
diff --git a/devel/p5-IO-HTML/Makefile b/devel/p5-IO-HTML/Makefile
index 94aec91e5c81..9df8cb0f1e12 100644
--- a/devel/p5-IO-HTML/Makefile
+++ b/devel/p5-IO-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-HTML
 PORTVERSION=	1.001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-HTML/pkg-plist b/devel/p5-IO-HTML/pkg-plist
index 81840f519add..dd9cdc7e29ec 100644
--- a/devel/p5-IO-HTML/pkg-plist
+++ b/devel/p5-IO-HTML/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/HTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/HTML/.packlist
 %%PERL5_MAN3%%/IO::HTML.3.gz
diff --git a/devel/p5-IO-Handle-Util/Makefile b/devel/p5-IO-Handle-Util/Makefile
index 987a71ed9ae5..e75fa1a49780 100644
--- a/devel/p5-IO-Handle-Util/Makefile
+++ b/devel/p5-IO-Handle-Util/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	IO-Handle-Util
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Handle-Util/pkg-plist b/devel/p5-IO-Handle-Util/pkg-plist
index b10bc4b1aca8..711c7cc67a2c 100644
--- a/devel/p5-IO-Handle-Util/pkg-plist
+++ b/devel/p5-IO-Handle-Util/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Handle/Util/.packlist
 %%SITE_PERL%%/IO/Handle/Iterator.pm
 %%SITE_PERL%%/IO/Handle/Prototype.pm
 %%SITE_PERL%%/IO/Handle/Prototype/Fallback.pm
diff --git a/devel/p5-IO-Interactive/Makefile b/devel/p5-IO-Interactive/Makefile
index 93fb345d8ad9..48fc707ade75 100644
--- a/devel/p5-IO-Interactive/Makefile
+++ b/devel/p5-IO-Interactive/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IO-Interactive
 PORTVERSION=	0.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-IO-Interactive/pkg-plist b/devel/p5-IO-Interactive/pkg-plist
index a035926be432..94d46953429c 100644
--- a/devel/p5-IO-Interactive/pkg-plist
+++ b/devel/p5-IO-Interactive/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IO::Interactive.3.gz
 %%SITE_PERL%%/IO/Interactive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interactive/.packlist
diff --git a/devel/p5-IO-KQueue/Makefile b/devel/p5-IO-KQueue/Makefile
index 3f294cec13ed..5565848c5d43 100644
--- a/devel/p5-IO-KQueue/Makefile
+++ b/devel/p5-IO-KQueue/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	IO-KQueue
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-KQueue/pkg-plist b/devel/p5-IO-KQueue/pkg-plist
index e1e8f5ab5ae2..c2ecac3b2d6c 100644
--- a/devel/p5-IO-KQueue/pkg-plist
+++ b/devel/p5-IO-KQueue/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/KQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/KQueue/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/KQueue/KQueue.so
+%%SITE_ARCH%%/IO/KQueue.pm
+%%SITE_ARCH%%/auto/IO/KQueue/KQueue.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tail.pl
 %%PERL5_MAN3%%/IO::KQueue.3.gz
diff --git a/devel/p5-IO-Lambda/Makefile b/devel/p5-IO-Lambda/Makefile
index b87cbbb3c1aa..130b21804f2c 100644
--- a/devel/p5-IO-Lambda/Makefile
+++ b/devel/p5-IO-Lambda/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Lambda
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5 parallel net www databases
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Lambda/pkg-plist b/devel/p5-IO-Lambda/pkg-plist
index 3a5af2c14a24..a3c7a13b107f 100644
--- a/devel/p5-IO-Lambda/pkg-plist
+++ b/devel/p5-IO-Lambda/pkg-plist
@@ -21,7 +21,6 @@
 %%SITE_PERL%%/IO/Lambda/Socket.pm
 %%SITE_PERL%%/IO/Lambda/Thread.pm
 %%SITE_PERL%%/IO/Lambda/Throttle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Lambda/.packlist
 %%PERL5_MAN3%%/IO::Lambda.3.gz
 %%PERL5_MAN3%%/IO::Lambda::Backtrace.3.gz
 %%PERL5_MAN3%%/IO::Lambda::Compat.3.gz
diff --git a/devel/p5-IO-LockedFile/Makefile b/devel/p5-IO-LockedFile/Makefile
index 6997717de3a1..e49d50c9b84c 100644
--- a/devel/p5-IO-LockedFile/Makefile
+++ b/devel/p5-IO-LockedFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-LockedFile
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-LockedFile/pkg-plist b/devel/p5-IO-LockedFile/pkg-plist
index 80c7eecea426..9907e64e4a72 100644
--- a/devel/p5-IO-LockedFile/pkg-plist
+++ b/devel/p5-IO-LockedFile/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/IO/LockedFile.pm
 %%SITE_PERL%%/IO/LockedFile/Flock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/LockedFile/.packlist
 %%PERL5_MAN3%%/IO::LockedFile.3.gz
 %%PERL5_MAN3%%/IO::LockedFile::Flock.3.gz
diff --git a/devel/p5-IO-MultiPipe/Makefile b/devel/p5-IO-MultiPipe/Makefile
index 0da550add46e..81514cd74f8c 100644
--- a/devel/p5-IO-MultiPipe/Makefile
+++ b/devel/p5-IO-MultiPipe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-MultiPipe
 PORTVERSION=	0.0.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/devel/p5-IO-MultiPipe/pkg-plist b/devel/p5-IO-MultiPipe/pkg-plist
index 819a597a92f8..03aec5d748cc 100644
--- a/devel/p5-IO-MultiPipe/pkg-plist
+++ b/devel/p5-IO-MultiPipe/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/MultiPipe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/MultiPipe/.packlist
 %%PERL5_MAN3%%/IO::MultiPipe.3.gz
diff --git a/devel/p5-IO-Multiplex/Makefile b/devel/p5-IO-Multiplex/Makefile
index 148d47a70a23..2702da3987ca 100644
--- a/devel/p5-IO-Multiplex/Makefile
+++ b/devel/p5-IO-Multiplex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Multiplex
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Multiplex/pkg-plist b/devel/p5-IO-Multiplex/pkg-plist
index 8b4d21956dc2..c357a3f440ff 100644
--- a/devel/p5-IO-Multiplex/pkg-plist
+++ b/devel/p5-IO-Multiplex/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Multiplex/.packlist
 %%SITE_PERL%%/IO/Multiplex.pm
 %%PERL5_MAN3%%/IO::Multiplex.3.gz
diff --git a/devel/p5-IO-NestedCapture/Makefile b/devel/p5-IO-NestedCapture/Makefile
index 2243256d1282..853ed84b5235 100644
--- a/devel/p5-IO-NestedCapture/Makefile
+++ b/devel/p5-IO-NestedCapture/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-NestedCapture
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Null/Makefile b/devel/p5-IO-Null/Makefile
index 1aa692163a7d..16fed2d0c74f 100644
--- a/devel/p5-IO-Null/Makefile
+++ b/devel/p5-IO-Null/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Null
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Null/pkg-plist b/devel/p5-IO-Null/pkg-plist
index bde883958029..2ebfddeff5b6 100644
--- a/devel/p5-IO-Null/pkg-plist
+++ b/devel/p5-IO-Null/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Null.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Null/.packlist
 %%PERL5_MAN3%%/IO::Null.3.gz
diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile
index 04844b727329..546f714beae8 100644
--- a/devel/p5-IO-Pager/Makefile
+++ b/devel/p5-IO-Pager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Pager
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Pager/pkg-plist b/devel/p5-IO-Pager/pkg-plist
index cd54b3439260..9bf0a15423d4 100644
--- a/devel/p5-IO-Pager/pkg-plist
+++ b/devel/p5-IO-Pager/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Pager/.packlist
 %%SITE_PERL%%/IO/Pager.pm
 %%SITE_PERL%%/IO/t.pl
 %%SITE_PERL%%/IO/Pager/Buffered.pm
diff --git a/devel/p5-IO-Pipely/Makefile b/devel/p5-IO-Pipely/Makefile
index 852c6a18240c..e9d870129bd7 100644
--- a/devel/p5-IO-Pipely/Makefile
+++ b/devel/p5-IO-Pipely/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IO-Pipely
 PORTVERSION=	0.005
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Pipely/pkg-plist b/devel/p5-IO-Pipely/pkg-plist
index 016a9be48f5b..11d0e36dea92 100644
--- a/devel/p5-IO-Pipely/pkg-plist
+++ b/devel/p5-IO-Pipely/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IO::Pipely.3.gz
 %%SITE_PERL%%/IO/Pipely.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Pipely/.packlist
diff --git a/devel/p5-IO-Prompt-Tiny/Makefile b/devel/p5-IO-Prompt-Tiny/Makefile
index 210a7581340e..1bd8c0a24355 100644
--- a/devel/p5-IO-Prompt-Tiny/Makefile
+++ b/devel/p5-IO-Prompt-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Prompt-Tiny
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Prompt-Tiny/pkg-plist b/devel/p5-IO-Prompt-Tiny/pkg-plist
index 101f00d8a3e3..08083336bc22 100644
--- a/devel/p5-IO-Prompt-Tiny/pkg-plist
+++ b/devel/p5-IO-Prompt-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Prompt/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Prompt/Tiny/.packlist
 %%PERL5_MAN3%%/IO::Prompt::Tiny.3.gz
diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile
index 33ed378444d7..e7a55698f798 100644
--- a/devel/p5-IO-Prompt/Makefile
+++ b/devel/p5-IO-Prompt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Prompt
 PORTVERSION=	0.99.7002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Prompt/pkg-plist b/devel/p5-IO-Prompt/pkg-plist
index b3f218d414da..cc1d817e2c65 100644
--- a/devel/p5-IO-Prompt/pkg-plist
+++ b/devel/p5-IO-Prompt/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Prompt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Prompt/.packlist
 %%PERL5_MAN3%%/IO::Prompt.3.gz
diff --git a/devel/p5-IO-Prompter/Makefile b/devel/p5-IO-Prompter/Makefile
index dabceeb1aca0..c735b6201dbf 100644
--- a/devel/p5-IO-Prompter/Makefile
+++ b/devel/p5-IO-Prompter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Prompter
 PORTVERSION=	0.004011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Prompter/pkg-plist b/devel/p5-IO-Prompter/pkg-plist
index 9c5d43890f74..5464a98ef47f 100644
--- a/devel/p5-IO-Prompter/pkg-plist
+++ b/devel/p5-IO-Prompter/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Prompter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Prompter/.packlist
 %%PERL5_MAN3%%/IO::Prompter.3.gz
diff --git a/devel/p5-IO-Pty-Easy/Makefile b/devel/p5-IO-Pty-Easy/Makefile
index 7d553c517064..86f023d75a3a 100644
--- a/devel/p5-IO-Pty-Easy/Makefile
+++ b/devel/p5-IO-Pty-Easy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Pty-Easy
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Pty-Easy/pkg-plist b/devel/p5-IO-Pty-Easy/pkg-plist
index 6d0303d32519..2f71485a7f4a 100644
--- a/devel/p5-IO-Pty-Easy/pkg-plist
+++ b/devel/p5-IO-Pty-Easy/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Pty/Easy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Pty/Easy/.packlist
 %%PERL5_MAN3%%/IO::Pty::Easy.3.gz
diff --git a/devel/p5-IO-SessionData/Makefile b/devel/p5-IO-SessionData/Makefile
index e11ef1ba8993..ad9287737c97 100644
--- a/devel/p5-IO-SessionData/Makefile
+++ b/devel/p5-IO-SessionData/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-SessionData
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-SessionData/pkg-plist b/devel/p5-IO-SessionData/pkg-plist
index b1980c3cef4b..17614a315935 100644
--- a/devel/p5-IO-SessionData/pkg-plist
+++ b/devel/p5-IO-SessionData/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/SessionData.pm
 %%SITE_PERL%%/IO/SessionSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/SessionData/.packlist
diff --git a/devel/p5-IO-String/Makefile b/devel/p5-IO-String/Makefile
index fba2a5276a72..0461c01e7c81 100644
--- a/devel/p5-IO-String/Makefile
+++ b/devel/p5-IO-String/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-String
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-String/pkg-plist b/devel/p5-IO-String/pkg-plist
index 3de2cdb4efae..5925e0a6004d 100644
--- a/devel/p5-IO-String/pkg-plist
+++ b/devel/p5-IO-String/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IO::String.3.gz
 %%SITE_PERL%%/IO/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/String/.packlist
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 4108df7e4bd2..f93e8d13175f 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Stty
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Tee/Makefile b/devel/p5-IO-Tee/Makefile
index 03379593fdcb..e2a73daa9ed1 100644
--- a/devel/p5-IO-Tee/Makefile
+++ b/devel/p5-IO-Tee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IO-Tee
 PORTVERSION=	0.64
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Tee/pkg-plist b/devel/p5-IO-Tee/pkg-plist
index 31e29f9ae878..ac00ff9d9fe2 100644
--- a/devel/p5-IO-Tee/pkg-plist
+++ b/devel/p5-IO-Tee/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IO::Tee.3.gz
 %%SITE_PERL%%/IO/Tee.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tee/.packlist
diff --git a/devel/p5-IO-TieCombine/Makefile b/devel/p5-IO-TieCombine/Makefile
index fe9c05383f74..8d649d4f33d1 100644
--- a/devel/p5-IO-TieCombine/Makefile
+++ b/devel/p5-IO-TieCombine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-TieCombine
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-TieCombine/pkg-plist b/devel/p5-IO-TieCombine/pkg-plist
index 35cbf053783e..9aca884bc932 100644
--- a/devel/p5-IO-TieCombine/pkg-plist
+++ b/devel/p5-IO-TieCombine/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/IO/TieCombine.pm
 %%SITE_PERL%%/IO/TieCombine/Handle.pm
 %%SITE_PERL%%/IO/TieCombine/Scalar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/TieCombine/.packlist
 %%PERL5_MAN3%%/IO::TieCombine.3.gz
 %%PERL5_MAN3%%/IO::TieCombine::Handle.3.gz
 %%PERL5_MAN3%%/IO::TieCombine::Scalar.3.gz
diff --git a/devel/p5-IO-Toolkit/Makefile b/devel/p5-IO-Toolkit/Makefile
index c92b4d2b52f3..3ed3c7324c5d 100644
--- a/devel/p5-IO-Toolkit/Makefile
+++ b/devel/p5-IO-Toolkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IO-Toolkit
 PORTVERSION=	1.008
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LINMAR/${PORTNAME:S/-//}/
diff --git a/devel/p5-IO-Toolkit/pkg-plist b/devel/p5-IO-Toolkit/pkg-plist
index 1d531d524719..1727bf05d30d 100644
--- a/devel/p5-IO-Toolkit/pkg-plist
+++ b/devel/p5-IO-Toolkit/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Toolkit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Toolkit/.packlist
 %%PERL5_MAN3%%/IO::Toolkit.3.gz
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index 11d80e413688..c9574b14fb6f 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Tty
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Tty/pkg-plist b/devel/p5-IO-Tty/pkg-plist
index 039934eb0c88..7498cc479b7b 100644
--- a/devel/p5-IO-Tty/pkg-plist
+++ b/devel/p5-IO-Tty/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/IO::Pty.3.gz
 %%PERL5_MAN3%%/IO::Tty.3.gz
 %%PERL5_MAN3%%/IO::Tty::Constant.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/Pty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty/Constant.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.so
+%%SITE_ARCH%%/IO/Pty.pm
+%%SITE_ARCH%%/IO/Tty.pm
+%%SITE_ARCH%%/IO/Tty/Constant.pm
+%%SITE_ARCH%%/auto/IO/Tty/Tty.so
diff --git a/devel/p5-IO-Util/Makefile b/devel/p5-IO-Util/Makefile
index 1d2a29e29fbf..2cf86bee5185 100644
--- a/devel/p5-IO-Util/Makefile
+++ b/devel/p5-IO-Util/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IO-Util
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-IO-Util/pkg-plist b/devel/p5-IO-Util/pkg-plist
index 5f7914f5e982..42092ca25b7d 100644
--- a/devel/p5-IO-Util/pkg-plist
+++ b/devel/p5-IO-Util/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IO::Util.3.gz
 %%SITE_PERL%%/IO/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Util/.packlist
diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile
index ffef7e687472..43090a148fd3 100644
--- a/devel/p5-IO-YAML/Makefile
+++ b/devel/p5-IO-YAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-YAML
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 9cda37a0d0b2..f9a7a8dbb451 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-stringy
 PORTVERSION=	2.110
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-stringy/pkg-plist b/devel/p5-IO-stringy/pkg-plist
index b98383e7658f..e30ebb6bf6cd 100644
--- a/devel/p5-IO-stringy/pkg-plist
+++ b/devel/p5-IO-stringy/pkg-plist
@@ -14,4 +14,3 @@
 %%SITE_PERL%%/IO/Stringy.pm
 %%SITE_PERL%%/IO/Wrap.pm
 %%SITE_PERL%%/IO/WrapTie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stringy/.packlist
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index 81baeb674dca..7c28f078aaa8 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IOC
 PORTVERSION=	0.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STEVAN
diff --git a/devel/p5-IOC/pkg-plist b/devel/p5-IOC/pkg-plist
index 342b4ac1d3f5..c38f3cc5f4ba 100644
--- a/devel/p5-IOC/pkg-plist
+++ b/devel/p5-IOC/pkg-plist
@@ -42,4 +42,3 @@
 %%SITE_PERL%%/IOC/Visitor/SearchForService.pm
 %%SITE_PERL%%/IOC/Visitor/ServiceLocator.pm
 %%SITE_PERL%%/Test/IOC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IOC/.packlist
diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index df3e3fa9ba53..34937cefd511 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Cache
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Cache/pkg-plist b/devel/p5-IPC-Cache/pkg-plist
index e0b373816d55..556621bea80a 100644
--- a/devel/p5-IPC-Cache/pkg-plist
+++ b/devel/p5-IPC-Cache/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IPC::Cache.3.gz
 %%SITE_PERL%%/IPC/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache/.packlist
diff --git a/devel/p5-IPC-Cmd/Makefile b/devel/p5-IPC-Cmd/Makefile
index 88dc8a42499a..81b11032b1c5 100644
--- a/devel/p5-IPC-Cmd/Makefile
+++ b/devel/p5-IPC-Cmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Cmd
 PORTVERSION=	0.84
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/devel/p5-IPC-Cmd/pkg-plist b/devel/p5-IPC-Cmd/pkg-plist
index 70d41d7dd103..284988bcc6f0 100644
--- a/devel/p5-IPC-Cmd/pkg-plist
+++ b/devel/p5-IPC-Cmd/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IPC/Cmd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cmd/.packlist
 %%PERL5_MAN3%%/IPC::Cmd.3.gz
diff --git a/devel/p5-IPC-DirQueue/Makefile b/devel/p5-IPC-DirQueue/Makefile
index 114412ca21a5..b04435d1d82d 100644
--- a/devel/p5-IPC-DirQueue/Makefile
+++ b/devel/p5-IPC-DirQueue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-DirQueue
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-DirQueue/pkg-plist b/devel/p5-IPC-DirQueue/pkg-plist
index afbe00e723ca..4a5b40bbaa0e 100644
--- a/devel/p5-IPC-DirQueue/pkg-plist
+++ b/devel/p5-IPC-DirQueue/pkg-plist
@@ -12,7 +12,6 @@ man/man1/dq-submit.1.gz
 %%SITE_PERL%%/IPC/DirQueue/IndexClient.pm
 %%SITE_PERL%%/IPC/DirQueue/IndexServer.pm
 %%SITE_PERL%%/IPC/DirQueue/Job.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/DirQueue/.packlist
 %%PERL5_MAN3%%/IPC::DirQueue.3.gz
 %%PERL5_MAN3%%/IPC::DirQueue::IndexClient.3.gz
 %%PERL5_MAN3%%/IPC::DirQueue::IndexServer.3.gz
diff --git a/devel/p5-IPC-Locker/Makefile b/devel/p5-IPC-Locker/Makefile
index 8b2045edfb70..aa3544a46ab8 100644
--- a/devel/p5-IPC-Locker/Makefile
+++ b/devel/p5-IPC-Locker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Locker
 PORTVERSION=	1.492
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Locker/pkg-plist b/devel/p5-IPC-Locker/pkg-plist
index d21d97d4174e..cf847f2b9b32 100644
--- a/devel/p5-IPC-Locker/pkg-plist
+++ b/devel/p5-IPC-Locker/pkg-plist
@@ -12,7 +12,6 @@ bin/uriexec
 %%SITE_PERL%%/IPC/Locker/Server.pm
 %%SITE_PERL%%/IPC/PidStat.pm
 %%SITE_PERL%%/IPC/PidStat/PidServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Locker/.packlist
 man/man1/lockerd.1.gz
 man/man1/lockersh.1.gz
 man/man1/pidstat.1.gz
diff --git a/devel/p5-IPC-MM/Makefile b/devel/p5-IPC-MM/Makefile
index 7c977bf42977..bab4665b2986 100644
--- a/devel/p5-IPC-MM/Makefile
+++ b/devel/p5-IPC-MM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-MM
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-MM/pkg-plist b/devel/p5-IPC-MM/pkg-plist
index 2b75027a8bc5..cc427ae88ae2 100644
--- a/devel/p5-IPC-MM/pkg-plist
+++ b/devel/p5-IPC-MM/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/IPC::MM.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/IPC/MM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/MM.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/autosplit.ix
+%%SITE_ARCH%%/IPC/MM.pm
+%%SITE_ARCH%%/auto/IPC/MM/MM.so
+%%SITE_ARCH%%/auto/IPC/MM/autosplit.ix
diff --git a/devel/p5-IPC-MMA/Makefile b/devel/p5-IPC-MMA/Makefile
index 37b379c304aa..299ef82b8d93 100644
--- a/devel/p5-IPC-MMA/Makefile
+++ b/devel/p5-IPC-MMA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-MMA
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-MMA/pkg-plist b/devel/p5-IPC-MMA/pkg-plist
index 0ddbfb880825..7f523af8c4d3 100644
--- a/devel/p5-IPC-MMA/pkg-plist
+++ b/devel/p5-IPC-MMA/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/IPC/MMA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPC/MMA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MMA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MMA/MMA.so
+%%SITE_ARCH%%/IPC/MMA.pm
+%%SITE_ARCH%%/IPC/MMA.pod
+%%SITE_ARCH%%/auto/IPC/MMA/MMA.so
 %%PERL5_MAN3%%/IPC::MMA.3.gz
diff --git a/devel/p5-IPC-Mmap-Share/Makefile b/devel/p5-IPC-Mmap-Share/Makefile
index b3e478777cc1..39f79024168a 100644
--- a/devel/p5-IPC-Mmap-Share/Makefile
+++ b/devel/p5-IPC-Mmap-Share/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Mmap-Share
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Mmap-Share/pkg-plist b/devel/p5-IPC-Mmap-Share/pkg-plist
index 678bb29cce7c..70485405baef 100644
--- a/devel/p5-IPC-Mmap-Share/pkg-plist
+++ b/devel/p5-IPC-Mmap-Share/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IPC/Mmap/Share.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/Share/.packlist
 %%PERL5_MAN3%%/IPC::Mmap::Share.3.gz
diff --git a/devel/p5-IPC-Mmap/Makefile b/devel/p5-IPC-Mmap/Makefile
index e3c03520cd3d..8ac4d028475e 100644
--- a/devel/p5-IPC-Mmap/Makefile
+++ b/devel/p5-IPC-Mmap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Mmap
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Mmap/pkg-plist b/devel/p5-IPC-Mmap/pkg-plist
index d51d8446c6e5..fa811ad17994 100644
--- a/devel/p5-IPC-Mmap/pkg-plist
+++ b/devel/p5-IPC-Mmap/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap/POSIX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/Mmap.so
+%%SITE_ARCH%%/IPC/Mmap.pm
+%%SITE_ARCH%%/IPC/Mmap/POSIX.pm
+%%SITE_ARCH%%/IPC/Mmap/Win32.pm
+%%SITE_ARCH%%/auto/IPC/Mmap/Mmap.so
diff --git a/devel/p5-IPC-Open3-Simple/Makefile b/devel/p5-IPC-Open3-Simple/Makefile
index 5734b5d1054f..81378f88a506 100644
--- a/devel/p5-IPC-Open3-Simple/Makefile
+++ b/devel/p5-IPC-Open3-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Open3-Simple
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Open3-Simple/pkg-plist b/devel/p5-IPC-Open3-Simple/pkg-plist
index 54a817881cd9..be1ce0eaf3be 100644
--- a/devel/p5-IPC-Open3-Simple/pkg-plist
+++ b/devel/p5-IPC-Open3-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IPC/Open3/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Open3/Simple/.packlist
 %%PERL5_MAN3%%/IPC::Open3::Simple.3.gz
diff --git a/devel/p5-IPC-PubSub/Makefile b/devel/p5-IPC-PubSub/Makefile
index 30b9c9d86d69..786c21da21f3 100644
--- a/devel/p5-IPC-PubSub/Makefile
+++ b/devel/p5-IPC-PubSub/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IPC-PubSub
 PORTVERSION=	0.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-PubSub/pkg-plist b/devel/p5-IPC-PubSub/pkg-plist
index f1a1a6a7e186..8f4d7cb705b9 100644
--- a/devel/p5-IPC-PubSub/pkg-plist
+++ b/devel/p5-IPC-PubSub/pkg-plist
@@ -10,5 +10,4 @@
 %%SITE_PERL%%/IPC/PubSub/Cacheable.pm
 %%SITE_PERL%%/IPC/PubSub/Publisher.pm
 %%SITE_PERL%%/IPC/PubSub/Subscriber.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/PubSub/.packlist
 %%PERL5_MAN3%%/IPC::PubSub.3.gz
diff --git a/devel/p5-IPC-Run-SafeHandles/Makefile b/devel/p5-IPC-Run-SafeHandles/Makefile
index a318202097d5..a993ce677453 100644
--- a/devel/p5-IPC-Run-SafeHandles/Makefile
+++ b/devel/p5-IPC-Run-SafeHandles/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	IPC-Run-SafeHandles
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Run-SafeHandles/pkg-plist b/devel/p5-IPC-Run-SafeHandles/pkg-plist
index 245a8e26ede1..a518c46a48ce 100644
--- a/devel/p5-IPC-Run-SafeHandles/pkg-plist
+++ b/devel/p5-IPC-Run-SafeHandles/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IPC::Run::SafeHandles.3.gz
 %%SITE_PERL%%/IPC/Run/SafeHandles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/SafeHandles/.packlist
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 7fe2a5fc442c..44ea119b2e73 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Run
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Run/pkg-plist b/devel/p5-IPC-Run/pkg-plist
index e77cf7d446a5..5c663d41389b 100644
--- a/devel/p5-IPC-Run/pkg-plist
+++ b/devel/p5-IPC-Run/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/IPC/Run/Win32Helper.pm
 %%SITE_PERL%%/IPC/Run/Win32IO.pm
 %%SITE_PERL%%/IPC/Run/Win32Pump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/.packlist
diff --git a/devel/p5-IPC-Run3/Makefile b/devel/p5-IPC-Run3/Makefile
index d034e88ba031..505a98547b56 100644
--- a/devel/p5-IPC-Run3/Makefile
+++ b/devel/p5-IPC-Run3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Run3
 PORTVERSION=	0.048
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Run3/pkg-plist b/devel/p5-IPC-Run3/pkg-plist
index 7fd0bd8e4e52..0df13cd95ab1 100644
--- a/devel/p5-IPC-Run3/pkg-plist
+++ b/devel/p5-IPC-Run3/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/IPC/Run3/ProfLogger.pm
 %%SITE_PERL%%/IPC/Run3/ProfPP.pm
 %%SITE_PERL%%/IPC/Run3/ProfReporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run3/.packlist
diff --git a/devel/p5-IPC-ShareLite/Makefile b/devel/p5-IPC-ShareLite/Makefile
index eb640fb2adfd..4aea0926320c 100644
--- a/devel/p5-IPC-ShareLite/Makefile
+++ b/devel/p5-IPC-ShareLite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-ShareLite
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-ShareLite/pkg-plist b/devel/p5-IPC-ShareLite/pkg-plist
index 41ba8b0927e7..f92a6fa91cfd 100644
--- a/devel/p5-IPC-ShareLite/pkg-plist
+++ b/devel/p5-IPC-ShareLite/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/IPC::ShareLite.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/IPC/ShareLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite/ShareLite.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite/autosplit.ix
+%%SITE_ARCH%%/IPC/ShareLite.pm
+%%SITE_ARCH%%/auto/IPC/ShareLite/ShareLite.so
+%%SITE_ARCH%%/auto/IPC/ShareLite/autosplit.ix
diff --git a/devel/p5-IPC-Shareable/Makefile b/devel/p5-IPC-Shareable/Makefile
index db6205d7dd0f..3d6838c2c43b 100644
--- a/devel/p5-IPC-Shareable/Makefile
+++ b/devel/p5-IPC-Shareable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Shareable
 PORTVERSION=	0.61
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Shareable/pkg-plist b/devel/p5-IPC-Shareable/pkg-plist
index d9e4f1ad5836..ee79fc05f55d 100644
--- a/devel/p5-IPC-Shareable/pkg-plist
+++ b/devel/p5-IPC-Shareable/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/IPC/Shareable.pm
 %%SITE_PERL%%/IPC/Shareable/SharedMem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Shareable/.packlist
 %%PERL5_MAN3%%/IPC::Shareable.3.gz
 %%PERL5_MAN3%%/IPC::Shareable::SharedMem.3.gz
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 25bafb8fe133..f959536005d4 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-SharedCache
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-SharedCache/pkg-plist b/devel/p5-IPC-SharedCache/pkg-plist
index 99ff18cd39fa..19eed56d90e2 100644
--- a/devel/p5-IPC-SharedCache/pkg-plist
+++ b/devel/p5-IPC-SharedCache/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IPC::SharedCache.3.gz
 %%SITE_PERL%%/IPC/SharedCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache/.packlist
diff --git a/devel/p5-IPC-ShellCmd/Makefile b/devel/p5-IPC-ShellCmd/Makefile
index 023e0d91a374..5e4712347be5 100644
--- a/devel/p5-IPC-ShellCmd/Makefile
+++ b/devel/p5-IPC-ShellCmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-ShellCmd
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ANDREWF
diff --git a/devel/p5-IPC-ShellCmd/pkg-plist b/devel/p5-IPC-ShellCmd/pkg-plist
index 40fb62ae96e0..e75a1d2ab0b6 100644
--- a/devel/p5-IPC-ShellCmd/pkg-plist
+++ b/devel/p5-IPC-ShellCmd/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/IPC/ShellCmd/SSH.pm
 %%SITE_PERL%%/IPC/ShellCmd/ShBase.pm
 %%SITE_PERL%%/IPC/ShellCmd/Sudo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShellCmd/.packlist
 %%PERL5_MAN3%%/IPC::ShellCmd.3.gz
 %%PERL5_MAN3%%/IPC::ShellCmd::Generic.3.gz
 %%PERL5_MAN3%%/IPC::ShellCmd::SSH.3.gz
diff --git a/devel/p5-IPC-Signal/Makefile b/devel/p5-IPC-Signal/Makefile
index a5683d8316cb..b66836d6a8e6 100644
--- a/devel/p5-IPC-Signal/Makefile
+++ b/devel/p5-IPC-Signal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Signal
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-Signal/pkg-plist b/devel/p5-IPC-Signal/pkg-plist
index 26d29cd790fd..1d78eecdeb85 100644
--- a/devel/p5-IPC-Signal/pkg-plist
+++ b/devel/p5-IPC-Signal/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IPC/Signal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Signal/.packlist
 %%PERL5_MAN3%%/IPC::Signal.3.gz
diff --git a/devel/p5-IPC-System-Simple/Makefile b/devel/p5-IPC-System-Simple/Makefile
index 9d09fa76512e..440793756013 100644
--- a/devel/p5-IPC-System-Simple/Makefile
+++ b/devel/p5-IPC-System-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	IPC-System-Simple
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IPC-System-Simple/pkg-plist b/devel/p5-IPC-System-Simple/pkg-plist
index 1feb52bf403d..6d5547ea90d8 100644
--- a/devel/p5-IPC-System-Simple/pkg-plist
+++ b/devel/p5-IPC-System-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IPC::System::Simple.3.gz
 %%SITE_PERL%%/IPC/System/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/System/Simple/.packlist
diff --git a/devel/p5-Import-Into/Makefile b/devel/p5-Import-Into/Makefile
index ad6b2597cdc1..fdd37d5485fa 100644
--- a/devel/p5-Import-Into/Makefile
+++ b/devel/p5-Import-Into/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Import-Into
 PORTVERSION=	1.002001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
diff --git a/devel/p5-Import-Into/pkg-plist b/devel/p5-Import-Into/pkg-plist
index 2c0038884d6e..69443acfd5f7 100644
--- a/devel/p5-Import-Into/pkg-plist
+++ b/devel/p5-Import-Into/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Import::Into.3.gz
 %%SITE_PERL%%/Import/Into.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Import/Into/.packlist
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index 8ae584a2e624..95e1cc1ecd2a 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline-ASM
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Inline-ASM/pkg-plist b/devel/p5-Inline-ASM/pkg-plist
index b9e22d1f9116..5a8a98546bab 100644
--- a/devel/p5-Inline-ASM/pkg-plist
+++ b/devel/p5-Inline-ASM/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Inline::ASM.3.gz
 %%SITE_PERL%%/Inline/ASM.pm
 %%SITE_PERL%%/Inline/ASM.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/ASM/.packlist
diff --git a/devel/p5-Inline-CPP/Makefile b/devel/p5-Inline-CPP/Makefile
index be80f2227fef..99c6d5006fc5 100644
--- a/devel/p5-Inline-CPP/Makefile
+++ b/devel/p5-Inline-CPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline-CPP
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Inline-CPP/pkg-plist b/devel/p5-Inline-CPP/pkg-plist
index 25af639ed2db..cd630b7539e2 100644
--- a/devel/p5-Inline-CPP/pkg-plist
+++ b/devel/p5-Inline-CPP/pkg-plist
@@ -5,4 +5,3 @@
 %%SITE_PERL%%/Inline/CPP.pod
 %%SITE_PERL%%/Inline/CPP/Config.pm
 %%SITE_PERL%%/Inline/CPP/grammar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/CPP/.packlist
diff --git a/devel/p5-Inline-Files/Makefile b/devel/p5-Inline-Files/Makefile
index eb420d0054b3..cd54b67d3fe7 100644
--- a/devel/p5-Inline-Files/Makefile
+++ b/devel/p5-Inline-Files/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline-Files
 PORTVERSION=	0.68
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Inline-Files/pkg-plist b/devel/p5-Inline-Files/pkg-plist
index 353d5b9a80eb..3017ce982021 100644
--- a/devel/p5-Inline-Files/pkg-plist
+++ b/devel/p5-Inline-Files/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Inline::Files::Virtual.3.gz
 %%SITE_PERL%%/Inline/Files.pm
 %%SITE_PERL%%/Inline/Files/Virtual.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Files/.packlist
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index 923773120377..bde2aa1fa6cf 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline-Filters
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Inline-Filters/pkg-plist b/devel/p5-Inline-Filters/pkg-plist
index 261307cbeec3..2fc65e81ddd6 100644
--- a/devel/p5-Inline-Filters/pkg-plist
+++ b/devel/p5-Inline-Filters/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Inline::Filters.3.gz
 %%SITE_PERL%%/Inline/Filters.pm
 %%SITE_PERL%%/Inline/Filters.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Filters/.packlist
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index 2b2bba1a3357..aec95758fdad 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline-Java
 PORTVERSION=	0.540
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Inline-Java/pkg-plist b/devel/p5-Inline-Java/pkg-plist
index 32976d085799..4c2a4a7eb379 100644
--- a/devel/p5-Inline-Java/pkg-plist
+++ b/devel/p5-Inline-Java/pkg-plist
@@ -1,40 +1,39 @@
 %%PERL5_MAN3%%/Inline::Java.3.gz
 %%PERL5_MAN3%%/Inline::Java::Callback.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Callback.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Callback.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/InlineJavaServer.jar
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/InlineJavaUser.jar
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/JNI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/JVM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Portable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Protocol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/default_j2sdk.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaArray.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCallback.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCallbackQueue.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCastException.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaClass.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaException.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaHandle.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaInvocationTargetException.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlException.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlInterpreter.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlNatives.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlObject.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaProtocol.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaServer.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaServerThread.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaThrown.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUtils.java
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI/JNI.so
+%%SITE_ARCH%%/Inline/Java.pm
+%%SITE_ARCH%%/Inline/Java.pod
+%%SITE_ARCH%%/Inline/Java/Array.pm
+%%SITE_ARCH%%/Inline/Java/Callback.pm
+%%SITE_ARCH%%/Inline/Java/Callback.pod
+%%SITE_ARCH%%/Inline/Java/Class.pm
+%%SITE_ARCH%%/Inline/Java/Handle.pm
+%%SITE_ARCH%%/Inline/Java/InlineJavaServer.jar
+%%SITE_ARCH%%/Inline/Java/InlineJavaUser.jar
+%%SITE_ARCH%%/Inline/Java/JNI.pm
+%%SITE_ARCH%%/Inline/Java/JVM.pm
+%%SITE_ARCH%%/Inline/Java/Object.pm
+%%SITE_ARCH%%/Inline/Java/Portable.pm
+%%SITE_ARCH%%/Inline/Java/Protocol.pm
+%%SITE_ARCH%%/Inline/Java/Server.pm
+%%SITE_ARCH%%/Inline/Java/default_j2sdk.pl
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaArray.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCallback.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCallbackQueue.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCastException.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaClass.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaException.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaHandle.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaInvocationTargetException.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlException.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlInterpreter.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlNatives.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlObject.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaProtocol.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaServer.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaServerThread.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaThrown.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java
+%%SITE_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUtils.java
+%%SITE_ARCH%%/auto/Inline/Java/JNI/JNI.so
diff --git a/devel/p5-Inline-TT/Makefile b/devel/p5-Inline-TT/Makefile
index ac19ba558b48..578b93c984fc 100644
--- a/devel/p5-Inline-TT/Makefile
+++ b/devel/p5-Inline-TT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline-TT
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Inline-TT/pkg-plist b/devel/p5-Inline-TT/pkg-plist
index 17e04400fde9..064ae26daed9 100644
--- a/devel/p5-Inline-TT/pkg-plist
+++ b/devel/p5-Inline-TT/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Inline/TT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/TT/.packlist
 %%PERL5_MAN3%%/Inline::TT.3.gz
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index 0bc3e5c0ddb7..43156891071b 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline-Tcl
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5 tcl
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Inline-Tcl/pkg-plist b/devel/p5-Inline-Tcl/pkg-plist
index 410d37fe656a..5f3742626783 100644
--- a/devel/p5-Inline-Tcl/pkg-plist
+++ b/devel/p5-Inline-Tcl/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Inline::Tcl.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Tcl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Tcl.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/Tcl.so
+%%SITE_ARCH%%/Inline/Tcl.pm
+%%SITE_ARCH%%/Inline/Tcl.pod
+%%SITE_ARCH%%/auto/Inline/Tcl/Tcl.so
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index 9b16c0c9ffaa..2da75031ae22 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Inline
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
diff --git a/devel/p5-Inline/pkg-plist b/devel/p5-Inline/pkg-plist
index f84dbd6b979c..e28a639e936c 100644
--- a/devel/p5-Inline/pkg-plist
+++ b/devel/p5-Inline/pkg-plist
@@ -121,4 +121,3 @@
 %%SITE_PERL%%/auto/Inline/rmpath.al
 %%SITE_PERL%%/auto/Inline/with_configs.al
 %%SITE_PERL%%/auto/Inline/write_inl_file.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/.packlist
diff --git a/devel/p5-InlineX-C2XS/Makefile b/devel/p5-InlineX-C2XS/Makefile
index 0f3c7639d596..b6e5cd6b7210 100644
--- a/devel/p5-InlineX-C2XS/Makefile
+++ b/devel/p5-InlineX-C2XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	InlineX-C2XS
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
diff --git a/devel/p5-InlineX-C2XS/pkg-plist b/devel/p5-InlineX-C2XS/pkg-plist
index 6fbbf76eec67..9aac386eb541 100644
--- a/devel/p5-InlineX-C2XS/pkg-plist
+++ b/devel/p5-InlineX-C2XS/pkg-plist
@@ -4,4 +4,3 @@ bin/c2xs
 %%SITE_PERL%%/InlineX/C2XS-Cookbook.pod
 %%SITE_PERL%%/InlineX/C2XS.pm
 %%SITE_PERL%%/InlineX/C2XS/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX/C2XS/.packlist
diff --git a/devel/p5-InlineX-CPP2XS/Makefile b/devel/p5-InlineX-CPP2XS/Makefile
index 7be252458b67..87c95863d37b 100644
--- a/devel/p5-InlineX-CPP2XS/Makefile
+++ b/devel/p5-InlineX-CPP2XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	InlineX-CPP2XS
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
diff --git a/devel/p5-InlineX-CPP2XS/pkg-plist b/devel/p5-InlineX-CPP2XS/pkg-plist
index b328bb3f3f7f..4178b7e4b211 100644
--- a/devel/p5-InlineX-CPP2XS/pkg-plist
+++ b/devel/p5-InlineX-CPP2XS/pkg-plist
@@ -3,4 +3,3 @@ bin/cpp2xs
 %%PERL5_MAN3%%/InlineX::CPP2XS.3.gz
 %%SITE_PERL%%/InlineX/CPP2XS-Cookbook.pod
 %%SITE_PERL%%/InlineX/CPP2XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX/CPP2XS/.packlist
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index 38dea4243112..ea0bd9e4157f 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Ioctl
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Ioctl/JPRIT
diff --git a/devel/p5-Ioctl/pkg-plist b/devel/p5-Ioctl/pkg-plist
index 77531aa9b0ec..f2256321dfa6 100644
--- a/devel/p5-Ioctl/pkg-plist
+++ b/devel/p5-Ioctl/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Ioctl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/Ioctl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/autosplit.ix
+%%SITE_ARCH%%/Ioctl.pm
+%%SITE_ARCH%%/auto/Ioctl/Ioctl.so
+%%SITE_ARCH%%/auto/Ioctl/autosplit.ix
diff --git a/devel/p5-Iodef-Pb-Simple/Makefile b/devel/p5-Iodef-Pb-Simple/Makefile
index 0d7a6e05be69..04f6d3ce96c2 100644
--- a/devel/p5-Iodef-Pb-Simple/Makefile
+++ b/devel/p5-Iodef-Pb-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Iodef-Pb-Simple
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAXJAZMAN/iodef
diff --git a/devel/p5-Iodef-Pb-Simple/pkg-plist b/devel/p5-Iodef-Pb-Simple/pkg-plist
index 6aa0568b744e..eaa79d95fa9f 100644
--- a/devel/p5-Iodef-Pb-Simple/pkg-plist
+++ b/devel/p5-Iodef-Pb-Simple/pkg-plist
@@ -36,4 +36,3 @@
 %%SITE_PERL%%/Iodef/Pb/Simple/Plugin/Restriction.pm
 %%SITE_PERL%%/Iodef/Pb/Simple/Plugin/Url.pm
 %%SITE_PERL%%/Iodef/Pb/t1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iodef/Pb/Simple/.packlist
diff --git a/devel/p5-Iterator-IO/Makefile b/devel/p5-Iterator-IO/Makefile
index 0629a1f8ee46..063ae533a947 100644
--- a/devel/p5-Iterator-IO/Makefile
+++ b/devel/p5-Iterator-IO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Iterator-IO
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Iterator-IO/pkg-plist b/devel/p5-Iterator-IO/pkg-plist
index 27b8a61d92cc..14284cb32bb4 100644
--- a/devel/p5-Iterator-IO/pkg-plist
+++ b/devel/p5-Iterator-IO/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Iterator::IO.3.gz
 %%SITE_PERL%%/Iterator/IO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/IO/.packlist
diff --git a/devel/p5-Iterator-Misc/Makefile b/devel/p5-Iterator-Misc/Makefile
index 1316e7f5258f..b0586dd2c9a2 100644
--- a/devel/p5-Iterator-Misc/Makefile
+++ b/devel/p5-Iterator-Misc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Iterator-Misc
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Iterator-Misc/pkg-plist b/devel/p5-Iterator-Misc/pkg-plist
index bede5fcee401..6e4328a6a232 100644
--- a/devel/p5-Iterator-Misc/pkg-plist
+++ b/devel/p5-Iterator-Misc/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Iterator::Misc.3.gz
 %%SITE_PERL%%/Iterator/Misc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Misc/.packlist
diff --git a/devel/p5-Iterator-Simple/Makefile b/devel/p5-Iterator-Simple/Makefile
index b2597a999d3b..6080bec35483 100644
--- a/devel/p5-Iterator-Simple/Makefile
+++ b/devel/p5-Iterator-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Iterator-Simple
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Iterator-Simple/pkg-plist b/devel/p5-Iterator-Simple/pkg-plist
index be3a56c59080..32948fdfc01b 100644
--- a/devel/p5-Iterator-Simple/pkg-plist
+++ b/devel/p5-Iterator-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Iterator::Simple.3.gz
 %%SITE_PERL%%/Iterator/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Simple/.packlist
diff --git a/devel/p5-Iterator-Util/Makefile b/devel/p5-Iterator-Util/Makefile
index 67280733ad56..73899665d4f8 100644
--- a/devel/p5-Iterator-Util/Makefile
+++ b/devel/p5-Iterator-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Iterator-Util
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Iterator-Util/pkg-plist b/devel/p5-Iterator-Util/pkg-plist
index ab8628974516..7003b56d7a18 100644
--- a/devel/p5-Iterator-Util/pkg-plist
+++ b/devel/p5-Iterator-Util/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Iterator::Util.3.gz
 %%SITE_PERL%%/Iterator/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Util/.packlist
diff --git a/devel/p5-Iterator/Makefile b/devel/p5-Iterator/Makefile
index dd9516dbf925..d532020d3563 100644
--- a/devel/p5-Iterator/Makefile
+++ b/devel/p5-Iterator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Iterator
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Iterator/pkg-plist b/devel/p5-Iterator/pkg-plist
index 22e6802ce39b..04c96856e8f0 100644
--- a/devel/p5-Iterator/pkg-plist
+++ b/devel/p5-Iterator/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Iterator.3.gz
 %%SITE_PERL%%/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/.packlist
diff --git a/devel/p5-JIRA-Client/Makefile b/devel/p5-JIRA-Client/Makefile
index cc077241a41b..5302cbb86188 100644
--- a/devel/p5-JIRA-Client/Makefile
+++ b/devel/p5-JIRA-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JIRA-Client
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	GOOGLE_CODE \
 		LOCAL/glarkin
diff --git a/devel/p5-JIRA-Client/pkg-plist b/devel/p5-JIRA-Client/pkg-plist
index 921a7233c34b..bb00b45ac462 100644
--- a/devel/p5-JIRA-Client/pkg-plist
+++ b/devel/p5-JIRA-Client/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/JIRA/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JIRA/Client/.packlist
 %%PERL5_MAN3%%/JIRA::Client.3.gz
diff --git a/devel/p5-JQuery/Makefile b/devel/p5-JQuery/Makefile
index 00b7c258371d..9d3ccca73d5f 100644
--- a/devel/p5-JQuery/Makefile
+++ b/devel/p5-JQuery/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	JQuery
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PETERG
diff --git a/devel/p5-JSON-Hyper/Makefile b/devel/p5-JSON-Hyper/Makefile
index c03b52b4d5bd..296241a27a7d 100644
--- a/devel/p5-JSON-Hyper/Makefile
+++ b/devel/p5-JSON-Hyper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-Hyper
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-JSON-Hyper/pkg-plist b/devel/p5-JSON-Hyper/pkg-plist
index 8e34b1eeae90..b0bef4d9f1b2 100644
--- a/devel/p5-JSON-Hyper/pkg-plist
+++ b/devel/p5-JSON-Hyper/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/JSON::Hyper::Link.3.gz
 %%SITE_PERL%%/JSON/Hyper.pm
 %%SITE_PERL%%/JSON/Hyper/Link.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Hyper/.packlist
diff --git a/devel/p5-JSON-Path/Makefile b/devel/p5-JSON-Path/Makefile
index 3ad98f203132..cc5483105909 100644
--- a/devel/p5-JSON-Path/Makefile
+++ b/devel/p5-JSON-Path/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	JSON-Path
 PORTVERSION=	0.205
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-JSON-Path/pkg-plist b/devel/p5-JSON-Path/pkg-plist
index 59e7a70e10f8..de0d25343cc7 100644
--- a/devel/p5-JSON-Path/pkg-plist
+++ b/devel/p5-JSON-Path/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/JSON::Path.3.gz
 %%SITE_PERL%%/JSON/Path.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Path/.packlist
diff --git a/devel/p5-JSON-RPC-Common/Makefile b/devel/p5-JSON-RPC-Common/Makefile
index 1103a36b3807..fd1b8b830943 100644
--- a/devel/p5-JSON-RPC-Common/Makefile
+++ b/devel/p5-JSON-RPC-Common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-RPC-Common
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-JSON-RPC-Common/pkg-plist b/devel/p5-JSON-RPC-Common/pkg-plist
index 4cb63aa3af2c..b6e952dca427 100644
--- a/devel/p5-JSON-RPC-Common/pkg-plist
+++ b/devel/p5-JSON-RPC-Common/pkg-plist
@@ -32,4 +32,3 @@
 %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_2_0.pm
 %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_2_0/Error.pm
 %%SITE_PERL%%/JSON/RPC/Common/TypeConstraints.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Common/.packlist
diff --git a/devel/p5-JSON-RPC-Dispatcher/Makefile b/devel/p5-JSON-RPC-Dispatcher/Makefile
index 0028117f9b79..cc5f325aa40b 100644
--- a/devel/p5-JSON-RPC-Dispatcher/Makefile
+++ b/devel/p5-JSON-RPC-Dispatcher/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-RPC-Dispatcher
 PORTVERSION=	0.0506
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-JSON-RPC-Dispatcher/pkg-plist b/devel/p5-JSON-RPC-Dispatcher/pkg-plist
index b031bda12673..09a9e63b3190 100644
--- a/devel/p5-JSON-RPC-Dispatcher/pkg-plist
+++ b/devel/p5-JSON-RPC-Dispatcher/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/JSON/RPC/Dispatcher.pm
 %%SITE_PERL%%/JSON/RPC/Dispatcher/App.pm
 %%SITE_PERL%%/JSON/RPC/Dispatcher/Procedure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Dispatcher/.packlist
diff --git a/devel/p5-JSON-RPC/Makefile b/devel/p5-JSON-RPC/Makefile
index 3c26dedfe8ce..3a731c6d22d9 100644
--- a/devel/p5-JSON-RPC/Makefile
+++ b/devel/p5-JSON-RPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JSON-RPC
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/devel/p5-JSON-Schema/Makefile b/devel/p5-JSON-Schema/Makefile
index 7fd7b7be29ce..db3678539c6c 100644
--- a/devel/p5-JSON-Schema/Makefile
+++ b/devel/p5-JSON-Schema/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	JSON-Schema
 PORTVERSION=	0.015
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-JSON-Schema/pkg-plist b/devel/p5-JSON-Schema/pkg-plist
index 3107d617634a..ae493993fe70 100644
--- a/devel/p5-JSON-Schema/pkg-plist
+++ b/devel/p5-JSON-Schema/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/JSON/Schema/Helper.pm
 %%SITE_PERL%%/JSON/Schema/Null.pm
 %%SITE_PERL%%/JSON/Schema/Result.pm
-%%SITE_PERL%%/mach/auto/JSON/Schema/.packlist
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index c89ec5598da8..fb2de12aca74 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Java
 PORTVERSION=	4.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel java perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Java/pkg-plist b/devel/p5-Java/pkg-plist
index 83efc5b4edfd..f5235e9b06ad 100644
--- a/devel/p5-Java/pkg-plist
+++ b/devel/p5-Java/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/Java.pm
 %%SITE_PERL%%/JavaArray.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Java/.packlist
 %%PERL5_MAN3%%/Java.3.gz
 %%PERL5_MAN3%%/JavaArray.3.gz
 share/p5-Java/JavaServer.jar
diff --git a/devel/p5-Jonk/Makefile b/devel/p5-Jonk/Makefile
index 2b23fa6fe91e..b60fd13d58ac 100644
--- a/devel/p5-Jonk/Makefile
+++ b/devel/p5-Jonk/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Jonk
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
diff --git a/devel/p5-Jonk/pkg-plist b/devel/p5-Jonk/pkg-plist
index d241331f4ef2..6c56ccfe79f7 100644
--- a/devel/p5-Jonk/pkg-plist
+++ b/devel/p5-Jonk/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jonk/.packlist
 %%SITE_PERL%%/Jonk.pm
 %%SITE_PERL%%/Jonk/Client.pm
 %%SITE_PERL%%/Jonk/Cookbook.pod
diff --git a/devel/p5-LV/Makefile b/devel/p5-LV/Makefile
index 93aa0f320568..1a59fc8d2e75 100644
--- a/devel/p5-LV/Makefile
+++ b/devel/p5-LV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LV
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/devel/p5-LV/pkg-plist b/devel/p5-LV/pkg-plist
index 54b20a5a2ba5..88ed18432cb3 100644
--- a/devel/p5-LV/pkg-plist
+++ b/devel/p5-LV/pkg-plist
@@ -2,5 +2,4 @@
 %%SITE_PERL%%/LV/Backend/Magic.pm
 %%SITE_PERL%%/LV/Backend/Sentinel.pm
 %%SITE_PERL%%/LV/Backend/Tie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LV/.packlist
 %%PERL5_MAN3%%/LV.3.gz
diff --git a/devel/p5-Lexical-Alias/Makefile b/devel/p5-Lexical-Alias/Makefile
index dcbc594e0d04..d04683cd49f6 100644
--- a/devel/p5-Lexical-Alias/Makefile
+++ b/devel/p5-Lexical-Alias/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lexical-Alias
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Lexical-Alias/pkg-plist b/devel/p5-Lexical-Alias/pkg-plist
index 3cde609823b2..3aaa05bf257d 100644
--- a/devel/p5-Lexical-Alias/pkg-plist
+++ b/devel/p5-Lexical-Alias/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Lexical/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Alias/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Alias/Alias.so
+%%SITE_ARCH%%/Lexical/Alias.pm
+%%SITE_ARCH%%/auto/Lexical/Alias/Alias.so
 %%PERL5_MAN3%%/Lexical::Alias.3.gz
diff --git a/devel/p5-Lexical-Import/Makefile b/devel/p5-Lexical-Import/Makefile
index de6fbb5b61d4..8adf1f7fb844 100644
--- a/devel/p5-Lexical-Import/Makefile
+++ b/devel/p5-Lexical-Import/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lexical-Import
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Lexical-Import/pkg-plist b/devel/p5-Lexical-Import/pkg-plist
index 1bab65d9bf76..596801052323 100644
--- a/devel/p5-Lexical-Import/pkg-plist
+++ b/devel/p5-Lexical-Import/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Lexical/Import.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Import/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Import/Import.so
+%%SITE_ARCH%%/Lexical/Import.pm
+%%SITE_ARCH%%/auto/Lexical/Import/Import.so
 %%PERL5_MAN3%%/Lexical::Import.3.gz
diff --git a/devel/p5-Lexical-Persistence/Makefile b/devel/p5-Lexical-Persistence/Makefile
index 404d82ea8c2a..44db34b0553e 100644
--- a/devel/p5-Lexical-Persistence/Makefile
+++ b/devel/p5-Lexical-Persistence/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lexical-Persistence
 PORTVERSION=	1.023
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Lexical-Persistence/pkg-plist b/devel/p5-Lexical-Persistence/pkg-plist
index 5157a8e28f98..421fcc50a751 100644
--- a/devel/p5-Lexical-Persistence/pkg-plist
+++ b/devel/p5-Lexical-Persistence/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lexical/Persistence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Persistence/.packlist
 %%PERL5_MAN3%%/Lexical::Persistence.3.gz
diff --git a/devel/p5-Lexical-SealRequireHints/Makefile b/devel/p5-Lexical-SealRequireHints/Makefile
index 45ce4aad0675..a2ba70adb3ea 100644
--- a/devel/p5-Lexical-SealRequireHints/Makefile
+++ b/devel/p5-Lexical-SealRequireHints/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lexical-SealRequireHints
 PORTVERSION=	0.007
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Lexical-SealRequireHints/pkg-plist b/devel/p5-Lexical-SealRequireHints/pkg-plist
index 2ad6588c41d3..d129ca0fbbe1 100644
--- a/devel/p5-Lexical-SealRequireHints/pkg-plist
+++ b/devel/p5-Lexical-SealRequireHints/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Lexical::SealRequireHints.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Lexical/SealRequireHints.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/SealRequireHints/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/SealRequireHints/SealRequireHints.so
+%%SITE_ARCH%%/Lexical/SealRequireHints.pm
+%%SITE_ARCH%%/auto/Lexical/SealRequireHints/SealRequireHints.so
diff --git a/devel/p5-Lexical-Var/Makefile b/devel/p5-Lexical-Var/Makefile
index 0e4f3c524265..524bc10baf59 100644
--- a/devel/p5-Lexical-Var/Makefile
+++ b/devel/p5-Lexical-Var/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lexical-Var
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Lexical-Var/pkg-plist b/devel/p5-Lexical-Var/pkg-plist
index 0fbb1ddc3e22..6c323cf514df 100644
--- a/devel/p5-Lexical-Var/pkg-plist
+++ b/devel/p5-Lexical-Var/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Lexical::Sub.3.gz
 %%PERL5_MAN3%%/Lexical::Var.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Lexical/Sub.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Lexical/Var.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Var/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Var/Var.so
+%%SITE_ARCH%%/Lexical/Sub.pm
+%%SITE_ARCH%%/Lexical/Var.pm
+%%SITE_ARCH%%/auto/Lexical/Var/Var.so
diff --git a/devel/p5-Lingua-JA-Fold/Makefile b/devel/p5-Lingua-JA-Fold/Makefile
index 0ab7891c1d4e..8771d25e7300 100644
--- a/devel/p5-Lingua-JA-Fold/Makefile
+++ b/devel/p5-Lingua-JA-Fold/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-JA-Fold
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Lingua
diff --git a/devel/p5-Lingua-JA-Fold/pkg-plist b/devel/p5-Lingua-JA-Fold/pkg-plist
index b73cdbb4b228..8cb0d6d1063c 100644
--- a/devel/p5-Lingua-JA-Fold/pkg-plist
+++ b/devel/p5-Lingua-JA-Fold/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::JA::Fold.3.gz
 %%SITE_PERL%%/Lingua/JA/Fold.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Fold/.packlist
diff --git a/devel/p5-Lingua-Translit/Makefile b/devel/p5-Lingua-Translit/Makefile
index 25cb5057d529..5beb328c1c6b 100644
--- a/devel/p5-Lingua-Translit/Makefile
+++ b/devel/p5-Lingua-Translit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Translit
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Lingua-Translit/pkg-plist b/devel/p5-Lingua-Translit/pkg-plist
index bdf1c49af9cf..aabdbcd73369 100644
--- a/devel/p5-Lingua-Translit/pkg-plist
+++ b/devel/p5-Lingua-Translit/pkg-plist
@@ -4,4 +4,3 @@ bin/translit
 man/man1/translit.1.gz
 %%SITE_PERL%%/Lingua/Translit/Tables.pm
 %%SITE_PERL%%/Lingua/Translit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Translit/.packlist
diff --git a/devel/p5-List-AllUtils/Makefile b/devel/p5-List-AllUtils/Makefile
index ab507f73fdd5..0de02359ff69 100644
--- a/devel/p5-List-AllUtils/Makefile
+++ b/devel/p5-List-AllUtils/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	List-AllUtils
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-AllUtils/pkg-plist b/devel/p5-List-AllUtils/pkg-plist
index 677f542e4d78..36593d18d0c2 100644
--- a/devel/p5-List-AllUtils/pkg-plist
+++ b/devel/p5-List-AllUtils/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/List/AllUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/AllUtils/.packlist
 %%PERL5_MAN3%%/List::AllUtils.3.gz
diff --git a/devel/p5-List-Cycle/Makefile b/devel/p5-List-Cycle/Makefile
index 99b6268f6261..e9bc543daf8d 100644
--- a/devel/p5-List-Cycle/Makefile
+++ b/devel/p5-List-Cycle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Cycle
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-Cycle/pkg-plist b/devel/p5-List-Cycle/pkg-plist
index 0858e26108ed..fcdad57dcdb1 100644
--- a/devel/p5-List-Cycle/pkg-plist
+++ b/devel/p5-List-Cycle/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/List::Cycle.3.gz
 %%SITE_PERL%%/List/Cycle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Cycle/.packlist
diff --git a/devel/p5-List-Gen/Makefile b/devel/p5-List-Gen/Makefile
index 817a84afe196..9024404310ed 100644
--- a/devel/p5-List-Gen/Makefile
+++ b/devel/p5-List-Gen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Gen
 PORTVERSION=	0.974
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-Gen/pkg-plist b/devel/p5-List-Gen/pkg-plist
index fdf5d4eb8bc8..12731313c4d1 100644
--- a/devel/p5-List-Gen/pkg-plist
+++ b/devel/p5-List-Gen/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/List/Gen/Lazy/Ops.pm
 %%SITE_PERL%%/List/Gen/Perl6.pm
 %%SITE_PERL%%/List/Generator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Gen/.packlist
 %%PERL5_MAN3%%/List::Gen.3.gz
 %%PERL5_MAN3%%/List::Gen::Benchmark.3.gz
 %%PERL5_MAN3%%/List::Gen::Cookbook.3.gz
diff --git a/devel/p5-List-Group/Makefile b/devel/p5-List-Group/Makefile
index 4ec53c7d1964..422c6aa6c781 100644
--- a/devel/p5-List-Group/Makefile
+++ b/devel/p5-List-Group/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Group
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-Group/pkg-plist b/devel/p5-List-Group/pkg-plist
index 34c65781b74e..b20cbb44eab7 100644
--- a/devel/p5-List-Group/pkg-plist
+++ b/devel/p5-List-Group/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/List/Group.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Group/.packlist
 %%PERL5_MAN3%%/List::Group.3.gz
diff --git a/devel/p5-List-Permutor/Makefile b/devel/p5-List-Permutor/Makefile
index 64dbb818e26b..ec10efe748d6 100644
--- a/devel/p5-List-Permutor/Makefile
+++ b/devel/p5-List-Permutor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Permutor
 PORTVERSION=	0.022
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-Permutor/pkg-plist b/devel/p5-List-Permutor/pkg-plist
index 90f0177d784d..84cfa0ebe99e 100644
--- a/devel/p5-List-Permutor/pkg-plist
+++ b/devel/p5-List-Permutor/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/List::Permutor.3.gz
 %%SITE_PERL%%/List/Permutor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Permutor/.packlist
diff --git a/devel/p5-List-PowerSet/Makefile b/devel/p5-List-PowerSet/Makefile
index 0fcc9312ce92..447b7601cb8e 100644
--- a/devel/p5-List-PowerSet/Makefile
+++ b/devel/p5-List-PowerSet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-PowerSet
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-PowerSet/pkg-plist b/devel/p5-List-PowerSet/pkg-plist
index 7ec2f5ffde82..8b746fc0b370 100644
--- a/devel/p5-List-PowerSet/pkg-plist
+++ b/devel/p5-List-PowerSet/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/List::PowerSet.3.gz
 %%SITE_PERL%%/List/PowerSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/PowerSet/.packlist
diff --git a/devel/p5-List-Rotation-Cycle/Makefile b/devel/p5-List-Rotation-Cycle/Makefile
index 8e58479598ef..dcb2fab75c38 100644
--- a/devel/p5-List-Rotation-Cycle/Makefile
+++ b/devel/p5-List-Rotation-Cycle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Rotation-Cycle
 PORTVERSION=	1.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN LOCAL/chinsan/CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-Rotation-Cycle/pkg-plist b/devel/p5-List-Rotation-Cycle/pkg-plist
index f4a250b6eb6c..9264fb436695 100644
--- a/devel/p5-List-Rotation-Cycle/pkg-plist
+++ b/devel/p5-List-Rotation-Cycle/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/List::Rotation::Cycle.3.gz
 %%SITE_PERL%%/List/Rotation/Cycle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Rotation/Cycle/.packlist
diff --git a/devel/p5-List-Uniq/Makefile b/devel/p5-List-Uniq/Makefile
index 33d8492e0719..d48e4abcddbf 100644
--- a/devel/p5-List-Uniq/Makefile
+++ b/devel/p5-List-Uniq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Uniq
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-Uniq/pkg-plist b/devel/p5-List-Uniq/pkg-plist
index 156f72ac5037..458c4ccd6b74 100644
--- a/devel/p5-List-Uniq/pkg-plist
+++ b/devel/p5-List-Uniq/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Uniq/.packlist
 %%SITE_PERL%%/List/Uniq.pm
 %%PERL5_MAN3%%/List::Uniq.3.gz
diff --git a/devel/p5-List-UtilsBy/Makefile b/devel/p5-List-UtilsBy/Makefile
index 092ed3b9f747..5ecda4823232 100644
--- a/devel/p5-List-UtilsBy/Makefile
+++ b/devel/p5-List-UtilsBy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	List-UtilsBy
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-List-UtilsBy/pkg-plist b/devel/p5-List-UtilsBy/pkg-plist
index 3bb33d8558fe..debd5534e321 100644
--- a/devel/p5-List-UtilsBy/pkg-plist
+++ b/devel/p5-List-UtilsBy/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/UtilsBy/.packlist
 %%SITE_PERL%%/List/UtilsBy.pm
 %%PERL5_MAN3%%/List::UtilsBy.3.gz
diff --git a/devel/p5-Locale-Maketext-Fuzzy/Makefile b/devel/p5-Locale-Maketext-Fuzzy/Makefile
index da772107c0b3..0e4f18c87b9d 100644
--- a/devel/p5-Locale-Maketext-Fuzzy/Makefile
+++ b/devel/p5-Locale-Maketext-Fuzzy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-Maketext-Fuzzy
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-Maketext-Fuzzy/pkg-plist b/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
index b643f7d90ea9..d3d05903a7c8 100644
--- a/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
+++ b/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Locale::Maketext::Fuzzy.3.gz
 %%SITE_PERL%%/Locale/Maketext/Fuzzy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Fuzzy/.packlist
diff --git a/devel/p5-Locale-Maketext-Gettext/Makefile b/devel/p5-Locale-Maketext-Gettext/Makefile
index 6d14df2b80c6..778dc2519659 100644
--- a/devel/p5-Locale-Maketext-Gettext/Makefile
+++ b/devel/p5-Locale-Maketext-Gettext/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Locale-Maketext-Gettext
 PORTVERSION=	1.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-Maketext-Gettext/pkg-plist b/devel/p5-Locale-Maketext-Gettext/pkg-plist
index 5bac8ad02dbc..1af289daca60 100644
--- a/devel/p5-Locale-Maketext-Gettext/pkg-plist
+++ b/devel/p5-Locale-Maketext-Gettext/pkg-plist
@@ -3,5 +3,4 @@ bin/maketext
 %%PERL5_MAN3%%/Locale::Maketext::Gettext::Functions.3.gz
 %%SITE_PERL%%/Locale/Maketext/Gettext.pm
 %%SITE_PERL%%/Locale/Maketext/Gettext/Functions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext-Gettext/.packlist
 man/man1/maketext.1.gz
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index 8c1ef73431d3..9c4a49d1c31f 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-Maketext-Lexicon
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Locale/DRTECH
diff --git a/devel/p5-Locale-Maketext-Lexicon/pkg-plist b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
index 48637ca03dc0..ce26b3a6325a 100644
--- a/devel/p5-Locale-Maketext-Lexicon/pkg-plist
+++ b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
@@ -33,5 +33,4 @@ bin/xgettext.pl
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Gettext.pm
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Msgcat.pm
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Tie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon/.packlist
 man/man1/xgettext.pl.1.gz
diff --git a/devel/p5-Locale-Maketext-Simple/Makefile b/devel/p5-Locale-Maketext-Simple/Makefile
index e7cb88d7d561..23b7e011957c 100644
--- a/devel/p5-Locale-Maketext-Simple/Makefile
+++ b/devel/p5-Locale-Maketext-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-Maketext-Simple
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-Maketext-Simple/pkg-plist b/devel/p5-Locale-Maketext-Simple/pkg-plist
index 51cf44a7d7f0..044281352de6 100644
--- a/devel/p5-Locale-Maketext-Simple/pkg-plist
+++ b/devel/p5-Locale-Maketext-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Locale/Maketext/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Simple/.packlist
 %%PERL5_MAN3%%/Locale::Maketext::Simple.3.gz
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index f87d4986df28..f37377ca9b68 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-Maketext
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TODDR
diff --git a/devel/p5-Locale-Maketext/pkg-plist b/devel/p5-Locale-Maketext/pkg-plist
index b104e3e1cfe6..5d7f1c79b6bf 100644
--- a/devel/p5-Locale-Maketext/pkg-plist
+++ b/devel/p5-Locale-Maketext/pkg-plist
@@ -9,4 +9,3 @@
 %%SITE_PERL%%/Locale/Maketext/Guts.pm
 %%SITE_PERL%%/Locale/Maketext/GutsLoader.pm
 %%SITE_PERL%%/Locale/Maketext/TPJ13.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext/.packlist
diff --git a/devel/p5-Locale-Msgfmt/Makefile b/devel/p5-Locale-Msgfmt/Makefile
index 5ccf8d643a48..e25d679d30bf 100644
--- a/devel/p5-Locale-Msgfmt/Makefile
+++ b/devel/p5-Locale-Msgfmt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Locale-Msgfmt
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-Msgfmt/pkg-plist b/devel/p5-Locale-Msgfmt/pkg-plist
index c167169839f2..b20f1fe7f80e 100644
--- a/devel/p5-Locale-Msgfmt/pkg-plist
+++ b/devel/p5-Locale-Msgfmt/pkg-plist
@@ -7,4 +7,3 @@
 %%SITE_PERL%%/Locale/Msgfmt/mo.pm
 %%SITE_PERL%%/Locale/Msgfmt/po.pm
 %%SITE_PERL%%/Module/Install/Msgfmt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Msgfmt/.packlist
diff --git a/devel/p5-Locale-PGetText/Makefile b/devel/p5-Locale-PGetText/Makefile
index 7eb00215a51b..d061c6bb3747 100644
--- a/devel/p5-Locale-PGetText/Makefile
+++ b/devel/p5-Locale-PGetText/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-PGetText
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist
index b6a444037ce9..5f0fdc3ba6a4 100644
--- a/devel/p5-Locale-PGetText/pkg-plist
+++ b/devel/p5-Locale-PGetText/pkg-plist
@@ -2,6 +2,5 @@ bin/MsgFormat
 bin/XText
 %%PERL5_MAN3%%/Locale::PGetText.3.gz
 %%SITE_PERL%%/Locale/PGetText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
 man/man1/MsgFormat.1.gz
 man/man1/XText.1.gz
diff --git a/devel/p5-Locale-PO/Makefile b/devel/p5-Locale-PO/Makefile
index 3f68fc9fda06..a9f392211d92 100644
--- a/devel/p5-Locale-PO/Makefile
+++ b/devel/p5-Locale-PO/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Locale-PO
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-PO/pkg-plist b/devel/p5-Locale-PO/pkg-plist
index 0f25361ee6e1..b851d5d1a260 100644
--- a/devel/p5-Locale-PO/pkg-plist
+++ b/devel/p5-Locale-PO/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Locale/PO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PO/.packlist
 %%PERL5_MAN3%%/Locale::PO.3.gz
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 9ef8d9155635..294bb7c982eb 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Locale-gettext
 PORTVERSION=	1.05
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-gettext/pkg-plist b/devel/p5-Locale-gettext/pkg-plist
index 4adf96c1ed36..b3b7ead07241 100644
--- a/devel/p5-Locale-gettext/pkg-plist
+++ b/devel/p5-Locale-gettext/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext/gettext.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Locale/gettext.pm
+%%SITE_ARCH%%/auto/Locale/gettext/gettext.so
+%%SITE_ARCH%%/Locale/gettext.pm
 %%PERL5_MAN3%%/Locale::gettext.3.gz
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index e42a964faa12..f22bb430f48e 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Locale-libintl
 PORTVERSION=	1.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Locale-libintl/pkg-plist b/devel/p5-Locale-libintl/pkg-plist
index 9ed98631c9d5..a0d283392e76 100644
--- a/devel/p5-Locale-libintl/pkg-plist
+++ b/devel/p5-Locale-libintl/pkg-plist
@@ -297,5 +297,4 @@
 %%SITE_PERL%%/Locale/gettext_xs.pm
 %%SITE_PERL%%/Locale/gettext_xs.pod
 %%SITE_PERL%%/Locale/libintlFAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext_xs/gettext_xs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libintl-perl/.packlist
+%%SITE_ARCH%%/auto/Locale/gettext_xs/gettext_xs.so
diff --git a/devel/p5-LockFile-Simple/Makefile b/devel/p5-LockFile-Simple/Makefile
index f76b4dbeebcb..1b3d8528ef58 100644
--- a/devel/p5-LockFile-Simple/Makefile
+++ b/devel/p5-LockFile-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LockFile-Simple
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-LockFile-Simple/pkg-plist b/devel/p5-LockFile-Simple/pkg-plist
index 0c79c0dc6883..6f01bbea1ea3 100644
--- a/devel/p5-LockFile-Simple/pkg-plist
+++ b/devel/p5-LockFile-Simple/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/LockFile/Lock/Simple.pm
 %%SITE_PERL%%/LockFile/Manager.pm
 %%SITE_PERL%%/LockFile/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile/Simple/.packlist
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index fa0fe0546acd..6759ac573411 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Log-Accounting-SVK
 PORTVERSION=	0.05
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Accounting-SVK/pkg-plist b/devel/p5-Log-Accounting-SVK/pkg-plist
index 8a54e9fee0dd..d8518cb67817 100644
--- a/devel/p5-Log-Accounting-SVK/pkg-plist
+++ b/devel/p5-Log-Accounting-SVK/pkg-plist
@@ -5,4 +5,3 @@ man/man1/svk-developer-graph.pl.1.gz
 %%PERL5_MAN3%%/Log::Accounting::SVK.3.gz
 %%SITE_PERL%%/Log/Accounting/SVK.pm
 %%SITE_PERL%%/Log/Accounting/SVK.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting/SVK/.packlist
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index e56ecc9bb06e..391a868742d1 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Log-Accounting-SVN
 PORTVERSION=	0.01
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Accounting-SVN/pkg-plist b/devel/p5-Log-Accounting-SVN/pkg-plist
index e7c242a03119..c3280c310548 100644
--- a/devel/p5-Log-Accounting-SVN/pkg-plist
+++ b/devel/p5-Log-Accounting-SVN/pkg-plist
@@ -1,4 +1,3 @@
 bin/svn-accounting.pl
 %%SITE_PERL%%/Log/Accounting/SVN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting/SVN/.packlist
 %%PERL5_MAN3%%/Log::Accounting::SVN.3.gz
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 252e13e7bf5f..ee135e53b90f 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Agent-Logger
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TBONE
diff --git a/devel/p5-Log-Agent-Logger/pkg-plist b/devel/p5-Log-Agent-Logger/pkg-plist
index 969c712774a8..c0a18875b4b1 100644
--- a/devel/p5-Log-Agent-Logger/pkg-plist
+++ b/devel/p5-Log-Agent-Logger/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Log::Agent::Logger.3.gz
 %%SITE_PERL%%/Log/Agent/Logger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger/.packlist
diff --git a/devel/p5-Log-Agent/Makefile b/devel/p5-Log-Agent/Makefile
index f163fbb52647..49a4766442d7 100644
--- a/devel/p5-Log-Agent/Makefile
+++ b/devel/p5-Log-Agent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Agent
 PORTVERSION=	1.000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Agent/pkg-plist b/devel/p5-Log-Agent/pkg-plist
index d1a9a2555b25..e087fd3986f1 100644
--- a/devel/p5-Log-Agent/pkg-plist
+++ b/devel/p5-Log-Agent/pkg-plist
@@ -73,4 +73,3 @@
 %%SITE_PERL%%/auto/Log/Agent/logxcarp.al
 %%SITE_PERL%%/auto/Log/Agent/logxcroak.al
 %%SITE_PERL%%/auto/Log/Agent/prio_tag.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/.packlist
diff --git a/devel/p5-Log-Any-Adapter-Callback/Makefile b/devel/p5-Log-Any-Adapter-Callback/Makefile
index d4d5e474cd6e..5592c7a21d82 100644
--- a/devel/p5-Log-Any-Adapter-Callback/Makefile
+++ b/devel/p5-Log-Any-Adapter-Callback/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Any-Adapter-Callback
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Any-Adapter-Callback/pkg-plist b/devel/p5-Log-Any-Adapter-Callback/pkg-plist
index de2d01ccb63d..b9d41c517749 100644
--- a/devel/p5-Log-Any-Adapter-Callback/pkg-plist
+++ b/devel/p5-Log-Any-Adapter-Callback/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Log::Any::Adapter::Callback.3.gz
 %%SITE_PERL%%/Log/Any/Adapter/Callback.pm
-%%SITE_PERL%%/mach/auto/Log/Any/Adapter/Callback/.packlist
diff --git a/devel/p5-Log-Any-Adapter-Dispatch/Makefile b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
index 0469eb6b33d0..1a4ea8647301 100644
--- a/devel/p5-Log-Any-Adapter-Dispatch/Makefile
+++ b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Any-Adapter-Dispatch
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Any-Adapter-Dispatch/pkg-plist b/devel/p5-Log-Any-Adapter-Dispatch/pkg-plist
index caccf6c62f67..7527121e2e2e 100644
--- a/devel/p5-Log-Any-Adapter-Dispatch/pkg-plist
+++ b/devel/p5-Log-Any-Adapter-Dispatch/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Any/Adapter/Dispatch/.packlist
 %%SITE_PERL%%/Log/Any/Adapter/Dispatch.pm
 %%PERL5_MAN3%%/Log::Any::Adapter::Dispatch.3.gz
diff --git a/devel/p5-Log-Any-Adapter-Log4perl/Makefile b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
index 169f3c77ef7a..861f2720cc70 100644
--- a/devel/p5-Log-Any-Adapter-Log4perl/Makefile
+++ b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Any-Adapter-Log4perl
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist b/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist
index 2c0a95a7b38c..d28a7b87f1de 100644
--- a/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist
+++ b/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Log::Any::Adapter::Log4perl.3.gz
 %%SITE_PERL%%/Log/Any/Adapter/Log4perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Any/Adapter/Log4perl/.packlist
diff --git a/devel/p5-Log-Any-Adapter-Syslog/Makefile b/devel/p5-Log-Any-Adapter-Syslog/Makefile
index f1c7178855ba..78dba9906bea 100644
--- a/devel/p5-Log-Any-Adapter-Syslog/Makefile
+++ b/devel/p5-Log-Any-Adapter-Syslog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Any-Adapter-Syslog
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Any-Adapter-Syslog/pkg-plist b/devel/p5-Log-Any-Adapter-Syslog/pkg-plist
index ef210aff6c6a..eea8ab4884f3 100644
--- a/devel/p5-Log-Any-Adapter-Syslog/pkg-plist
+++ b/devel/p5-Log-Any-Adapter-Syslog/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Any/Adapter/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Any/Adapter/Syslog/.packlist
 %%PERL5_MAN3%%/Log::Any::Adapter::Syslog.3.gz
diff --git a/devel/p5-Log-Any-Adapter/Makefile b/devel/p5-Log-Any-Adapter/Makefile
index 8a2841c3cf3b..e4316484da08 100644
--- a/devel/p5-Log-Any-Adapter/Makefile
+++ b/devel/p5-Log-Any-Adapter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Any-Adapter
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Any-Adapter/pkg-plist b/devel/p5-Log-Any-Adapter/pkg-plist
index 0bd8ef0dae87..7088979e6e07 100644
--- a/devel/p5-Log-Any-Adapter/pkg-plist
+++ b/devel/p5-Log-Any-Adapter/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Any/Adapter/.packlist
 %%SITE_PERL%%/Log/Any/Adapter.pm
 %%SITE_PERL%%/Log/Any/Adapter/Base.pm
 %%SITE_PERL%%/Log/Any/Adapter/Development.pod
diff --git a/devel/p5-Log-Any-App/Makefile b/devel/p5-Log-Any-App/Makefile
index 1f5aa834efa4..0132c85473e0 100644
--- a/devel/p5-Log-Any-App/Makefile
+++ b/devel/p5-Log-Any-App/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Any-App
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Any/Makefile b/devel/p5-Log-Any/Makefile
index f3c3b6668158..65fedc8fc036 100644
--- a/devel/p5-Log-Any/Makefile
+++ b/devel/p5-Log-Any/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Any
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JSWARTZ
diff --git a/devel/p5-Log-Any/pkg-plist b/devel/p5-Log-Any/pkg-plist
index 7197b52effa0..20948c208109 100644
--- a/devel/p5-Log-Any/pkg-plist
+++ b/devel/p5-Log-Any/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Any/.packlist
 %%SITE_PERL%%/Log/Any.pm
 %%SITE_PERL%%/Log/Any/Adapter/Core.pm
 %%SITE_PERL%%/Log/Any/Adapter/Null.pm
diff --git a/devel/p5-Log-Contextual/Makefile b/devel/p5-Log-Contextual/Makefile
index f77af8f921bb..b4c773cc036e 100644
--- a/devel/p5-Log-Contextual/Makefile
+++ b/devel/p5-Log-Contextual/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Contextual
 PORTVERSION=	0.006004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Contextual/pkg-plist b/devel/p5-Log-Contextual/pkg-plist
index f7d5695a39a1..44c915e820b8 100644
--- a/devel/p5-Log-Contextual/pkg-plist
+++ b/devel/p5-Log-Contextual/pkg-plist
@@ -8,7 +8,6 @@
 %%PERL5_MAN3%%/Log::Contextual::SimpleLogger.3.gz
 %%PERL5_MAN3%%/Log::Contextual::TeeLogger.3.gz
 %%PERL5_MAN3%%/Log::Contextual::WarnLogger.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Contextual/.packlist
 %%SITE_PERL%%/Log/Contextual.pm
 %%SITE_PERL%%/Log/Contextual/Easy/Default.pm
 %%SITE_PERL%%/Log/Contextual/Easy/Package.pm
diff --git a/devel/p5-Log-Defer/Makefile b/devel/p5-Log-Defer/Makefile
index f1bd319163fa..4784259a80f7 100644
--- a/devel/p5-Log-Defer/Makefile
+++ b/devel/p5-Log-Defer/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Defer
 PORTVERSION=	0.311
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Defer/pkg-plist b/devel/p5-Log-Defer/pkg-plist
index 4d7a4d5a6e71..4c9fda8b696c 100644
--- a/devel/p5-Log-Defer/pkg-plist
+++ b/devel/p5-Log-Defer/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Log::README.3.gz
 %%SITE_PERL%%/Log/Defer.pm
 %%SITE_PERL%%/Log/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Defer/.packlist
diff --git a/devel/p5-Log-Dispatch-Array/Makefile b/devel/p5-Log-Dispatch-Array/Makefile
index cc322a2e2ed6..63a045fc9bd3 100644
--- a/devel/p5-Log-Dispatch-Array/Makefile
+++ b/devel/p5-Log-Dispatch-Array/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Array
 PORTVERSION=	1.001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 # MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Log-Dispatch-Array/pkg-plist b/devel/p5-Log-Dispatch-Array/pkg-plist
index 63a8b5a8ae0b..d74faadefd00 100644
--- a/devel/p5-Log-Dispatch-Array/pkg-plist
+++ b/devel/p5-Log-Dispatch-Array/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Dispatch/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Array/.packlist
 %%PERL5_MAN3%%/Log::Dispatch::Array.3.gz
diff --git a/devel/p5-Log-Dispatch-Colorful/Makefile b/devel/p5-Log-Dispatch-Colorful/Makefile
index c32487db0845..f72b353f945b 100644
--- a/devel/p5-Log-Dispatch-Colorful/Makefile
+++ b/devel/p5-Log-Dispatch-Colorful/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Log-Dispatch-Colorful
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-Colorful/pkg-plist b/devel/p5-Log-Dispatch-Colorful/pkg-plist
index b618db486173..4ce1a7a339d7 100644
--- a/devel/p5-Log-Dispatch-Colorful/pkg-plist
+++ b/devel/p5-Log-Dispatch-Colorful/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Dispatch/Colorful.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Colorful/.packlist
 %%PERL5_MAN3%%/Log::Dispatch::Colorful.3.gz
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index cfac7acfc27a..3ba120fc9090 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Config
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-Config/pkg-plist b/devel/p5-Log-Dispatch-Config/pkg-plist
index 0748e2a2e2ce..637f9550a379 100644
--- a/devel/p5-Log-Dispatch-Config/pkg-plist
+++ b/devel/p5-Log-Dispatch-Config/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Log/Dispatch/Config.pm
 %%SITE_PERL%%/Log/Dispatch/Configurator.pm
 %%SITE_PERL%%/Log/Dispatch/Configurator/AppConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config/.packlist
diff --git a/devel/p5-Log-Dispatch-Configurator-Any/Makefile b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
index 534b77b5bbae..4d22d8e14301 100644
--- a/devel/p5-Log-Dispatch-Configurator-Any/Makefile
+++ b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Configurator-Any
 PORTVERSION=	1.122.640
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-Configurator-Any/pkg-plist b/devel/p5-Log-Dispatch-Configurator-Any/pkg-plist
index 2fbc64944c5f..5f63c029e43b 100644
--- a/devel/p5-Log-Dispatch-Configurator-Any/pkg-plist
+++ b/devel/p5-Log-Dispatch-Configurator-Any/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Dispatch/Configurator/Any.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Configurator/Any/.packlist
 %%PERL5_MAN3%%/Log::Dispatch::Configurator::Any.3.gz
diff --git a/devel/p5-Log-Dispatch-Configurator-YAML/Makefile b/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
index 6fea1e1d0687..6049c00a7311 100644
--- a/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
+++ b/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Configurator-YAML
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-Configurator-YAML/pkg-plist b/devel/p5-Log-Dispatch-Configurator-YAML/pkg-plist
index e55fdfe12508..e989ba353e85 100644
--- a/devel/p5-Log-Dispatch-Configurator-YAML/pkg-plist
+++ b/devel/p5-Log-Dispatch-Configurator-YAML/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Dispatch/Configurator/YAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Configurator/YAML/.packlist
 %%PERL5_MAN3%%/Log::Dispatch::Configurator::YAML.3.gz
diff --git a/devel/p5-Log-Dispatch-DBI/Makefile b/devel/p5-Log-Dispatch-DBI/Makefile
index 214e5a3315f5..9602089b9235 100644
--- a/devel/p5-Log-Dispatch-DBI/Makefile
+++ b/devel/p5-Log-Dispatch-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-DBI
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-DBI/pkg-plist b/devel/p5-Log-Dispatch-DBI/pkg-plist
index 0fa72069f1df..b9b3d3321663 100644
--- a/devel/p5-Log-Dispatch-DBI/pkg-plist
+++ b/devel/p5-Log-Dispatch-DBI/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Log::Dispatch::DBI.3.gz
 %%SITE_PERL%%/Log/Dispatch/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/DBI/.packlist
diff --git a/devel/p5-Log-Dispatch-Dir/Makefile b/devel/p5-Log-Dispatch-Dir/Makefile
index f9cc826b4b88..6e0236716176 100644
--- a/devel/p5-Log-Dispatch-Dir/Makefile
+++ b/devel/p5-Log-Dispatch-Dir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Dir
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-Dir/pkg-plist b/devel/p5-Log-Dispatch-Dir/pkg-plist
index 2f53a8ce0fae..e15a8f53eff3 100644
--- a/devel/p5-Log-Dispatch-Dir/pkg-plist
+++ b/devel/p5-Log-Dispatch-Dir/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Dispatch/Dir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Dir/.packlist
 %%PERL5_MAN3%%/Log::Dispatch::Dir.3.gz
diff --git a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
index 2173ca60644f..9b6a14258711 100644
--- a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
+++ b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Email-EmailSend
 DISTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-File-Rolling/Makefile b/devel/p5-Log-Dispatch-File-Rolling/Makefile
index 550f0000b331..576201306b94 100644
--- a/devel/p5-Log-Dispatch-File-Rolling/Makefile
+++ b/devel/p5-Log-Dispatch-File-Rolling/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Dispatch-File-Rolling
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-File-Rolling/pkg-plist b/devel/p5-Log-Dispatch-File-Rolling/pkg-plist
index 7e138ac73a2c..5a7bf58cf6d7 100644
--- a/devel/p5-Log-Dispatch-File-Rolling/pkg-plist
+++ b/devel/p5-Log-Dispatch-File-Rolling/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Dispatch/File/Rolling.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/File/Rolling/.packlist
 %%PERL5_MAN3%%/Log::Dispatch::File::Rolling.3.gz
diff --git a/devel/p5-Log-Dispatch-File-Stamped/Makefile b/devel/p5-Log-Dispatch-File-Stamped/Makefile
index 41defd82b77e..0ca3e5ba0707 100644
--- a/devel/p5-Log-Dispatch-File-Stamped/Makefile
+++ b/devel/p5-Log-Dispatch-File-Stamped/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-File-Stamped
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Log
diff --git a/devel/p5-Log-Dispatch-File-Stamped/pkg-plist b/devel/p5-Log-Dispatch-File-Stamped/pkg-plist
index 34b7f8ffd7b2..5894f0fc06f7 100644
--- a/devel/p5-Log-Dispatch-File-Stamped/pkg-plist
+++ b/devel/p5-Log-Dispatch-File-Stamped/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/File/Stamped/.packlist
 %%SITE_PERL%%/Log/Dispatch/File/Stamped.pm
 %%PERL5_MAN3%%/Log::Dispatch::File::Stamped.3.gz
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 90c512c35de1..69120bb30ff7 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-FileRotate
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-FileRotate/pkg-plist b/devel/p5-Log-Dispatch-FileRotate/pkg-plist
index 6589a84fa37b..3ab05455c2e6 100644
--- a/devel/p5-Log-Dispatch-FileRotate/pkg-plist
+++ b/devel/p5-Log-Dispatch-FileRotate/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Dispatch/FileRotate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/FileRotate/.packlist
 %%PERL5_MAN3%%/Log::Dispatch::FileRotate.3.gz
diff --git a/devel/p5-Log-Dispatch-FileShared/Makefile b/devel/p5-Log-Dispatch-FileShared/Makefile
index 841afe042ab5..c3d4726d90ac 100644
--- a/devel/p5-Log-Dispatch-FileShared/Makefile
+++ b/devel/p5-Log-Dispatch-FileShared/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-FileShared
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-FileShared/pkg-plist b/devel/p5-Log-Dispatch-FileShared/pkg-plist
index 29400b9e9cf2..2dbc4b16d4be 100644
--- a/devel/p5-Log-Dispatch-FileShared/pkg-plist
+++ b/devel/p5-Log-Dispatch-FileShared/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Log::Dispatch::FileShared.3.gz
 %%SITE_PERL%%/Log/Dispatch/FileShared.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/FileShared/.packlist
diff --git a/devel/p5-Log-Dispatch-Perl/Makefile b/devel/p5-Log-Dispatch-Perl/Makefile
index 5d285516a22f..c677ac409774 100644
--- a/devel/p5-Log-Dispatch-Perl/Makefile
+++ b/devel/p5-Log-Dispatch-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Perl
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-Perl/pkg-plist b/devel/p5-Log-Dispatch-Perl/pkg-plist
index a85c413e3fd5..38a98a805f09 100644
--- a/devel/p5-Log-Dispatch-Perl/pkg-plist
+++ b/devel/p5-Log-Dispatch-Perl/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Log::Dispatch::Perl.3.gz
 %%SITE_PERL%%/Log/Dispatch/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Perl/.packlist
diff --git a/devel/p5-Log-Dispatch-Screen-Color/Makefile b/devel/p5-Log-Dispatch-Screen-Color/Makefile
index 2033ea37aa5c..cd91195ad297 100644
--- a/devel/p5-Log-Dispatch-Screen-Color/Makefile
+++ b/devel/p5-Log-Dispatch-Screen-Color/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Dispatch-Screen-Color
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch-Screen-Color/pkg-plist b/devel/p5-Log-Dispatch-Screen-Color/pkg-plist
index a6855114ee1e..71436cf093bb 100644
--- a/devel/p5-Log-Dispatch-Screen-Color/pkg-plist
+++ b/devel/p5-Log-Dispatch-Screen-Color/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Screen/Color/.packlist
 %%SITE_PERL%%/Log/Dispatch/Screen/Color.pm
 %%PERL5_MAN3%%/Log::Dispatch::Screen::Color.3.gz
diff --git a/devel/p5-Log-Dispatch-Scribe/Makefile b/devel/p5-Log-Dispatch-Scribe/Makefile
index 8b5be871431c..ba5fed2d6528 100644
--- a/devel/p5-Log-Dispatch-Scribe/Makefile
+++ b/devel/p5-Log-Dispatch-Scribe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatch-Scribe
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Log
diff --git a/devel/p5-Log-Dispatch-Scribe/pkg-plist b/devel/p5-Log-Dispatch-Scribe/pkg-plist
index 63acc3149a2c..a3960c2167cf 100644
--- a/devel/p5-Log-Dispatch-Scribe/pkg-plist
+++ b/devel/p5-Log-Dispatch-Scribe/pkg-plist
@@ -1,5 +1,4 @@
 bin/scribe_cat.pl
 %%PERL5_MAN3%%/Log::Dispatch::Scribe.3.gz
 %%SITE_PERL%%/Log/Dispatch/Scribe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Scribe/.packlist
 man/man1/scribe_cat.pl.1.gz
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index c1f7bbde7d64..4bf14f56667a 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Dispatch
 PORTVERSION=	2.42
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dispatch/pkg-plist b/devel/p5-Log-Dispatch/pkg-plist
index 97fda92753c3..a6bec88e8a63 100644
--- a/devel/p5-Log-Dispatch/pkg-plist
+++ b/devel/p5-Log-Dispatch/pkg-plist
@@ -32,4 +32,3 @@
 %%SITE_PERL%%/Log/Dispatch/Output.pm
 %%SITE_PERL%%/Log/Dispatch/Screen.pm
 %%SITE_PERL%%/Log/Dispatch/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/.packlist
diff --git a/devel/p5-Log-Dispatchouli/Makefile b/devel/p5-Log-Dispatchouli/Makefile
index 10c35caf0ab1..b8adab0358f4 100644
--- a/devel/p5-Log-Dispatchouli/Makefile
+++ b/devel/p5-Log-Dispatchouli/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Dispatchouli
 PORTVERSION=	2.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Log-Dispatchouli/pkg-plist b/devel/p5-Log-Dispatchouli/pkg-plist
index 77fb5818f509..00c713a4603f 100644
--- a/devel/p5-Log-Dispatchouli/pkg-plist
+++ b/devel/p5-Log-Dispatchouli/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Log/Dispatchouli.pm
 %%SITE_PERL%%/Log/Dispatchouli/Global.pm
 %%SITE_PERL%%/Log/Dispatchouli/Proxy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatchouli/.packlist
 %%PERL5_MAN3%%/Log::Dispatchouli.3.gz
 %%PERL5_MAN3%%/Log::Dispatchouli::Global.3.gz
 %%PERL5_MAN3%%/Log::Dispatchouli::Proxy.3.gz
diff --git a/devel/p5-Log-Dump/Makefile b/devel/p5-Log-Dump/Makefile
index de12198cdcf7..6392f81c99f8 100644
--- a/devel/p5-Log-Dump/Makefile
+++ b/devel/p5-Log-Dump/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Dump
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Dump/pkg-plist b/devel/p5-Log-Dump/pkg-plist
index 54f0c3f01ca0..282b3cfefe71 100644
--- a/devel/p5-Log-Dump/pkg-plist
+++ b/devel/p5-Log-Dump/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Log/Dump.pm
 %%SITE_PERL%%/Log/Dump/Class.pm
 %%SITE_PERL%%/Log/Dump/Functions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dump/.packlist
diff --git a/devel/p5-Log-Handler/Makefile b/devel/p5-Log-Handler/Makefile
index a59164bf608b..f01b0c773cc2 100644
--- a/devel/p5-Log-Handler/Makefile
+++ b/devel/p5-Log-Handler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Handler
 PORTVERSION=	0.84
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Handler/pkg-plist b/devel/p5-Log-Handler/pkg-plist
index ec3d6eb21bee..81474eccd897 100644
--- a/devel/p5-Log-Handler/pkg-plist
+++ b/devel/p5-Log-Handler/pkg-plist
@@ -14,7 +14,6 @@
 %%SITE_PERL%%/Log/Handler/Plugin/Config/General.pm
 %%SITE_PERL%%/Log/Handler/Plugin/Config/Properties.pm
 %%SITE_PERL%%/Log/Handler/Plugin/YAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Handler/.packlist
 %%PERL5_MAN3%%/Log::Handler.3.gz
 %%PERL5_MAN3%%/Log::Handler::Config.3.gz
 %%PERL5_MAN3%%/Log::Handler::Examples.3.gz
diff --git a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
index adbe61b2b073..09f962184003 100644
--- a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
+++ b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Log4perl-Appender-RabbitMQ
 PORTVERSION=	0.102220
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BUNDACIA
diff --git a/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist b/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist
index de0e7b1b5c85..b2ca6d118b76 100644
--- a/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist
+++ b/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Log4perl/Appender/RabbitMQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Log4perl/Appender/RabbitMQ/.packlist
 %%PERL5_MAN3%%/Log::Log4perl::Appender::RabbitMQ.3.gz
diff --git a/devel/p5-Log-Log4perl/Makefile b/devel/p5-Log-Log4perl/Makefile
index 1ef4e2b5dd5a..4ca4640c6176 100644
--- a/devel/p5-Log-Log4perl/Makefile
+++ b/devel/p5-Log-Log4perl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Log-Log4perl
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Log4perl/pkg-plist b/devel/p5-Log-Log4perl/pkg-plist
index 7540114aaef0..16074ee0f708 100644
--- a/devel/p5-Log-Log4perl/pkg-plist
+++ b/devel/p5-Log-Log4perl/pkg-plist
@@ -50,7 +50,6 @@ bin/l4p-tmpl
 %%SITE_PERL%%/Log/Log4perl/Util.pm
 %%SITE_PERL%%/Log/Log4perl/Util/Semaphore.pm
 %%SITE_PERL%%/Log/Log4perl/Util/TimeTracker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Log4perl/.packlist
 %%PERL5_MAN3%%/Log::Log4perl.3.gz
 %%PERL5_MAN3%%/Log::Log4perl::Appender.3.gz
 %%PERL5_MAN3%%/Log::Log4perl::Appender::Buffer.3.gz
diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
index 92354ed59031..5d8c4f1e826b 100644
--- a/devel/p5-Log-Message-Simple/Makefile
+++ b/devel/p5-Log-Message-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Message-Simple
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Message-Simple/pkg-plist b/devel/p5-Log-Message-Simple/pkg-plist
index b120f4782dce..dc4932a78d6d 100644
--- a/devel/p5-Log-Message-Simple/pkg-plist
+++ b/devel/p5-Log-Message-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Log::Message::Simple.3.gz
 %%SITE_PERL%%/Log/Message/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Message/Simple/.packlist
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index 158bb8fcdf19..d67669c16846 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Message
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/devel/p5-Log-Message/pkg-plist b/devel/p5-Log-Message/pkg-plist
index afbd06b281d9..62d4c6cd0579 100644
--- a/devel/p5-Log-Message/pkg-plist
+++ b/devel/p5-Log-Message/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Log/Message/Config.pm
 %%SITE_PERL%%/Log/Message/Handlers.pm
 %%SITE_PERL%%/Log/Message/Item.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Message/.packlist
diff --git a/devel/p5-Log-Minimal/Makefile b/devel/p5-Log-Minimal/Makefile
index 8b7475db875b..b73edf59972c 100644
--- a/devel/p5-Log-Minimal/Makefile
+++ b/devel/p5-Log-Minimal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Minimal
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index 6e260b4aa6cc..754f2e31dcb9 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Report
 PORTVERSION=	0.99.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARKOV
diff --git a/devel/p5-Log-Report/pkg-plist b/devel/p5-Log-Report/pkg-plist
index 31df2f035ddb..8e925cdd6997 100644
--- a/devel/p5-Log-Report/pkg-plist
+++ b/devel/p5-Log-Report/pkg-plist
@@ -1,5 +1,4 @@
 bin/xgettext-perl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Report/.packlist
 %%SITE_PERL%%/Log/Report.pm
 %%SITE_PERL%%/Log/Report.pod
 %%SITE_PERL%%/Log/Report/Die.pm
diff --git a/devel/p5-Log-Simple/Makefile b/devel/p5-Log-Simple/Makefile
index 2945233a2207..74fa6bdd94a9 100644
--- a/devel/p5-Log-Simple/Makefile
+++ b/devel/p5-Log-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Simple
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-Simple/pkg-plist b/devel/p5-Log-Simple/pkg-plist
index 3d718101afa4..e8a0e9dc2192 100644
--- a/devel/p5-Log-Simple/pkg-plist
+++ b/devel/p5-Log-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Log/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Simple/.packlist
 %%PERL5_MAN3%%/Log::Simple.3.gz
diff --git a/devel/p5-Log-Trace/Makefile b/devel/p5-Log-Trace/Makefile
index 35bfebe3bca6..d243ed079a6a 100644
--- a/devel/p5-Log-Trace/Makefile
+++ b/devel/p5-Log-Trace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Trace
 PORTVERSION=	1.070
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Log
diff --git a/devel/p5-Log-Trace/pkg-plist b/devel/p5-Log-Trace/pkg-plist
index 4009e4f553de..f68aa44d3090 100644
--- a/devel/p5-Log-Trace/pkg-plist
+++ b/devel/p5-Log-Trace/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Log/Trace.pm
 %%SITE_PERL%%/Log/Trace/Manual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Trace/.packlist
 %%PERL5_MAN3%%/Log::Trace.3.gz
 %%PERL5_MAN3%%/Log::Trace::Manual.3.gz
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index dcb92a411888..0e5ca03dcf67 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-TraceMessages
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Log-TraceMessages/pkg-plist b/devel/p5-Log-TraceMessages/pkg-plist
index a022df870774..069475612895 100644
--- a/devel/p5-Log-TraceMessages/pkg-plist
+++ b/devel/p5-Log-TraceMessages/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Log::TraceMessages.3.gz
 %%SITE_PERL%%/Log/TraceMessages.pm
 %%SITE_PERL%%/auto/Log/TraceMessages/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages/.packlist
diff --git a/devel/p5-Logfile-Rotate/Makefile b/devel/p5-Logfile-Rotate/Makefile
index 4b3b8506c8e7..9ecfe2c7f6ec 100644
--- a/devel/p5-Logfile-Rotate/Makefile
+++ b/devel/p5-Logfile-Rotate/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Logfile-Rotate
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Logfile-Rotate/pkg-plist b/devel/p5-Logfile-Rotate/pkg-plist
index 7231d68faaef..feddf1f61a43 100644
--- a/devel/p5-Logfile-Rotate/pkg-plist
+++ b/devel/p5-Logfile-Rotate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Logfile::Rotate.3.gz
 %%SITE_PERL%%/Logfile/Rotate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Logfile/Rotate/.packlist
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index 0316dc05e88b..8d55adb72497 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Luka
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TPG
diff --git a/devel/p5-Luka/pkg-plist b/devel/p5-Luka/pkg-plist
index a13ac0682a5b..be4d164010ee 100644
--- a/devel/p5-Luka/pkg-plist
+++ b/devel/p5-Luka/pkg-plist
@@ -4,7 +4,6 @@
 %%SITE_PERL%%/Luka/ExceptionBase.pm
 %%SITE_PERL%%/Luka/Exceptions.pm
 %%SITE_PERL%%/Luka/Mailer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Luka/.packlist
 %%PERL5_MAN3%%/Luka.3.gz
 %%PERL5_MAN3%%/Luka::Conf.3.gz
 %%PERL5_MAN3%%/Luka::Exceptions.3.gz
diff --git a/devel/p5-Lvalue/Makefile b/devel/p5-Lvalue/Makefile
index 292f609bff0f..4efff3172d42 100644
--- a/devel/p5-Lvalue/Makefile
+++ b/devel/p5-Lvalue/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lvalue
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ASG
diff --git a/devel/p5-Lvalue/pkg-plist b/devel/p5-Lvalue/pkg-plist
index 8b38983e8204..aa6804182462 100644
--- a/devel/p5-Lvalue/pkg-plist
+++ b/devel/p5-Lvalue/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lvalue.3.gz
 %%SITE_PERL%%/Lvalue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lvalue/.packlist
diff --git a/devel/p5-MRO-Compat/Makefile b/devel/p5-MRO-Compat/Makefile
index 88b1f63cb97b..826ebe5c2f76 100644
--- a/devel/p5-MRO-Compat/Makefile
+++ b/devel/p5-MRO-Compat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MRO-Compat
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/devel/p5-MRO-Compat/pkg-plist b/devel/p5-MRO-Compat/pkg-plist
index 5e7b08516b0a..7bc05b9ed656 100644
--- a/devel/p5-MRO-Compat/pkg-plist
+++ b/devel/p5-MRO-Compat/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MRO::Compat.3.gz
 %%SITE_PERL%%/MRO/Compat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MRO/Compat/.packlist
diff --git a/devel/p5-MRO-Define/Makefile b/devel/p5-MRO-Define/Makefile
index 0cd5ee1da5a6..3ecda7a5e9af 100644
--- a/devel/p5-MRO-Define/Makefile
+++ b/devel/p5-MRO-Define/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MRO-Define
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/devel/p5-MRO-Define/pkg-plist b/devel/p5-MRO-Define/pkg-plist
index ca06b1dd8477..8aac901020a4 100644
--- a/devel/p5-MRO-Define/pkg-plist
+++ b/devel/p5-MRO-Define/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/MRO::Define.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/MRO/Define.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MRO/Define/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MRO/Define/Define.so
+%%SITE_ARCH%%/MRO/Define.pm
+%%SITE_ARCH%%/auto/MRO/Define/Define.so
diff --git a/devel/p5-Mac-FileSpec-Unixish/Makefile b/devel/p5-Mac-FileSpec-Unixish/Makefile
index a563be8f5850..17f11c037b95 100644
--- a/devel/p5-Mac-FileSpec-Unixish/Makefile
+++ b/devel/p5-Mac-FileSpec-Unixish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mac-FileSpec-Unixish
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Mac-FileSpec-Unixish/pkg-plist b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
index 666bff571ab5..6da71e2e6bea 100644
--- a/devel/p5-Mac-FileSpec-Unixish/pkg-plist
+++ b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Mac::FileSpec::Unixish.3.gz
 %%SITE_PERL%%/Mac/FileSpec/Unixish.pm
 %%SITE_PERL%%/Mac/FileSpec/unixish_guts_test.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish/.packlist
diff --git a/devel/p5-Mac-PropertyList/Makefile b/devel/p5-Mac-PropertyList/Makefile
index 2bf4826d30be..039c96c70607 100644
--- a/devel/p5-Mac-PropertyList/Makefile
+++ b/devel/p5-Mac-PropertyList/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mac-PropertyList
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Mac-PropertyList/pkg-plist b/devel/p5-Mac-PropertyList/pkg-plist
index c3008a8a450c..06c3baa50c7c 100644
--- a/devel/p5-Mac-PropertyList/pkg-plist
+++ b/devel/p5-Mac-PropertyList/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Mac/PropertyList.pm
 %%SITE_PERL%%/Mac/PropertyList/ReadBinary.pm
 %%SITE_PERL%%/Mac/PropertyList/WriteBinary.pm
-%%SITE_PERL%%/mach/auto/Mac/PropertyList/.packlist
 %%PERL5_MAN3%%/Mac::PropertyList.3.gz
 %%PERL5_MAN3%%/Mac::PropertyList::ReadBinary.3.gz
 %%PERL5_MAN3%%/Mac::PropertyList::WriteBinary.3.gz
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index 3d04e5844f42..9fbd2959e609 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Make
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Make/pkg-plist b/devel/p5-Make/pkg-plist
index ca1aa84073cc..f456c200835d 100644
--- a/devel/p5-Make/pkg-plist
+++ b/devel/p5-Make/pkg-plist
@@ -1,5 +1,4 @@
 bin/perlmake
 %%PERL5_MAN3%%/Make.3.gz
 %%SITE_PERL%%/Make.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Make/.packlist
 man/man1/perlmake.1.gz
diff --git a/devel/p5-Media-Type-Simple/Makefile b/devel/p5-Media-Type-Simple/Makefile
index 1035e6eea1c5..6041072c3080 100644
--- a/devel/p5-Media-Type-Simple/Makefile
+++ b/devel/p5-Media-Type-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Media-Type-Simple
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RRWO
diff --git a/devel/p5-Media-Type-Simple/pkg-plist b/devel/p5-Media-Type-Simple/pkg-plist
index f47bbfb32c77..a892bcc51138 100644
--- a/devel/p5-Media-Type-Simple/pkg-plist
+++ b/devel/p5-Media-Type-Simple/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/MIME/Type/Simple.pm
 %%SITE_PERL%%/Media/Type/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Media/Type/Simple/.packlist
 %%PERL5_MAN3%%/MIME::Type::Simple.3.gz
 %%PERL5_MAN3%%/Media::Type::Simple.3.gz
diff --git a/devel/p5-Memoize-ExpireLRU/Makefile b/devel/p5-Memoize-ExpireLRU/Makefile
index 8988e6504eac..ba12b344f4c3 100644
--- a/devel/p5-Memoize-ExpireLRU/Makefile
+++ b/devel/p5-Memoize-ExpireLRU/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Memoize-ExpireLRU
 PORTVERSION=	0.55
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Memoize-ExpireLRU/pkg-plist b/devel/p5-Memoize-ExpireLRU/pkg-plist
index ce24650541c7..f3420863593e 100644
--- a/devel/p5-Memoize-ExpireLRU/pkg-plist
+++ b/devel/p5-Memoize-ExpireLRU/pkg-plist
@@ -2,5 +2,4 @@
 %%SITE_PERL%%/auto/Memoize/ExpireLRU/DumpCache.al
 %%SITE_PERL%%/auto/Memoize/ExpireLRU/ShowStats.al
 %%SITE_PERL%%/auto/Memoize/ExpireLRU/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize/ExpireLRU/.packlist
 %%PERL5_MAN3%%/Memoize::ExpireLRU.3.gz
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index e7ee2d29738d..bc40ba8830d7 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Memoize
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MJD
diff --git a/devel/p5-Memoize/pkg-plist b/devel/p5-Memoize/pkg-plist
index 384e275a0c0d..890756a86e52 100644
--- a/devel/p5-Memoize/pkg-plist
+++ b/devel/p5-Memoize/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize/.packlist
 %%SITE_PERL%%/Memoize.pm
 %%SITE_PERL%%/Memoize/ExpireTest.pm
 %%SITE_PERL%%/Memoize/Expire.pm
diff --git a/devel/p5-Meta-Builder/Makefile b/devel/p5-Meta-Builder/Makefile
index e100118958b1..c90d767984d3 100644
--- a/devel/p5-Meta-Builder/Makefile
+++ b/devel/p5-Meta-Builder/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Meta-Builder
 PORTVERSION=	0.003
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
diff --git a/devel/p5-MetaCPAN-Client/Makefile b/devel/p5-MetaCPAN-Client/Makefile
index 99b22fb61aed..e2141da4b4fc 100644
--- a/devel/p5-MetaCPAN-Client/Makefile
+++ b/devel/p5-MetaCPAN-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MetaCPAN-Client
 PORTVERSION=	1.003000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:XSAWYERX
diff --git a/devel/p5-MetaCPAN-Client/pkg-plist b/devel/p5-MetaCPAN-Client/pkg-plist
index c169da73c727..c7f1cddc0b71 100644
--- a/devel/p5-MetaCPAN-Client/pkg-plist
+++ b/devel/p5-MetaCPAN-Client/pkg-plist
@@ -9,7 +9,6 @@
 %%SITE_PERL%%/MetaCPAN/Client/Request.pm
 %%SITE_PERL%%/MetaCPAN/Client/ResultSet.pm
 %%SITE_PERL%%/MetaCPAN/Client/Role/Entity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MetaCPAN/Client/.packlist
 %%PERL5_MAN3%%/MetaCPAN::Client.3.gz
 %%PERL5_MAN3%%/MetaCPAN::Client::Author.3.gz
 %%PERL5_MAN3%%/MetaCPAN::Client::Distribution.3.gz
diff --git a/devel/p5-Metabase-Client-Simple/Makefile b/devel/p5-Metabase-Client-Simple/Makefile
index dcbec9fbf586..b08f9c981dae 100644
--- a/devel/p5-Metabase-Client-Simple/Makefile
+++ b/devel/p5-Metabase-Client-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Metabase-Client-Simple
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Metabase-Client-Simple/pkg-plist b/devel/p5-Metabase-Client-Simple/pkg-plist
index d1d7b24bd319..41040e8fa6ad 100644
--- a/devel/p5-Metabase-Client-Simple/pkg-plist
+++ b/devel/p5-Metabase-Client-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Metabase/Client/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Metabase/Client/Simple/.packlist
 %%PERL5_MAN3%%/Metabase::Client::Simple.3.gz
diff --git a/devel/p5-Metabase-Fact/Makefile b/devel/p5-Metabase-Fact/Makefile
index faca1da0ef0b..582718a433de 100644
--- a/devel/p5-Metabase-Fact/Makefile
+++ b/devel/p5-Metabase-Fact/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Metabase-Fact
 PORTVERSION=	0.024
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Metabase-Fact/pkg-plist b/devel/p5-Metabase-Fact/pkg-plist
index 20cb55bcddaf..3a5cb91c9f44 100644
--- a/devel/p5-Metabase-Fact/pkg-plist
+++ b/devel/p5-Metabase-Fact/pkg-plist
@@ -16,7 +16,6 @@ man/man1/metabase-profile.1.gz
 %%SITE_PERL%%/Metabase/Resource/cpan.pm
 %%SITE_PERL%%/Metabase/Resource/perl/commit.pm
 %%SITE_PERL%%/Metabase/Resource/cpan/distfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Metabase/Fact/.packlist
 %%PERL5_MAN3%%/Metabase::Fact.3.gz
 %%PERL5_MAN3%%/Metabase::Fact::Hash.3.gz
 %%PERL5_MAN3%%/Metabase::Fact::String.3.gz
diff --git a/devel/p5-Method-Alias/Makefile b/devel/p5-Method-Alias/Makefile
index d5ce357ffb82..d73462838781 100644
--- a/devel/p5-Method-Alias/Makefile
+++ b/devel/p5-Method-Alias/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Method-Alias
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/devel/p5-Method-Alias/pkg-plist b/devel/p5-Method-Alias/pkg-plist
index cfd510e6ab12..182b397286d3 100644
--- a/devel/p5-Method-Alias/pkg-plist
+++ b/devel/p5-Method-Alias/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Method::Alias.3.gz
 %%SITE_PERL%%/Method/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Method/Alias/.packlist
diff --git a/devel/p5-Method-Signatures-Simple/Makefile b/devel/p5-Method-Signatures-Simple/Makefile
index daef36078cee..abf0defb4ad4 100644
--- a/devel/p5-Method-Signatures-Simple/Makefile
+++ b/devel/p5-Method-Signatures-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Method-Signatures-Simple
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RHESA
diff --git a/devel/p5-Method-Signatures-Simple/pkg-plist b/devel/p5-Method-Signatures-Simple/pkg-plist
index 350dbf65bae9..090410fd68e2 100644
--- a/devel/p5-Method-Signatures-Simple/pkg-plist
+++ b/devel/p5-Method-Signatures-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Method::Signatures::Simple.3.gz
 %%SITE_PERL%%/Method/Signatures/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Method/Signatures/Simple/.packlist
diff --git a/devel/p5-Mixin-Linewise/Makefile b/devel/p5-Mixin-Linewise/Makefile
index 3abc7b265f87..7ed285ed1094 100644
--- a/devel/p5-Mixin-Linewise/Makefile
+++ b/devel/p5-Mixin-Linewise/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Mixin-Linewise
 PORTVERSION=	0.106
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Mixin-Linewise/pkg-plist b/devel/p5-Mixin-Linewise/pkg-plist
index 07e09fd5224c..720c49b76dc2 100644
--- a/devel/p5-Mixin-Linewise/pkg-plist
+++ b/devel/p5-Mixin-Linewise/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Mixin/Linewise.pm
 %%SITE_PERL%%/Mixin/Linewise/Readers.pm
 %%SITE_PERL%%/Mixin/Linewise/Writers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mixin/Linewise/.packlist
diff --git a/devel/p5-Mknod/Makefile b/devel/p5-Mknod/Makefile
index 1afbef9d346f..78fb41c9ba94 100644
--- a/devel/p5-Mknod/Makefile
+++ b/devel/p5-Mknod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mknod
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RLZWART
diff --git a/devel/p5-Mknod/pkg-plist b/devel/p5-Mknod/pkg-plist
index 4c2e9d794cea..86fe28e16caa 100644
--- a/devel/p5-Mknod/pkg-plist
+++ b/devel/p5-Mknod/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Mknod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mknod/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mknod/Mknod.so
+%%SITE_ARCH%%/Mknod.pm
+%%SITE_ARCH%%/auto/Mknod/Mknod.so
 %%PERL5_MAN3%%/Mknod.3.gz
diff --git a/devel/p5-Mo/Makefile b/devel/p5-Mo/Makefile
index 5af91829c10e..b8f6c33fa265 100644
--- a/devel/p5-Mo/Makefile
+++ b/devel/p5-Mo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mo
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CARLOS
diff --git a/devel/p5-Mo/pkg-plist b/devel/p5-Mo/pkg-plist
index 23570954152b..a3b8f0e92a66 100644
--- a/devel/p5-Mo/pkg-plist
+++ b/devel/p5-Mo/pkg-plist
@@ -35,7 +35,6 @@ bin/mo-inline
 %%SITE_PERL%%/Mo/required.pod
 %%SITE_PERL%%/Mo/xs.pm
 %%SITE_PERL%%/Mo/xs.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mo/.packlist
 %%PERL5_MAN3%%/Mo.3.gz
 %%PERL5_MAN3%%/Mo::Design.3.gz
 %%PERL5_MAN3%%/Mo::Features.3.gz
diff --git a/devel/p5-Mock-Quick/Makefile b/devel/p5-Mock-Quick/Makefile
index 1443981f44cc..5f67c29802a5 100644
--- a/devel/p5-Mock-Quick/Makefile
+++ b/devel/p5-Mock-Quick/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mock-Quick
 PORTVERSION=	1.108
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
diff --git a/devel/p5-Module-Build-Convert/Makefile b/devel/p5-Module-Build-Convert/Makefile
index 6a61663c48c1..6e47f3667be4 100644
--- a/devel/p5-Module-Build-Convert/Makefile
+++ b/devel/p5-Module-Build-Convert/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Build-Convert
 PORTVERSION=	0.49
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Build-Kwalitee/Makefile b/devel/p5-Module-Build-Kwalitee/Makefile
index ad18ebbe5ddf..4a32a9152845 100644
--- a/devel/p5-Module-Build-Kwalitee/Makefile
+++ b/devel/p5-Module-Build-Kwalitee/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Build-Kwalitee
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Build-Tiny/Makefile b/devel/p5-Module-Build-Tiny/Makefile
index 495cbe6136c0..5db235a21204 100644
--- a/devel/p5-Module-Build-Tiny/Makefile
+++ b/devel/p5-Module-Build-Tiny/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Module-Build-Tiny
 PORTVERSION=	0.039
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Build-Tiny/pkg-plist b/devel/p5-Module-Build-Tiny/pkg-plist
index 0a9ab8748081..330ba2608426 100644
--- a/devel/p5-Module-Build-Tiny/pkg-plist
+++ b/devel/p5-Module-Build-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Build/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Build/Tiny/.packlist
 %%PERL5_MAN3%%/Module::Build::Tiny.3.gz
diff --git a/devel/p5-Module-Build-XSUtil/Makefile b/devel/p5-Module-Build-XSUtil/Makefile
index 927f3250e0a2..84734bd479f3 100644
--- a/devel/p5-Module-Build-XSUtil/Makefile
+++ b/devel/p5-Module-Build-XSUtil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Build-XSUtil
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index bdd71aa9a4b8..de02c95749f3 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Module-Build
 PORTVERSION=	0.4206
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-CPANTS-Analyse/Makefile b/devel/p5-Module-CPANTS-Analyse/Makefile
index af41893e7a3e..5ec4597c22d7 100644
--- a/devel/p5-Module-CPANTS-Analyse/Makefile
+++ b/devel/p5-Module-CPANTS-Analyse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-CPANTS-Analyse
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-CPANfile/Makefile b/devel/p5-Module-CPANfile/Makefile
index 94c01d8cd5d0..f0f4459503cf 100644
--- a/devel/p5-Module-CPANfile/Makefile
+++ b/devel/p5-Module-CPANfile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-CPANfile
 PORTVERSION=	1.0002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Module
diff --git a/devel/p5-Module-CPANfile/pkg-plist b/devel/p5-Module-CPANfile/pkg-plist
index 0348b5898978..7c396f79100f 100644
--- a/devel/p5-Module-CPANfile/pkg-plist
+++ b/devel/p5-Module-CPANfile/pkg-plist
@@ -10,4 +10,3 @@ man/man1/mymeta-cpanfile.1.gz
 %%SITE_PERL%%/Module/CPANfile/Environment.pm
 %%SITE_PERL%%/cpanfile-faq.pod
 %%SITE_PERL%%/cpanfile.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CPANfile/.packlist
diff --git a/devel/p5-Module-CheckDeps/Makefile b/devel/p5-Module-CheckDeps/Makefile
index b1288856d76e..527f7e4de632 100644
--- a/devel/p5-Module-CheckDeps/Makefile
+++ b/devel/p5-Module-CheckDeps/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-CheckDeps
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ALEXBIO
diff --git a/devel/p5-Module-CheckDeps/pkg-plist b/devel/p5-Module-CheckDeps/pkg-plist
index 3f593feb455f..bad1ac271e80 100644
--- a/devel/p5-Module-CheckDeps/pkg-plist
+++ b/devel/p5-Module-CheckDeps/pkg-plist
@@ -1,5 +1,4 @@
 bin/checkdeps
 %%SITE_PERL%%/Module/CheckDeps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CheckDeps/.packlist
 %%PERL5_MAN3%%/Module::CheckDeps.3.gz
 man/man1/checkdeps.1.gz
diff --git a/devel/p5-Module-Collect/Makefile b/devel/p5-Module-Collect/Makefile
index f40327879742..51b505359d0c 100644
--- a/devel/p5-Module-Collect/Makefile
+++ b/devel/p5-Module-Collect/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Collect
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Collect/pkg-plist b/devel/p5-Module-Collect/pkg-plist
index 4b681f77638e..e7c7b095196a 100644
--- a/devel/p5-Module-Collect/pkg-plist
+++ b/devel/p5-Module-Collect/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Module/Collect/Package.pm
 %%SITE_PERL%%/Module/Collect.pm
 %%SITE_PERL%%/Module/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Collect/.packlist
 %%PERL5_MAN3%%/Module::Collect.3.gz
 %%PERL5_MAN3%%/Module::README.3.gz
 %%PERL5_MAN3%%/Module::Collect::Package.3.gz
diff --git a/devel/p5-Module-Compile/Makefile b/devel/p5-Module-Compile/Makefile
index b92db0dc2ab1..ba47f3d45db4 100644
--- a/devel/p5-Module-Compile/Makefile
+++ b/devel/p5-Module-Compile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Compile
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Compile/pkg-plist b/devel/p5-Module-Compile/pkg-plist
index f7d39e05a90b..bb63ca4a361a 100644
--- a/devel/p5-Module-Compile/pkg-plist
+++ b/devel/p5-Module-Compile/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Compile/.packlist
 %%SITE_PERL%%/Module/Compile.pm
 %%SITE_PERL%%/Module/Compile.pod
 %%SITE_PERL%%/Module/Compile/Opt.pm
diff --git a/devel/p5-Module-CoreList/Makefile b/devel/p5-Module-CoreList/Makefile
index aa423a9d9a4e..5a0b35586679 100644
--- a/devel/p5-Module-CoreList/Makefile
+++ b/devel/p5-Module-CoreList/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-CoreList
 PORTVERSION=	5.021003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-CoreList/pkg-plist b/devel/p5-Module-CoreList/pkg-plist
index 783e91e2bcc2..cbf1d0e1f2b8 100644
--- a/devel/p5-Module-CoreList/pkg-plist
+++ b/devel/p5-Module-CoreList/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/Module/CoreList.pod
 %%SITE_PERL%%/Module/CoreList/TieHashDelta.pm
 %%SITE_PERL%%/Module/CoreList/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CoreList/.packlist
 %%PERL5_MAN3%%/Module::CoreList.3.gz
 %%PERL5_MAN3%%/Module::CoreList::Utils.3.gz
diff --git a/devel/p5-Module-Dependency/Makefile b/devel/p5-Module-Dependency/Makefile
index 36251bc889bc..13e5826102f4 100644
--- a/devel/p5-Module-Dependency/Makefile
+++ b/devel/p5-Module-Dependency/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Dependency
 PORTVERSION=	1.86
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Dependency/pkg-plist b/devel/p5-Module-Dependency/pkg-plist
index 9314e4f5e4af..24e6ec630c75 100644
--- a/devel/p5-Module-Dependency/pkg-plist
+++ b/devel/p5-Module-Dependency/pkg-plist
@@ -11,7 +11,6 @@ bin/pmd_indexer.plx
 %%SITE_PERL%%/Module/Dependency/Indexer.pm
 %%SITE_PERL%%/Module/Dependency/Info.pm
 %%SITE_PERL%%/Module/pmd_dump.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Dependency/.packlist
 man/man1/pmd_dump.pl.1.gz
 man/man1/pmd_grapher.plx.1.gz
 man/man1/pmd_indexer.plx.1.gz
diff --git a/devel/p5-Module-Depends/Makefile b/devel/p5-Module-Depends/Makefile
index d6338e4982fe..c157b4c54bfd 100644
--- a/devel/p5-Module-Depends/Makefile
+++ b/devel/p5-Module-Depends/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Depends
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Extract/Makefile b/devel/p5-Module-Extract/Makefile
index 409ec5ff4d85..bdd28c66cae1 100644
--- a/devel/p5-Module-Extract/Makefile
+++ b/devel/p5-Module-Extract/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Extract
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Extract/pkg-plist b/devel/p5-Module-Extract/pkg-plist
index c9564f30adcd..a33c6253b1f4 100644
--- a/devel/p5-Module-Extract/pkg-plist
+++ b/devel/p5-Module-Extract/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Extract.3.gz
 %%SITE_PERL%%/Module/Extract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Extract/.packlist
diff --git a/devel/p5-Module-ExtractUse/Makefile b/devel/p5-Module-ExtractUse/Makefile
index 2445f073f16e..004447fc67b8 100644
--- a/devel/p5-Module-ExtractUse/Makefile
+++ b/devel/p5-Module-ExtractUse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-ExtractUse
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Find/Makefile b/devel/p5-Module-Find/Makefile
index c4141aafa6c9..da09e0868aff 100644
--- a/devel/p5-Module-Find/Makefile
+++ b/devel/p5-Module-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Find
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Find/pkg-plist b/devel/p5-Module-Find/pkg-plist
index 052c21e1490a..cd351e25b07d 100644
--- a/devel/p5-Module-Find/pkg-plist
+++ b/devel/p5-Module-Find/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Find.3.gz
 %%SITE_PERL%%/Module/Find.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Find/.packlist
diff --git a/devel/p5-Module-Functions/Makefile b/devel/p5-Module-Functions/Makefile
index 39b355a54705..d23cb3c3eca5 100644
--- a/devel/p5-Module-Functions/Makefile
+++ b/devel/p5-Module-Functions/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Functions
 PORTVERSION=	2.1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Implementation/Makefile b/devel/p5-Module-Implementation/Makefile
index dc923a5782cd..909b43cf9b93 100644
--- a/devel/p5-Module-Implementation/Makefile
+++ b/devel/p5-Module-Implementation/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Implementation
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Implementation/pkg-plist b/devel/p5-Module-Implementation/pkg-plist
index 5289ffbaa727..5ca18d43e9b9 100644
--- a/devel/p5-Module-Implementation/pkg-plist
+++ b/devel/p5-Module-Implementation/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Implementation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Implementation/.packlist
 %%PERL5_MAN3%%/Module::Implementation.3.gz
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index 6e5ff8d94671..15573e467eb8 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Info-File
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Module
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index cb6d7645ded0..d4ec29f3ab87 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Info
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Info/pkg-plist b/devel/p5-Module-Info/pkg-plist
index 1a3c5306d589..b46907a01c77 100644
--- a/devel/p5-Module-Info/pkg-plist
+++ b/devel/p5-Module-Info/pkg-plist
@@ -8,4 +8,3 @@ man/man1/pfunc.1.gz
 %%SITE_PERL%%/B/Module/Info.pm
 %%SITE_PERL%%/B/BUtils.pm
 %%SITE_PERL%%/Module/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info/.packlist
diff --git a/devel/p5-Module-Inspector/Makefile b/devel/p5-Module-Inspector/Makefile
index 1c85d5bc0e1f..c41e90bd3aed 100644
--- a/devel/p5-Module-Inspector/Makefile
+++ b/devel/p5-Module-Inspector/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Inspector
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Inspector/pkg-plist b/devel/p5-Module-Inspector/pkg-plist
index 079d8e54b833..3e803191980f 100644
--- a/devel/p5-Module-Inspector/pkg-plist
+++ b/devel/p5-Module-Inspector/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Inspector.3.gz
 %%SITE_PERL%%/Module/Inspector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Inspector/.packlist
diff --git a/devel/p5-Module-Install-AuthorRequires/Makefile b/devel/p5-Module-Install-AuthorRequires/Makefile
index d540cec79160..b89e4c72722e 100644
--- a/devel/p5-Module-Install-AuthorRequires/Makefile
+++ b/devel/p5-Module-Install-AuthorRequires/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Install-AuthorRequires
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Install-AuthorRequires/pkg-plist b/devel/p5-Module-Install-AuthorRequires/pkg-plist
index 6feea9cfbad0..18891c2a43cf 100644
--- a/devel/p5-Module-Install-AuthorRequires/pkg-plist
+++ b/devel/p5-Module-Install-AuthorRequires/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/AuthorRequires/.packlist
 %%SITE_PERL%%/Module/Install/Admin/AuthorRequires.pm
 %%SITE_PERL%%/Module/Install/AuthorRequires.pm
 %%PERL5_MAN3%%/Module::Install::AuthorRequires.3.gz
diff --git a/devel/p5-Module-Install-AuthorTests/Makefile b/devel/p5-Module-Install-AuthorTests/Makefile
index c109304b249d..b71d04e4c63f 100644
--- a/devel/p5-Module-Install-AuthorTests/Makefile
+++ b/devel/p5-Module-Install-AuthorTests/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Install-AuthorTests
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Install-AuthorTests/pkg-plist b/devel/p5-Module-Install-AuthorTests/pkg-plist
index d6854d68909c..daa48981e3ce 100644
--- a/devel/p5-Module-Install-AuthorTests/pkg-plist
+++ b/devel/p5-Module-Install-AuthorTests/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Install/AuthorTests.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/AuthorTests/.packlist
 %%PERL5_MAN3%%/Module::Install::AuthorTests.3.gz
diff --git a/devel/p5-Module-Install-ReadmeFromPod/Makefile b/devel/p5-Module-Install-ReadmeFromPod/Makefile
index 10fd5b6ab7c1..c921ddbfb8d9 100644
--- a/devel/p5-Module-Install-ReadmeFromPod/Makefile
+++ b/devel/p5-Module-Install-ReadmeFromPod/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Install-ReadmeFromPod
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Install-ReadmeFromPod/pkg-plist b/devel/p5-Module-Install-ReadmeFromPod/pkg-plist
index 3af5bcff5eb2..d34d929ec07c 100644
--- a/devel/p5-Module-Install-ReadmeFromPod/pkg-plist
+++ b/devel/p5-Module-Install-ReadmeFromPod/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Install::ReadmeFromPod.3.gz
 %%SITE_PERL%%/Module/Install/ReadmeFromPod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/ReadmeFromPod/.packlist
diff --git a/devel/p5-Module-Install-Repository/Makefile b/devel/p5-Module-Install-Repository/Makefile
index 0e537a909fd8..cae0b9c887b0 100644
--- a/devel/p5-Module-Install-Repository/Makefile
+++ b/devel/p5-Module-Install-Repository/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Install-Repository
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Install-Repository/pkg-plist b/devel/p5-Module-Install-Repository/pkg-plist
index 7223ecb247e8..ca63344ea55d 100644
--- a/devel/p5-Module-Install-Repository/pkg-plist
+++ b/devel/p5-Module-Install-Repository/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/Repository/.packlist
 %%SITE_PERL%%/Module/Install/Repository.pm
 %%PERL5_MAN3%%/Module::Install::Repository.3.gz
diff --git a/devel/p5-Module-Install-Template/Makefile b/devel/p5-Module-Install-Template/Makefile
index b2159a404a20..cd9faf853324 100644
--- a/devel/p5-Module-Install-Template/Makefile
+++ b/devel/p5-Module-Install-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Install-Template
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Install-Template/pkg-plist b/devel/p5-Module-Install-Template/pkg-plist
index bd57935b05b2..dfba5e4dcc79 100644
--- a/devel/p5-Module-Install-Template/pkg-plist
+++ b/devel/p5-Module-Install-Template/pkg-plist
@@ -1,4 +1,3 @@
 bin/tt_pm_to_blib
 %%PERL5_MAN3%%/Module::Install::Template.3.gz
 %%SITE_PERL%%/Module/Install/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/Template/.packlist
diff --git a/devel/p5-Module-Install-TestBase/Makefile b/devel/p5-Module-Install-TestBase/Makefile
index dd8896ff3d0f..75f929491c78 100644
--- a/devel/p5-Module-Install-TestBase/Makefile
+++ b/devel/p5-Module-Install-TestBase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Install-TestBase
 PORTVERSION=	0.86
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Install-TestBase/pkg-plist b/devel/p5-Module-Install-TestBase/pkg-plist
index a63152a5d42c..8a61eb4e08ec 100644
--- a/devel/p5-Module-Install-TestBase/pkg-plist
+++ b/devel/p5-Module-Install-TestBase/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Module::Install::TestBase.3.gz
 %%SITE_PERL%%/Module/Install/TestBase.pm
 %%SITE_PERL%%/Module/Install/TestBase.pod
-%%SITE_ARCH%%/auto/Module/Install/TestBase/.packlist
diff --git a/devel/p5-Module-Install-XSUtil/Makefile b/devel/p5-Module-Install-XSUtil/Makefile
index 852ebd50f6da..06b40290b4f3 100644
--- a/devel/p5-Module-Install-XSUtil/Makefile
+++ b/devel/p5-Module-Install-XSUtil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Install-XSUtil
 PORTVERSION=	0.45
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
diff --git a/devel/p5-Module-Install-XSUtil/pkg-plist b/devel/p5-Module-Install-XSUtil/pkg-plist
index 5a14a51797a1..8035ed649809 100644
--- a/devel/p5-Module-Install-XSUtil/pkg-plist
+++ b/devel/p5-Module-Install-XSUtil/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Install/XSUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/XSUtil/.packlist
 %%PERL5_MAN3%%/Module::Install::XSUtil.3.gz
diff --git a/devel/p5-Module-Install/Makefile b/devel/p5-Module-Install/Makefile
index f58efca419b7..c18510a438f7 100644
--- a/devel/p5-Module-Install/Makefile
+++ b/devel/p5-Module-Install/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Install
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Install/pkg-plist b/devel/p5-Module-Install/pkg-plist
index 08d5ba4f4e7b..854c87ec19d5 100644
--- a/devel/p5-Module-Install/pkg-plist
+++ b/devel/p5-Module-Install/pkg-plist
@@ -57,4 +57,3 @@
 %%SITE_PERL%%/Module/Install/WriteAll.pm
 %%SITE_PERL%%/inc/Module/Install.pm
 %%SITE_PERL%%/inc/Module/Install/DSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/.packlist
diff --git a/devel/p5-Module-List/Makefile b/devel/p5-Module-List/Makefile
index 1cd46787fe40..0420255ce9ef 100644
--- a/devel/p5-Module-List/Makefile
+++ b/devel/p5-Module-List/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-List
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Load-Conditional/Makefile b/devel/p5-Module-Load-Conditional/Makefile
index 2d6644c41ef4..6bcd0f938211 100644
--- a/devel/p5-Module-Load-Conditional/Makefile
+++ b/devel/p5-Module-Load-Conditional/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Load-Conditional
 PORTVERSION=	0.62
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Load-Conditional/pkg-plist b/devel/p5-Module-Load-Conditional/pkg-plist
index 930f3206e716..a2fe1abccde3 100644
--- a/devel/p5-Module-Load-Conditional/pkg-plist
+++ b/devel/p5-Module-Load-Conditional/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Load::Conditional.3.gz
 %%SITE_PERL%%/Module/Load/Conditional.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load/Conditional/.packlist
diff --git a/devel/p5-Module-Load/Makefile b/devel/p5-Module-Load/Makefile
index 4907a9ab9dab..90c0c2b772eb 100644
--- a/devel/p5-Module-Load/Makefile
+++ b/devel/p5-Module-Load/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Load
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Load/pkg-plist b/devel/p5-Module-Load/pkg-plist
index c8cdb081b155..b2aff077ba01 100644
--- a/devel/p5-Module-Load/pkg-plist
+++ b/devel/p5-Module-Load/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Load.3.gz
 %%SITE_PERL%%/Module/Load.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load/.packlist
diff --git a/devel/p5-Module-Loaded/Makefile b/devel/p5-Module-Loaded/Makefile
index 09454212e0a7..918391d0f240 100644
--- a/devel/p5-Module-Loaded/Makefile
+++ b/devel/p5-Module-Loaded/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Loaded
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Loaded/pkg-plist b/devel/p5-Module-Loaded/pkg-plist
index ec64b1afa2ae..a4664d600be7 100644
--- a/devel/p5-Module-Loaded/pkg-plist
+++ b/devel/p5-Module-Loaded/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Loaded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Loaded/.packlist
 %%PERL5_MAN3%%/Module::Loaded.3.gz
diff --git a/devel/p5-Module-Manifest/Makefile b/devel/p5-Module-Manifest/Makefile
index a6f7df8473b2..d1ccb651ee8d 100644
--- a/devel/p5-Module-Manifest/Makefile
+++ b/devel/p5-Module-Manifest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Manifest
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Manifest/pkg-plist b/devel/p5-Module-Manifest/pkg-plist
index 6c62eefcd0ac..30c3b30d2c7d 100644
--- a/devel/p5-Module-Manifest/pkg-plist
+++ b/devel/p5-Module-Manifest/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Manifest.3.gz
 %%SITE_PERL%%/Module/Manifest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Manifest/.packlist
diff --git a/devel/p5-Module-Math-Depends/Makefile b/devel/p5-Module-Math-Depends/Makefile
index c69c908fd8f8..1044d425ad65 100644
--- a/devel/p5-Module-Math-Depends/Makefile
+++ b/devel/p5-Module-Math-Depends/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Math-Depends
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Math-Depends/pkg-plist b/devel/p5-Module-Math-Depends/pkg-plist
index 81df4d53c80a..71ca4780c011 100644
--- a/devel/p5-Module-Math-Depends/pkg-plist
+++ b/devel/p5-Module-Math-Depends/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Math::Depends.3.gz
 %%SITE_PERL%%/Module/Math/Depends.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Math/Depends/.packlist
diff --git a/devel/p5-Module-Metadata/Makefile b/devel/p5-Module-Metadata/Makefile
index 0634707ee375..2fb037ee7d1a 100644
--- a/devel/p5-Module-Metadata/Makefile
+++ b/devel/p5-Module-Metadata/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Metadata
 PORTVERSION=	1.000024
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-Module-Metadata/pkg-plist b/devel/p5-Module-Metadata/pkg-plist
index ddb304abbc8f..98eac29cb9b6 100644
--- a/devel/p5-Module-Metadata/pkg-plist
+++ b/devel/p5-Module-Metadata/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Metadata.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Metadata/.packlist
 %%SITE_PERL%%/Module/Metadata.pm
diff --git a/devel/p5-Module-Path/Makefile b/devel/p5-Module-Path/Makefile
index 24052b1a4a32..0e09a47e77ba 100644
--- a/devel/p5-Module-Path/Makefile
+++ b/devel/p5-Module-Path/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Path
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Path/pkg-plist b/devel/p5-Module-Path/pkg-plist
index 53ed2279a600..f32a14b46ed2 100644
--- a/devel/p5-Module-Path/pkg-plist
+++ b/devel/p5-Module-Path/pkg-plist
@@ -1,5 +1,4 @@
 bin/mpath
 %%SITE_PERL%%/Module/Path.pm
-%%SITE_PERL%%/mach/auto/Module/Path/.packlist
 man/man1/mpath.1.gz
 %%PERL5_MAN3%%/Module::Path.3.gz
diff --git a/devel/p5-Module-Pluggable-Fast/Makefile b/devel/p5-Module-Pluggable-Fast/Makefile
index 48d6a7d069c6..3aad232cecbc 100644
--- a/devel/p5-Module-Pluggable-Fast/Makefile
+++ b/devel/p5-Module-Pluggable-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Pluggable-Fast
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/devel/p5-Module-Pluggable-Fast/pkg-plist b/devel/p5-Module-Pluggable-Fast/pkg-plist
index e1170bce3aff..7e66d19959c1 100644
--- a/devel/p5-Module-Pluggable-Fast/pkg-plist
+++ b/devel/p5-Module-Pluggable-Fast/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Pluggable::Fast.3.gz
 %%SITE_PERL%%/Module/Pluggable/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/Fast/.packlist
diff --git a/devel/p5-Module-Pluggable-Ordered/Makefile b/devel/p5-Module-Pluggable-Ordered/Makefile
index 29ba45e5c0df..ae788b515a5b 100644
--- a/devel/p5-Module-Pluggable-Ordered/Makefile
+++ b/devel/p5-Module-Pluggable-Ordered/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Pluggable-Ordered
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Pluggable-Ordered/pkg-plist b/devel/p5-Module-Pluggable-Ordered/pkg-plist
index 34eb397ea750..167fc8a004f1 100644
--- a/devel/p5-Module-Pluggable-Ordered/pkg-plist
+++ b/devel/p5-Module-Pluggable-Ordered/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Pluggable::Ordered.3.gz
 %%SITE_PERL%%/Module/Pluggable/Ordered.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/Ordered/.packlist
diff --git a/devel/p5-Module-Pluggable/Makefile b/devel/p5-Module-Pluggable/Makefile
index 5f91cc99c0aa..144c88042cba 100644
--- a/devel/p5-Module-Pluggable/Makefile
+++ b/devel/p5-Module-Pluggable/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Pluggable
 PORTVERSION=	5.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Pluggable/pkg-plist b/devel/p5-Module-Pluggable/pkg-plist
index 6c045744f5d5..291ec4f830b5 100644
--- a/devel/p5-Module-Pluggable/pkg-plist
+++ b/devel/p5-Module-Pluggable/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Devel/InnerPackage.pm
 %%SITE_PERL%%/Module/Pluggable.pm
 %%SITE_PERL%%/Module/Pluggable/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/.packlist
 %%PERL5_MAN3%%/Devel::InnerPackage.3.gz
 %%PERL5_MAN3%%/Module::Pluggable.3.gz
 %%PERL5_MAN3%%/Module::Pluggable::Object.3.gz
diff --git a/devel/p5-Module-Reader/Makefile b/devel/p5-Module-Reader/Makefile
index 50df20bd7465..e31e847142cb 100644
--- a/devel/p5-Module-Reader/Makefile
+++ b/devel/p5-Module-Reader/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Reader
 PORTVERSION=	0.002003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Reader/pkg-plist b/devel/p5-Module-Reader/pkg-plist
index f06bf3cd395a..f8cafdd4d4df 100644
--- a/devel/p5-Module-Reader/pkg-plist
+++ b/devel/p5-Module-Reader/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Reader.3.gz
 %%SITE_PERL%%/Module/Reader.pm
-%%SITE_PERL%%/mach/auto/Module/Reader/.packlist
diff --git a/devel/p5-Module-Recursive-Require/Makefile b/devel/p5-Module-Recursive-Require/Makefile
index fb93aa2f17f0..68f574a80e62 100644
--- a/devel/p5-Module-Recursive-Require/Makefile
+++ b/devel/p5-Module-Recursive-Require/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Recursive-Require
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Recursive-Require/pkg-plist b/devel/p5-Module-Recursive-Require/pkg-plist
index ba5c7303f9f8..a5fd922a4e40 100644
--- a/devel/p5-Module-Recursive-Require/pkg-plist
+++ b/devel/p5-Module-Recursive-Require/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Recursive::Require.3.gz
 %%SITE_PERL%%/Module/Recursive/Require.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Recursive/Require/.packlist
diff --git a/devel/p5-Module-Refresh/Makefile b/devel/p5-Module-Refresh/Makefile
index 4f2469eb3941..38dbf807da84 100644
--- a/devel/p5-Module-Refresh/Makefile
+++ b/devel/p5-Module-Refresh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Refresh
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Module
diff --git a/devel/p5-Module-Refresh/pkg-plist b/devel/p5-Module-Refresh/pkg-plist
index a86602ea5ce4..b415b0c5fb16 100644
--- a/devel/p5-Module-Refresh/pkg-plist
+++ b/devel/p5-Module-Refresh/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Refresh.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Refresh/.packlist
 %%PERL5_MAN3%%/Module::Refresh.3.gz
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index b1a75b979b1e..c67ca1375330 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Release
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Release/pkg-plist b/devel/p5-Module-Release/pkg-plist
index 7ef53dbdfdcf..a14309c9b70b 100644
--- a/devel/p5-Module-Release/pkg-plist
+++ b/devel/p5-Module-Release/pkg-plist
@@ -7,7 +7,6 @@ bin/release
 %%SITE_PERL%%/Module/Release/Prereq.pm
 %%SITE_PERL%%/Module/Release/SVN.pm
 %%SITE_PERL%%/Module/Release/WebUpload/Mojo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Release/.packlist
 %%PERL5_MAN3%%/Module::Release.3.gz
 %%PERL5_MAN3%%/Module::Release::FTP.3.gz
 %%PERL5_MAN3%%/Module::Release::Kwalitee.3.gz
diff --git a/devel/p5-Module-Reload-Sel/Makefile b/devel/p5-Module-Reload-Sel/Makefile
index f44867392591..54c3fc6f2f97 100644
--- a/devel/p5-Module-Reload-Sel/Makefile
+++ b/devel/p5-Module-Reload-Sel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Reload-Sel
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Reload-Sel/pkg-plist b/devel/p5-Module-Reload-Sel/pkg-plist
index a16f11b74507..8303a0e649a0 100644
--- a/devel/p5-Module-Reload-Sel/pkg-plist
+++ b/devel/p5-Module-Reload-Sel/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Reload/Selective.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload/Selective/.packlist
 %%PERL5_MAN3%%/Module::Reload::Selective.3.gz
diff --git a/devel/p5-Module-Reload/Makefile b/devel/p5-Module-Reload/Makefile
index 750a89bc8f9b..89e032a6bc92 100644
--- a/devel/p5-Module-Reload/Makefile
+++ b/devel/p5-Module-Reload/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Reload
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Reload/pkg-plist b/devel/p5-Module-Reload/pkg-plist
index 706e1861916b..e39ad2f38550 100644
--- a/devel/p5-Module-Reload/pkg-plist
+++ b/devel/p5-Module-Reload/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Reload.3.gz
 %%SITE_PERL%%/Module/Reload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload/.packlist
diff --git a/devel/p5-Module-Runtime/Makefile b/devel/p5-Module-Runtime/Makefile
index abef4000d326..9ef580d9b4d3 100644
--- a/devel/p5-Module-Runtime/Makefile
+++ b/devel/p5-Module-Runtime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Runtime
 PORTVERSION=	0.014
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-ScanDeps/Makefile b/devel/p5-Module-ScanDeps/Makefile
index bbe3ae2e5c91..70a07678a9b6 100644
--- a/devel/p5-Module-ScanDeps/Makefile
+++ b/devel/p5-Module-ScanDeps/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-ScanDeps
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSCHUPP
diff --git a/devel/p5-Module-ScanDeps/pkg-plist b/devel/p5-Module-ScanDeps/pkg-plist
index fa1854cf84e7..ff2bea43436c 100644
--- a/devel/p5-Module-ScanDeps/pkg-plist
+++ b/devel/p5-Module-ScanDeps/pkg-plist
@@ -4,4 +4,3 @@ man/man1/scandeps.pl.1.gz
 %%SITE_PERL%%/Module/ScanDeps.pm
 %%SITE_PERL%%/Module/ScanDeps/Cache.pm
 %%SITE_PERL%%/Module/ScanDeps/DataFeed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/ScanDeps/.packlist
diff --git a/devel/p5-Module-Setup/Makefile b/devel/p5-Module-Setup/Makefile
index 4d2eb87c9f70..2e1f5ed7de3a 100644
--- a/devel/p5-Module-Setup/Makefile
+++ b/devel/p5-Module-Setup/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Setup
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Setup/pkg-plist b/devel/p5-Module-Setup/pkg-plist
index 3bea18c372ad..7206220c1111 100644
--- a/devel/p5-Module-Setup/pkg-plist
+++ b/devel/p5-Module-Setup/pkg-plist
@@ -1,5 +1,4 @@
 bin/module-setup
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Setup/.packlist
 %%SITE_PERL%%/Module/MEMOja.pod
 %%SITE_PERL%%/Module/Setup.pm
 %%SITE_PERL%%/Module/Setup/Devel.pm
diff --git a/devel/p5-Module-Starter-PBP/Makefile b/devel/p5-Module-Starter-PBP/Makefile
index e4b0e815f195..f6eadcbda332 100644
--- a/devel/p5-Module-Starter-PBP/Makefile
+++ b/devel/p5-Module-Starter-PBP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Starter-PBP
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Module-Starter-PBP/pkg-plist b/devel/p5-Module-Starter-PBP/pkg-plist
index 2996d75f0a96..383d443a4821 100644
--- a/devel/p5-Module-Starter-PBP/pkg-plist
+++ b/devel/p5-Module-Starter-PBP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Module/Starter/PBP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter/PBP/.packlist
 %%PERL5_MAN3%%/Module::Starter::PBP.3.gz
diff --git a/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile b/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
index e787e1dca071..dba095bc0e04 100644
--- a/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
+++ b/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Starter-Plugin-SimpleStore
 PORTVERSION=	0.144
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Starter-Plugin-SimpleStore/pkg-plist b/devel/p5-Module-Starter-Plugin-SimpleStore/pkg-plist
index ad5af587a306..1344a023f242 100644
--- a/devel/p5-Module-Starter-Plugin-SimpleStore/pkg-plist
+++ b/devel/p5-Module-Starter-Plugin-SimpleStore/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Module/Starter/Plugin/DirStore.pm
 %%SITE_PERL%%/Module/Starter/Plugin/InlineStore.pm
 %%SITE_PERL%%/Module/Starter/Plugin/ModuleStore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter/Plugin/DirStore/.packlist
diff --git a/devel/p5-Module-Starter-Plugin-TT2/Makefile b/devel/p5-Module-Starter-Plugin-TT2/Makefile
index 9fc3b414d936..56e57525bf76 100644
--- a/devel/p5-Module-Starter-Plugin-TT2/Makefile
+++ b/devel/p5-Module-Starter-Plugin-TT2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Starter-Plugin-TT2
 PORTVERSION=	0.125
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Starter-Plugin-TT2/pkg-plist b/devel/p5-Module-Starter-Plugin-TT2/pkg-plist
index 4da4aa7bfe83..7edd3d3e3883 100644
--- a/devel/p5-Module-Starter-Plugin-TT2/pkg-plist
+++ b/devel/p5-Module-Starter-Plugin-TT2/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Starter::Plugin::TT2.3.gz
 %%SITE_PERL%%/Module/Starter/Plugin/TT2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter/Plugin/TT2/.packlist
diff --git a/devel/p5-Module-Starter/Makefile b/devel/p5-Module-Starter/Makefile
index 31df228bb4b9..eb75ad2b7d5b 100644
--- a/devel/p5-Module-Starter/Makefile
+++ b/devel/p5-Module-Starter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Starter
 PORTVERSION=	1.62
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Starter/pkg-plist b/devel/p5-Module-Starter/pkg-plist
index 1f12a6fc4475..0de73195e97c 100644
--- a/devel/p5-Module-Starter/pkg-plist
+++ b/devel/p5-Module-Starter/pkg-plist
@@ -11,5 +11,4 @@ bin/module-starter
 %%SITE_PERL%%/Module/Starter/Plugin.pod
 %%SITE_PERL%%/Module/Starter/Plugin/Template.pm
 %%SITE_PERL%%/Module/Starter/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter/.packlist
 man/man1/module-starter.1.gz
diff --git a/devel/p5-Module-Used/Makefile b/devel/p5-Module-Used/Makefile
index 991a5b9117b7..920ab3bcbf6b 100644
--- a/devel/p5-Module-Used/Makefile
+++ b/devel/p5-Module-Used/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Module-Used
 PORTVERSION=	v1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Util/Makefile b/devel/p5-Module-Util/Makefile
index 2b6f11b79e46..98a4d0ad3423 100644
--- a/devel/p5-Module-Util/Makefile
+++ b/devel/p5-Module-Util/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Util
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Module
diff --git a/devel/p5-Module-Version/Makefile b/devel/p5-Module-Version/Makefile
index 6af0090f72bc..56e73f694ef6 100644
--- a/devel/p5-Module-Version/Makefile
+++ b/devel/p5-Module-Version/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Version
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Version/pkg-plist b/devel/p5-Module-Version/pkg-plist
index 357e02a0c4a6..3965b7c6da04 100644
--- a/devel/p5-Module-Version/pkg-plist
+++ b/devel/p5-Module-Version/pkg-plist
@@ -1,7 +1,6 @@
 bin/mversion
 %%SITE_PERL%%/Module/Version.pm
 %%SITE_PERL%%/Module/Version/App.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Version/.packlist
 %%PERL5_MAN3%%/Module::Version.3.gz
 %%PERL5_MAN3%%/Module::Version::App.3.gz
 man/man1/mversion.1.gz
diff --git a/devel/p5-Module-Versions-Report/Makefile b/devel/p5-Module-Versions-Report/Makefile
index 76724f3f6a8e..a6b86c1439e0 100644
--- a/devel/p5-Module-Versions-Report/Makefile
+++ b/devel/p5-Module-Versions-Report/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Versions-Report
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Versions-Report/pkg-plist b/devel/p5-Module-Versions-Report/pkg-plist
index e6ab8406b734..0bb5ec18a461 100644
--- a/devel/p5-Module-Versions-Report/pkg-plist
+++ b/devel/p5-Module-Versions-Report/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Module::Versions::Report.3.gz
 %%SITE_PERL%%/Module/Versions/Report.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module-Versions-Report/.packlist
diff --git a/devel/p5-Module-Versions/Makefile b/devel/p5-Module-Versions/Makefile
index 808168ae8a5d..64c3fbb3f000 100644
--- a/devel/p5-Module-Versions/Makefile
+++ b/devel/p5-Module-Versions/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Module-Versions
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Module-Versions/pkg-plist b/devel/p5-Module-Versions/pkg-plist
index f5edccf7ebca..96f70fb76b37 100644
--- a/devel/p5-Module-Versions/pkg-plist
+++ b/devel/p5-Module-Versions/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Versions/.packlist
 %%SITE_PERL%%/Module/Versions.pm
 %%PERL5_MAN3%%/Module::Versions.3.gz
diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile
index 6f9db04edc7e..524ec6791a2d 100644
--- a/devel/p5-Moo/Makefile
+++ b/devel/p5-Moo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Moo
 PORTVERSION=	1.006000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
diff --git a/devel/p5-Moo/pkg-plist b/devel/p5-Moo/pkg-plist
index 9da66b7e2dbf..b891cc39a3da 100644
--- a/devel/p5-Moo/pkg-plist
+++ b/devel/p5-Moo/pkg-plist
@@ -3,7 +3,6 @@
 %%PERL5_MAN3%%/Sub::Defer.3.gz
 %%PERL5_MAN3%%/Sub::Quote.3.gz
 %%PERL5_MAN3%%/oo.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moo/.packlist
 %%SITE_PERL%%/Method/Generate/Accessor.pm
 %%SITE_PERL%%/Method/Generate/BuildAll.pm
 %%SITE_PERL%%/Method/Generate/Constructor.pm
diff --git a/devel/p5-MooX-Cmd/Makefile b/devel/p5-MooX-Cmd/Makefile
index 8f61260fd403..512978d8d735 100644
--- a/devel/p5-MooX-Cmd/Makefile
+++ b/devel/p5-MooX-Cmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooX-Cmd
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-Cmd/pkg-plist b/devel/p5-MooX-Cmd/pkg-plist
index ac0c97ff9c38..a729c85ed2cd 100644
--- a/devel/p5-MooX-Cmd/pkg-plist
+++ b/devel/p5-MooX-Cmd/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/MooX/Cmd.pm
 %%SITE_PERL%%/MooX/Cmd/Role.pm
 %%SITE_PERL%%/MooX/Cmd/Tester.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooX/Cmd/.packlist
diff --git a/devel/p5-MooX-ConfigFromFile/Makefile b/devel/p5-MooX-ConfigFromFile/Makefile
index 21a8d60e9e4a..1b931364af5c 100644
--- a/devel/p5-MooX-ConfigFromFile/Makefile
+++ b/devel/p5-MooX-ConfigFromFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooX-ConfigFromFile
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-ConfigFromFile/pkg-plist b/devel/p5-MooX-ConfigFromFile/pkg-plist
index 73d66aaf28d9..2a11e2c92a92 100644
--- a/devel/p5-MooX-ConfigFromFile/pkg-plist
+++ b/devel/p5-MooX-ConfigFromFile/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/MooX/ConfigFromFile.pm
 %%SITE_PERL%%/MooX/ConfigFromFile/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooX/ConfigFromFile/.packlist
 %%PERL5_MAN3%%/MooX::ConfigFromFile.3.gz
 %%PERL5_MAN3%%/MooX::ConfigFromFile::Role.3.gz
diff --git a/devel/p5-MooX-File-ConfigDir/Makefile b/devel/p5-MooX-File-ConfigDir/Makefile
index ceb82993f584..b979566baf35 100644
--- a/devel/p5-MooX-File-ConfigDir/Makefile
+++ b/devel/p5-MooX-File-ConfigDir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooX-File-ConfigDir
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-File-ConfigDir/pkg-plist b/devel/p5-MooX-File-ConfigDir/pkg-plist
index 3b287b8e758f..b4f20ef9d9cf 100644
--- a/devel/p5-MooX-File-ConfigDir/pkg-plist
+++ b/devel/p5-MooX-File-ConfigDir/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooX/File/ConfigDir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooX/File/ConfigDir/.packlist
 %%PERL5_MAN3%%/MooX::File::ConfigDir.3.gz
diff --git a/devel/p5-MooX-HandlesVia/Makefile b/devel/p5-MooX-HandlesVia/Makefile
index 8a8a5cbcd57b..e9b061a5a9fd 100644
--- a/devel/p5-MooX-HandlesVia/Makefile
+++ b/devel/p5-MooX-HandlesVia/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooX-HandlesVia
 PORTVERSION=	0.001005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-HandlesVia/pkg-plist b/devel/p5-MooX-HandlesVia/pkg-plist
index f7a0bf7b873d..5540987401c3 100644
--- a/devel/p5-MooX-HandlesVia/pkg-plist
+++ b/devel/p5-MooX-HandlesVia/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/Data/Perl/Number/MooseLike.pm
 %%SITE_PERL%%/Data/Perl/String/MooseLike.pm
 %%SITE_PERL%%/MooX/HandlesVia.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooX/HandlesVia/.packlist
diff --git a/devel/p5-MooX-Options/Makefile b/devel/p5-MooX-Options/Makefile
index 43d362bf75c9..60ce250ddf6a 100644
--- a/devel/p5-MooX-Options/Makefile
+++ b/devel/p5-MooX-Options/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooX-Options
 PORTVERSION=	4.008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-StrictConstructor/Makefile b/devel/p5-MooX-StrictConstructor/Makefile
index 3f3708f90bb0..7b330aa08423 100644
--- a/devel/p5-MooX-StrictConstructor/Makefile
+++ b/devel/p5-MooX-StrictConstructor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooX-StrictConstructor
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
index 3b36b6cf006f..48e52cdc7d7b 100644
--- a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
+++ b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooX-Types-MooseLike-Numeric
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-Types-MooseLike-Numeric/pkg-plist b/devel/p5-MooX-Types-MooseLike-Numeric/pkg-plist
index fd96a500d1fc..24ea1901a0ce 100644
--- a/devel/p5-MooX-Types-MooseLike-Numeric/pkg-plist
+++ b/devel/p5-MooX-Types-MooseLike-Numeric/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooX/Types/MooseLike/Numeric/.packlist
 %%PERL5_MAN3%%/MooX::Types::MooseLike::Numeric.3.gz
 %%SITE_PERL%%/MooX/Types/MooseLike/Numeric.pm
diff --git a/devel/p5-MooX-Types-MooseLike/Makefile b/devel/p5-MooX-Types-MooseLike/Makefile
index c8ddd45483f5..256244f762e3 100644
--- a/devel/p5-MooX-Types-MooseLike/Makefile
+++ b/devel/p5-MooX-Types-MooseLike/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooX-Types-MooseLike
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-Types-MooseLike/pkg-plist b/devel/p5-MooX-Types-MooseLike/pkg-plist
index 550a9611c770..f6dcf9dab533 100644
--- a/devel/p5-MooX-Types-MooseLike/pkg-plist
+++ b/devel/p5-MooX-Types-MooseLike/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/MooX/Types/MooseLike.pm
 %%SITE_PERL%%/MooX/Types/MooseLike/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooX/Types/MooseLike/.packlist
 %%PERL5_MAN3%%/MooX::Types::MooseLike.3.gz
 %%PERL5_MAN3%%/MooX::Types::MooseLike::Base.3.gz
diff --git a/devel/p5-MooX-late/Makefile b/devel/p5-MooX-late/Makefile
index 342534c7f522..0f1e1d275e7a 100644
--- a/devel/p5-MooX-late/Makefile
+++ b/devel/p5-MooX-late/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooX-late
 PORTVERSION=	0.015
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooX-late/pkg-plist b/devel/p5-MooX-late/pkg-plist
index 9bcff3eee42e..380096ed5544 100644
--- a/devel/p5-MooX-late/pkg-plist
+++ b/devel/p5-MooX-late/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooX::late.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooX/late/.packlist
 %%SITE_PERL%%/MooX/late.pm
diff --git a/devel/p5-Moos/Makefile b/devel/p5-Moos/Makefile
index fb370e2ae977..bfd3c26e6778 100644
--- a/devel/p5-Moos/Makefile
+++ b/devel/p5-Moos/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Moos
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/devel/p5-Moos/pkg-plist b/devel/p5-Moos/pkg-plist
index 66d8ec2ed765..703e11873839 100644
--- a/devel/p5-Moos/pkg-plist
+++ b/devel/p5-Moos/pkg-plist
@@ -3,7 +3,6 @@ bin/remoos
 %%SITE_PERL%%/Moos.pod
 %%SITE_PERL%%/Moos/Role.pm
 %%SITE_PERL%%/Moos/Role.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moos/.packlist
 %%SITE_PERL%%/oos.pm
 %%SITE_PERL%%/oos.pod
 %%PERL5_MAN3%%/Moos.3.gz
diff --git a/devel/p5-Moose-Autobox/Makefile b/devel/p5-Moose-Autobox/Makefile
index f45c0ac059c2..be987b939895 100644
--- a/devel/p5-Moose-Autobox/Makefile
+++ b/devel/p5-Moose-Autobox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Moose-Autobox
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Moose-Autobox/pkg-plist b/devel/p5-Moose-Autobox/pkg-plist
index f80fff0d9b3a..8bbf4979e12e 100644
--- a/devel/p5-Moose-Autobox/pkg-plist
+++ b/devel/p5-Moose-Autobox/pkg-plist
@@ -12,7 +12,6 @@
 %%SITE_PERL%%/Moose/Autobox/String.pm
 %%SITE_PERL%%/Moose/Autobox/Undef.pm
 %%SITE_PERL%%/Moose/Autobox/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Autobox/.packlist
 %%PERL5_MAN3%%/Moose::Autobox.3.gz
 %%PERL5_MAN3%%/Moose::Autobox::Array.3.gz
 %%PERL5_MAN3%%/Moose::Autobox::Code.3.gz
diff --git a/devel/p5-Moose-Policy/Makefile b/devel/p5-Moose-Policy/Makefile
index 2062395122cb..d45f96f24a94 100644
--- a/devel/p5-Moose-Policy/Makefile
+++ b/devel/p5-Moose-Policy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Moose-Policy
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/devel/p5-Moose-Policy/pkg-plist b/devel/p5-Moose-Policy/pkg-plist
index 85188e08ac9a..c7fc120251a3 100644
--- a/devel/p5-Moose-Policy/pkg-plist
+++ b/devel/p5-Moose-Policy/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Moose/Policy/FollowPBP.pm
 %%SITE_PERL%%/Moose/Policy/JavaAccessors.pm
 %%SITE_PERL%%/Moose/Policy/SingleInheritence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Policy/.packlist
diff --git a/devel/p5-Moose-Test/Makefile b/devel/p5-Moose-Test/Makefile
index c7cafaa1201c..77f516e5bbf8 100644
--- a/devel/p5-Moose-Test/Makefile
+++ b/devel/p5-Moose-Test/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Moose-Test
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARTAK
diff --git a/devel/p5-Moose-Test/pkg-plist b/devel/p5-Moose-Test/pkg-plist
index de26e917e692..0b92fafe10ed 100644
--- a/devel/p5-Moose-Test/pkg-plist
+++ b/devel/p5-Moose-Test/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Moose/Test.pm
 %%SITE_PERL%%/Moose/Test/Case.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Test/.packlist
 %%PERL5_MAN3%%/Moose::Test.3.gz
 %%PERL5_MAN3%%/Moose::Test::Case.3.gz
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index 397da2172488..4da5b4146432 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Moose
 PORTVERSION=	2.1204
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Moose/pkg-plist b/devel/p5-Moose/pkg-plist
index 27344898e675..bcff6cec9a27 100644
--- a/devel/p5-Moose/pkg-plist
+++ b/devel/p5-Moose/pkg-plist
@@ -131,433 +131,432 @@ bin/moose-outdated
 %%PERL5_MAN3%%/Test::Moose.3.gz
 %%PERL5_MAN3%%/metaclass.3.gz
 %%PERL5_MAN3%%/oose.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class/Immutable/Trait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Deprecated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Instance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Accessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Constructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Generated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Inlined.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Meta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Overload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Wrapped.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/MiniTrait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/AttributeCore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasAttributes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Module.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Package.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Conflicts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/BankAccount_MethodModifiersAndSubclassing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/BinaryTree_AttributeFeatures.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/BinaryTree_BuilderAndLazyBuild.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Company_Subtypes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/DateTime_ExtendingNonMooseParent.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Document_AugmentAndInner.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Genome_OverloadingSubtypesAndCoercion.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/HTTP_SubtypesAndCoercion.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Immutable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Person_BUILDARGSAndBUILD.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Point_AttributesAndSubclassing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Debugging_BaseClassRole.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/ExtensionOverview.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Mooseish_MooseSugar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Legacy/Debugging_BaseClassReplacement.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Legacy/Labeled_AttributeMetaclass.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Legacy/Table_ClassMetaclass.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/GlobRef_InstanceMetaclass.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Labeled_AttributeTrait.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/PrivateOrPublic_MethodMetaclass.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Table_MetaclassTrait.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/WhyMeta.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/ApplicationToInstance.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/Comparable_CodeReuse.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/Restartable_AdvancedComposition.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Snack/Keywords.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Snack/Types.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Style.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Deprecated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AccessorMustReadWrite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AddParameterizableTypeTakesParameterizableType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AddRoleTakesAMooseMetaRoleInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AddRoleToARoleTakesAMooseMetaRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ApplyTakesABlessedInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttachToClassNeedsAClassMOPClassInstanceOrASubclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeConflictInRoles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeConflictInSummation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeExtensionIsNotSupportedInRoles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeIsRequired.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeMustBeAnClassMOPMixinAttributeCoreOrSubclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeNamesDoNotMatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeValueIsNotAnObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AttributeValueIsNotDefined.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/AutoDeRefNeedsArrayRefOrHashRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/BadOptionFormat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/BothBuilderAndDefaultAreNotAllowed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/BuilderDoesNotExist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/BuilderMethodNotSupportedForAttribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/BuilderMethodNotSupportedForInlineAttribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/BuilderMustBeAMethodName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CallingMethodOnAnImmutableInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CallingReadOnlyMethodOnAnImmutableInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CanExtendOnlyClasses.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CanOnlyConsumeRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CanOnlyWrapBlessedCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CanReblessOnlyIntoASubclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CanReblessOnlyIntoASuperclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotAddAdditionalTypeCoercionsToUnion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotAddAsAnAttributeToARole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotApplyBaseClassRolesToRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotAssignValueToReadOnlyAccessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotAugmentIfLocalMethodPresent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotAugmentNoSuperMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotAutoDerefWithoutIsa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotAutoDereferenceTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCalculateNativeType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCallAnAbstractBaseMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCallAnAbstractMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCoerceAWeakRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCoerceAttributeWhichHasNoCoercion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCreateHigherOrderTypeWithoutATypeParameter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCreateMethodAliasLocalMethodIsPresent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotCreateMethodAliasLocalMethodIsPresentInClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotDelegateLocalMethodIsPresent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotDelegateWithoutIsa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotFindDelegateMetaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotFindType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotFindTypeGivenToMatchOnType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotFixMetaclassCompatibility.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotGenerateInlineConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotInitializeMooseMetaRoleComposite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotInlineTypeConstraintCheck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotLocatePackageInINC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotMakeMetaclassCompatible.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotOverrideALocalMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotOverrideBodyOfMetaMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotOverrideLocalMethodIsPresent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotOverrideNoSuperMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotRegisterUnnamedTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CannotUseLazyBuildAndDefaultSimultaneously.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CircularReferenceInAlso.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ClassDoesNotHaveInitMeta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ClassDoesTheExcludedRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ClassNamesDoNotMatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CloneObjectExpectsAnInstanceOfMetaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CodeBlockMustBeACodeRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CoercingWithoutCoercions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CoercionAlreadyExists.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CoercionNeedsTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ConflictDetectedInCheckRoleExclusions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ConflictDetectedInCheckRoleExclusionsInToClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ConstructClassInstanceTakesPackageName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotCreateMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotCreateWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotEvalConstructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotEvalDestructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotFindTypeConstraintToCoerceFrom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotGenerateInlineAttributeMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotLocateTypeConstraintForUnion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CouldNotParseType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CreateMOPClassTakesArrayRefOfAttributes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CreateMOPClassTakesArrayRefOfSuperclasses.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CreateMOPClassTakesHashRefOfMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CreateTakesArrayRefOfRoles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CreateTakesHashRefOfAttributes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/CreateTakesHashRefOfMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/DefaultToMatchOnTypeMustBeCodeRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/DelegationToAClassWhichIsNotLoaded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/DelegationToARoleWhichIsNotLoaded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/DelegationToATypeWhichIsNotAClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/DoesRequiresRoleName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/EnumCalledWithAnArrayRefAndAdditionalArgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/EnumValuesMustBeString.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ExtendsMissingArgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/HandlesMustBeAHashRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/IllegalInheritedOptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/IllegalMethodTypeToAddMethodModifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/IncompatibleMetaclassOfSuperclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InitMetaRequiresClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InitializeTakesUnBlessedPackageName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InstanceBlessedIntoWrongClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InstanceMustBeABlessedReference.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidArgPassedToMooseUtilMetaRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidArgumentToMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidArgumentsToTraitAliases.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidBaseTypeGivenToCreateParameterizedTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidHandleValue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidHasProvidedInARole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidNameForType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidRoleApplication.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidTypeGivenToCreateParameterizedTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/InvalidValueForIs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/IsaDoesNotDoTheRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/IsaLacksDoesMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/LazyAttributeNeedsADefault.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Legacy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MOPAttributeNewNeedsAttributeName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MatchActionMustBeACodeRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MessageParameterMustBeCodeRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassIsAClassNotASubclassOfGivenMetaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassIsARoleNotASubclassOfGivenMetaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassIsNotASubclassOfGivenMetaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassMustBeASubclassOfMooseMetaClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassMustBeASubclassOfMooseMetaRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassMustBeDerivedFromClassMOPClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassNotLoaded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MetaclassTypeIncompatible.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MethodExpectedAMetaclassObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MethodExpectsFewerArgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MethodExpectsMoreArgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MethodModifierNeedsMethodName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MethodNameConflictInRoles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MethodNameNotFoundInInheritanceHierarchy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MethodNameNotGiven.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustDefineAMethodName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustDefineAnAttributeName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustHaveAtLeastOneValueToEnumerate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustPassAHashOfOptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustPassAMooseMetaRoleInstanceOrSubclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustPassAPackageNameOrAnExistingClassMOPPackageInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustPassEvenNumberOfArguments.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustPassEvenNumberOfAttributeOptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustProvideANameForTheAttribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSpecifyAtleastOneMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSpecifyAtleastOneRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSpecifyAtleastOneRoleToApplicant.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyAClassMOPAttributeInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyADelegateToMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyAMetaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyAMooseMetaAttributeInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyAnAccessorTypeToConstructWith.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyAnAttributeToConstructWith.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyArrayRefAsCurriedArguments.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/MustSupplyPackageNameAndName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NeedsTypeConstraintUnionForTypeCoercionUnion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NeitherAttributeNorAttributeNameIsGiven.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NeitherClassNorClassNameIsGiven.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NeitherRoleNorRoleNameIsGiven.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NeitherTypeNorTypeNameIsGiven.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NoAttributeFoundInSuperClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NoBodyToInitializeInAnAbstractBaseClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NoCasesMatched.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NoConstraintCheckForTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NoDestructorClassSpecified.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NoImmutableTraitSpecifiedForClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/NoParentGivenToSubtype.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/OnlyInstancesCanBeCloned.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/OperatorIsRequired.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/OverrideConflictInComposition.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/OverrideConflictInSummation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/PackageDoesNotUseMooseExporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/PackageNameAndNameParamsNotGivenToWrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/PackagesAndModulesAreNotCachable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ParameterIsNotSubtypeOfParent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ReferencesAreNotAllowedAsDefault.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RequiredAttributeLacksInitialization.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RequiredAttributeNeedsADefault.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RequiredMethodsImportedByClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RequiredMethodsNotImplementedByClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/AttributeName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/EitherAttributeOrAttributeName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/Instance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/InvalidAttributeOptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/ParamsHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/RoleForCreate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/RoleForCreateMOPClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/Role/TypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RoleDoesTheExcludedRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RoleExclusionConflict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RoleNameRequired.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RoleNameRequiredForMooseMetaRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RoleNamesDoNotMatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RolesDoNotSupportAugment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RolesDoNotSupportExtends.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RolesDoNotSupportInner.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RolesDoNotSupportRegexReferencesForMethodModifiers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RolesInCreateTakesAnArrayRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/RolesListMustBeInstancesOfMooseMetaRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/SingleParamsToNewMustBeHashRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/TriggerMustBeACodeRef.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/TypeConstraintCannotBeUsedForAParameterizableType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/TypeConstraintIsAlreadyCreated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/TypeNamesDoNotMatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/TypeParameterMustBeMooseMetaType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/UnableToCanonicalizeHandles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/UnableToCanonicalizeNonRolePackage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/UnableToRecognizeDelegateMetaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/UndefinedHashKeysPassedToMethod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/UnionCalledWithAnArrayRefAndAdditionalArgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/UnionTakesAtleastTwoTypeNames.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ValidationFailedForInlineTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/ValidationFailedForTypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/WrapTakesACodeRefToBless.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exception/WrongTypeConstraintGiven.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Exporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Intro.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Attributes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/BestPractices.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Classes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Concepts.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Construction.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Contributing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Delegation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Delta.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Exceptions.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Exceptions/Manifest.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/MOP.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/MethodModifiers.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/MooseX.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Roles.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Support.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Types.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Manual/Unsweetened.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait/Bool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait/Code.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait/Counter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait/Number.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Attribute/Native/Trait/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Class/Immutable/Trait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Instance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/accessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/clear.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/count.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/delete.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/elements.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/first.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/first_index.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/get.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/grep.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/insert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/is_empty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/join.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/map.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/natatime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/pop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/push.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/reduce.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/shallow_clone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/shift.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/shuffle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/sort_in_place.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/splice.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/uniq.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/unshift.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/not.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/toggle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/unset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Code/execute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Code/execute_method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Collection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/dec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/inc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/reset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/clear.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/count.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/defined.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/elements.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/exists.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/get.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/is_empty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/keys.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/kv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/shallow_clone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/values.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/abs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/add.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/div.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/mod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/mul.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/sub.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Reader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/append.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/chomp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/chop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/clear.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/inc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/length.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/match.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/prepend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/replace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/String/substr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Accessor/Native/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Augmented.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Constructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Delegation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Destructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Meta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Method/Overridden.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Mixin/AttributeCore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Object/Trait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Application.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Application/RoleSummation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Application/ToClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Application/ToInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Application/ToRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Composite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Method/Conflicting.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/Role/Method/Required.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeCoercion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeCoercion/Union.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/DuckType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/Enum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/Parameterizable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/Parameterized.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/Registry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Meta/TypeConstraint/Union.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Spec/Role.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Unsweetened.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Util/MetaRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Util/TypeConstraints.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Util/TypeConstraints/Builtins.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Test/Moose.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Moose.so
-%%SITE_PERL%%/%%PERL_ARCH%%/metaclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/oose.pm
+%%SITE_ARCH%%/Class/MOP.pm
+%%SITE_ARCH%%/Class/MOP/Attribute.pm
+%%SITE_ARCH%%/Class/MOP/Class.pm
+%%SITE_ARCH%%/Class/MOP/Class/Immutable/Trait.pm
+%%SITE_ARCH%%/Class/MOP/Deprecated.pm
+%%SITE_ARCH%%/Class/MOP/Instance.pm
+%%SITE_ARCH%%/Class/MOP/Method.pm
+%%SITE_ARCH%%/Class/MOP/Method/Accessor.pm
+%%SITE_ARCH%%/Class/MOP/Method/Constructor.pm
+%%SITE_ARCH%%/Class/MOP/Method/Generated.pm
+%%SITE_ARCH%%/Class/MOP/Method/Inlined.pm
+%%SITE_ARCH%%/Class/MOP/Method/Meta.pm
+%%SITE_ARCH%%/Class/MOP/Method/Overload.pm
+%%SITE_ARCH%%/Class/MOP/Method/Wrapped.pm
+%%SITE_ARCH%%/Class/MOP/MiniTrait.pm
+%%SITE_ARCH%%/Class/MOP/Mixin.pm
+%%SITE_ARCH%%/Class/MOP/Mixin/AttributeCore.pm
+%%SITE_ARCH%%/Class/MOP/Mixin/HasAttributes.pm
+%%SITE_ARCH%%/Class/MOP/Mixin/HasMethods.pm
+%%SITE_ARCH%%/Class/MOP/Module.pm
+%%SITE_ARCH%%/Class/MOP/Object.pm
+%%SITE_ARCH%%/Class/MOP/Package.pm
+%%SITE_ARCH%%/Moose.pm
+%%SITE_ARCH%%/Moose/Conflicts.pm
+%%SITE_ARCH%%/Moose/Cookbook.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/BankAccount_MethodModifiersAndSubclassing.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/BinaryTree_AttributeFeatures.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/BinaryTree_BuilderAndLazyBuild.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/Company_Subtypes.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/DateTime_ExtendingNonMooseParent.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/Document_AugmentAndInner.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/Genome_OverloadingSubtypesAndCoercion.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/HTTP_SubtypesAndCoercion.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/Immutable.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/Person_BUILDARGSAndBUILD.pod
+%%SITE_ARCH%%/Moose/Cookbook/Basics/Point_AttributesAndSubclassing.pod
+%%SITE_ARCH%%/Moose/Cookbook/Extending/Debugging_BaseClassRole.pod
+%%SITE_ARCH%%/Moose/Cookbook/Extending/ExtensionOverview.pod
+%%SITE_ARCH%%/Moose/Cookbook/Extending/Mooseish_MooseSugar.pod
+%%SITE_ARCH%%/Moose/Cookbook/Legacy/Debugging_BaseClassReplacement.pod
+%%SITE_ARCH%%/Moose/Cookbook/Legacy/Labeled_AttributeMetaclass.pod
+%%SITE_ARCH%%/Moose/Cookbook/Legacy/Table_ClassMetaclass.pod
+%%SITE_ARCH%%/Moose/Cookbook/Meta/GlobRef_InstanceMetaclass.pod
+%%SITE_ARCH%%/Moose/Cookbook/Meta/Labeled_AttributeTrait.pod
+%%SITE_ARCH%%/Moose/Cookbook/Meta/PrivateOrPublic_MethodMetaclass.pod
+%%SITE_ARCH%%/Moose/Cookbook/Meta/Table_MetaclassTrait.pod
+%%SITE_ARCH%%/Moose/Cookbook/Meta/WhyMeta.pod
+%%SITE_ARCH%%/Moose/Cookbook/Roles/ApplicationToInstance.pod
+%%SITE_ARCH%%/Moose/Cookbook/Roles/Comparable_CodeReuse.pod
+%%SITE_ARCH%%/Moose/Cookbook/Roles/Restartable_AdvancedComposition.pod
+%%SITE_ARCH%%/Moose/Cookbook/Snack/Keywords.pod
+%%SITE_ARCH%%/Moose/Cookbook/Snack/Types.pod
+%%SITE_ARCH%%/Moose/Cookbook/Style.pod
+%%SITE_ARCH%%/Moose/Deprecated.pm
+%%SITE_ARCH%%/Moose/Exception.pm
+%%SITE_ARCH%%/Moose/Exception/AccessorMustReadWrite.pm
+%%SITE_ARCH%%/Moose/Exception/AddParameterizableTypeTakesParameterizableType.pm
+%%SITE_ARCH%%/Moose/Exception/AddRoleTakesAMooseMetaRoleInstance.pm
+%%SITE_ARCH%%/Moose/Exception/AddRoleToARoleTakesAMooseMetaRole.pm
+%%SITE_ARCH%%/Moose/Exception/ApplyTakesABlessedInstance.pm
+%%SITE_ARCH%%/Moose/Exception/AttachToClassNeedsAClassMOPClassInstanceOrASubclass.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeConflictInRoles.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeConflictInSummation.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeExtensionIsNotSupportedInRoles.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeIsRequired.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeMustBeAnClassMOPMixinAttributeCoreOrSubclass.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeNamesDoNotMatch.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeValueIsNotAnObject.pm
+%%SITE_ARCH%%/Moose/Exception/AttributeValueIsNotDefined.pm
+%%SITE_ARCH%%/Moose/Exception/AutoDeRefNeedsArrayRefOrHashRef.pm
+%%SITE_ARCH%%/Moose/Exception/BadOptionFormat.pm
+%%SITE_ARCH%%/Moose/Exception/BothBuilderAndDefaultAreNotAllowed.pm
+%%SITE_ARCH%%/Moose/Exception/BuilderDoesNotExist.pm
+%%SITE_ARCH%%/Moose/Exception/BuilderMethodNotSupportedForAttribute.pm
+%%SITE_ARCH%%/Moose/Exception/BuilderMethodNotSupportedForInlineAttribute.pm
+%%SITE_ARCH%%/Moose/Exception/BuilderMustBeAMethodName.pm
+%%SITE_ARCH%%/Moose/Exception/CallingMethodOnAnImmutableInstance.pm
+%%SITE_ARCH%%/Moose/Exception/CallingReadOnlyMethodOnAnImmutableInstance.pm
+%%SITE_ARCH%%/Moose/Exception/CanExtendOnlyClasses.pm
+%%SITE_ARCH%%/Moose/Exception/CanOnlyConsumeRole.pm
+%%SITE_ARCH%%/Moose/Exception/CanOnlyWrapBlessedCode.pm
+%%SITE_ARCH%%/Moose/Exception/CanReblessOnlyIntoASubclass.pm
+%%SITE_ARCH%%/Moose/Exception/CanReblessOnlyIntoASuperclass.pm
+%%SITE_ARCH%%/Moose/Exception/CannotAddAdditionalTypeCoercionsToUnion.pm
+%%SITE_ARCH%%/Moose/Exception/CannotAddAsAnAttributeToARole.pm
+%%SITE_ARCH%%/Moose/Exception/CannotApplyBaseClassRolesToRole.pm
+%%SITE_ARCH%%/Moose/Exception/CannotAssignValueToReadOnlyAccessor.pm
+%%SITE_ARCH%%/Moose/Exception/CannotAugmentIfLocalMethodPresent.pm
+%%SITE_ARCH%%/Moose/Exception/CannotAugmentNoSuperMethod.pm
+%%SITE_ARCH%%/Moose/Exception/CannotAutoDerefWithoutIsa.pm
+%%SITE_ARCH%%/Moose/Exception/CannotAutoDereferenceTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCalculateNativeType.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCallAnAbstractBaseMethod.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCallAnAbstractMethod.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCoerceAWeakRef.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCoerceAttributeWhichHasNoCoercion.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCreateHigherOrderTypeWithoutATypeParameter.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCreateMethodAliasLocalMethodIsPresent.pm
+%%SITE_ARCH%%/Moose/Exception/CannotCreateMethodAliasLocalMethodIsPresentInClass.pm
+%%SITE_ARCH%%/Moose/Exception/CannotDelegateLocalMethodIsPresent.pm
+%%SITE_ARCH%%/Moose/Exception/CannotDelegateWithoutIsa.pm
+%%SITE_ARCH%%/Moose/Exception/CannotFindDelegateMetaclass.pm
+%%SITE_ARCH%%/Moose/Exception/CannotFindType.pm
+%%SITE_ARCH%%/Moose/Exception/CannotFindTypeGivenToMatchOnType.pm
+%%SITE_ARCH%%/Moose/Exception/CannotFixMetaclassCompatibility.pm
+%%SITE_ARCH%%/Moose/Exception/CannotGenerateInlineConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/CannotInitializeMooseMetaRoleComposite.pm
+%%SITE_ARCH%%/Moose/Exception/CannotInlineTypeConstraintCheck.pm
+%%SITE_ARCH%%/Moose/Exception/CannotLocatePackageInINC.pm
+%%SITE_ARCH%%/Moose/Exception/CannotMakeMetaclassCompatible.pm
+%%SITE_ARCH%%/Moose/Exception/CannotOverrideALocalMethod.pm
+%%SITE_ARCH%%/Moose/Exception/CannotOverrideBodyOfMetaMethods.pm
+%%SITE_ARCH%%/Moose/Exception/CannotOverrideLocalMethodIsPresent.pm
+%%SITE_ARCH%%/Moose/Exception/CannotOverrideNoSuperMethod.pm
+%%SITE_ARCH%%/Moose/Exception/CannotRegisterUnnamedTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/CannotUseLazyBuildAndDefaultSimultaneously.pm
+%%SITE_ARCH%%/Moose/Exception/CircularReferenceInAlso.pm
+%%SITE_ARCH%%/Moose/Exception/ClassDoesNotHaveInitMeta.pm
+%%SITE_ARCH%%/Moose/Exception/ClassDoesTheExcludedRole.pm
+%%SITE_ARCH%%/Moose/Exception/ClassNamesDoNotMatch.pm
+%%SITE_ARCH%%/Moose/Exception/CloneObjectExpectsAnInstanceOfMetaclass.pm
+%%SITE_ARCH%%/Moose/Exception/CodeBlockMustBeACodeRef.pm
+%%SITE_ARCH%%/Moose/Exception/CoercingWithoutCoercions.pm
+%%SITE_ARCH%%/Moose/Exception/CoercionAlreadyExists.pm
+%%SITE_ARCH%%/Moose/Exception/CoercionNeedsTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/ConflictDetectedInCheckRoleExclusions.pm
+%%SITE_ARCH%%/Moose/Exception/ConflictDetectedInCheckRoleExclusionsInToClass.pm
+%%SITE_ARCH%%/Moose/Exception/ConstructClassInstanceTakesPackageName.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotCreateMethod.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotCreateWriter.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotEvalConstructor.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotEvalDestructor.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotFindTypeConstraintToCoerceFrom.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotGenerateInlineAttributeMethod.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotLocateTypeConstraintForUnion.pm
+%%SITE_ARCH%%/Moose/Exception/CouldNotParseType.pm
+%%SITE_ARCH%%/Moose/Exception/CreateMOPClassTakesArrayRefOfAttributes.pm
+%%SITE_ARCH%%/Moose/Exception/CreateMOPClassTakesArrayRefOfSuperclasses.pm
+%%SITE_ARCH%%/Moose/Exception/CreateMOPClassTakesHashRefOfMethods.pm
+%%SITE_ARCH%%/Moose/Exception/CreateTakesArrayRefOfRoles.pm
+%%SITE_ARCH%%/Moose/Exception/CreateTakesHashRefOfAttributes.pm
+%%SITE_ARCH%%/Moose/Exception/CreateTakesHashRefOfMethods.pm
+%%SITE_ARCH%%/Moose/Exception/DefaultToMatchOnTypeMustBeCodeRef.pm
+%%SITE_ARCH%%/Moose/Exception/DelegationToAClassWhichIsNotLoaded.pm
+%%SITE_ARCH%%/Moose/Exception/DelegationToARoleWhichIsNotLoaded.pm
+%%SITE_ARCH%%/Moose/Exception/DelegationToATypeWhichIsNotAClass.pm
+%%SITE_ARCH%%/Moose/Exception/DoesRequiresRoleName.pm
+%%SITE_ARCH%%/Moose/Exception/EnumCalledWithAnArrayRefAndAdditionalArgs.pm
+%%SITE_ARCH%%/Moose/Exception/EnumValuesMustBeString.pm
+%%SITE_ARCH%%/Moose/Exception/ExtendsMissingArgs.pm
+%%SITE_ARCH%%/Moose/Exception/HandlesMustBeAHashRef.pm
+%%SITE_ARCH%%/Moose/Exception/IllegalInheritedOptions.pm
+%%SITE_ARCH%%/Moose/Exception/IllegalMethodTypeToAddMethodModifier.pm
+%%SITE_ARCH%%/Moose/Exception/IncompatibleMetaclassOfSuperclass.pm
+%%SITE_ARCH%%/Moose/Exception/InitMetaRequiresClass.pm
+%%SITE_ARCH%%/Moose/Exception/InitializeTakesUnBlessedPackageName.pm
+%%SITE_ARCH%%/Moose/Exception/InstanceBlessedIntoWrongClass.pm
+%%SITE_ARCH%%/Moose/Exception/InstanceMustBeABlessedReference.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidArgPassedToMooseUtilMetaRole.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidArgumentToMethod.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidArgumentsToTraitAliases.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidBaseTypeGivenToCreateParameterizedTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidHandleValue.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidHasProvidedInARole.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidNameForType.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidRoleApplication.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidTypeGivenToCreateParameterizedTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/InvalidValueForIs.pm
+%%SITE_ARCH%%/Moose/Exception/IsaDoesNotDoTheRole.pm
+%%SITE_ARCH%%/Moose/Exception/IsaLacksDoesMethod.pm
+%%SITE_ARCH%%/Moose/Exception/LazyAttributeNeedsADefault.pm
+%%SITE_ARCH%%/Moose/Exception/Legacy.pm
+%%SITE_ARCH%%/Moose/Exception/MOPAttributeNewNeedsAttributeName.pm
+%%SITE_ARCH%%/Moose/Exception/MatchActionMustBeACodeRef.pm
+%%SITE_ARCH%%/Moose/Exception/MessageParameterMustBeCodeRef.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassIsAClassNotASubclassOfGivenMetaclass.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassIsARoleNotASubclassOfGivenMetaclass.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassIsNotASubclassOfGivenMetaclass.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassMustBeASubclassOfMooseMetaClass.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassMustBeASubclassOfMooseMetaRole.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassMustBeDerivedFromClassMOPClass.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassNotLoaded.pm
+%%SITE_ARCH%%/Moose/Exception/MetaclassTypeIncompatible.pm
+%%SITE_ARCH%%/Moose/Exception/MethodExpectedAMetaclassObject.pm
+%%SITE_ARCH%%/Moose/Exception/MethodExpectsFewerArgs.pm
+%%SITE_ARCH%%/Moose/Exception/MethodExpectsMoreArgs.pm
+%%SITE_ARCH%%/Moose/Exception/MethodModifierNeedsMethodName.pm
+%%SITE_ARCH%%/Moose/Exception/MethodNameConflictInRoles.pm
+%%SITE_ARCH%%/Moose/Exception/MethodNameNotFoundInInheritanceHierarchy.pm
+%%SITE_ARCH%%/Moose/Exception/MethodNameNotGiven.pm
+%%SITE_ARCH%%/Moose/Exception/MustDefineAMethodName.pm
+%%SITE_ARCH%%/Moose/Exception/MustDefineAnAttributeName.pm
+%%SITE_ARCH%%/Moose/Exception/MustHaveAtLeastOneValueToEnumerate.pm
+%%SITE_ARCH%%/Moose/Exception/MustPassAHashOfOptions.pm
+%%SITE_ARCH%%/Moose/Exception/MustPassAMooseMetaRoleInstanceOrSubclass.pm
+%%SITE_ARCH%%/Moose/Exception/MustPassAPackageNameOrAnExistingClassMOPPackageInstance.pm
+%%SITE_ARCH%%/Moose/Exception/MustPassEvenNumberOfArguments.pm
+%%SITE_ARCH%%/Moose/Exception/MustPassEvenNumberOfAttributeOptions.pm
+%%SITE_ARCH%%/Moose/Exception/MustProvideANameForTheAttribute.pm
+%%SITE_ARCH%%/Moose/Exception/MustSpecifyAtleastOneMethod.pm
+%%SITE_ARCH%%/Moose/Exception/MustSpecifyAtleastOneRole.pm
+%%SITE_ARCH%%/Moose/Exception/MustSpecifyAtleastOneRoleToApplicant.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyAClassMOPAttributeInstance.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyADelegateToMethod.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyAMetaclass.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyAMooseMetaAttributeInstance.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyAnAccessorTypeToConstructWith.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyAnAttributeToConstructWith.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyArrayRefAsCurriedArguments.pm
+%%SITE_ARCH%%/Moose/Exception/MustSupplyPackageNameAndName.pm
+%%SITE_ARCH%%/Moose/Exception/NeedsTypeConstraintUnionForTypeCoercionUnion.pm
+%%SITE_ARCH%%/Moose/Exception/NeitherAttributeNorAttributeNameIsGiven.pm
+%%SITE_ARCH%%/Moose/Exception/NeitherClassNorClassNameIsGiven.pm
+%%SITE_ARCH%%/Moose/Exception/NeitherRoleNorRoleNameIsGiven.pm
+%%SITE_ARCH%%/Moose/Exception/NeitherTypeNorTypeNameIsGiven.pm
+%%SITE_ARCH%%/Moose/Exception/NoAttributeFoundInSuperClass.pm
+%%SITE_ARCH%%/Moose/Exception/NoBodyToInitializeInAnAbstractBaseClass.pm
+%%SITE_ARCH%%/Moose/Exception/NoCasesMatched.pm
+%%SITE_ARCH%%/Moose/Exception/NoConstraintCheckForTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/NoDestructorClassSpecified.pm
+%%SITE_ARCH%%/Moose/Exception/NoImmutableTraitSpecifiedForClass.pm
+%%SITE_ARCH%%/Moose/Exception/NoParentGivenToSubtype.pm
+%%SITE_ARCH%%/Moose/Exception/OnlyInstancesCanBeCloned.pm
+%%SITE_ARCH%%/Moose/Exception/OperatorIsRequired.pm
+%%SITE_ARCH%%/Moose/Exception/OverrideConflictInComposition.pm
+%%SITE_ARCH%%/Moose/Exception/OverrideConflictInSummation.pm
+%%SITE_ARCH%%/Moose/Exception/PackageDoesNotUseMooseExporter.pm
+%%SITE_ARCH%%/Moose/Exception/PackageNameAndNameParamsNotGivenToWrap.pm
+%%SITE_ARCH%%/Moose/Exception/PackagesAndModulesAreNotCachable.pm
+%%SITE_ARCH%%/Moose/Exception/ParameterIsNotSubtypeOfParent.pm
+%%SITE_ARCH%%/Moose/Exception/ReferencesAreNotAllowedAsDefault.pm
+%%SITE_ARCH%%/Moose/Exception/RequiredAttributeLacksInitialization.pm
+%%SITE_ARCH%%/Moose/Exception/RequiredAttributeNeedsADefault.pm
+%%SITE_ARCH%%/Moose/Exception/RequiredMethodsImportedByClass.pm
+%%SITE_ARCH%%/Moose/Exception/RequiredMethodsNotImplementedByClass.pm
+%%SITE_ARCH%%/Moose/Exception/Role/Attribute.pm
+%%SITE_ARCH%%/Moose/Exception/Role/AttributeName.pm
+%%SITE_ARCH%%/Moose/Exception/Role/Class.pm
+%%SITE_ARCH%%/Moose/Exception/Role/EitherAttributeOrAttributeName.pm
+%%SITE_ARCH%%/Moose/Exception/Role/Instance.pm
+%%SITE_ARCH%%/Moose/Exception/Role/InvalidAttributeOptions.pm
+%%SITE_ARCH%%/Moose/Exception/Role/Method.pm
+%%SITE_ARCH%%/Moose/Exception/Role/ParamsHash.pm
+%%SITE_ARCH%%/Moose/Exception/Role/Role.pm
+%%SITE_ARCH%%/Moose/Exception/Role/RoleForCreate.pm
+%%SITE_ARCH%%/Moose/Exception/Role/RoleForCreateMOPClass.pm
+%%SITE_ARCH%%/Moose/Exception/Role/TypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/RoleDoesTheExcludedRole.pm
+%%SITE_ARCH%%/Moose/Exception/RoleExclusionConflict.pm
+%%SITE_ARCH%%/Moose/Exception/RoleNameRequired.pm
+%%SITE_ARCH%%/Moose/Exception/RoleNameRequiredForMooseMetaRole.pm
+%%SITE_ARCH%%/Moose/Exception/RoleNamesDoNotMatch.pm
+%%SITE_ARCH%%/Moose/Exception/RolesDoNotSupportAugment.pm
+%%SITE_ARCH%%/Moose/Exception/RolesDoNotSupportExtends.pm
+%%SITE_ARCH%%/Moose/Exception/RolesDoNotSupportInner.pm
+%%SITE_ARCH%%/Moose/Exception/RolesDoNotSupportRegexReferencesForMethodModifiers.pm
+%%SITE_ARCH%%/Moose/Exception/RolesInCreateTakesAnArrayRef.pm
+%%SITE_ARCH%%/Moose/Exception/RolesListMustBeInstancesOfMooseMetaRole.pm
+%%SITE_ARCH%%/Moose/Exception/SingleParamsToNewMustBeHashRef.pm
+%%SITE_ARCH%%/Moose/Exception/TriggerMustBeACodeRef.pm
+%%SITE_ARCH%%/Moose/Exception/TypeConstraintCannotBeUsedForAParameterizableType.pm
+%%SITE_ARCH%%/Moose/Exception/TypeConstraintIsAlreadyCreated.pm
+%%SITE_ARCH%%/Moose/Exception/TypeNamesDoNotMatch.pm
+%%SITE_ARCH%%/Moose/Exception/TypeParameterMustBeMooseMetaType.pm
+%%SITE_ARCH%%/Moose/Exception/UnableToCanonicalizeHandles.pm
+%%SITE_ARCH%%/Moose/Exception/UnableToCanonicalizeNonRolePackage.pm
+%%SITE_ARCH%%/Moose/Exception/UnableToRecognizeDelegateMetaclass.pm
+%%SITE_ARCH%%/Moose/Exception/UndefinedHashKeysPassedToMethod.pm
+%%SITE_ARCH%%/Moose/Exception/UnionCalledWithAnArrayRefAndAdditionalArgs.pm
+%%SITE_ARCH%%/Moose/Exception/UnionTakesAtleastTwoTypeNames.pm
+%%SITE_ARCH%%/Moose/Exception/ValidationFailedForInlineTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/ValidationFailedForTypeConstraint.pm
+%%SITE_ARCH%%/Moose/Exception/WrapTakesACodeRefToBless.pm
+%%SITE_ARCH%%/Moose/Exception/WrongTypeConstraintGiven.pm
+%%SITE_ARCH%%/Moose/Exporter.pm
+%%SITE_ARCH%%/Moose/Intro.pod
+%%SITE_ARCH%%/Moose/Manual.pod
+%%SITE_ARCH%%/Moose/Manual/Attributes.pod
+%%SITE_ARCH%%/Moose/Manual/BestPractices.pod
+%%SITE_ARCH%%/Moose/Manual/Classes.pod
+%%SITE_ARCH%%/Moose/Manual/Concepts.pod
+%%SITE_ARCH%%/Moose/Manual/Construction.pod
+%%SITE_ARCH%%/Moose/Manual/Contributing.pod
+%%SITE_ARCH%%/Moose/Manual/Delegation.pod
+%%SITE_ARCH%%/Moose/Manual/Delta.pod
+%%SITE_ARCH%%/Moose/Manual/Exceptions.pod
+%%SITE_ARCH%%/Moose/Manual/Exceptions/Manifest.pod
+%%SITE_ARCH%%/Moose/Manual/FAQ.pod
+%%SITE_ARCH%%/Moose/Manual/MOP.pod
+%%SITE_ARCH%%/Moose/Manual/MethodModifiers.pod
+%%SITE_ARCH%%/Moose/Manual/MooseX.pod
+%%SITE_ARCH%%/Moose/Manual/Roles.pod
+%%SITE_ARCH%%/Moose/Manual/Support.pod
+%%SITE_ARCH%%/Moose/Manual/Types.pod
+%%SITE_ARCH%%/Moose/Manual/Unsweetened.pod
+%%SITE_ARCH%%/Moose/Meta/Attribute.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait/Array.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait/Bool.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait/Code.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait/Counter.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait/Hash.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait/Number.pm
+%%SITE_ARCH%%/Moose/Meta/Attribute/Native/Trait/String.pm
+%%SITE_ARCH%%/Moose/Meta/Class.pm
+%%SITE_ARCH%%/Moose/Meta/Class/Immutable/Trait.pm
+%%SITE_ARCH%%/Moose/Meta/Instance.pm
+%%SITE_ARCH%%/Moose/Meta/Method.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/Writer.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/accessor.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/clear.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/count.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/delete.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/elements.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/first.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/first_index.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/get.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/grep.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/insert.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/is_empty.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/join.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/map.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/natatime.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/pop.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/push.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/reduce.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/set.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/shallow_clone.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/shift.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/shuffle.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/sort.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/sort_in_place.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/splice.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/uniq.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Array/unshift.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/not.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/set.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/toggle.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Bool/unset.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Code/execute.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Code/execute_method.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Collection.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/Writer.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/dec.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/inc.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/reset.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Counter/set.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/Writer.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/clear.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/count.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/defined.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/elements.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/exists.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/get.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/is_empty.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/keys.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/kv.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/set.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/shallow_clone.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Hash/values.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/abs.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/add.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/div.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/mod.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/mul.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/set.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Number/sub.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Reader.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/append.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/chomp.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/chop.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/clear.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/inc.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/length.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/match.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/prepend.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/replace.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/String/substr.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Accessor/Native/Writer.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Augmented.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Constructor.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Delegation.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Destructor.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Meta.pm
+%%SITE_ARCH%%/Moose/Meta/Method/Overridden.pm
+%%SITE_ARCH%%/Moose/Meta/Mixin/AttributeCore.pm
+%%SITE_ARCH%%/Moose/Meta/Object/Trait.pm
+%%SITE_ARCH%%/Moose/Meta/Role.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Application.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Application/RoleSummation.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Application/ToClass.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Application/ToInstance.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Application/ToRole.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Attribute.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Composite.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Method.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Method/Conflicting.pm
+%%SITE_ARCH%%/Moose/Meta/Role/Method/Required.pm
+%%SITE_ARCH%%/Moose/Meta/TypeCoercion.pm
+%%SITE_ARCH%%/Moose/Meta/TypeCoercion/Union.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/Class.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/DuckType.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/Enum.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/Parameterizable.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/Parameterized.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/Registry.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/Role.pm
+%%SITE_ARCH%%/Moose/Meta/TypeConstraint/Union.pm
+%%SITE_ARCH%%/Moose/Object.pm
+%%SITE_ARCH%%/Moose/Role.pm
+%%SITE_ARCH%%/Moose/Spec/Role.pod
+%%SITE_ARCH%%/Moose/Unsweetened.pod
+%%SITE_ARCH%%/Moose/Util.pm
+%%SITE_ARCH%%/Moose/Util/MetaRole.pm
+%%SITE_ARCH%%/Moose/Util/TypeConstraints.pm
+%%SITE_ARCH%%/Moose/Util/TypeConstraints/Builtins.pm
+%%SITE_ARCH%%/Test/Moose.pm
+%%SITE_ARCH%%/auto/Moose/Moose.so
+%%SITE_ARCH%%/metaclass.pm
+%%SITE_ARCH%%/oose.pm
diff --git a/devel/p5-MooseX-Aliases/Makefile b/devel/p5-MooseX-Aliases/Makefile
index 4c8b22d2b261..a7b9ad8eb0df 100644
--- a/devel/p5-MooseX-Aliases/Makefile
+++ b/devel/p5-MooseX-Aliases/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Aliases
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/devel/p5-MooseX-Aliases/pkg-plist b/devel/p5-MooseX-Aliases/pkg-plist
index 4d826af98e9b..fd256560ed57 100644
--- a/devel/p5-MooseX-Aliases/pkg-plist
+++ b/devel/p5-MooseX-Aliases/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Aliases/.packlist
 %%SITE_PERL%%/MooseX/Aliases.pm
 %%SITE_PERL%%/MooseX/Aliases/Meta/Trait/Attribute.pm
 %%SITE_PERL%%/MooseX/Aliases/Meta/Trait/Class.pm
diff --git a/devel/p5-MooseX-App-Cmd/Makefile b/devel/p5-MooseX-App-Cmd/Makefile
index 925148e918d9..bd36cb1bc92a 100644
--- a/devel/p5-MooseX-App-Cmd/Makefile
+++ b/devel/p5-MooseX-App-Cmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-App-Cmd
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-App-Cmd/pkg-plist b/devel/p5-MooseX-App-Cmd/pkg-plist
index 6b38d8860c10..d64d184390d2 100644
--- a/devel/p5-MooseX-App-Cmd/pkg-plist
+++ b/devel/p5-MooseX-App-Cmd/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/MooseX::App::Cmd::Command.3.gz
 %%SITE_PERL%%/MooseX/App/Cmd.pm
 %%SITE_PERL%%/MooseX/App/Cmd/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/App/Cmd/.packlist
diff --git a/devel/p5-MooseX-App/Makefile b/devel/p5-MooseX-App/Makefile
index cd22a14266ee..33d221db331e 100644
--- a/devel/p5-MooseX-App/Makefile
+++ b/devel/p5-MooseX-App/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-App
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-App/pkg-plist b/devel/p5-MooseX-App/pkg-plist
index 3d27faac54df..d4f98184b64f 100644
--- a/devel/p5-MooseX-App/pkg-plist
+++ b/devel/p5-MooseX-App/pkg-plist
@@ -40,7 +40,6 @@
 %%SITE_PERL%%/MooseX/App/Tutorial.pod
 %%SITE_PERL%%/MooseX/App/Utils.pm
 %%SITE_PERL%%/MooseX/App/WritingPlugins.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/App/.packlist
 %%PERL5_MAN3%%/MooseX::App.3.gz
 %%PERL5_MAN3%%/MooseX::App::Command.3.gz
 %%PERL5_MAN3%%/MooseX::App::Message::Block.3.gz
diff --git a/devel/p5-MooseX-ArrayRef/Makefile b/devel/p5-MooseX-ArrayRef/Makefile
index 36663560af33..5a0f4d4e7ca9 100644
--- a/devel/p5-MooseX-ArrayRef/Makefile
+++ b/devel/p5-MooseX-ArrayRef/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-ArrayRef
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-ArrayRef/pkg-plist b/devel/p5-MooseX-ArrayRef/pkg-plist
index 7a6b7efc93b3..31a69b61f914 100644
--- a/devel/p5-MooseX-ArrayRef/pkg-plist
+++ b/devel/p5-MooseX-ArrayRef/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/MooseX/ArrayRef.pm
 %%SITE_PERL%%/MooseX/ArrayRef/Meta/Class.pm
 %%SITE_PERL%%/MooseX/ArrayRef/Meta/Instance.pm
-%%SITE_PERL%%/mach/auto/MooseX/ArrayRef/.packlist
diff --git a/devel/p5-MooseX-Async/Makefile b/devel/p5-MooseX-Async/Makefile
index 4d39eee9132f..6c779a007849 100644
--- a/devel/p5-MooseX-Async/Makefile
+++ b/devel/p5-MooseX-Async/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Async
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Async/pkg-plist b/devel/p5-MooseX-Async/pkg-plist
index 5e23830d7e39..b2284b2a2c8f 100644
--- a/devel/p5-MooseX-Async/pkg-plist
+++ b/devel/p5-MooseX-Async/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/MooseX/Async/Meta/Method/State.pm
 %%SITE_PERL%%/MooseX/Async/Meta/Role.pm
 %%SITE_PERL%%/MooseX/Async/Meta/Trait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Async/.packlist
diff --git a/devel/p5-MooseX-Attribute-Chained/Makefile b/devel/p5-MooseX-Attribute-Chained/Makefile
index 97ac7e23521b..cd07d4dd251d 100644
--- a/devel/p5-MooseX-Attribute-Chained/Makefile
+++ b/devel/p5-MooseX-Attribute-Chained/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Attribute-Chained
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Attribute-ENV/Makefile b/devel/p5-MooseX-Attribute-ENV/Makefile
index 839b9258b7b3..f8a18a1bfcbc 100644
--- a/devel/p5-MooseX-Attribute-ENV/Makefile
+++ b/devel/p5-MooseX-Attribute-ENV/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MooseX-Attribute-ENV
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Attribute-ENV/pkg-plist b/devel/p5-MooseX-Attribute-ENV/pkg-plist
index e998eb69a79f..42341f2f0865 100644
--- a/devel/p5-MooseX-Attribute-ENV/pkg-plist
+++ b/devel/p5-MooseX-Attribute-ENV/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Attribute/ENV/.packlist
 %%SITE_PERL%%/MooseX/Attribute/ENV.pm
 %%PERL5_MAN3%%/MooseX::Attribute::ENV.3.gz
diff --git a/devel/p5-MooseX-AttributeHelpers/Makefile b/devel/p5-MooseX-AttributeHelpers/Makefile
index 60af1874a33a..41d2932da304 100644
--- a/devel/p5-MooseX-AttributeHelpers/Makefile
+++ b/devel/p5-MooseX-AttributeHelpers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-AttributeHelpers
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-AttributeHelpers/pkg-plist b/devel/p5-MooseX-AttributeHelpers/pkg-plist
index 93f53655d6cd..0a8b3dbab989 100644
--- a/devel/p5-MooseX-AttributeHelpers/pkg-plist
+++ b/devel/p5-MooseX-AttributeHelpers/pkg-plist
@@ -60,4 +60,3 @@
 %%SITE_PERL%%/MooseX/AttributeHelpers/Trait/Counter.pm
 %%SITE_PERL%%/MooseX/AttributeHelpers/Trait/Number.pm
 %%SITE_PERL%%/MooseX/AttributeHelpers/Trait/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/AttributeHelpers/.packlist
diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile
index ee9a22bc0b45..b9b5ccf70f35 100644
--- a/devel/p5-MooseX-AttributeShortcuts/Makefile
+++ b/devel/p5-MooseX-AttributeShortcuts/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-AttributeShortcuts
 PORTVERSION=	0.017
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	MooseX
diff --git a/devel/p5-MooseX-AttributeShortcuts/pkg-plist b/devel/p5-MooseX-AttributeShortcuts/pkg-plist
index 836967777076..0f8e476e46cf 100644
--- a/devel/p5-MooseX-AttributeShortcuts/pkg-plist
+++ b/devel/p5-MooseX-AttributeShortcuts/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/AttributeShortcuts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/AttributeShortcuts/.packlist
 %%PERL5_MAN3%%/MooseX::AttributeShortcuts.3.gz
diff --git a/devel/p5-MooseX-AuthorizedMethods/Makefile b/devel/p5-MooseX-AuthorizedMethods/Makefile
index 2e4ac1f2ffc4..6e2fccfb5c1c 100644
--- a/devel/p5-MooseX-AuthorizedMethods/Makefile
+++ b/devel/p5-MooseX-AuthorizedMethods/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-AuthorizedMethods
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-AuthorizedMethods/pkg-plist b/devel/p5-MooseX-AuthorizedMethods/pkg-plist
index f07888855aca..f95cfe19995b 100644
--- a/devel/p5-MooseX-AuthorizedMethods/pkg-plist
+++ b/devel/p5-MooseX-AuthorizedMethods/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/MooseX/Meta/Method/Authorized/Application/ToInstance.pm
 %%SITE_PERL%%/MooseX/Meta/Method/Authorized/CheckRoles.pm
 %%SITE_PERL%%/MooseX/Meta/Method/Authorized/Meta/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/AuthorizedMethods/.packlist
 %%PERL5_MAN3%%/MooseX::AuthorizedMethods.3.gz
 %%PERL5_MAN3%%/MooseX::Meta::Method::Authorized.3.gz
 %%PERL5_MAN3%%/MooseX::Meta::Method::Authorized::CheckRoles.3.gz
diff --git a/devel/p5-MooseX-ClassAttribute/Makefile b/devel/p5-MooseX-ClassAttribute/Makefile
index 3a1d5a6b205a..4f98f353d304 100644
--- a/devel/p5-MooseX-ClassAttribute/Makefile
+++ b/devel/p5-MooseX-ClassAttribute/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-ClassAttribute
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/devel/p5-MooseX-ClassAttribute/pkg-plist b/devel/p5-MooseX-ClassAttribute/pkg-plist
index d403a37068e0..f32b9af319d5 100644
--- a/devel/p5-MooseX-ClassAttribute/pkg-plist
+++ b/devel/p5-MooseX-ClassAttribute/pkg-plist
@@ -18,4 +18,3 @@
 %%SITE_PERL%%/MooseX/ClassAttribute/Trait/Mixin/HasClassAttributes.pm
 %%SITE_PERL%%/MooseX/ClassAttribute/Trait/Role.pm
 %%SITE_PERL%%/MooseX/ClassAttribute/Trait/Role/Composite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/ClassAttribute/.packlist
diff --git a/devel/p5-MooseX-Clone/Makefile b/devel/p5-MooseX-Clone/Makefile
index 35de4c18488c..3868119a4ba4 100644
--- a/devel/p5-MooseX-Clone/Makefile
+++ b/devel/p5-MooseX-Clone/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MooseX-Clone
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Clone/pkg-plist b/devel/p5-MooseX-Clone/pkg-plist
index 4bc178434ce0..b61b23f7efc6 100644
--- a/devel/p5-MooseX-Clone/pkg-plist
+++ b/devel/p5-MooseX-Clone/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/MooseX/Clone/Meta/Attribute/Trait/Copy.pm
 %%SITE_PERL%%/MooseX/Clone/Meta/Attribute/Trait/NoClone.pm
 %%SITE_PERL%%/MooseX/Clone/Meta/Attribute/Trait/StorableClone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Clone/.packlist
diff --git a/devel/p5-MooseX-CompileTime-Traits/Makefile b/devel/p5-MooseX-CompileTime-Traits/Makefile
index 26adab76cdab..d00e394df306 100644
--- a/devel/p5-MooseX-CompileTime-Traits/Makefile
+++ b/devel/p5-MooseX-CompileTime-Traits/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-CompileTime-Traits
 PORTVERSION=	1.102570
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-CompileTime-Traits/pkg-plist b/devel/p5-MooseX-CompileTime-Traits/pkg-plist
index eb0fad006a40..8b76837a4c0f 100644
--- a/devel/p5-MooseX-CompileTime-Traits/pkg-plist
+++ b/devel/p5-MooseX-CompileTime-Traits/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/CompileTime/Traits/.packlist
 %%SITE_PERL%%/MooseX/CompileTime/Traits.pm
 %%PERL5_MAN3%%/MooseX::CompileTime::Traits.3.gz
diff --git a/devel/p5-MooseX-ConfigFromFile/Makefile b/devel/p5-MooseX-ConfigFromFile/Makefile
index 8b6373914c05..178bad6cf331 100644
--- a/devel/p5-MooseX-ConfigFromFile/Makefile
+++ b/devel/p5-MooseX-ConfigFromFile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-ConfigFromFile
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-ConfigFromFile/pkg-plist b/devel/p5-MooseX-ConfigFromFile/pkg-plist
index f36e8011ce19..618110245496 100644
--- a/devel/p5-MooseX-ConfigFromFile/pkg-plist
+++ b/devel/p5-MooseX-ConfigFromFile/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::ConfigFromFile.3.gz
-%%SITE_PERL%%/mach/auto/MooseX/ConfigFromFile/.packlist
 %%SITE_PERL%%/MooseX/ConfigFromFile.pm
diff --git a/devel/p5-MooseX-Daemonize/Makefile b/devel/p5-MooseX-Daemonize/Makefile
index 9dbd750a5ecd..4c2d7f0192d5 100644
--- a/devel/p5-MooseX-Daemonize/Makefile
+++ b/devel/p5-MooseX-Daemonize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Daemonize
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Daemonize/pkg-plist b/devel/p5-MooseX-Daemonize/pkg-plist
index e0cb3f291417..5c128f04921e 100644
--- a/devel/p5-MooseX-Daemonize/pkg-plist
+++ b/devel/p5-MooseX-Daemonize/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/MooseX/Daemonize/Pid/File.pm
 %%SITE_PERL%%/MooseX/Daemonize/WithPidFile.pm
 %%SITE_PERL%%/Test/MooseX/Daemonize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Daemonize/.packlist
diff --git a/devel/p5-MooseX-Declare/Makefile b/devel/p5-MooseX-Declare/Makefile
index afcbf593899d..7af3cf6b9367 100644
--- a/devel/p5-MooseX-Declare/Makefile
+++ b/devel/p5-MooseX-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Declare
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Declare/pkg-plist b/devel/p5-MooseX-Declare/pkg-plist
index c86fe548aef1..95c252835242 100644
--- a/devel/p5-MooseX-Declare/pkg-plist
+++ b/devel/p5-MooseX-Declare/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Declare/.packlist
 %%SITE_PERL%%/MooseX/Declare.pm
 %%SITE_PERL%%/MooseX/Declare/Context.pm
 %%SITE_PERL%%/MooseX/Declare/Context/Namespaced.pm
diff --git a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
index def8d6f03f5e..cbb79b8f1bd2 100644
--- a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
+++ b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Emulate-Class-Accessor-Fast
 PORTVERSION=	0.00903
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/pkg-plist b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/pkg-plist
index a2515e6233c4..663f1f69ab03 100644
--- a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/pkg-plist
+++ b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/MooseX/Emulate/Class/Accessor/Fast.pm
 %%SITE_PERL%%/MooseX/Emulate/Class/Accessor/Fast/Meta/Accessor.pm
 %%SITE_PERL%%/MooseX/Emulate/Class/Accessor/Fast/Meta/Role/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Emulate/Class/Accessor/Fast/.packlist
diff --git a/devel/p5-MooseX-FollowPBP/Makefile b/devel/p5-MooseX-FollowPBP/Makefile
index 76fa853ec5fd..6d111d7e2605 100644
--- a/devel/p5-MooseX-FollowPBP/Makefile
+++ b/devel/p5-MooseX-FollowPBP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-FollowPBP
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-FollowPBP/pkg-plist b/devel/p5-MooseX-FollowPBP/pkg-plist
index 768008f0d9bd..e8bc08280477 100644
--- a/devel/p5-MooseX-FollowPBP/pkg-plist
+++ b/devel/p5-MooseX-FollowPBP/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/MooseX/FollowPBP.pm
 %%SITE_PERL%%/MooseX/FollowPBP/Role/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/FollowPBP/.packlist
 %%PERL5_MAN3%%/MooseX::FollowPBP.3.gz
 %%PERL5_MAN3%%/MooseX::FollowPBP::Role::Attribute.3.gz
diff --git a/devel/p5-MooseX-Getopt/Makefile b/devel/p5-MooseX-Getopt/Makefile
index 4b3bf852b12e..b8dc1496a985 100644
--- a/devel/p5-MooseX-Getopt/Makefile
+++ b/devel/p5-MooseX-Getopt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Getopt
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-MooseX-Getopt/pkg-plist b/devel/p5-MooseX-Getopt/pkg-plist
index 7df38b7b5a7c..56cb432f4bc1 100644
--- a/devel/p5-MooseX-Getopt/pkg-plist
+++ b/devel/p5-MooseX-Getopt/pkg-plist
@@ -9,7 +9,6 @@
 %%SITE_PERL%%/MooseX/Getopt/OptionTypeMap.pm
 %%SITE_PERL%%/MooseX/Getopt/ProcessedArgv.pm
 %%SITE_PERL%%/MooseX/Getopt/Strict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Getopt/.packlist
 %%PERL5_MAN3%%/MooseX::Getopt.3.gz
 %%PERL5_MAN3%%/MooseX::Getopt::Basic.3.gz
 %%PERL5_MAN3%%/MooseX::Getopt::Dashes.3.gz
diff --git a/devel/p5-MooseX-Has-Options/Makefile b/devel/p5-MooseX-Has-Options/Makefile
index 8e0a6363aafd..822aca88feff 100644
--- a/devel/p5-MooseX-Has-Options/Makefile
+++ b/devel/p5-MooseX-Has-Options/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Has-Options
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	MooseX
diff --git a/devel/p5-MooseX-Has-Options/pkg-plist b/devel/p5-MooseX-Has-Options/pkg-plist
index af2ede090c86..81605d03e6a1 100644
--- a/devel/p5-MooseX-Has-Options/pkg-plist
+++ b/devel/p5-MooseX-Has-Options/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/MooseX/Has/Options/Handler/Accessors.pm
 %%SITE_PERL%%/MooseX/Has/Options/Handler/NativeTypes.pm
 %%SITE_PERL%%/MooseX/Has/Options/Handler/NoInit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Has/Options/.packlist
diff --git a/devel/p5-MooseX-Has-Sugar/Makefile b/devel/p5-MooseX-Has-Sugar/Makefile
index 843bf04835ec..ff0bd4ec950f 100644
--- a/devel/p5-MooseX-Has-Sugar/Makefile
+++ b/devel/p5-MooseX-Has-Sugar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Has-Sugar
 PORTVERSION=	1.000004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Has-Sugar/pkg-plist b/devel/p5-MooseX-Has-Sugar/pkg-plist
index 09ef1a52c6a0..c38b9e17a805 100644
--- a/devel/p5-MooseX-Has-Sugar/pkg-plist
+++ b/devel/p5-MooseX-Has-Sugar/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/MooseX/Has/Sugar.pm
 %%SITE_PERL%%/MooseX/Has/Sugar/Saccharin.pm
 %%SITE_PERL%%/MooseX/Has/Sugar/Minimal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Has/Sugar/.packlist
 %%PERL5_MAN3%%/MooseX::Has::Sugar.3.gz
 %%PERL5_MAN3%%/MooseX::Has::Sugar::Minimal.3.gz
 %%PERL5_MAN3%%/MooseX::Has::Sugar::Saccharin.3.gz
diff --git a/devel/p5-MooseX-HasDefaults/Makefile b/devel/p5-MooseX-HasDefaults/Makefile
index c42aab1893f5..fa90da5e2602 100644
--- a/devel/p5-MooseX-HasDefaults/Makefile
+++ b/devel/p5-MooseX-HasDefaults/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-HasDefaults
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN/../by-authors/id/S/SA/SARTAK
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-HasDefaults/pkg-plist b/devel/p5-MooseX-HasDefaults/pkg-plist
index 85902c1e77f9..ed1cb7dce422 100644
--- a/devel/p5-MooseX-HasDefaults/pkg-plist
+++ b/devel/p5-MooseX-HasDefaults/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/mach/auto/MooseX/HasDefaults/.packlist
 %%SITE_PERL%%/MooseX/HasDefaults/Meta/IsRO.pm
 %%SITE_PERL%%/MooseX/HasDefaults/Meta/IsRW.pm
 %%SITE_PERL%%/MooseX/HasDefaults/RW.pm
diff --git a/devel/p5-MooseX-IOC/Makefile b/devel/p5-MooseX-IOC/Makefile
index 8fdcf5654bee..d958cc53f76d 100644
--- a/devel/p5-MooseX-IOC/Makefile
+++ b/devel/p5-MooseX-IOC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MooseX-IOC
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-IOC/pkg-plist b/devel/p5-MooseX-IOC/pkg-plist
index 708b79093284..8e6508d38fc8 100644
--- a/devel/p5-MooseX-IOC/pkg-plist
+++ b/devel/p5-MooseX-IOC/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/MooseX::IOC::Meta::Attribute.3.gz
 %%SITE_PERL%%/MooseX/IOC.pm
 %%SITE_PERL%%/MooseX/IOC/Meta/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/IOC/.packlist
diff --git a/devel/p5-MooseX-InsideOut/Makefile b/devel/p5-MooseX-InsideOut/Makefile
index ebc661fb156f..e46e7deb2194 100644
--- a/devel/p5-MooseX-InsideOut/Makefile
+++ b/devel/p5-MooseX-InsideOut/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MooseX-InsideOut
 PORTVERSION=	0.106
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-InsideOut/pkg-plist b/devel/p5-MooseX-InsideOut/pkg-plist
index 629c556fce26..feb6f7035a56 100644
--- a/devel/p5-MooseX-InsideOut/pkg-plist
+++ b/devel/p5-MooseX-InsideOut/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/MooseX::InsideOut::Role::Meta::Instance.3.gz
 %%SITE_PERL%%/MooseX/InsideOut.pm
 %%SITE_PERL%%/MooseX/InsideOut/Role/Meta/Instance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/InsideOut/.packlist
diff --git a/devel/p5-MooseX-LazyRequire/Makefile b/devel/p5-MooseX-LazyRequire/Makefile
index 316f44aac018..904fd94c6e9d 100644
--- a/devel/p5-MooseX-LazyRequire/Makefile
+++ b/devel/p5-MooseX-LazyRequire/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-LazyRequire
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-LazyRequire/pkg-plist b/devel/p5-MooseX-LazyRequire/pkg-plist
index b008f1f98067..f6bba9f1478f 100644
--- a/devel/p5-MooseX-LazyRequire/pkg-plist
+++ b/devel/p5-MooseX-LazyRequire/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/MooseX::LazyRequire::Meta::Attribute::Trait::LazyRequire.3.gz
 %%SITE_PERL%%/MooseX/LazyRequire.pm
 %%SITE_PERL%%/MooseX/LazyRequire/Meta/Attribute/Trait/LazyRequire.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/LazyRequire/.packlist
diff --git a/devel/p5-MooseX-Lists/Makefile b/devel/p5-MooseX-Lists/Makefile
index 9f6bb6fa1636..3789124b90a5 100644
--- a/devel/p5-MooseX-Lists/Makefile
+++ b/devel/p5-MooseX-Lists/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Lists
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Lists/pkg-plist b/devel/p5-MooseX-Lists/pkg-plist
index 33835b6b8020..790dd582838c 100644
--- a/devel/p5-MooseX-Lists/pkg-plist
+++ b/devel/p5-MooseX-Lists/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Lists.3.gz
 %%SITE_PERL%%/MooseX/Lists.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Lists/.packlist
diff --git a/devel/p5-MooseX-Log-Log4perl/Makefile b/devel/p5-MooseX-Log-Log4perl/Makefile
index 51f3280146c8..c931a29bf0c5 100644
--- a/devel/p5-MooseX-Log-Log4perl/Makefile
+++ b/devel/p5-MooseX-Log-Log4perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Log-Log4perl
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Log-Log4perl/pkg-plist b/devel/p5-MooseX-Log-Log4perl/pkg-plist
index 8a14847eb943..846863099910 100644
--- a/devel/p5-MooseX-Log-Log4perl/pkg-plist
+++ b/devel/p5-MooseX-Log-Log4perl/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/MooseX::Log::Log4perl::Easy.3.gz
 %%SITE_PERL%%/MooseX/Log/Log4perl.pm
 %%SITE_PERL%%/MooseX/Log/Log4perl/Easy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Log/Log4perl/.packlist
diff --git a/devel/p5-MooseX-MarkAsMethods/Makefile b/devel/p5-MooseX-MarkAsMethods/Makefile
index 5fa84bf8632e..3304e5a09633 100644
--- a/devel/p5-MooseX-MarkAsMethods/Makefile
+++ b/devel/p5-MooseX-MarkAsMethods/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-MarkAsMethods
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-MarkAsMethods/pkg-plist b/devel/p5-MooseX-MarkAsMethods/pkg-plist
index 3c9f81aef6e4..c6f1c89c0a3d 100644
--- a/devel/p5-MooseX-MarkAsMethods/pkg-plist
+++ b/devel/p5-MooseX-MarkAsMethods/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/MarkAsMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/MarkAsMethods/.packlist
 %%PERL5_MAN3%%/MooseX::MarkAsMethods.3.gz
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
index 20fce2d6c1df..559716aff0ee 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
+++ b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Meta-TypeConstraint-ForceCoercion
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/pkg-plist b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/pkg-plist
index 023f5ab7ab84..4a8fd840fd9b 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/pkg-plist
+++ b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Meta::TypeConstraint::ForceCoercion.3.gz
 %%SITE_PERL%%/MooseX/Meta/TypeConstraint/ForceCoercion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Meta/TypeConstraint/ForceCoercion/.packlist
diff --git a/devel/p5-MooseX-MetaDescription/Makefile b/devel/p5-MooseX-MetaDescription/Makefile
index cbef8b3be70b..561a2327c2f5 100644
--- a/devel/p5-MooseX-MetaDescription/Makefile
+++ b/devel/p5-MooseX-MetaDescription/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-MetaDescription
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-MetaDescription/pkg-plist b/devel/p5-MooseX-MetaDescription/pkg-plist
index 2e3a41507620..259df23a2c20 100644
--- a/devel/p5-MooseX-MetaDescription/pkg-plist
+++ b/devel/p5-MooseX-MetaDescription/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/MooseX/MetaDescription/Meta/Attribute.pm
 %%SITE_PERL%%/MooseX/MetaDescription/Meta/Class.pm
 %%SITE_PERL%%/MooseX/MetaDescription/Meta/Trait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/MetaDescription/.packlist
 %%PERL5_MAN3%%/MooseX::MetaDescription.3.gz
 %%PERL5_MAN3%%/MooseX::MetaDescription::Description.3.gz
 %%PERL5_MAN3%%/MooseX::MetaDescription::Meta::Attribute.3.gz
diff --git a/devel/p5-MooseX-Method-Signatures/Makefile b/devel/p5-MooseX-Method-Signatures/Makefile
index 57c1cb75c1c8..3f303fefecef 100644
--- a/devel/p5-MooseX-Method-Signatures/Makefile
+++ b/devel/p5-MooseX-Method-Signatures/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Method-Signatures
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Method-Signatures/pkg-plist b/devel/p5-MooseX-Method-Signatures/pkg-plist
index 5bbe636e27b5..632aaf428af2 100644
--- a/devel/p5-MooseX-Method-Signatures/pkg-plist
+++ b/devel/p5-MooseX-Method-Signatures/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Method/Signatures/.packlist
 %%SITE_PERL%%/MooseX/Method/Signatures.pm
 %%SITE_PERL%%/MooseX/Method/Signatures/Types.pm
 %%SITE_PERL%%/MooseX/Method/Signatures/Meta/Method.pm
diff --git a/devel/p5-MooseX-MethodAttributes/Makefile b/devel/p5-MooseX-MethodAttributes/Makefile
index 7ef03aede7b8..5598bc151e3c 100644
--- a/devel/p5-MooseX-MethodAttributes/Makefile
+++ b/devel/p5-MooseX-MethodAttributes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-MethodAttributes
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-MethodAttributes/pkg-plist b/devel/p5-MooseX-MethodAttributes/pkg-plist
index bdf87ad606ee..6d4022116985 100644
--- a/devel/p5-MooseX-MethodAttributes/pkg-plist
+++ b/devel/p5-MooseX-MethodAttributes/pkg-plist
@@ -24,4 +24,3 @@
 %%SITE_PERL%%/MooseX/MethodAttributes/Role/Meta/Role.pm
 %%SITE_PERL%%/MooseX/MethodAttributes/Role/Meta/Role/Application.pm
 %%SITE_PERL%%/MooseX/MethodAttributes/Role/Meta/Role/Application/Summation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/MethodAttributes/.packlist
diff --git a/devel/p5-MooseX-MultiInitArg/Makefile b/devel/p5-MooseX-MultiInitArg/Makefile
index f61ac26fbfd2..1ef15f94c5b7 100644
--- a/devel/p5-MooseX-MultiInitArg/Makefile
+++ b/devel/p5-MooseX-MultiInitArg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-MultiInitArg
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-MultiInitArg/pkg-plist b/devel/p5-MooseX-MultiInitArg/pkg-plist
index 86f48b252b42..03e9abd25bf6 100644
--- a/devel/p5-MooseX-MultiInitArg/pkg-plist
+++ b/devel/p5-MooseX-MultiInitArg/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/MooseX/MultiInitArg.pm
 %%SITE_PERL%%/MooseX/MultiInitArg/Attribute.pm
 %%SITE_PERL%%/MooseX/MultiInitArg/Trait.pm
-%%SITE_PERL%%/mach/auto/MooseX/MultiInitArg/.packlist
diff --git a/devel/p5-MooseX-MultiMethods/Makefile b/devel/p5-MooseX-MultiMethods/Makefile
index 4087dd5c0821..c0ae3d816da1 100644
--- a/devel/p5-MooseX-MultiMethods/Makefile
+++ b/devel/p5-MooseX-MultiMethods/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-MultiMethods
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-MultiMethods/pkg-plist b/devel/p5-MooseX-MultiMethods/pkg-plist
index 376aea22f437..7571f2acdae5 100644
--- a/devel/p5-MooseX-MultiMethods/pkg-plist
+++ b/devel/p5-MooseX-MultiMethods/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/MooseX/MultiMethods.pm
 %%SITE_PERL%%/MooseX/MultiMethods/Meta/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/MultiMethods/.packlist
 %%PERL5_MAN3%%/MooseX::MultiMethods.3.gz
 %%PERL5_MAN3%%/MooseX::MultiMethods::Meta::Method.3.gz
diff --git a/devel/p5-MooseX-NonMoose/Makefile b/devel/p5-MooseX-NonMoose/Makefile
index 3fa2be53a773..474612690ba5 100644
--- a/devel/p5-MooseX-NonMoose/Makefile
+++ b/devel/p5-MooseX-NonMoose/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-NonMoose
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-NonMoose/pkg-plist b/devel/p5-MooseX-NonMoose/pkg-plist
index 1ba9b43dc276..e80887c53e61 100644
--- a/devel/p5-MooseX-NonMoose/pkg-plist
+++ b/devel/p5-MooseX-NonMoose/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/MooseX/NonMoose/InsideOut.pm
 %%SITE_PERL%%/MooseX/NonMoose/Meta/Role/Class.pm
 %%SITE_PERL%%/MooseX/NonMoose/Meta/Role/Constructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/NonMoose/.packlist
diff --git a/devel/p5-MooseX-Object-Pluggable/Makefile b/devel/p5-MooseX-Object-Pluggable/Makefile
index 4730ac8d072a..57f26df52c82 100644
--- a/devel/p5-MooseX-Object-Pluggable/Makefile
+++ b/devel/p5-MooseX-Object-Pluggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Object-Pluggable
 PORTVERSION=	0.0012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Object-Pluggable/pkg-plist b/devel/p5-MooseX-Object-Pluggable/pkg-plist
index dfc031a1744a..f6a7d2a23eb1 100644
--- a/devel/p5-MooseX-Object-Pluggable/pkg-plist
+++ b/devel/p5-MooseX-Object-Pluggable/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Object/Pluggable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Object/Pluggable/.packlist
 %%PERL5_MAN3%%/MooseX::Object::Pluggable.3.gz
diff --git a/devel/p5-MooseX-OneArgNew/Makefile b/devel/p5-MooseX-OneArgNew/Makefile
index 4326d424cd4d..aa5a504e4b59 100644
--- a/devel/p5-MooseX-OneArgNew/Makefile
+++ b/devel/p5-MooseX-OneArgNew/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-OneArgNew
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-MooseX-OneArgNew/pkg-plist b/devel/p5-MooseX-OneArgNew/pkg-plist
index d33803d0064e..e35039ee8c8d 100644
--- a/devel/p5-MooseX-OneArgNew/pkg-plist
+++ b/devel/p5-MooseX-OneArgNew/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/OneArgNew.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/OneArgNew/.packlist
 %%PERL5_MAN3%%/MooseX::OneArgNew.3.gz
diff --git a/devel/p5-MooseX-POE/Makefile b/devel/p5-MooseX-POE/Makefile
index 0502edb2a977..c03c5a868aa7 100644
--- a/devel/p5-MooseX-POE/Makefile
+++ b/devel/p5-MooseX-POE/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-POE
 PORTVERSION=	0.215
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-POE/pkg-plist b/devel/p5-MooseX-POE/pkg-plist
index 46a8a5996071..3197c8a104ed 100644
--- a/devel/p5-MooseX-POE/pkg-plist
+++ b/devel/p5-MooseX-POE/pkg-plist
@@ -20,4 +20,3 @@
 %%SITE_PERL%%/MooseX/POE/Meta/Trait/SweetArgs.pm
 %%SITE_PERL%%/MooseX/POE/Role.pm
 %%SITE_PERL%%/MooseX/POE/SweetArgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/POE/.packlist
diff --git a/devel/p5-MooseX-Params-Validate/Makefile b/devel/p5-MooseX-Params-Validate/Makefile
index c29c6a366204..691fbe0d29f8 100644
--- a/devel/p5-MooseX-Params-Validate/Makefile
+++ b/devel/p5-MooseX-Params-Validate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Params-Validate
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Params-Validate/pkg-plist b/devel/p5-MooseX-Params-Validate/pkg-plist
index f245fd26c35a..18917edaa57b 100644
--- a/devel/p5-MooseX-Params-Validate/pkg-plist
+++ b/devel/p5-MooseX-Params-Validate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Params::Validate.3.gz
 %%SITE_PERL%%/MooseX/Params/Validate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Params/Validate/.packlist
diff --git a/devel/p5-MooseX-RelatedClassRoles/Makefile b/devel/p5-MooseX-RelatedClassRoles/Makefile
index 0271d804c08d..b687f255c45b 100644
--- a/devel/p5-MooseX-RelatedClassRoles/Makefile
+++ b/devel/p5-MooseX-RelatedClassRoles/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	MooseX-RelatedClassRoles
 PORTVERSION=	0.004
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-RelatedClassRoles/pkg-plist b/devel/p5-MooseX-RelatedClassRoles/pkg-plist
index fc79eb26ee6d..2f174ef99c90 100644
--- a/devel/p5-MooseX-RelatedClassRoles/pkg-plist
+++ b/devel/p5-MooseX-RelatedClassRoles/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::RelatedClassRoles.3.gz
 %%SITE_PERL%%/MooseX/RelatedClassRoles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/RelatedClassRoles/.packlist
diff --git a/devel/p5-MooseX-Role-Loggable/Makefile b/devel/p5-MooseX-Role-Loggable/Makefile
index 7a562949ef8d..961921381b7c 100644
--- a/devel/p5-MooseX-Role-Loggable/Makefile
+++ b/devel/p5-MooseX-Role-Loggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Role-Loggable
 PORTVERSION=	0.112
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Role-Loggable/pkg-plist b/devel/p5-MooseX-Role-Loggable/pkg-plist
index 218d15f3499f..0d69bd0d994b 100644
--- a/devel/p5-MooseX-Role-Loggable/pkg-plist
+++ b/devel/p5-MooseX-Role-Loggable/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Role::Loggable.3.gz
 %%SITE_PERL%%/MooseX/Role/Loggable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/Loggable/.packlist
diff --git a/devel/p5-MooseX-Role-Matcher/Makefile b/devel/p5-MooseX-Role-Matcher/Makefile
index 73b08f1a4870..34f85752b306 100644
--- a/devel/p5-MooseX-Role-Matcher/Makefile
+++ b/devel/p5-MooseX-Role-Matcher/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Role-Matcher
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Role-Matcher/pkg-plist b/devel/p5-MooseX-Role-Matcher/pkg-plist
index a52775dea09c..e43b0b7d6974 100644
--- a/devel/p5-MooseX-Role-Matcher/pkg-plist
+++ b/devel/p5-MooseX-Role-Matcher/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Role/Matcher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/Matcher/.packlist
 %%PERL5_MAN3%%/MooseX::Role::Matcher.3.gz
diff --git a/devel/p5-MooseX-Role-Parameterized/Makefile b/devel/p5-MooseX-Role-Parameterized/Makefile
index 88026c95cdbc..0bfab5b85c79 100644
--- a/devel/p5-MooseX-Role-Parameterized/Makefile
+++ b/devel/p5-MooseX-Role-Parameterized/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Role-Parameterized
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARTAK
diff --git a/devel/p5-MooseX-Role-Parameterized/pkg-plist b/devel/p5-MooseX-Role-Parameterized/pkg-plist
index 4a30a952b475..753d378b1be3 100644
--- a/devel/p5-MooseX-Role-Parameterized/pkg-plist
+++ b/devel/p5-MooseX-Role-Parameterized/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/MooseX/Role/Parameterized/Meta/Trait/Parameterized.pm
 %%SITE_PERL%%/MooseX/Role/Parameterized/Parameters.pm
 %%SITE_PERL%%/MooseX/Role/Parameterized/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/Parameterized/.packlist
diff --git a/devel/p5-MooseX-Role-Strict/Makefile b/devel/p5-MooseX-Role-Strict/Makefile
index 1b788c2ac664..828b9c4906f7 100644
--- a/devel/p5-MooseX-Role-Strict/Makefile
+++ b/devel/p5-MooseX-Role-Strict/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Role-Strict
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Role-Strict/pkg-plist b/devel/p5-MooseX-Role-Strict/pkg-plist
index 60e8cfc43b99..fcf3a0bfda74 100644
--- a/devel/p5-MooseX-Role-Strict/pkg-plist
+++ b/devel/p5-MooseX-Role-Strict/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/MooseX/Role/Strict.pm
 %%SITE_PERL%%/MooseX/Meta/Role/Strict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/Strict/.packlist
 %%PERL5_MAN3%%/MooseX::Meta::Role::Strict.3.gz
 %%PERL5_MAN3%%/MooseX::Role::Strict.3.gz
diff --git a/devel/p5-MooseX-Role-WithOverloading/Makefile b/devel/p5-MooseX-Role-WithOverloading/Makefile
index cd6677cf708a..c589167db62f 100644
--- a/devel/p5-MooseX-Role-WithOverloading/Makefile
+++ b/devel/p5-MooseX-Role-WithOverloading/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Role-WithOverloading
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
@@ -22,6 +23,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/MooseX/Role/WithOverloading/WithOverloading.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/MooseX/Role/WithOverloading/WithOverloading.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-MooseX-Role-WithOverloading/pkg-plist b/devel/p5-MooseX-Role-WithOverloading/pkg-plist
index e4a0d9f0acb1..c9711f9b6a84 100644
--- a/devel/p5-MooseX-Role-WithOverloading/pkg-plist
+++ b/devel/p5-MooseX-Role-WithOverloading/pkg-plist
@@ -11,18 +11,17 @@
 %%PERL5_MAN3%%/MooseX::Role::WithOverloading::Meta::Role::Application::ToInstance.3.gz
 %%PERL5_MAN3%%/MooseX::Role::WithOverloading::Meta::Role::Application::ToRole.3.gz
 %%PERL5_MAN3%%/MooseX::Role::WithOverloading::Meta::Role::Composite.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite/ToClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite/ToInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite/ToRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/FixOverloadedRefs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/ToClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/ToInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/ToRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Composite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/WithOverloading/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/WithOverloading/WithOverloading.so
+%%SITE_ARCH%%/MooseX/Role/README.pod
+%%SITE_ARCH%%/MooseX/Role/WithOverloading.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite/ToClass.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite/ToInstance.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/Composite/ToRole.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/FixOverloadedRefs.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/ToClass.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/ToInstance.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Application/ToRole.pm
+%%SITE_ARCH%%/MooseX/Role/WithOverloading/Meta/Role/Composite.pm
+%%SITE_ARCH%%/auto/MooseX/Role/WithOverloading/WithOverloading.so
diff --git a/devel/p5-MooseX-Runnable/Makefile b/devel/p5-MooseX-Runnable/Makefile
index ee87fa5dab76..d0098b6e01b9 100644
--- a/devel/p5-MooseX-Runnable/Makefile
+++ b/devel/p5-MooseX-Runnable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Runnable
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Runnable/pkg-plist b/devel/p5-MooseX-Runnable/pkg-plist
index 17617a824ca8..a6dc0c53aee1 100644
--- a/devel/p5-MooseX-Runnable/pkg-plist
+++ b/devel/p5-MooseX-Runnable/pkg-plist
@@ -13,7 +13,6 @@ bin/mx-run
 %%SITE_PERL%%/MooseX/Runnable/Invocation/Scheme/MooseX/Getopt.pm
 %%SITE_PERL%%/MooseX/Runnable/Run.pm
 %%SITE_PERL%%/MooseX/Runnable/Util/ArgParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Runnable/.packlist
 %%PERL5_MAN3%%/MooseX::Runnable.3.gz
 %%PERL5_MAN3%%/MooseX::Runnable::Invocation.3.gz
 %%PERL5_MAN3%%/MooseX::Runnable::Invocation::MxRun.3.gz
diff --git a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
index cfedea223d82..04a4f5db8686 100644
--- a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
+++ b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-SemiAffordanceAccessor
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/devel/p5-MooseX-SemiAffordanceAccessor/pkg-plist b/devel/p5-MooseX-SemiAffordanceAccessor/pkg-plist
index 661270125941..ae90332f106b 100644
--- a/devel/p5-MooseX-SemiAffordanceAccessor/pkg-plist
+++ b/devel/p5-MooseX-SemiAffordanceAccessor/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/MooseX::SemiAffordanceAccessor::Role::Attribute.3.gz
 %%SITE_PERL%%/MooseX/SemiAffordanceAccessor.pm
 %%SITE_PERL%%/MooseX/SemiAffordanceAccessor/Role/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/SemiAffordanceAccessor/.packlist
diff --git a/devel/p5-MooseX-SetOnce/Makefile b/devel/p5-MooseX-SetOnce/Makefile
index 40fb8c660758..4ec15ca371d2 100644
--- a/devel/p5-MooseX-SetOnce/Makefile
+++ b/devel/p5-MooseX-SetOnce/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-SetOnce
 PORTVERSION=	0.200002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-SetOnce/pkg-plist b/devel/p5-MooseX-SetOnce/pkg-plist
index 250bd8dda810..47af1de067dc 100644
--- a/devel/p5-MooseX-SetOnce/pkg-plist
+++ b/devel/p5-MooseX-SetOnce/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/SetOnce.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/SetOnce/.packlist
 %%PERL5_MAN3%%/MooseX::SetOnce.3.gz
diff --git a/devel/p5-MooseX-SimpleConfig/Makefile b/devel/p5-MooseX-SimpleConfig/Makefile
index e71113b9b98d..2b15a8ada285 100644
--- a/devel/p5-MooseX-SimpleConfig/Makefile
+++ b/devel/p5-MooseX-SimpleConfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-SimpleConfig
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-SimpleConfig/pkg-plist b/devel/p5-MooseX-SimpleConfig/pkg-plist
index ff88874bd5bd..02569e985865 100644
--- a/devel/p5-MooseX-SimpleConfig/pkg-plist
+++ b/devel/p5-MooseX-SimpleConfig/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/SimpleConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/SimpleConfig/.packlist
 %%PERL5_MAN3%%/MooseX::SimpleConfig.3.gz
diff --git a/devel/p5-MooseX-Singleton/Makefile b/devel/p5-MooseX-Singleton/Makefile
index a238bd5b6e46..73b1e0aadf8a 100644
--- a/devel/p5-MooseX-Singleton/Makefile
+++ b/devel/p5-MooseX-Singleton/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Singleton
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Singleton/pkg-plist b/devel/p5-MooseX-Singleton/pkg-plist
index eb02d07e9640..5759f513ec03 100644
--- a/devel/p5-MooseX-Singleton/pkg-plist
+++ b/devel/p5-MooseX-Singleton/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/MooseX/Singleton/Role/Meta/Instance.pm
 %%SITE_PERL%%/MooseX/Singleton/Role/Meta/Method/Constructor.pm
 %%SITE_PERL%%/MooseX/Singleton/Role/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Singleton/.packlist
diff --git a/devel/p5-MooseX-Storage/Makefile b/devel/p5-MooseX-Storage/Makefile
index 6d05c33fdbb6..3b0b7cc12bd7 100644
--- a/devel/p5-MooseX-Storage/Makefile
+++ b/devel/p5-MooseX-Storage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Storage
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Storage/pkg-plist b/devel/p5-MooseX-Storage/pkg-plist
index 8c47a7762849..d6b49716fb53 100644
--- a/devel/p5-MooseX-Storage/pkg-plist
+++ b/devel/p5-MooseX-Storage/pkg-plist
@@ -18,7 +18,6 @@
 %%SITE_PERL%%/MooseX/Storage/Traits/DisableCycleDetection.pm
 %%SITE_PERL%%/MooseX/Storage/Traits/OnlyWhenBuilt.pm
 %%SITE_PERL%%/MooseX/Storage/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Storage/.packlist
 %%PERL5_MAN3%%/MooseX::Storage.3.gz
 %%PERL5_MAN3%%/MooseX::Storage::Base::WithChecksum.3.gz
 %%PERL5_MAN3%%/MooseX::Storage::Basic.3.gz
diff --git a/devel/p5-MooseX-StrictConstructor/Makefile b/devel/p5-MooseX-StrictConstructor/Makefile
index b71df3fd4811..f0d445af5891 100644
--- a/devel/p5-MooseX-StrictConstructor/Makefile
+++ b/devel/p5-MooseX-StrictConstructor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-StrictConstructor
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-StrictConstructor/pkg-plist b/devel/p5-MooseX-StrictConstructor/pkg-plist
index 30deb2e117f6..62a9a2c0d493 100644
--- a/devel/p5-MooseX-StrictConstructor/pkg-plist
+++ b/devel/p5-MooseX-StrictConstructor/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/MooseX/StrictConstructor.pm
 %%SITE_PERL%%/MooseX/StrictConstructor/Trait/Class.pm
 %%SITE_PERL%%/MooseX/StrictConstructor/Trait/Method/Constructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/StrictConstructor/.packlist
diff --git a/devel/p5-MooseX-Traits-Pluggable/Makefile b/devel/p5-MooseX-Traits-Pluggable/Makefile
index 35bda350b769..aba4daece7a6 100644
--- a/devel/p5-MooseX-Traits-Pluggable/Makefile
+++ b/devel/p5-MooseX-Traits-Pluggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Traits-Pluggable
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Traits-Pluggable/pkg-plist b/devel/p5-MooseX-Traits-Pluggable/pkg-plist
index 07c2e65b4f63..e02b10639c3c 100644
--- a/devel/p5-MooseX-Traits-Pluggable/pkg-plist
+++ b/devel/p5-MooseX-Traits-Pluggable/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Traits/Pluggable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Traits/Pluggable/.packlist
 %%PERL5_MAN3%%/MooseX::Traits::Pluggable.3.gz
diff --git a/devel/p5-MooseX-Traits/Makefile b/devel/p5-MooseX-Traits/Makefile
index c2c71adc9a33..db53c6bd2e59 100644
--- a/devel/p5-MooseX-Traits/Makefile
+++ b/devel/p5-MooseX-Traits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Traits
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Traits/pkg-plist b/devel/p5-MooseX-Traits/pkg-plist
index d7c0e7c7bf40..7d8ec134d67f 100644
--- a/devel/p5-MooseX-Traits/pkg-plist
+++ b/devel/p5-MooseX-Traits/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/MooseX::Traits::Util.3.gz
 %%SITE_PERL%%/MooseX/Traits.pm
 %%SITE_PERL%%/MooseX/Traits/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Traits/.packlist
diff --git a/devel/p5-MooseX-TransactionalMethods/Makefile b/devel/p5-MooseX-TransactionalMethods/Makefile
index 008fa6651820..ac64313b6b76 100644
--- a/devel/p5-MooseX-TransactionalMethods/Makefile
+++ b/devel/p5-MooseX-TransactionalMethods/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-TransactionalMethods
 PORTVERSION=	0.008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-TransactionalMethods/pkg-plist b/devel/p5-MooseX-TransactionalMethods/pkg-plist
index c5d487f3c061..a752bb34d05a 100644
--- a/devel/p5-MooseX-TransactionalMethods/pkg-plist
+++ b/devel/p5-MooseX-TransactionalMethods/pkg-plist
@@ -4,6 +4,5 @@
 %%SITE_PERL%%/MooseX/Meta/Method/Transactional/Application/ToInstance.pm
 %%SITE_PERL%%/MooseX/Meta/Method/Transactional/Meta/Role.pm
 %%SITE_PERL%%/MooseX/TransactionalMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/TransactionalMethods/.packlist
 %%PERL5_MAN3%%/MooseX::Meta::Method::Transactional.3.gz
 %%PERL5_MAN3%%/MooseX::TransactionalMethods.3.gz
diff --git a/devel/p5-MooseX-Types-Common/Makefile b/devel/p5-MooseX-Types-Common/Makefile
index ae37874432ad..b8df5b8fcb7c 100644
--- a/devel/p5-MooseX-Types-Common/Makefile
+++ b/devel/p5-MooseX-Types-Common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-Common
 PORTVERSION=	0.001012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-MooseX-Types-Common/pkg-plist b/devel/p5-MooseX-Types-Common/pkg-plist
index 7ddba70b93e0..023867684f0e 100644
--- a/devel/p5-MooseX-Types-Common/pkg-plist
+++ b/devel/p5-MooseX-Types-Common/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/MooseX/Types/Common.pm
 %%SITE_PERL%%/MooseX/Types/Common/Numeric.pm
 %%SITE_PERL%%/MooseX/Types/Common/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Common/.packlist
 %%PERL5_MAN3%%/MooseX::Types::Common.3.gz
 %%PERL5_MAN3%%/MooseX::Types::Common::Numeric.3.gz
 %%PERL5_MAN3%%/MooseX::Types::Common::String.3.gz
diff --git a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
index b8552614387e..532622d0a4c1 100644
--- a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-DateTime-ButMaintained
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-DateTime-ButMaintained/pkg-plist b/devel/p5-MooseX-Types-DateTime-ButMaintained/pkg-plist
index 16e26b0aa444..d415ffb7103a 100644
--- a/devel/p5-MooseX-Types-DateTime-ButMaintained/pkg-plist
+++ b/devel/p5-MooseX-Types-DateTime-ButMaintained/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Types::DateTime::ButMaintained.3.gz
 %%SITE_PERL%%/MooseX/Types/DateTime/ButMaintained.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/DateTime/ButMaintained/.packlist
diff --git a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
index aef1dec6b842..b6e217cee65a 100644
--- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-DateTime-MoreCoercions
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-DateTime-MoreCoercions/pkg-plist b/devel/p5-MooseX-Types-DateTime-MoreCoercions/pkg-plist
index caa540fa9db3..602bbc98ae79 100644
--- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/pkg-plist
+++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Types/DateTime/MoreCoercions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/DateTime/MoreCoercions/.packlist
 %%PERL5_MAN3%%/MooseX::Types::DateTime::MoreCoercions.3.gz
diff --git a/devel/p5-MooseX-Types-DateTime/Makefile b/devel/p5-MooseX-Types-DateTime/Makefile
index c34c17e8c169..e41c66427168 100644
--- a/devel/p5-MooseX-Types-DateTime/Makefile
+++ b/devel/p5-MooseX-Types-DateTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-DateTime
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-MooseX-Types-DateTime/pkg-plist b/devel/p5-MooseX-Types-DateTime/pkg-plist
index 016705f86b6f..3bc356c96c6d 100644
--- a/devel/p5-MooseX-Types-DateTime/pkg-plist
+++ b/devel/p5-MooseX-Types-DateTime/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Types/DateTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/DateTime/.packlist
 %%PERL5_MAN3%%/MooseX::Types::DateTime.3.gz
diff --git a/devel/p5-MooseX-Types-DateTimeX/Makefile b/devel/p5-MooseX-Types-DateTimeX/Makefile
index a42ddff3197e..63dbc7166ea6 100644
--- a/devel/p5-MooseX-Types-DateTimeX/Makefile
+++ b/devel/p5-MooseX-Types-DateTimeX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-DateTimeX
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-DateTimeX/pkg-plist b/devel/p5-MooseX-Types-DateTimeX/pkg-plist
index b50267bc76c7..f6620c189d6e 100644
--- a/devel/p5-MooseX-Types-DateTimeX/pkg-plist
+++ b/devel/p5-MooseX-Types-DateTimeX/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Types::DateTimeX.3.gz
 %%SITE_PERL%%/MooseX/Types/DateTimeX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/DateTimeX/.packlist
diff --git a/devel/p5-MooseX-Types-ISO8601/Makefile b/devel/p5-MooseX-Types-ISO8601/Makefile
index a6ff8c53d7bb..8472bda5fffa 100644
--- a/devel/p5-MooseX-Types-ISO8601/Makefile
+++ b/devel/p5-MooseX-Types-ISO8601/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-Types-ISO8601
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-ISO8601/pkg-plist b/devel/p5-MooseX-Types-ISO8601/pkg-plist
index 6e130a63d108..a1d594f0fab2 100644
--- a/devel/p5-MooseX-Types-ISO8601/pkg-plist
+++ b/devel/p5-MooseX-Types-ISO8601/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Types/ISO8601.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/ISO8601/.packlist
 %%PERL5_MAN3%%/MooseX::Types::ISO8601.3.gz
diff --git a/devel/p5-MooseX-Types-JSON/Makefile b/devel/p5-MooseX-Types-JSON/Makefile
index 632979749eb3..fbbe4f467627 100644
--- a/devel/p5-MooseX-Types-JSON/Makefile
+++ b/devel/p5-MooseX-Types-JSON/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-JSON
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MILA
diff --git a/devel/p5-MooseX-Types-JSON/pkg-plist b/devel/p5-MooseX-Types-JSON/pkg-plist
index d3f10afd2814..568322369d24 100644
--- a/devel/p5-MooseX-Types-JSON/pkg-plist
+++ b/devel/p5-MooseX-Types-JSON/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Types::JSON.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/JSON/.packlist
 %%SITE_PERL%%/MooseX/Types/JSON.pm
diff --git a/devel/p5-MooseX-Types-LoadableClass/Makefile b/devel/p5-MooseX-Types-LoadableClass/Makefile
index 5d88ed9d1331..aef57440a485 100644
--- a/devel/p5-MooseX-Types-LoadableClass/Makefile
+++ b/devel/p5-MooseX-Types-LoadableClass/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-Types-LoadableClass
 PORTVERSION=	0.012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-MooseX-Types-LoadableClass/pkg-plist b/devel/p5-MooseX-Types-LoadableClass/pkg-plist
index d91c9760ef82..174d93d67bf6 100644
--- a/devel/p5-MooseX-Types-LoadableClass/pkg-plist
+++ b/devel/p5-MooseX-Types-LoadableClass/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/LoadableClass/.packlist
 %%SITE_PERL%%/MooseX/Types/LoadableClass.pm
 %%PERL5_MAN3%%/MooseX::Types::LoadableClass.3.gz
diff --git a/devel/p5-MooseX-Types-Path-Class/Makefile b/devel/p5-MooseX-Types-Path-Class/Makefile
index c8f7ae8dcdc6..be09e17d1c4c 100644
--- a/devel/p5-MooseX-Types-Path-Class/Makefile
+++ b/devel/p5-MooseX-Types-Path-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-Path-Class
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-Path-Class/pkg-plist b/devel/p5-MooseX-Types-Path-Class/pkg-plist
index 68808fe42a89..28299f2845d4 100644
--- a/devel/p5-MooseX-Types-Path-Class/pkg-plist
+++ b/devel/p5-MooseX-Types-Path-Class/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Types::Path::Class.3.gz
 %%SITE_PERL%%/MooseX/Types/Path/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Path/Class/.packlist
diff --git a/devel/p5-MooseX-Types-Path-Tiny/Makefile b/devel/p5-MooseX-Types-Path-Tiny/Makefile
index df2489fd7454..f42d74d360ab 100644
--- a/devel/p5-MooseX-Types-Path-Tiny/Makefile
+++ b/devel/p5-MooseX-Types-Path-Tiny/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-Types-Path-Tiny
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-Path-Tiny/pkg-plist b/devel/p5-MooseX-Types-Path-Tiny/pkg-plist
index d71d9318cb89..5729b1cbb1cf 100644
--- a/devel/p5-MooseX-Types-Path-Tiny/pkg-plist
+++ b/devel/p5-MooseX-Types-Path-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Types::Path::Tiny.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Path/Tiny/.packlist
 %%SITE_PERL%%/MooseX/Types/Path/Tiny.pm
diff --git a/devel/p5-MooseX-Types-Perl/Makefile b/devel/p5-MooseX-Types-Perl/Makefile
index 042570577e48..7f5509ced239 100644
--- a/devel/p5-MooseX-Types-Perl/Makefile
+++ b/devel/p5-MooseX-Types-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-Perl
 PORTVERSION=	0.101343
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-Perl/pkg-plist b/devel/p5-MooseX-Types-Perl/pkg-plist
index f599449644f6..ec807d317fc8 100644
--- a/devel/p5-MooseX-Types-Perl/pkg-plist
+++ b/devel/p5-MooseX-Types-Perl/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Types/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Perl/.packlist
 %%PERL5_MAN3%%/MooseX::Types::Perl.3.gz
diff --git a/devel/p5-MooseX-Types-PortNumber/Makefile b/devel/p5-MooseX-Types-PortNumber/Makefile
index 755304764669..f6ea3d66a9b9 100644
--- a/devel/p5-MooseX-Types-PortNumber/Makefile
+++ b/devel/p5-MooseX-Types-PortNumber/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	MooseX-Types-PortNumber
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-PortNumber/pkg-plist b/devel/p5-MooseX-Types-PortNumber/pkg-plist
index 26a1ca8787a6..b7da5b4d0cfc 100644
--- a/devel/p5-MooseX-Types-PortNumber/pkg-plist
+++ b/devel/p5-MooseX-Types-PortNumber/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Types/PortNumber.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/PortNumber/.packlist
 %%PERL5_MAN3%%/MooseX::Types::PortNumber.3.gz
diff --git a/devel/p5-MooseX-Types-Set-Object/Makefile b/devel/p5-MooseX-Types-Set-Object/Makefile
index ba1aa37d029f..4e26441dfc49 100644
--- a/devel/p5-MooseX-Types-Set-Object/Makefile
+++ b/devel/p5-MooseX-Types-Set-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-Set-Object
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-Set-Object/pkg-plist b/devel/p5-MooseX-Types-Set-Object/pkg-plist
index 4a2c28283f0c..1e6867b661dd 100644
--- a/devel/p5-MooseX-Types-Set-Object/pkg-plist
+++ b/devel/p5-MooseX-Types-Set-Object/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Types/Set/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Set/Object/.packlist
 %%PERL5_MAN3%%/MooseX::Types::Set::Object.3.gz
diff --git a/devel/p5-MooseX-Types-Signal/Makefile b/devel/p5-MooseX-Types-Signal/Makefile
index f0a90c17f4dd..19b5db4dc958 100644
--- a/devel/p5-MooseX-Types-Signal/Makefile
+++ b/devel/p5-MooseX-Types-Signal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-Signal
 PORTVERSION=	1.101932
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-Signal/pkg-plist b/devel/p5-MooseX-Types-Signal/pkg-plist
index 4d86a0a53c1b..788e0a80c8da 100644
--- a/devel/p5-MooseX-Types-Signal/pkg-plist
+++ b/devel/p5-MooseX-Types-Signal/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Signal/.packlist
 %%PERL5_MAN3%%/MooseX::Types::Signal.3.gz
 %%SITE_PERL%%/MooseX/Types/Signal.pm
diff --git a/devel/p5-MooseX-Types-Stringlike/Makefile b/devel/p5-MooseX-Types-Stringlike/Makefile
index 8bd9a64c8bcf..9b6d9cb04a4b 100644
--- a/devel/p5-MooseX-Types-Stringlike/Makefile
+++ b/devel/p5-MooseX-Types-Stringlike/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MooseX-Types-Stringlike
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-Stringlike/pkg-plist b/devel/p5-MooseX-Types-Stringlike/pkg-plist
index 9880c4e33839..1dc606c424e2 100644
--- a/devel/p5-MooseX-Types-Stringlike/pkg-plist
+++ b/devel/p5-MooseX-Types-Stringlike/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MooseX::Types::Stringlike.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Stringlike/.packlist
 %%SITE_PERL%%/MooseX/Types/Stringlike.pm
diff --git a/devel/p5-MooseX-Types-Structured/Makefile b/devel/p5-MooseX-Types-Structured/Makefile
index 87ac51ae990b..1882f6c2747e 100644
--- a/devel/p5-MooseX-Types-Structured/Makefile
+++ b/devel/p5-MooseX-Types-Structured/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-Structured
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-Structured/pkg-plist b/devel/p5-MooseX-Types-Structured/pkg-plist
index 05f955768224..6723afb129af 100644
--- a/devel/p5-MooseX-Types-Structured/pkg-plist
+++ b/devel/p5-MooseX-Types-Structured/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/MooseX/Types/Structured.pm
 %%SITE_PERL%%/MooseX/Types/Structured/MessageStack.pm
 %%SITE_PERL%%/MooseX/Types/Structured/OverflowHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/Structured/.packlist
diff --git a/devel/p5-MooseX-Types-URI/Makefile b/devel/p5-MooseX-Types-URI/Makefile
index c6c0845c2f58..cb20691a1a9c 100644
--- a/devel/p5-MooseX-Types-URI/Makefile
+++ b/devel/p5-MooseX-Types-URI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-URI
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-URI/pkg-plist b/devel/p5-MooseX-Types-URI/pkg-plist
index dbaf7d3499c0..d99bdee0fa70 100644
--- a/devel/p5-MooseX-Types-URI/pkg-plist
+++ b/devel/p5-MooseX-Types-URI/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MooseX/Types/URI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/URI/.packlist
 %%PERL5_MAN3%%/MooseX::Types::URI.3.gz
diff --git a/devel/p5-MooseX-Types-VariantTable/Makefile b/devel/p5-MooseX-Types-VariantTable/Makefile
index 8dcffa537be6..0b52aa03ee27 100644
--- a/devel/p5-MooseX-Types-VariantTable/Makefile
+++ b/devel/p5-MooseX-Types-VariantTable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types-VariantTable
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MooseX-Types-VariantTable/pkg-plist b/devel/p5-MooseX-Types-VariantTable/pkg-plist
index 8ad260be9e2d..36da2428cb60 100644
--- a/devel/p5-MooseX-Types-VariantTable/pkg-plist
+++ b/devel/p5-MooseX-Types-VariantTable/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/MooseX/Types/VariantTable/Declare.pm
 %%SITE_PERL%%/MooseX/Types/VariantTable.pm
 %%SITE_PERL%%/Moose/Meta/Method/VariantTable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/VariantTable/.packlist
 %%PERL5_MAN3%%/MooseX::Types::VariantTable::Declare.3.gz
 %%PERL5_MAN3%%/MooseX::Types::VariantTable.3.gz
diff --git a/devel/p5-MooseX-Types/Makefile b/devel/p5-MooseX-Types/Makefile
index 48a939b05cdb..6f34b18f4d73 100644
--- a/devel/p5-MooseX-Types/Makefile
+++ b/devel/p5-MooseX-Types/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MooseX-Types
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-MooseX-Types/pkg-plist b/devel/p5-MooseX-Types/pkg-plist
index 9cfd009ef7cd..c442f7fd1a0a 100644
--- a/devel/p5-MooseX-Types/pkg-plist
+++ b/devel/p5-MooseX-Types/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/MooseX/Types/UndefinedType.pm
 %%SITE_PERL%%/MooseX/Types/Util.pm
 %%SITE_PERL%%/MooseX/Types/Wrapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/.packlist
 %%PERL5_MAN3%%/MooseX::Types.3.gz
 %%PERL5_MAN3%%/MooseX::Types::Base.3.gz
 %%PERL5_MAN3%%/MooseX::Types::CheckedUtilExports.3.gz
diff --git a/devel/p5-Mouse/Makefile b/devel/p5-Mouse/Makefile
index 124c6ae7d68d..c659ef4002d0 100644
--- a/devel/p5-Mouse/Makefile
+++ b/devel/p5-Mouse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mouse
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Mouse/pkg-plist b/devel/p5-Mouse/pkg-plist
index 829acfa67618..2008715faea2 100644
--- a/devel/p5-Mouse/pkg-plist
+++ b/devel/p5-Mouse/pkg-plist
@@ -1,34 +1,34 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Exporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Method/Accessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Method/Constructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Method/Delegation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Method/Destructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Module.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Role/Application.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Role/Composite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/Role/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Meta/TypeConstraint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/PurePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Spec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Tiny.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/TypeRegistry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Util/MetaRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/Util/TypeConstraints.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mouse/XS.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Squirrel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Squirrel/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Test/Mouse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mouse/Mouse.so
-%%SITE_PERL%%/%%PERL_ARCH%%/ouse.pm
+%%SITE_ARCH%%/Mouse.pm
+%%SITE_ARCH%%/Mouse/Exporter.pm
+%%SITE_ARCH%%/Mouse/Meta/Attribute.pm
+%%SITE_ARCH%%/Mouse/Meta/Class.pm
+%%SITE_ARCH%%/Mouse/Meta/Method.pm
+%%SITE_ARCH%%/Mouse/Meta/Method/Accessor.pm
+%%SITE_ARCH%%/Mouse/Meta/Method/Constructor.pm
+%%SITE_ARCH%%/Mouse/Meta/Method/Delegation.pm
+%%SITE_ARCH%%/Mouse/Meta/Method/Destructor.pm
+%%SITE_ARCH%%/Mouse/Meta/Module.pm
+%%SITE_ARCH%%/Mouse/Meta/Role.pm
+%%SITE_ARCH%%/Mouse/Meta/Role/Application.pm
+%%SITE_ARCH%%/Mouse/Meta/Role/Composite.pm
+%%SITE_ARCH%%/Mouse/Meta/Role/Method.pm
+%%SITE_ARCH%%/Mouse/Meta/TypeConstraint.pm
+%%SITE_ARCH%%/Mouse/Object.pm
+%%SITE_ARCH%%/Mouse/PurePerl.pm
+%%SITE_ARCH%%/Mouse/Role.pm
+%%SITE_ARCH%%/Mouse/Spec.pm
+%%SITE_ARCH%%/Mouse/Tiny.pm
+%%SITE_ARCH%%/Mouse/Tiny.pod
+%%SITE_ARCH%%/Mouse/TypeRegistry.pm
+%%SITE_ARCH%%/Mouse/Util.pm
+%%SITE_ARCH%%/Mouse/Util/MetaRole.pm
+%%SITE_ARCH%%/Mouse/Util/TypeConstraints.pm
+%%SITE_ARCH%%/Mouse/XS.pod
+%%SITE_ARCH%%/Squirrel.pm
+%%SITE_ARCH%%/Squirrel/Role.pm
+%%SITE_ARCH%%/Test/Mouse.pm
+%%SITE_ARCH%%/auto/Mouse/Mouse.so
+%%SITE_ARCH%%/ouse.pm
 %%PERL5_MAN3%%/Mouse.3.gz
 %%PERL5_MAN3%%/Mouse::Exporter.3.gz
 %%PERL5_MAN3%%/Mouse::Meta::Attribute.3.gz
diff --git a/devel/p5-MouseX-App-Cmd/Makefile b/devel/p5-MouseX-App-Cmd/Makefile
index 4b92c0258459..c790ba57b1d1 100644
--- a/devel/p5-MouseX-App-Cmd/Makefile
+++ b/devel/p5-MouseX-App-Cmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MouseX-App-Cmd
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MouseX-App-Cmd/pkg-plist b/devel/p5-MouseX-App-Cmd/pkg-plist
index 572051ba97c1..40fe5a2f1667 100644
--- a/devel/p5-MouseX-App-Cmd/pkg-plist
+++ b/devel/p5-MouseX-App-Cmd/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/MouseX/App/Cmd.pm
 %%SITE_PERL%%/MouseX/App/Cmd/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/App/Cmd/.packlist
 %%PERL5_MAN3%%/MouseX::App::Cmd.3.gz
 %%PERL5_MAN3%%/MouseX::App::Cmd::Command.3.gz
diff --git a/devel/p5-MouseX-AttributeHelpers/Makefile b/devel/p5-MouseX-AttributeHelpers/Makefile
index 63d731f0c92f..e684174da1f0 100644
--- a/devel/p5-MouseX-AttributeHelpers/Makefile
+++ b/devel/p5-MouseX-AttributeHelpers/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MouseX-AttributeHelpers
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MASAKI
diff --git a/devel/p5-MouseX-AttributeHelpers/pkg-plist b/devel/p5-MouseX-AttributeHelpers/pkg-plist
index d2d84e48dc7d..b1d27040c8ef 100644
--- a/devel/p5-MouseX-AttributeHelpers/pkg-plist
+++ b/devel/p5-MouseX-AttributeHelpers/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/AttributeHelpers/.packlist
 %%SITE_PERL%%/MouseX/AttributeHelpers.pm
 %%SITE_PERL%%/MouseX/AttributeHelpers/Base.pm
 %%SITE_PERL%%/MouseX/AttributeHelpers/Bool.pm
diff --git a/devel/p5-MouseX-ConfigFromFile/Makefile b/devel/p5-MouseX-ConfigFromFile/Makefile
index f07da2a0437c..30df5f3b271d 100644
--- a/devel/p5-MouseX-ConfigFromFile/Makefile
+++ b/devel/p5-MouseX-ConfigFromFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MouseX-ConfigFromFile
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MASAKI
diff --git a/devel/p5-MouseX-ConfigFromFile/pkg-plist b/devel/p5-MouseX-ConfigFromFile/pkg-plist
index 0373c864fffc..31aee43f18ec 100644
--- a/devel/p5-MouseX-ConfigFromFile/pkg-plist
+++ b/devel/p5-MouseX-ConfigFromFile/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/ConfigFromFile/.packlist
 %%SITE_PERL%%/MouseX/ConfigFromFile.pm
 %%PERL5_MAN3%%/MouseX::ConfigFromFile.3.gz
diff --git a/devel/p5-MouseX-Foreign/Makefile b/devel/p5-MouseX-Foreign/Makefile
index b76ee1c55459..a14b92b5e618 100644
--- a/devel/p5-MouseX-Foreign/Makefile
+++ b/devel/p5-MouseX-Foreign/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MouseX-Foreign
 PORTVERSION=	1.000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index 5dfafd6d75a5..c7a1ae60e0ea 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -2,7 +2,9 @@
 
 PORTNAME=	MouseX-Getopt
 PORTVERSION=	${DISTVERSION}00
+PORTREVISION=	1
 DISTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	MouseX
diff --git a/devel/p5-MouseX-Getopt/pkg-plist b/devel/p5-MouseX-Getopt/pkg-plist
index e42add217e6a..918e0440f944 100644
--- a/devel/p5-MouseX-Getopt/pkg-plist
+++ b/devel/p5-MouseX-Getopt/pkg-plist
@@ -18,4 +18,3 @@
 %%SITE_PERL%%/MouseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm
 %%SITE_PERL%%/MouseX/Getopt/OptionTypeMap.pm
 %%SITE_PERL%%/MouseX/Getopt/Strict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/Getopt/.packlist
diff --git a/devel/p5-MouseX-NativeTraits/Makefile b/devel/p5-MouseX-NativeTraits/Makefile
index 4a3dc2f834a7..0c64f8771e24 100644
--- a/devel/p5-MouseX-NativeTraits/Makefile
+++ b/devel/p5-MouseX-NativeTraits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MouseX-NativeTraits
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-MouseX-NativeTraits/pkg-plist b/devel/p5-MouseX-NativeTraits/pkg-plist
index 4000d0aff329..43eb4256d204 100644
--- a/devel/p5-MouseX-NativeTraits/pkg-plist
+++ b/devel/p5-MouseX-NativeTraits/pkg-plist
@@ -22,7 +22,6 @@
 %%SITE_PERL%%/MouseX/NativeTraits/MethodProvider/Str.pm
 %%SITE_PERL%%/MouseX/NativeTraits/Num.pm
 %%SITE_PERL%%/MouseX/NativeTraits/Str.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/NativeTraits/.packlist
 %%PERL5_MAN3%%/Mouse::Meta::Attribute::Custom::Trait::Array.3.gz
 %%PERL5_MAN3%%/Mouse::Meta::Attribute::Custom::Trait::Bool.3.gz
 %%PERL5_MAN3%%/Mouse::Meta::Attribute::Custom::Trait::Code.3.gz
diff --git a/devel/p5-MouseX-StrictConstructor/Makefile b/devel/p5-MouseX-StrictConstructor/Makefile
index 5e5c04d9ddbe..14607d07e481 100644
--- a/devel/p5-MouseX-StrictConstructor/Makefile
+++ b/devel/p5-MouseX-StrictConstructor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MouseX-StrictConstructor
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
diff --git a/devel/p5-MouseX-StrictConstructor/pkg-plist b/devel/p5-MouseX-StrictConstructor/pkg-plist
index 479d0fadcac5..1915dcbb4438 100644
--- a/devel/p5-MouseX-StrictConstructor/pkg-plist
+++ b/devel/p5-MouseX-StrictConstructor/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MouseX/StrictConstructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/StrictConstructor/.packlist
 %%PERL5_MAN3%%/MouseX::StrictConstructor.3.gz
diff --git a/devel/p5-MouseX-Traits/Makefile b/devel/p5-MouseX-Traits/Makefile
index ec5aaa6c23a5..f17fdf3086c6 100644
--- a/devel/p5-MouseX-Traits/Makefile
+++ b/devel/p5-MouseX-Traits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MouseX-Traits
 PORTVERSION=	0.1102
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
diff --git a/devel/p5-MouseX-Traits/pkg-plist b/devel/p5-MouseX-Traits/pkg-plist
index 39df663b6703..c7f94fe5b4d8 100644
--- a/devel/p5-MouseX-Traits/pkg-plist
+++ b/devel/p5-MouseX-Traits/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/MouseX/Traits.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/Traits/.packlist
 %%PERL5_MAN3%%/MouseX::Traits.3.gz
diff --git a/devel/p5-MouseX-Types-Path-Class/Makefile b/devel/p5-MouseX-Types-Path-Class/Makefile
index c9e09c8f99cd..1c24fe7d6c66 100644
--- a/devel/p5-MouseX-Types-Path-Class/Makefile
+++ b/devel/p5-MouseX-Types-Path-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MouseX-Types-Path-Class
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MASAKI
diff --git a/devel/p5-MouseX-Types-Path-Class/pkg-plist b/devel/p5-MouseX-Types-Path-Class/pkg-plist
index 0d04933d13c9..cab383bd726b 100644
--- a/devel/p5-MouseX-Types-Path-Class/pkg-plist
+++ b/devel/p5-MouseX-Types-Path-Class/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/Types/Path/Class/.packlist
 %%SITE_PERL%%/MouseX/Types/Path/Class.pm
 %%PERL5_MAN3%%/MouseX::Types::Path::Class.3.gz
diff --git a/devel/p5-MouseX-Types/Makefile b/devel/p5-MouseX-Types/Makefile
index 632682f2d327..74f4bfb5e5d6 100644
--- a/devel/p5-MouseX-Types/Makefile
+++ b/devel/p5-MouseX-Types/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MouseX-Types
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
diff --git a/devel/p5-MouseX-Types/pkg-plist b/devel/p5-MouseX-Types/pkg-plist
index 5f42a180b62c..556070f4d787 100644
--- a/devel/p5-MouseX-Types/pkg-plist
+++ b/devel/p5-MouseX-Types/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/MouseX/Types/TypeDecorator.pm
 %%SITE_PERL%%/MouseX/Types/Mouse.pm
 %%SITE_PERL%%/MouseX/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MouseX/Types/.packlist
 %%PERL5_MAN3%%/MouseX::Types.3.gz
 %%PERL5_MAN3%%/MouseX::Types::Moose.3.gz
 %%PERL5_MAN3%%/MouseX::Types::Mouse.3.gz
diff --git a/devel/p5-Multiplex-CMD/Makefile b/devel/p5-Multiplex-CMD/Makefile
index 17e7d735861c..79fca2d9951a 100644
--- a/devel/p5-Multiplex-CMD/Makefile
+++ b/devel/p5-Multiplex-CMD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Multiplex-CMD
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Multiplex-CMD/pkg-plist b/devel/p5-Multiplex-CMD/pkg-plist
index 66b5e7c1864b..3b1115208e21 100644
--- a/devel/p5-Multiplex-CMD/pkg-plist
+++ b/devel/p5-Multiplex-CMD/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Multiplex/CMD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Multiplex/CMD/.packlist
 %%PERL5_MAN3%%/Multiplex::CMD.3.gz
diff --git a/devel/p5-NEXT/Makefile b/devel/p5-NEXT/Makefile
index 0e0546591279..8b973d669fc6 100644
--- a/devel/p5-NEXT/Makefile
+++ b/devel/p5-NEXT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NEXT
 PORTVERSION=	0.65
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-NEXT/pkg-plist b/devel/p5-NEXT/pkg-plist
index df43a5a19f19..6373b1ca6137 100644
--- a/devel/p5-NEXT/pkg-plist
+++ b/devel/p5-NEXT/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/NEXT.3.gz
 %%SITE_PERL%%/NEXT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NEXT/.packlist
diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index 6093ca2a41e0..622c74a96519 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DBus
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Net-DBus/pkg-plist b/devel/p5-Net-DBus/pkg-plist
index e4703ddd56a0..305904d595b1 100644
--- a/devel/p5-Net-DBus/pkg-plist
+++ b/devel/p5-Net-DBus/pkg-plist
@@ -1,37 +1,36 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DBus/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DBus/DBus.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/ASyncReply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Annotation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/RemoteObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Service.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/RemoteService.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Dumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Callback.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Exporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Reactor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Watch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Bus.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Connection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Message.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Introspector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/PendingCall.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Message/Signal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Message/MethodReturn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Message/MethodCall.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Binding/Message/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Test/MockConnection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Test/MockObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Test/MockIterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Test/MockMessage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Tutorial/UsingObjects.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Tutorial/ExportingObjects.pod
+%%SITE_ARCH%%/auto/Net/DBus/DBus.so
+%%SITE_ARCH%%/Net/DBus.pm
+%%SITE_ARCH%%/Net/DBus/ASyncReply.pm
+%%SITE_ARCH%%/Net/DBus/Annotation.pm
+%%SITE_ARCH%%/Net/DBus/Error.pm
+%%SITE_ARCH%%/Net/DBus/RemoteObject.pm
+%%SITE_ARCH%%/Net/DBus/Service.pm
+%%SITE_ARCH%%/Net/DBus/Object.pm
+%%SITE_ARCH%%/Net/DBus/RemoteService.pm
+%%SITE_ARCH%%/Net/DBus/Dumper.pm
+%%SITE_ARCH%%/Net/DBus/Callback.pm
+%%SITE_ARCH%%/Net/DBus/Exporter.pm
+%%SITE_ARCH%%/Net/DBus/Reactor.pm
+%%SITE_ARCH%%/Net/DBus/Tutorial.pod
+%%SITE_ARCH%%/Net/DBus/Binding/Value.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Watch.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Bus.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Connection.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Iterator.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Message.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Introspector.pm
+%%SITE_ARCH%%/Net/DBus/Binding/PendingCall.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Server.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Message/Signal.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Message/MethodReturn.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Message/MethodCall.pm
+%%SITE_ARCH%%/Net/DBus/Binding/Message/Error.pm
+%%SITE_ARCH%%/Net/DBus/Test/MockConnection.pm
+%%SITE_ARCH%%/Net/DBus/Test/MockObject.pm
+%%SITE_ARCH%%/Net/DBus/Test/MockIterator.pm
+%%SITE_ARCH%%/Net/DBus/Test/MockMessage.pm
+%%SITE_ARCH%%/Net/DBus/Tutorial/UsingObjects.pod
+%%SITE_ARCH%%/Net/DBus/Tutorial/ExportingObjects.pod
 %%PERL5_MAN3%%/Net::DBus::ASyncReply.3.gz
 %%PERL5_MAN3%%/Net::DBus::Annotation.3.gz
 %%PERL5_MAN3%%/Net::DBus::Tutorial.3.gz
diff --git a/devel/p5-Net-ZooKeeper/Makefile b/devel/p5-Net-ZooKeeper/Makefile
index ee0a75089760..b82cf7689a44 100644
--- a/devel/p5-Net-ZooKeeper/Makefile
+++ b/devel/p5-Net-ZooKeeper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-ZooKeeper
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,6 +21,6 @@ CONFIGURE_ARGS+=	--zookeeper-include ${PREFIX}/include \
 			--zookeeper-lib ${PREFIX}/libs
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/ZooKeeper/ZooKeeper.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/ZooKeeper/ZooKeeper.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Net-ZooKeeper/pkg-plist b/devel/p5-Net-ZooKeeper/pkg-plist
index 41a152d47c4d..b11f1f35713b 100644
--- a/devel/p5-Net-ZooKeeper/pkg-plist
+++ b/devel/p5-Net-ZooKeeper/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ZooKeeper/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ZooKeeper/ZooKeeper.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/ZooKeeper.pm
+%%SITE_ARCH%%/auto/Net/ZooKeeper/ZooKeeper.so
+%%SITE_ARCH%%/Net/ZooKeeper.pm
 %%PERL5_MAN3%%/Net::ZooKeeper.3.gz
diff --git a/devel/p5-No-Worries/Makefile b/devel/p5-No-Worries/Makefile
index a88ac951b889..fa9115b162d0 100644
--- a/devel/p5-No-Worries/Makefile
+++ b/devel/p5-No-Worries/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	No-Worries
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-No-Worries/pkg-plist b/devel/p5-No-Worries/pkg-plist
index 32e31af1f5ed..d19ffaf796e4 100644
--- a/devel/p5-No-Worries/pkg-plist
+++ b/devel/p5-No-Worries/pkg-plist
@@ -12,7 +12,6 @@
 %%SITE_PERL%%/No/Worries/String.pm
 %%SITE_PERL%%/No/Worries/Syslog.pm
 %%SITE_PERL%%/No/Worries/Warn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/No/Worries/.packlist
 %%PERL5_MAN3%%/No::Worries.3.gz
 %%PERL5_MAN3%%/No::Worries::DN.3.gz
 %%PERL5_MAN3%%/No::Worries::Date.3.gz
diff --git a/devel/p5-Number-Bytes-Human/Makefile b/devel/p5-Number-Bytes-Human/Makefile
index 46b954fb5f19..d339065a1577 100644
--- a/devel/p5-Number-Bytes-Human/Makefile
+++ b/devel/p5-Number-Bytes-Human/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Bytes-Human
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Number-Bytes-Human/pkg-plist b/devel/p5-Number-Bytes-Human/pkg-plist
index 49f80b669485..849ac027aad4 100644
--- a/devel/p5-Number-Bytes-Human/pkg-plist
+++ b/devel/p5-Number-Bytes-Human/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Bytes/Human/.packlist
 %%SITE_PERL%%/Number/Bytes/Human.pm
 %%PERL5_MAN3%%/Number::Bytes::Human.3.gz
diff --git a/devel/p5-Number-Tolerant/Makefile b/devel/p5-Number-Tolerant/Makefile
index ccb5e8fa4be1..72dff6311b7d 100644
--- a/devel/p5-Number-Tolerant/Makefile
+++ b/devel/p5-Number-Tolerant/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Tolerant
 PORTVERSION=	1.703
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Number-Tolerant/pkg-plist b/devel/p5-Number-Tolerant/pkg-plist
index b6d4a297464e..9c0104c3ba00 100644
--- a/devel/p5-Number-Tolerant/pkg-plist
+++ b/devel/p5-Number-Tolerant/pkg-plist
@@ -13,7 +13,6 @@
 %%SITE_PERL%%/Number/Tolerant/Type/plus_or_minus.pm
 %%SITE_PERL%%/Number/Tolerant/Type/plus_or_minus_pct.pm
 %%SITE_PERL%%/Number/Tolerant/Type/to.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Tolerant/.packlist
 %%PERL5_MAN3%%/Number::Tolerant.3.gz
 %%PERL5_MAN3%%/Number::Tolerant::Constant.3.gz
 %%PERL5_MAN3%%/Number::Tolerant::Type.3.gz
diff --git a/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index abdce3f69a82..65e34fa4a0c5 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OLE-Storage_Lite
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-OLE-Storage_Lite/pkg-plist b/devel/p5-OLE-Storage_Lite/pkg-plist
index b6cc01de050f..bae19d3b5949 100644
--- a/devel/p5-OLE-Storage_Lite/pkg-plist
+++ b/devel/p5-OLE-Storage_Lite/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/OLE::Storage_Lite.3.gz
 %%SITE_PERL%%/OLE/Storage_Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE/Storage_Lite/.packlist
diff --git a/devel/p5-OOTools/Makefile b/devel/p5-OOTools/Makefile
index adbd08e2accf..964874136a89 100644
--- a/devel/p5-OOTools/Makefile
+++ b/devel/p5-OOTools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OOTools
 PORTVERSION=	2.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SKNPP
diff --git a/devel/p5-OOTools/pkg-plist b/devel/p5-OOTools/pkg-plist
index ee773458ac95..2c2dbad7c441 100644
--- a/devel/p5-OOTools/pkg-plist
+++ b/devel/p5-OOTools/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/Object/props.pm
 %%SITE_PERL%%/Package/groups.pm
 %%SITE_PERL%%/Package/props.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/props/.packlist
diff --git a/devel/p5-Object-Accessor/Makefile b/devel/p5-Object-Accessor/Makefile
index 705648a4af47..ae49459018c5 100644
--- a/devel/p5-Object-Accessor/Makefile
+++ b/devel/p5-Object-Accessor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Accessor
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Accessor/pkg-plist b/devel/p5-Object-Accessor/pkg-plist
index 5bba5501ea0c..0a416f7a6220 100644
--- a/devel/p5-Object-Accessor/pkg-plist
+++ b/devel/p5-Object-Accessor/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::Accessor.3.gz
 %%SITE_PERL%%/Object/Accessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Accessor/.packlist
diff --git a/devel/p5-Object-Array/Makefile b/devel/p5-Object-Array/Makefile
index 2d97ff343906..f2f3548ed39d 100644
--- a/devel/p5-Object-Array/Makefile
+++ b/devel/p5-Object-Array/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Object-Array
 PORTVERSION=	0.060
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Array/pkg-plist b/devel/p5-Object-Array/pkg-plist
index a26be1ff9cdb..7cf0431175bd 100644
--- a/devel/p5-Object-Array/pkg-plist
+++ b/devel/p5-Object-Array/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Object/Array.pm
 %%SITE_PERL%%/Object/Array/Plugin/Builtins.pm
 %%SITE_PERL%%/Object/Array/Plugin/ListMoreUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Array/.packlist
 %%PERL5_MAN3%%/Object::Array.3.gz
 %%PERL5_MAN3%%/Object::Array::Plugin::Builtins.3.gz
 %%PERL5_MAN3%%/Object::Array::Plugin::ListMoreUtils.3.gz
diff --git a/devel/p5-Object-Authority/Makefile b/devel/p5-Object-Authority/Makefile
index e6d45c1ed0a4..1db377c4c73c 100644
--- a/devel/p5-Object-Authority/Makefile
+++ b/devel/p5-Object-Authority/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-AUTHORITY
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Authority/pkg-plist b/devel/p5-Object-Authority/pkg-plist
index cd434e835619..039a42dbde27 100644
--- a/devel/p5-Object-Authority/pkg-plist
+++ b/devel/p5-Object-Authority/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::AUTHORITY.3.gz
 %%SITE_PERL%%/Object/AUTHORITY.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/AUTHORITY/.packlist
diff --git a/devel/p5-Object-Container/Makefile b/devel/p5-Object-Container/Makefile
index 6e1bdcc3cbd0..98094779ff05 100644
--- a/devel/p5-Object-Container/Makefile
+++ b/devel/p5-Object-Container/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Container
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Container/pkg-plist b/devel/p5-Object-Container/pkg-plist
index 829375be2096..e613126061e4 100644
--- a/devel/p5-Object-Container/pkg-plist
+++ b/devel/p5-Object-Container/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Object/Container.pm
 %%SITE_PERL%%/Object/Container/ja.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Container/.packlist
 %%PERL5_MAN3%%/Object::Container.3.gz
 %%PERL5_MAN3%%/Object::Container::ja.3.gz
diff --git a/devel/p5-Object-Declare/Makefile b/devel/p5-Object-Declare/Makefile
index 837809220cd7..5f6285d1779b 100644
--- a/devel/p5-Object-Declare/Makefile
+++ b/devel/p5-Object-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Declare
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Declare/pkg-plist b/devel/p5-Object-Declare/pkg-plist
index 329c2486a9e5..9fb124dee175 100644
--- a/devel/p5-Object-Declare/pkg-plist
+++ b/devel/p5-Object-Declare/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::Declare.3.gz
 %%SITE_PERL%%/Object/Declare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Declare/.packlist
diff --git a/devel/p5-Object-Destroyer/Makefile b/devel/p5-Object-Destroyer/Makefile
index fab0e99c40b8..b69c195901fd 100644
--- a/devel/p5-Object-Destroyer/Makefile
+++ b/devel/p5-Object-Destroyer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Destroyer
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Destroyer/pkg-plist b/devel/p5-Object-Destroyer/pkg-plist
index e9ee79770179..875c00df92e7 100644
--- a/devel/p5-Object-Destroyer/pkg-plist
+++ b/devel/p5-Object-Destroyer/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::Destroyer.3.gz
 %%SITE_PERL%%/Object/Destroyer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Destroyer/.packlist
diff --git a/devel/p5-Object-Enum/Makefile b/devel/p5-Object-Enum/Makefile
index faa20fa6e155..193e8fff37ce 100644
--- a/devel/p5-Object-Enum/Makefile
+++ b/devel/p5-Object-Enum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Enum
 PORTVERSION=	0.07.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Enum/pkg-plist b/devel/p5-Object-Enum/pkg-plist
index 7c73169a936c..b8d21a426324 100644
--- a/devel/p5-Object-Enum/pkg-plist
+++ b/devel/p5-Object-Enum/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::Enum.3.gz
 %%SITE_PERL%%/Object/Enum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Enum/.packlist
diff --git a/devel/p5-Object-Event/Makefile b/devel/p5-Object-Event/Makefile
index a26295e133eb..174198e068b3 100644
--- a/devel/p5-Object-Event/Makefile
+++ b/devel/p5-Object-Event/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Event
 PORTVERSION=	1.220
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Event/pkg-plist b/devel/p5-Object-Event/pkg-plist
index e04f066a63dd..ddc00967c1d0 100644
--- a/devel/p5-Object-Event/pkg-plist
+++ b/devel/p5-Object-Event/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Object/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Event/.packlist
 %%PERL5_MAN3%%/Object::Event.3.gz
diff --git a/devel/p5-Object-InsideOut/Makefile b/devel/p5-Object-InsideOut/Makefile
index 62ff2786f518..43e9e5ab4ba3 100644
--- a/devel/p5-Object-InsideOut/Makefile
+++ b/devel/p5-Object-InsideOut/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-InsideOut
 PORTVERSION=	3.98
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JDHEDDEN
diff --git a/devel/p5-Object-InsideOut/pkg-plist b/devel/p5-Object-InsideOut/pkg-plist
index 8fd5d2b33285..fc0623c2403b 100644
--- a/devel/p5-Object-InsideOut/pkg-plist
+++ b/devel/p5-Object-InsideOut/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/InsideOut/.packlist
 %%SITE_PERL%%/Bundle/Object/InsideOut.pm
 %%SITE_PERL%%/Object/InsideOut.pm
 %%SITE_PERL%%/Object/InsideOut.pod
diff --git a/devel/p5-Object-MultiType/Makefile b/devel/p5-Object-MultiType/Makefile
index 45779c1b1925..ee2f6a7d694c 100644
--- a/devel/p5-Object-MultiType/Makefile
+++ b/devel/p5-Object-MultiType/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-MultiType
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-MultiType/pkg-plist b/devel/p5-Object-MultiType/pkg-plist
index 65921283f417..402ca0967bfc 100644
--- a/devel/p5-Object-MultiType/pkg-plist
+++ b/devel/p5-Object-MultiType/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::MultiType.3.gz
 %%SITE_PERL%%/Object/MultiType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/MultiType/.packlist
diff --git a/devel/p5-Object-Pluggable/Makefile b/devel/p5-Object-Pluggable/Makefile
index 0db8c7d62f53..473c26c7a33b 100644
--- a/devel/p5-Object-Pluggable/Makefile
+++ b/devel/p5-Object-Pluggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Pluggable
 PORTVERSION=	1.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HINRIK
diff --git a/devel/p5-Object-Pluggable/pkg-plist b/devel/p5-Object-Pluggable/pkg-plist
index 615710559a55..b731f93bf71e 100644
--- a/devel/p5-Object-Pluggable/pkg-plist
+++ b/devel/p5-Object-Pluggable/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Object/Pluggable.pm
 %%SITE_PERL%%/Object/Pluggable/Pipeline.pm
 %%SITE_PERL%%/Object/Pluggable/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Pluggable/.packlist
 %%PERL5_MAN3%%/Object::Pluggable.3.gz
 %%PERL5_MAN3%%/Object::Pluggable::Constants.3.gz
 %%PERL5_MAN3%%/Object::Pluggable::Pipeline.3.gz
diff --git a/devel/p5-Object-Realize-Later/Makefile b/devel/p5-Object-Realize-Later/Makefile
index 20c61338edec..ff24403547f5 100644
--- a/devel/p5-Object-Realize-Later/Makefile
+++ b/devel/p5-Object-Realize-Later/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Realize-Later
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Object
diff --git a/devel/p5-Object-Realize-Later/pkg-plist b/devel/p5-Object-Realize-Later/pkg-plist
index 7a5cbe223ab7..9d0cfe3424ba 100644
--- a/devel/p5-Object-Realize-Later/pkg-plist
+++ b/devel/p5-Object-Realize-Later/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Object::Realize::Later.3.gz
 %%SITE_PERL%%/Object/Realize/Later.pm
 %%SITE_PERL%%/Object/Realize/Later.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Realize/Later/.packlist
diff --git a/devel/p5-Object-Role/Makefile b/devel/p5-Object-Role/Makefile
index a7f4d4b4796c..5ec1782e60c9 100644
--- a/devel/p5-Object-Role/Makefile
+++ b/devel/p5-Object-Role/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Role
 PORTVERSION=	0.001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Role/pkg-plist b/devel/p5-Object-Role/pkg-plist
index 4908968dacb4..172e16b5f6a7 100644
--- a/devel/p5-Object-Role/pkg-plist
+++ b/devel/p5-Object-Role/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::Role.3.gz
 %%SITE_PERL%%/Object/Role.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Role/.packlist
diff --git a/devel/p5-Object-Signature/Makefile b/devel/p5-Object-Signature/Makefile
index 579baabd7f29..58d7a4e98ea0 100644
--- a/devel/p5-Object-Signature/Makefile
+++ b/devel/p5-Object-Signature/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Signature
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Signature/pkg-plist b/devel/p5-Object-Signature/pkg-plist
index 4325ec8d4844..d76fb3b2af03 100644
--- a/devel/p5-Object-Signature/pkg-plist
+++ b/devel/p5-Object-Signature/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Object::Signature::File.3.gz
 %%SITE_PERL%%/Object/Signature.pm
 %%SITE_PERL%%/Object/Signature/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Signature/.packlist
diff --git a/devel/p5-Object-Simple/Makefile b/devel/p5-Object-Simple/Makefile
index 81ef083ed8fc..7d516419b027 100644
--- a/devel/p5-Object-Simple/Makefile
+++ b/devel/p5-Object-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Simple
 PORTVERSION=	3.1000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Simple/pkg-plist b/devel/p5-Object-Simple/pkg-plist
index 4e41c4312604..07eae6a3c154 100644
--- a/devel/p5-Object-Simple/pkg-plist
+++ b/devel/p5-Object-Simple/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Object/Simple.pm
 %%SITE_PERL%%/Object/Simple/Accessor.pm
 %%SITE_PERL%%/Object/Simple/Guide.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Simple/.packlist
diff --git a/devel/p5-Object-Tiny-Lvalue/Makefile b/devel/p5-Object-Tiny-Lvalue/Makefile
index 2be6a3be6162..864fc6210f13 100644
--- a/devel/p5-Object-Tiny-Lvalue/Makefile
+++ b/devel/p5-Object-Tiny-Lvalue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Tiny-Lvalue
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Tiny-Lvalue/pkg-plist b/devel/p5-Object-Tiny-Lvalue/pkg-plist
index 5ef51b9ea420..abb52d84e0f6 100644
--- a/devel/p5-Object-Tiny-Lvalue/pkg-plist
+++ b/devel/p5-Object-Tiny-Lvalue/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Object/Tiny/Lvalue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Tiny/Lvalue/.packlist
 %%PERL5_MAN3%%/Object::Tiny::Lvalue.3.gz
diff --git a/devel/p5-Object-Tiny/Makefile b/devel/p5-Object-Tiny/Makefile
index 1520e28fa461..ae47fb45200b 100644
--- a/devel/p5-Object-Tiny/Makefile
+++ b/devel/p5-Object-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Object-Tiny
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Object-Tiny/pkg-plist b/devel/p5-Object-Tiny/pkg-plist
index 9a4741eb9a93..06fd6e0bf079 100644
--- a/devel/p5-Object-Tiny/pkg-plist
+++ b/devel/p5-Object-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Object::Tiny.3.gz
 %%SITE_PERL%%/Object/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Tiny/.packlist
diff --git a/devel/p5-Olson-Abbreviations/Makefile b/devel/p5-Olson-Abbreviations/Makefile
index 8b7d63ac1b96..4b4e113d70cf 100644
--- a/devel/p5-Olson-Abbreviations/Makefile
+++ b/devel/p5-Olson-Abbreviations/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Olson-Abbreviations
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ECARROLL
diff --git a/devel/p5-Olson-Abbreviations/pkg-plist b/devel/p5-Olson-Abbreviations/pkg-plist
index c28174763840..a7cd92a01b68 100644
--- a/devel/p5-Olson-Abbreviations/pkg-plist
+++ b/devel/p5-Olson-Abbreviations/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Olson::Abbreviations.3.gz
 %%SITE_PERL%%/Olson/Abbreviations.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Olson/Abbreviations/.packlist
diff --git a/devel/p5-Ouch/Makefile b/devel/p5-Ouch/Makefile
index 42eeb3a2fdc3..f753fd170b23 100644
--- a/devel/p5-Ouch/Makefile
+++ b/devel/p5-Ouch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Ouch
 PORTVERSION=	0.0408
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RIZEN
diff --git a/devel/p5-Ouch/pkg-plist b/devel/p5-Ouch/pkg-plist
index c2c8ff1090ed..f90cb48e7d0e 100644
--- a/devel/p5-Ouch/pkg-plist
+++ b/devel/p5-Ouch/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Ouch.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ouch/.packlist
 %%SITE_PERL%%/Ouch.pm
diff --git a/devel/p5-PAR-Dist/Makefile b/devel/p5-PAR-Dist/Makefile
index a2b85257e544..4079ea7a4b99 100644
--- a/devel/p5-PAR-Dist/Makefile
+++ b/devel/p5-PAR-Dist/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PAR-Dist
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PAR-Dist/pkg-plist b/devel/p5-PAR-Dist/pkg-plist
index 2e0453089946..06b69f34331a 100644
--- a/devel/p5-PAR-Dist/pkg-plist
+++ b/devel/p5-PAR-Dist/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/PAR::Dist.3.gz
 %%SITE_PERL%%/PAR/Dist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR/Dist/.packlist
diff --git a/devel/p5-PAR-Packer/Makefile b/devel/p5-PAR-Packer/Makefile
index 6a98fb4fd991..61ba425c23ff 100644
--- a/devel/p5-PAR-Packer/Makefile
+++ b/devel/p5-PAR-Packer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PAR-Packer
 PORTVERSION=	1.01.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PAR-Packer/pkg-plist b/devel/p5-PAR-Packer/pkg-plist
index 843cb9574091..2c0f92d9fb15 100644
--- a/devel/p5-PAR-Packer/pkg-plist
+++ b/devel/p5-PAR-Packer/pkg-plist
@@ -19,7 +19,6 @@ man/man1/tkpp.1.gz
 %%SITE_PERL%%/PAR/StrippedPARL/Base.pm
 %%SITE_PERL%%/PAR/StrippedPARL/Dynamic.pm
 %%SITE_PERL%%/PAR/StrippedPARL/Static.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR/Packer/.packlist
 %%PERL5_MAN3%%/App::Packer::PAR.3.gz
 %%PERL5_MAN3%%/Dynamic.3.gz
 %%PERL5_MAN3%%/PAR::Filter.3.gz
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index 040d9d4f8868..76724a9d7d4f 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PAR
 PORTVERSION=	1.00.7
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PAR/pkg-plist b/devel/p5-PAR/pkg-plist
index e5298b7b36de..95df4e7ebf69 100644
--- a/devel/p5-PAR/pkg-plist
+++ b/devel/p5-PAR/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/PAR/SetupProgname.pm
 %%SITE_PERL%%/PAR/SetupTemp.pm
 %%SITE_PERL%%/PAR/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR/.packlist
 %%PERL5_MAN3%%/PAR.3.gz
 %%PERL5_MAN3%%/PAR::Environment.3.gz
 %%PERL5_MAN3%%/PAR::FAQ.3.gz
diff --git a/devel/p5-PCSC-Card/Makefile b/devel/p5-PCSC-Card/Makefile
index 2030d56ef52a..a10d28253096 100644
--- a/devel/p5-PCSC-Card/Makefile
+++ b/devel/p5-PCSC-Card/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PCSC-Card
 PORTVERSION=	1.4.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PCSC-Card/pkg-plist b/devel/p5-PCSC-Card/pkg-plist
index 71418276fd51..64a5d3e67e46 100644
--- a/devel/p5-PCSC-Card/pkg-plist
+++ b/devel/p5-PCSC-Card/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/Chipcard::PCSC.3.gz
 %%PERL5_MAN3%%/Chipcard::PCSC::Card.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.so
+%%SITE_ARCH%%/Chipcard/PCSC.pm
+%%SITE_ARCH%%/Chipcard/PCSC.pod
+%%SITE_ARCH%%/Chipcard/PCSC/Card.pm
+%%SITE_ARCH%%/Chipcard/PCSC/Card.pod
+%%SITE_ARCH%%/auto/Chipcard/PCSC/PCSC.so
diff --git a/devel/p5-PHP-Serialization/Makefile b/devel/p5-PHP-Serialization/Makefile
index 00f3b5e783a0..a402f52b02ae 100644
--- a/devel/p5-PHP-Serialization/Makefile
+++ b/devel/p5-PHP-Serialization/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PHP-Serialization
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	PHP
diff --git a/devel/p5-PHP-Serialization/pkg-plist b/devel/p5-PHP-Serialization/pkg-plist
index d5c9bd6f606c..0b0c976e2835 100644
--- a/devel/p5-PHP-Serialization/pkg-plist
+++ b/devel/p5-PHP-Serialization/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/PHP::Serialization.3.gz
 %%SITE_PERL%%/PHP/Serialization.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Serialization/.packlist
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 7920a35e9d2c..8f717b4fd045 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-API-Hooks
 PORTVERSION=	1.0800
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-API-Hooks/pkg-plist b/devel/p5-POE-API-Hooks/pkg-plist
index b12018409554..c3c31c68a48b 100644
--- a/devel/p5-POE-API-Hooks/pkg-plist
+++ b/devel/p5-POE-API-Hooks/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::API::Hooks.3.gz
 %%SITE_PERL%%/POE/API/Hooks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Hooks/.packlist
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index c52987482c2f..190a58ef76c1 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-API-Peek
 DISTVERSION=	2.20
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-POE-API-Peek/pkg-plist b/devel/p5-POE-API-Peek/pkg-plist
index 7c6a39ab939d..f86c9db8c392 100644
--- a/devel/p5-POE-API-Peek/pkg-plist
+++ b/devel/p5-POE-API-Peek/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Peek/.packlist
 %%SITE_PERL%%/POE/API/Peek.pm
 %%PERL5_MAN3%%/POE::API::Peek.3.gz
diff --git a/devel/p5-POE-Component-Child/Makefile b/devel/p5-POE-Component-Child/Makefile
index 662ff1d19c6a..c94b02bd374c 100644
--- a/devel/p5-POE-Component-Child/Makefile
+++ b/devel/p5-POE-Component-Child/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Child
 PORTVERSION=	1.39
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-Child/pkg-plist b/devel/p5-POE-Component-Child/pkg-plist
index 2f86374f138f..769037843ab7 100644
--- a/devel/p5-POE-Component-Child/pkg-plist
+++ b/devel/p5-POE-Component-Child/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Child.3.gz
 %%SITE_PERL%%/POE/Component/Child.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Child/.packlist
diff --git a/devel/p5-POE-Component-Cron/Makefile b/devel/p5-POE-Component-Cron/Makefile
index 0c5baf6beb38..430b135c0572 100644
--- a/devel/p5-POE-Component-Cron/Makefile
+++ b/devel/p5-POE-Component-Cron/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Cron
 PORTVERSION=	0.021
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-Cron/pkg-plist b/devel/p5-POE-Component-Cron/pkg-plist
index 587472a4d10c..1207a628300a 100644
--- a/devel/p5-POE-Component-Cron/pkg-plist
+++ b/devel/p5-POE-Component-Cron/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Cron.3.gz
 %%SITE_PERL%%/POE/Component/Cron.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Cron/.packlist
diff --git a/devel/p5-POE-Component-Daemon/Makefile b/devel/p5-POE-Component-Daemon/Makefile
index 98cc8c43f28d..585a3aaa606e 100644
--- a/devel/p5-POE-Component-Daemon/Makefile
+++ b/devel/p5-POE-Component-Daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Daemon
 PORTVERSION=	0.1400
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-Daemon/pkg-plist b/devel/p5-POE-Component-Daemon/pkg-plist
index 5e605a95557a..af2dccb78104 100644
--- a/devel/p5-POE-Component-Daemon/pkg-plist
+++ b/devel/p5-POE-Component-Daemon/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/POE/Component/Daemon.pm
 %%SITE_PERL%%/POE/Component/Daemon/Scoreboard.pm
 %%SITE_PERL%%/POE/Component/Daemon/ScoreboardSemaphore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Daemon/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/forking
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/preforking
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index 083160872046..ca90b098e03b 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-DebugShell
 PORTVERSION=	1.412
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-DebugShell/pkg-plist b/devel/p5-POE-Component-DebugShell/pkg-plist
index 2e63a5d10ab3..d8a3ba74babf 100644
--- a/devel/p5-POE-Component-DebugShell/pkg-plist
+++ b/devel/p5-POE-Component-DebugShell/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::DebugShell.3.gz
 %%SITE_PERL%%/POE/Component/DebugShell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DebugShell/.packlist
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index eafde170047a..d4a42b2e4f48 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-DirWatch
 PORTVERSION=	0.300001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-DirWatch/pkg-plist b/devel/p5-POE-Component-DirWatch/pkg-plist
index c0758b9d8923..a8a9ff639096 100644
--- a/devel/p5-POE-Component-DirWatch/pkg-plist
+++ b/devel/p5-POE-Component-DirWatch/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/POE/Component/DirWatch/Role/AIO.pm
 %%SITE_PERL%%/POE/Component/DirWatch/Role/Signatures.pm
 %%SITE_PERL%%/POE/Component/DirWatch/Unmodified.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch/.packlist
diff --git a/devel/p5-POE-Component-Hailo/Makefile b/devel/p5-POE-Component-Hailo/Makefile
index 80035dff15dd..b56b9a51cb53 100644
--- a/devel/p5-POE-Component-Hailo/Makefile
+++ b/devel/p5-POE-Component-Hailo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Hailo
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HINRIK
diff --git a/devel/p5-POE-Component-Hailo/pkg-plist b/devel/p5-POE-Component-Hailo/pkg-plist
index 73dbf0463d28..136667329fdc 100644
--- a/devel/p5-POE-Component-Hailo/pkg-plist
+++ b/devel/p5-POE-Component-Hailo/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/Hailo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Hailo/.packlist
 %%PERL5_MAN3%%/POE::Component::Hailo.3.gz
diff --git a/devel/p5-POE-Component-IKC/Makefile b/devel/p5-POE-Component-IKC/Makefile
index dfd19599841d..6f7e519222e2 100644
--- a/devel/p5-POE-Component-IKC/Makefile
+++ b/devel/p5-POE-Component-IKC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IKC
 PORTVERSION=	0.2305
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-IKC/pkg-plist b/devel/p5-POE-Component-IKC/pkg-plist
index 44934141056d..09060f2de405 100644
--- a/devel/p5-POE-Component-IKC/pkg-plist
+++ b/devel/p5-POE-Component-IKC/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/POE/Component/IKC/Server.pm
 %%SITE_PERL%%/POE/Component/IKC/Specifier.pm
 %%SITE_PERL%%/POE/Component/IKC/Timing.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IKC/.packlist
 %%PERL5_MAN3%%/POE::Component::IKC.3.gz
 %%PERL5_MAN3%%/POE::Component::IKC::Channel.3.gz
 %%PERL5_MAN3%%/POE::Component::IKC::Client.3.gz
diff --git a/devel/p5-POE-Component-JobQueue/Makefile b/devel/p5-POE-Component-JobQueue/Makefile
index 8e3158ddff70..1c14137b0294 100644
--- a/devel/p5-POE-Component-JobQueue/Makefile
+++ b/devel/p5-POE-Component-JobQueue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-JobQueue
 PORTVERSION=	0.5710
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-JobQueue/pkg-plist b/devel/p5-POE-Component-JobQueue/pkg-plist
index 3a347c408f8d..8fcc745c25a0 100644
--- a/devel/p5-POE-Component-JobQueue/pkg-plist
+++ b/devel/p5-POE-Component-JobQueue/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::JobQueue.3.gz
 %%SITE_PERL%%/POE/Component/JobQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/JobQueue/.packlist
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index 60395360a0bd..1d721358f399 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Logger
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-Logger/pkg-plist b/devel/p5-POE-Component-Logger/pkg-plist
index 78001df8e822..b44a7c1169e3 100644
--- a/devel/p5-POE-Component-Logger/pkg-plist
+++ b/devel/p5-POE-Component-Logger/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Logger.3.gz
 %%SITE_PERL%%/POE/Component/Logger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger/.packlist
diff --git a/devel/p5-POE-Component-Pluggable/Makefile b/devel/p5-POE-Component-Pluggable/Makefile
index 944ae4779d5a..2d5f44ff14a5 100644
--- a/devel/p5-POE-Component-Pluggable/Makefile
+++ b/devel/p5-POE-Component-Pluggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Pluggable
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-Pluggable/pkg-plist b/devel/p5-POE-Component-Pluggable/pkg-plist
index 78fcb0145230..405887b43cf9 100644
--- a/devel/p5-POE-Component-Pluggable/pkg-plist
+++ b/devel/p5-POE-Component-Pluggable/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/POE/Component/Pluggable.pm
 %%SITE_PERL%%/POE/Component/Pluggable/Constants.pm
 %%SITE_PERL%%/POE/Component/Pluggable/Pipeline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pluggable/.packlist
diff --git a/devel/p5-POE-Component-RSS/Makefile b/devel/p5-POE-Component-RSS/Makefile
index 8b41394b4e53..0c5301bc634b 100644
--- a/devel/p5-POE-Component-RSS/Makefile
+++ b/devel/p5-POE-Component-RSS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-RSS
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5 textproc
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-RSS/pkg-plist b/devel/p5-POE-Component-RSS/pkg-plist
index b0deb2da0e19..4af9d6843254 100644
--- a/devel/p5-POE-Component-RSS/pkg-plist
+++ b/devel/p5-POE-Component-RSS/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::RSS.3.gz
 %%SITE_PERL%%/POE/Component/RSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSS/.packlist
diff --git a/devel/p5-POE-Component-RSSAggregator/Makefile b/devel/p5-POE-Component-RSSAggregator/Makefile
index 8b51dec1ca2b..b2188dc23133 100644
--- a/devel/p5-POE-Component-RSSAggregator/Makefile
+++ b/devel/p5-POE-Component-RSSAggregator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-RSSAggregator
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5 textproc
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-RSSAggregator/pkg-plist b/devel/p5-POE-Component-RSSAggregator/pkg-plist
index af2301d30fa0..3d0ff289a810 100644
--- a/devel/p5-POE-Component-RSSAggregator/pkg-plist
+++ b/devel/p5-POE-Component-RSSAggregator/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::RSSAggregator.3.gz
 %%SITE_PERL%%/POE/Component/RSSAggregator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSSAggregator/.packlist
diff --git a/devel/p5-POE-Component-Schedule/Makefile b/devel/p5-POE-Component-Schedule/Makefile
index 9e7da4b324cd..1dc2afbdb8a1 100644
--- a/devel/p5-POE-Component-Schedule/Makefile
+++ b/devel/p5-POE-Component-Schedule/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Schedule
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-Server-XMLRPC/Makefile b/devel/p5-POE-Component-Server-XMLRPC/Makefile
index b1838e447f4c..9a3b3490ee7f 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/Makefile
+++ b/devel/p5-POE-Component-Server-XMLRPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Server-XMLRPC
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-Server-XMLRPC/pkg-plist b/devel/p5-POE-Component-Server-XMLRPC/pkg-plist
index e8694f955af1..31bee373fa02 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/pkg-plist
+++ b/devel/p5-POE-Component-Server-XMLRPC/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/Server/XMLRPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/XMLRPC/.packlist
 %%PERL5_MAN3%%/POE::Component::Server::XMLRPC.3.gz
diff --git a/devel/p5-POE-Component-Syndicator/Makefile b/devel/p5-POE-Component-Syndicator/Makefile
index 5ec604e5745a..733ce0e75322 100644
--- a/devel/p5-POE-Component-Syndicator/Makefile
+++ b/devel/p5-POE-Component-Syndicator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Syndicator
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HINRIK
diff --git a/devel/p5-POE-Component-Syndicator/pkg-plist b/devel/p5-POE-Component-Syndicator/pkg-plist
index 858cc8f3a91d..2d3f74b37373 100644
--- a/devel/p5-POE-Component-Syndicator/pkg-plist
+++ b/devel/p5-POE-Component-Syndicator/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/Syndicator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Syndicator/.packlist
 %%PERL5_MAN3%%/POE::Component::Syndicator.3.gz
diff --git a/devel/p5-POE-Component-TSTP/Makefile b/devel/p5-POE-Component-TSTP/Makefile
index a96301192664..ba00e3404133 100644
--- a/devel/p5-POE-Component-TSTP/Makefile
+++ b/devel/p5-POE-Component-TSTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-TSTP
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Component-TSTP/pkg-plist b/devel/p5-POE-Component-TSTP/pkg-plist
index afc980aff97a..ffe83c3f0a8c 100644
--- a/devel/p5-POE-Component-TSTP/pkg-plist
+++ b/devel/p5-POE-Component-TSTP/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::TSTP.3.gz
 %%SITE_PERL%%/POE/Component/TSTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/TSTP/.packlist
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index 078c032cc3a4..6ddca4c0456e 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Devel-Profiler
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Devel-Profiler/pkg-plist b/devel/p5-POE-Devel-Profiler/pkg-plist
index 27ccd1e910a9..58b4523da3c0 100644
--- a/devel/p5-POE-Devel-Profiler/pkg-plist
+++ b/devel/p5-POE-Devel-Profiler/pkg-plist
@@ -4,5 +4,4 @@ bin/poepp
 %%SITE_PERL%%/POE/Devel/Profiler/Parser.pm
 %%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicGraphViz.pm
 %%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicSummary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel/Profiler/.packlist
 man/man1/poepp.1.gz
diff --git a/devel/p5-POE-Loop-Glib/Makefile b/devel/p5-POE-Loop-Glib/Makefile
index 2b314f9e21d9..fa5b1f380566 100644
--- a/devel/p5-POE-Loop-Glib/Makefile
+++ b/devel/p5-POE-Loop-Glib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Loop-Glib
 PORTVERSION=	0.038
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:APOCAL
diff --git a/devel/p5-POE-Loop-Glib/pkg-plist b/devel/p5-POE-Loop-Glib/pkg-plist
index 70fde49f6a6a..4bb643ed4ce9 100644
--- a/devel/p5-POE-Loop-Glib/pkg-plist
+++ b/devel/p5-POE-Loop-Glib/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/POE/Loop/Glib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Loop/Glib/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtk2_counter.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/minimal.pl
 %%PERL5_MAN3%%/POE::Loop::Glib.3.gz
diff --git a/devel/p5-POE-Loop-Tk/Makefile b/devel/p5-POE-Loop-Tk/Makefile
index e986d47da0ea..5631917e0888 100644
--- a/devel/p5-POE-Loop-Tk/Makefile
+++ b/devel/p5-POE-Loop-Tk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Loop-Tk
 PORTVERSION=	1.305
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Loop-Tk/pkg-plist b/devel/p5-POE-Loop-Tk/pkg-plist
index 67995dd4133e..4ab2212efc0e 100644
--- a/devel/p5-POE-Loop-Tk/pkg-plist
+++ b/devel/p5-POE-Loop-Tk/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/POE/Loop/Tk.pm
 %%SITE_PERL%%/POE/Loop/TkActiveState.pm
 %%SITE_PERL%%/POE/Loop/TkCommon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Loop/Tk/.packlist
 %%PERL5_MAN3%%/POE::Loop::Tk.3.gz
 %%PERL5_MAN3%%/POE::Loop::TkActiveState.3.gz
 %%PERL5_MAN3%%/POE::Loop::TkCommon.3.gz
diff --git a/devel/p5-POE-Quickie/Makefile b/devel/p5-POE-Quickie/Makefile
index 2e22637a4d00..db4329a64c43 100644
--- a/devel/p5-POE-Quickie/Makefile
+++ b/devel/p5-POE-Quickie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Quickie
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Quickie/pkg-plist b/devel/p5-POE-Quickie/pkg-plist
index a98b90b4d337..fca1ba3b68e7 100644
--- a/devel/p5-POE-Quickie/pkg-plist
+++ b/devel/p5-POE-Quickie/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Quickie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Quickie/.packlist
 %%PERL5_MAN3%%/POE::Quickie.3.gz
diff --git a/devel/p5-POE-Session-MultiDispatch/Makefile b/devel/p5-POE-Session-MultiDispatch/Makefile
index 0647cb8124cc..78cf229a13a0 100644
--- a/devel/p5-POE-Session-MultiDispatch/Makefile
+++ b/devel/p5-POE-Session-MultiDispatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Session-MultiDispatch
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-Session-MultiDispatch/pkg-plist b/devel/p5-POE-Session-MultiDispatch/pkg-plist
index 776ff7c74b0a..6280a4da3aec 100644
--- a/devel/p5-POE-Session-MultiDispatch/pkg-plist
+++ b/devel/p5-POE-Session-MultiDispatch/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Session::MultiDispatch.3.gz
 %%SITE_PERL%%/POE/Session/MultiDispatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/MultiDispatch/.packlist
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index 97e5930ef127..1318c6efcb7e 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -3,10 +3,12 @@
 
 PORTNAME=	POE-Stage
 PORTVERSION=	0.0600
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTVERSION=	0.060
+PORTREVISION=	1
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for formalized POE components
diff --git a/devel/p5-POE-Stage/pkg-plist b/devel/p5-POE-Stage/pkg-plist
index 3249bb62f5dd..c76b7ad1a752 100644
--- a/devel/p5-POE-Stage/pkg-plist
+++ b/devel/p5-POE-Stage/pkg-plist
@@ -33,4 +33,3 @@
 %%SITE_PERL%%/POE/Watcher/Wheel/ReadWrite.pm
 %%SITE_PERL%%/POE/Watcher/Wheel/Run.pm
 %%SITE_PERL%%/POE/Watcher/Wheel/SocketFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Stage/.packlist
diff --git a/devel/p5-POE-Test-Loops/Makefile b/devel/p5-POE-Test-Loops/Makefile
index eee85e3496af..f210c05d013d 100644
--- a/devel/p5-POE-Test-Loops/Makefile
+++ b/devel/p5-POE-Test-Loops/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Test-Loops
 PORTVERSION=	1.359
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RCAPUTO
diff --git a/devel/p5-POE-Test-Loops/pkg-plist b/devel/p5-POE-Test-Loops/pkg-plist
index 4a73bfd0364d..d4ad934ee388 100644
--- a/devel/p5-POE-Test-Loops/pkg-plist
+++ b/devel/p5-POE-Test-Loops/pkg-plist
@@ -1,7 +1,6 @@
 bin/poe-gen-tests
 man/man1/poe-gen-tests.1.gz
 %%PERL5_MAN3%%/POE::Test::Loops.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Test/Loops/.packlist
 %%SITE_PERL%%/POE/Test/DondeEstan.pm
 %%SITE_PERL%%/POE/Test/Loops.pm
 %%SITE_PERL%%/POE/Test/Loops/00_info.pm
diff --git a/devel/p5-POE-XS-Loop-Poll/Makefile b/devel/p5-POE-XS-Loop-Poll/Makefile
index a695ea23fbc9..3707d93362a6 100644
--- a/devel/p5-POE-XS-Loop-Poll/Makefile
+++ b/devel/p5-POE-XS-Loop-Poll/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-XS-Loop-Poll
 PORTVERSION=	1.000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-XS-Loop-Poll/pkg-plist b/devel/p5-POE-XS-Loop-Poll/pkg-plist
index 8a9f26efa032..b5c0cd065172 100644
--- a/devel/p5-POE-XS-Loop-Poll/pkg-plist
+++ b/devel/p5-POE-XS-Loop-Poll/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/POE::XS::Loop::Poll.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Loop/Poll.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop/Poll/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop/Poll/Poll.so
+%%SITE_ARCH%%/POE/XS/Loop/Poll.pm
+%%SITE_ARCH%%/auto/POE/XS/Loop/Poll/Poll.so
diff --git a/devel/p5-POE-XS-Queue-Array/Makefile b/devel/p5-POE-XS-Queue-Array/Makefile
index 6631466bf991..f3da9591995d 100644
--- a/devel/p5-POE-XS-Queue-Array/Makefile
+++ b/devel/p5-POE-XS-Queue-Array/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-XS-Queue-Array
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE-XS-Queue-Array/pkg-plist b/devel/p5-POE-XS-Queue-Array/pkg-plist
index 513353571de4..52d6a958b78a 100644
--- a/devel/p5-POE-XS-Queue-Array/pkg-plist
+++ b/devel/p5-POE-XS-Queue-Array/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/POE::XS::Queue::Array.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Queue/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue/Array/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue/Array/Array.so
+%%SITE_ARCH%%/POE/XS/Queue/Array.pm
+%%SITE_ARCH%%/auto/POE/XS/Queue/Array/Array.so
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 1ab3c7f8caaf..1a4ecd26bd87 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE
 PORTVERSION=	1.358
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POE/pkg-plist b/devel/p5-POE/pkg-plist
index fea1c548dd90..b26dafd72a12 100644
--- a/devel/p5-POE/pkg-plist
+++ b/devel/p5-POE/pkg-plist
@@ -90,7 +90,6 @@
 %%SITE_PERL%%/POE/Wheel/ReadWrite.pm
 %%SITE_PERL%%/POE/Wheel/Run.pm
 %%SITE_PERL%%/POE/Wheel/SocketFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.samples
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/create.perl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fakelogin.perl
diff --git a/devel/p5-POEx-Role-SessionInstantiation/Makefile b/devel/p5-POEx-Role-SessionInstantiation/Makefile
index d5c35da4aaf6..37e77aaf054c 100644
--- a/devel/p5-POEx-Role-SessionInstantiation/Makefile
+++ b/devel/p5-POEx-Role-SessionInstantiation/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POEx-Role-SessionInstantiation
 PORTVERSION=	1.102610
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
diff --git a/devel/p5-POEx-Role-SessionInstantiation/pkg-plist b/devel/p5-POEx-Role-SessionInstantiation/pkg-plist
index f2b30c0f97ec..645aac386a1e 100644
--- a/devel/p5-POEx-Role-SessionInstantiation/pkg-plist
+++ b/devel/p5-POEx-Role-SessionInstantiation/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Role/SessionInstantiation/.packlist
 %%SITE_PERL%%/POEx/Role/Event.pm
 %%SITE_PERL%%/POEx/Role/SessionInstantiation.pm
 %%SITE_PERL%%/POEx/Role/SessionInstantiation/Meta/POEState.pm
diff --git a/devel/p5-POEx-Role-Streaming/Makefile b/devel/p5-POEx-Role-Streaming/Makefile
index 258a4de83429..a7799fde8fc3 100644
--- a/devel/p5-POEx-Role-Streaming/Makefile
+++ b/devel/p5-POEx-Role-Streaming/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POEx-Role-Streaming
 PORTVERSION=	1.102610
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
diff --git a/devel/p5-POEx-Role-Streaming/pkg-plist b/devel/p5-POEx-Role-Streaming/pkg-plist
index 5be4533a00d2..ede0276accdf 100644
--- a/devel/p5-POEx-Role-Streaming/pkg-plist
+++ b/devel/p5-POEx-Role-Streaming/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Role/Streaming/.packlist
 %%SITE_PERL%%/POEx/Role/Streaming.pm
 %%PERL5_MAN3%%/POEx::Role::Streaming.3.gz
diff --git a/devel/p5-POEx-Types/Makefile b/devel/p5-POEx-Types/Makefile
index 1a2905c3e2c8..703146ae80a1 100644
--- a/devel/p5-POEx-Types/Makefile
+++ b/devel/p5-POEx-Types/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POEx-Types
 PORTVERSION=	1.100910
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
diff --git a/devel/p5-POEx-Types/pkg-plist b/devel/p5-POEx-Types/pkg-plist
index b83d19e1108b..9ae1c86e93aa 100644
--- a/devel/p5-POEx-Types/pkg-plist
+++ b/devel/p5-POEx-Types/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Types/.packlist
 %%SITE_PERL%%/POEx/Types.pm
 %%PERL5_MAN3%%/POEx::Types.3.gz
diff --git a/devel/p5-POSIX-strftime-Compiler/Makefile b/devel/p5-POSIX-strftime-Compiler/Makefile
index e1103433420e..35825a4188e7 100644
--- a/devel/p5-POSIX-strftime-Compiler/Makefile
+++ b/devel/p5-POSIX-strftime-Compiler/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POSIX-strftime-Compiler
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POSIX-strptime/Makefile b/devel/p5-POSIX-strptime/Makefile
index a9c89119407d..2d0726f3847a 100644
--- a/devel/p5-POSIX-strptime/Makefile
+++ b/devel/p5-POSIX-strptime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POSIX-strptime
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-POSIX-strptime/pkg-plist b/devel/p5-POSIX-strptime/pkg-plist
index 645b8d52caae..ed486e13a89b 100644
--- a/devel/p5-POSIX-strptime/pkg-plist
+++ b/devel/p5-POSIX-strptime/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/POSIX/strptime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/strptime/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/strptime/strptime.so
+%%SITE_ARCH%%/POSIX/strptime.pm
+%%SITE_ARCH%%/auto/POSIX/strptime/strptime.so
 %%PERL5_MAN3%%/POSIX::strptime.3.gz
diff --git a/devel/p5-PPerl/Makefile b/devel/p5-PPerl/Makefile
index e00e584acc7f..19459d3b133a 100644
--- a/devel/p5-PPerl/Makefile
+++ b/devel/p5-PPerl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PPerl
 PORTVERSION=	0.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
@@ -16,7 +16,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/PPerl/PPerl.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PPerl/PPerl.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pperl
 
 .include <bsd.port.mk>
diff --git a/devel/p5-PPerl/pkg-plist b/devel/p5-PPerl/pkg-plist
index 37b87a21b336..0177b85c9105 100644
--- a/devel/p5-PPerl/pkg-plist
+++ b/devel/p5-PPerl/pkg-plist
@@ -1,6 +1,5 @@
 bin/pperl
 man/man1/pperl.1.gz
 %%PERL5_MAN3%%/PPerl.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPerl/PPerl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPerl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/PPerl.pm
+%%SITE_ARCH%%/auto/PPerl/PPerl.so
+%%SITE_ARCH%%/PPerl.pm
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 5cf06b7fbae1..6e6979ed3d9c 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PV
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Package-Constants/Makefile b/devel/p5-Package-Constants/Makefile
index 77c9b7b5434c..afab8d18aa73 100644
--- a/devel/p5-Package-Constants/Makefile
+++ b/devel/p5-Package-Constants/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Package-Constants
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Package-Constants/pkg-plist b/devel/p5-Package-Constants/pkg-plist
index f26857d311f4..be066a8de92b 100644
--- a/devel/p5-Package-Constants/pkg-plist
+++ b/devel/p5-Package-Constants/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Package/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Constants/.packlist
 %%PERL5_MAN3%%/Package::Constants.3.gz
diff --git a/devel/p5-Package-DeprecationManager/Makefile b/devel/p5-Package-DeprecationManager/Makefile
index 956311af9111..72c1c9e8e7cf 100644
--- a/devel/p5-Package-DeprecationManager/Makefile
+++ b/devel/p5-Package-DeprecationManager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Package-DeprecationManager
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Package-DeprecationManager/pkg-plist b/devel/p5-Package-DeprecationManager/pkg-plist
index e96face8c7f0..07a2ee1d3007 100644
--- a/devel/p5-Package-DeprecationManager/pkg-plist
+++ b/devel/p5-Package-DeprecationManager/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Package::DeprecationManager.3.gz
 %%SITE_PERL%%/Package/DeprecationManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/DeprecationManager/.packlist
diff --git a/devel/p5-Package-Generator/Makefile b/devel/p5-Package-Generator/Makefile
index e28bf44556d5..4f4fb8f5b9bc 100644
--- a/devel/p5-Package-Generator/Makefile
+++ b/devel/p5-Package-Generator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Package-Generator
 PORTVERSION=	1.106
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Package-Generator/pkg-plist b/devel/p5-Package-Generator/pkg-plist
index c6f1d66dbecf..d6f19559e72c 100644
--- a/devel/p5-Package-Generator/pkg-plist
+++ b/devel/p5-Package-Generator/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Package/Generator.pm
 %%SITE_PERL%%/Package/Reaper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Generator/.packlist
 %%PERL5_MAN3%%/Package::Reaper.3.gz
 %%PERL5_MAN3%%/Package::Generator.3.gz
diff --git a/devel/p5-Package-Stash-XS/Makefile b/devel/p5-Package-Stash-XS/Makefile
index a0ed75d1bc4a..ac0e6a35fe53 100644
--- a/devel/p5-Package-Stash-XS/Makefile
+++ b/devel/p5-Package-Stash-XS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Package-Stash-XS
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/devel/p5-Package-Stash-XS/pkg-plist b/devel/p5-Package-Stash-XS/pkg-plist
index 642352a5c352..7f05a41867ac 100644
--- a/devel/p5-Package-Stash-XS/pkg-plist
+++ b/devel/p5-Package-Stash-XS/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Package/Stash/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/XS/XS.so
+%%SITE_ARCH%%/Package/Stash/XS.pm
+%%SITE_ARCH%%/auto/Package/Stash/XS/XS.so
 %%PERL5_MAN3%%/Package::Stash::XS.3.gz
diff --git a/devel/p5-Package-Stash/Makefile b/devel/p5-Package-Stash/Makefile
index e47fcd93f2e0..199a81ff9ffa 100644
--- a/devel/p5-Package-Stash/Makefile
+++ b/devel/p5-Package-Stash/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Package-Stash
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/devel/p5-Package-Stash/pkg-plist b/devel/p5-Package-Stash/pkg-plist
index 220f87b16584..5b3ebd39c511 100644
--- a/devel/p5-Package-Stash/pkg-plist
+++ b/devel/p5-Package-Stash/pkg-plist
@@ -4,5 +4,4 @@ bin/package-stash-conflicts
 %%SITE_PERL%%/Package/Stash.pm
 %%SITE_PERL%%/Package/Stash/Conflicts.pm
 %%SITE_PERL%%/Package/Stash/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/.packlist
 man/man1/package-stash-conflicts.1.gz
diff --git a/devel/p5-Package-Variant/Makefile b/devel/p5-Package-Variant/Makefile
index 10acf1d90119..3ccc22b02f3a 100644
--- a/devel/p5-Package-Variant/Makefile
+++ b/devel/p5-Package-Variant/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Package-Variant
 PORTVERSION=	1.002002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Package-Variant/pkg-plist b/devel/p5-Package-Variant/pkg-plist
index ad8f8eaf740f..957caef8143e 100644
--- a/devel/p5-Package-Variant/pkg-plist
+++ b/devel/p5-Package-Variant/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Package::Variant.3.gz
 %%SITE_PERL%%/Package/Variant.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Variant/.packlist
diff --git a/devel/p5-PadWalker/Makefile b/devel/p5-PadWalker/Makefile
index a539dc4f17ac..6fdc182d4647 100644
--- a/devel/p5-PadWalker/Makefile
+++ b/devel/p5-PadWalker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PadWalker
 PORTVERSION=	1.98
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROBIN
diff --git a/devel/p5-PadWalker/pkg-plist b/devel/p5-PadWalker/pkg-plist
index 50b1d34c7af2..946df22affba 100644
--- a/devel/p5-PadWalker/pkg-plist
+++ b/devel/p5-PadWalker/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/PadWalker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PadWalker/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PadWalker/PadWalker.so
+%%SITE_ARCH%%/PadWalker.pm
+%%SITE_ARCH%%/auto/PadWalker/PadWalker.so
 %%PERL5_MAN3%%/PadWalker.3.gz
diff --git a/devel/p5-Parallel-Async/Makefile b/devel/p5-Parallel-Async/Makefile
index d385821d10a5..fc79726b04ce 100644
--- a/devel/p5-Parallel-Async/Makefile
+++ b/devel/p5-Parallel-Async/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Parallel-Async
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parallel-Fork-BossWorker/Makefile b/devel/p5-Parallel-Fork-BossWorker/Makefile
index 6a5bfa8f8f62..4d0c7ccfa316 100644
--- a/devel/p5-Parallel-Fork-BossWorker/Makefile
+++ b/devel/p5-Parallel-Fork-BossWorker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parallel-Fork-BossWorker
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parallel-Fork-BossWorker/pkg-plist b/devel/p5-Parallel-Fork-BossWorker/pkg-plist
index 6c2a5e6dd031..c5e5d8142175 100644
--- a/devel/p5-Parallel-Fork-BossWorker/pkg-plist
+++ b/devel/p5-Parallel-Fork-BossWorker/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Parallel::Fork::BossWorker.3.gz
 %%SITE_PERL%%/Parallel/Fork/BossWorker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Fork/BossWorker/.packlist
diff --git a/devel/p5-Parallel-ForkManager/Makefile b/devel/p5-Parallel-ForkManager/Makefile
index 11574bb36856..0bb840633bce 100644
--- a/devel/p5-Parallel-ForkManager/Makefile
+++ b/devel/p5-Parallel-ForkManager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parallel-ForkManager
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parallel-ForkManager/pkg-plist b/devel/p5-Parallel-ForkManager/pkg-plist
index 18289df498bc..33b65722b60a 100644
--- a/devel/p5-Parallel-ForkManager/pkg-plist
+++ b/devel/p5-Parallel-ForkManager/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Parallel::ForkManager.3.gz
 %%SITE_PERL%%/Parallel/ForkManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/ForkManager/.packlist
diff --git a/devel/p5-Parallel-Iterator/Makefile b/devel/p5-Parallel-Iterator/Makefile
index 904e6a296fa6..9ad18bc153a7 100644
--- a/devel/p5-Parallel-Iterator/Makefile
+++ b/devel/p5-Parallel-Iterator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parallel-Iterator
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parallel-Prefork/Makefile b/devel/p5-Parallel-Prefork/Makefile
index d61a6a934851..76c6be34a5a3 100644
--- a/devel/p5-Parallel-Prefork/Makefile
+++ b/devel/p5-Parallel-Prefork/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parallel-Prefork
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZUHO
diff --git a/devel/p5-Parallel-Prefork/pkg-plist b/devel/p5-Parallel-Prefork/pkg-plist
index da186158503e..0701cf945ef5 100644
--- a/devel/p5-Parallel-Prefork/pkg-plist
+++ b/devel/p5-Parallel-Prefork/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Prefork/.packlist
 %%SITE_PERL%%/Parallel/Prefork.pm
 %%SITE_PERL%%/Parallel/Prefork/SpareWorkers.pm
 %%SITE_PERL%%/Parallel/Prefork/SpareWorkers/Scoreboard.pm
diff --git a/devel/p5-Parallel-Scoreboard/Makefile b/devel/p5-Parallel-Scoreboard/Makefile
index 37fd8812c10a..44e2a6983311 100644
--- a/devel/p5-Parallel-Scoreboard/Makefile
+++ b/devel/p5-Parallel-Scoreboard/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Parallel-Scoreboard
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parallel-Scoreboard/pkg-plist b/devel/p5-Parallel-Scoreboard/pkg-plist
index 6992cb268e08..44328f1a8922 100644
--- a/devel/p5-Parallel-Scoreboard/pkg-plist
+++ b/devel/p5-Parallel-Scoreboard/pkg-plist
@@ -1,7 +1,6 @@
 %%PERL5_MAN3%%/Parallel::Scoreboard.3.gz
 %%PERL5_MAN3%%/Parallel::Scoreboard::PSGI::App.3.gz
 %%PERL5_MAN3%%/Parallel::Scoreboard::PSGI::App::JSON.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Scoreboard/.packlist
 %%SITE_PERL%%/Parallel/Scoreboard.pm
 %%SITE_PERL%%/Parallel/Scoreboard/PSGI/App.pm
 %%SITE_PERL%%/Parallel/Scoreboard/PSGI/App/JSON.pm
diff --git a/devel/p5-Params-CallbackRequest/Makefile b/devel/p5-Params-CallbackRequest/Makefile
index 5800a82ca8c9..3cc25ef0a1d9 100644
--- a/devel/p5-Params-CallbackRequest/Makefile
+++ b/devel/p5-Params-CallbackRequest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Params-CallbackRequest
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Params-Check/Makefile b/devel/p5-Params-Check/Makefile
index 58253fa4c138..f94c217a2ad5 100644
--- a/devel/p5-Params-Check/Makefile
+++ b/devel/p5-Params-Check/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Params-Check
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Params-Check/pkg-plist b/devel/p5-Params-Check/pkg-plist
index 2ce05122dc85..15a4fadc3ca7 100644
--- a/devel/p5-Params-Check/pkg-plist
+++ b/devel/p5-Params-Check/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Params::Check.3.gz
 %%SITE_PERL%%/Params/Check.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Check/.packlist
diff --git a/devel/p5-Params-Classify/Makefile b/devel/p5-Params-Classify/Makefile
index 39ee42fd3a60..7689719e767d 100644
--- a/devel/p5-Params-Classify/Makefile
+++ b/devel/p5-Params-Classify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Params-Classify
 PORTVERSION=	0.013
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Params-Classify/pkg-plist b/devel/p5-Params-Classify/pkg-plist
index 052939f256ab..ff1b1feb5e7c 100644
--- a/devel/p5-Params-Classify/pkg-plist
+++ b/devel/p5-Params-Classify/pkg-plist
@@ -1,3 +1,3 @@
 %%PERL5_MAN3%%/Params::Classify.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/Classify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Classify/Classify.so
+%%SITE_ARCH%%/Params/Classify.pm
+%%SITE_ARCH%%/auto/Params/Classify/Classify.so
diff --git a/devel/p5-Params-Coerce/Makefile b/devel/p5-Params-Coerce/Makefile
index 5280d9672523..d1bcb014f97e 100644
--- a/devel/p5-Params-Coerce/Makefile
+++ b/devel/p5-Params-Coerce/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Params-Coerce
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Params-Coerce/pkg-plist b/devel/p5-Params-Coerce/pkg-plist
index b83a180629ac..6e1decefcff6 100644
--- a/devel/p5-Params-Coerce/pkg-plist
+++ b/devel/p5-Params-Coerce/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Params/Coerce.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Coerce/.packlist
 %%PERL5_MAN3%%/Params::Coerce.3.gz
diff --git a/devel/p5-Params-Util/Makefile b/devel/p5-Params-Util/Makefile
index fccc0ae790a7..fc0851b609cd 100644
--- a/devel/p5-Params-Util/Makefile
+++ b/devel/p5-Params-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Params-Util
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Params-Util/pkg-plist b/devel/p5-Params-Util/pkg-plist
index fa2ec8158e48..4d5eeb96cf6e 100644
--- a/devel/p5-Params-Util/pkg-plist
+++ b/devel/p5-Params-Util/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Params::Util.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Util/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Util/Util.so
+%%SITE_ARCH%%/Params/Util.pm
+%%SITE_ARCH%%/auto/Params/Util/Util.so
diff --git a/devel/p5-Params-Validate-Dependencies/Makefile b/devel/p5-Params-Validate-Dependencies/Makefile
index 12e001dd19db..3eccf3973494 100644
--- a/devel/p5-Params-Validate-Dependencies/Makefile
+++ b/devel/p5-Params-Validate-Dependencies/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Params-Validate-Dependencies
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Params-Validate-Dependencies/pkg-plist b/devel/p5-Params-Validate-Dependencies/pkg-plist
index c518286d5fa5..130fdaeab7fa 100644
--- a/devel/p5-Params-Validate-Dependencies/pkg-plist
+++ b/devel/p5-Params-Validate-Dependencies/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Params/Validate/Dependencies.pm
 %%SITE_PERL%%/Params/Validate/Dependencies/Documenter.pm
 %%SITE_PERL%%/Params/Validate/Dependencies/Extending.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate/Dependencies/.packlist
 %%PERL5_MAN3%%/Data::Domain::Dependencies.3.gz
 %%PERL5_MAN3%%/Params::Validate::Dependencies.3.gz
 %%PERL5_MAN3%%/Params::Validate::Dependencies::Extending.3.gz
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 6403aa23dfff..680a99953ae0 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Params-Validate
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Params-Validate/pkg-plist b/devel/p5-Params-Validate/pkg-plist
index 2ebda5fd7d7f..af789f69ac0b 100644
--- a/devel/p5-Params-Validate/pkg-plist
+++ b/devel/p5-Params-Validate/pkg-plist
@@ -1,10 +1,10 @@
 %%PERL5_MAN3%%/Attribute::Params::Validate.3.gz
 %%PERL5_MAN3%%/Params::Validate.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Attribute/Params/Validate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/Validate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/Validate/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/Validate/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/Validate/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/ValidatePP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Params/ValidateXS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate/XS/XS.so
+%%SITE_ARCH%%/Attribute/Params/Validate.pm
+%%SITE_ARCH%%/Params/Validate.pm
+%%SITE_ARCH%%/Params/Validate/Constants.pm
+%%SITE_ARCH%%/Params/Validate/PP.pm
+%%SITE_ARCH%%/Params/Validate/XS.pm
+%%SITE_ARCH%%/Params/ValidatePP.pm
+%%SITE_ARCH%%/Params/ValidateXS.pm
+%%SITE_ARCH%%/auto/Params/Validate/XS/XS.so
diff --git a/devel/p5-Paranoid/Makefile b/devel/p5-Paranoid/Makefile
index dd3ea6010cb3..5526d450acba 100644
--- a/devel/p5-Paranoid/Makefile
+++ b/devel/p5-Paranoid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Paranoid
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Paranoid/pkg-plist b/devel/p5-Paranoid/pkg-plist
index de5fc538f617..b67c3635dd90 100644
--- a/devel/p5-Paranoid/pkg-plist
+++ b/devel/p5-Paranoid/pkg-plist
@@ -18,7 +18,6 @@
 %%SITE_PERL%%/Paranoid/Network/Socket.pm
 %%SITE_PERL%%/Paranoid/Debug.pm
 %%SITE_PERL%%/Paranoid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Paranoid/.packlist
 %%PERL5_MAN3%%/Paranoid::Data.3.gz
 %%PERL5_MAN3%%/Paranoid::Log::File.3.gz
 %%PERL5_MAN3%%/Paranoid::Log::Email.3.gz
diff --git a/devel/p5-Parse-CPAN-Meta/Makefile b/devel/p5-Parse-CPAN-Meta/Makefile
index 164e5ea55726..dc782df7e41a 100644
--- a/devel/p5-Parse-CPAN-Meta/Makefile
+++ b/devel/p5-Parse-CPAN-Meta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-CPAN-Meta
 PORTVERSION=	1.44.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Parse-CPAN-Meta/pkg-plist b/devel/p5-Parse-CPAN-Meta/pkg-plist
index 63aa75c0241b..7024400cc0b0 100644
--- a/devel/p5-Parse-CPAN-Meta/pkg-plist
+++ b/devel/p5-Parse-CPAN-Meta/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Parse/CPAN/Meta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/CPAN/Meta/.packlist
 %%PERL5_MAN3%%/Parse::CPAN::Meta.3.gz
diff --git a/devel/p5-Parse-CPAN-Packages-Fast/Makefile b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
index 54dc7f19f11e..d913ec46b7f1 100644
--- a/devel/p5-Parse-CPAN-Packages-Fast/Makefile
+++ b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-CPAN-Packages-Fast
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-CPAN-Packages-Fast/pkg-plist b/devel/p5-Parse-CPAN-Packages-Fast/pkg-plist
index 080f8439000a..bf782082b44e 100644
--- a/devel/p5-Parse-CPAN-Packages-Fast/pkg-plist
+++ b/devel/p5-Parse-CPAN-Packages-Fast/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Parse/CPAN/Packages/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/CPAN/Packages/Fast/.packlist
 %%PERL5_MAN3%%/Parse::CPAN::Packages::Fast.3.gz
diff --git a/devel/p5-Parse-CPAN-Packages/Makefile b/devel/p5-Parse-CPAN-Packages/Makefile
index ea0c1b4d6304..01e3e7cfc226 100644
--- a/devel/p5-Parse-CPAN-Packages/Makefile
+++ b/devel/p5-Parse-CPAN-Packages/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-CPAN-Packages
 PORTVERSION=	2.38
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-CPAN-Packages/pkg-plist b/devel/p5-Parse-CPAN-Packages/pkg-plist
index 755bec275a3d..85607753a0cd 100644
--- a/devel/p5-Parse-CPAN-Packages/pkg-plist
+++ b/devel/p5-Parse-CPAN-Packages/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Parse/CPAN/Packages.pm
 %%SITE_PERL%%/Parse/CPAN/Packages/Distribution.pm
 %%SITE_PERL%%/Parse/CPAN/Packages/Package.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/CPAN/Packages/.packlist
 %%PERL5_MAN3%%/Parse::CPAN::Packages.3.gz
 %%PERL5_MAN3%%/Parse::CPAN::Packages::Distribution.3.gz
 %%PERL5_MAN3%%/Parse::CPAN::Packages::Package.3.gz
diff --git a/devel/p5-Parse-ErrorString-Perl/Makefile b/devel/p5-Parse-ErrorString-Perl/Makefile
index 99941b9bedf1..121f4eccc2d7 100644
--- a/devel/p5-Parse-ErrorString-Perl/Makefile
+++ b/devel/p5-Parse-ErrorString-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-ErrorString-Perl
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-ErrorString-Perl/pkg-plist b/devel/p5-Parse-ErrorString-Perl/pkg-plist
index 5348639627d8..388252a85641 100644
--- a/devel/p5-Parse-ErrorString-Perl/pkg-plist
+++ b/devel/p5-Parse-ErrorString-Perl/pkg-plist
@@ -3,7 +3,6 @@ man/man1/check_perldiag.1.gz
 %%SITE_PERL%%/Parse/ErrorString/Perl/ErrorItem.pm
 %%SITE_PERL%%/Parse/ErrorString/Perl/StackItem.pm
 %%SITE_PERL%%/Parse/ErrorString/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ErrorString/Perl/.packlist
 %%PERL5_MAN3%%/Parse::ErrorString::Perl.3.gz
 %%PERL5_MAN3%%/Parse::ErrorString::Perl::ErrorItem.3.gz
 %%PERL5_MAN3%%/Parse::ErrorString::Perl::StackItem.3.gz
diff --git a/devel/p5-Parse-ExuberantCTags/Makefile b/devel/p5-Parse-ExuberantCTags/Makefile
index ef36a4399263..ee2db0a7b7eb 100644
--- a/devel/p5-Parse-ExuberantCTags/Makefile
+++ b/devel/p5-Parse-ExuberantCTags/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-ExuberantCTags
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-ExuberantCTags/pkg-plist b/devel/p5-Parse-ExuberantCTags/pkg-plist
index a0d04b70552f..17e4eed7ff04 100644
--- a/devel/p5-Parse-ExuberantCTags/pkg-plist
+++ b/devel/p5-Parse-ExuberantCTags/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Parse::ExuberantCTags.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Parse/ExuberantCTags.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ExuberantCTags/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ExuberantCTags/ExuberantCTags.so
+%%SITE_ARCH%%/Parse/ExuberantCTags.pm
+%%SITE_ARCH%%/auto/Parse/ExuberantCTags/ExuberantCTags.so
diff --git a/devel/p5-Parse-Method-Signatures/Makefile b/devel/p5-Parse-Method-Signatures/Makefile
index e875dc5c7d38..5b3de0b89f90 100644
--- a/devel/p5-Parse-Method-Signatures/Makefile
+++ b/devel/p5-Parse-Method-Signatures/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Method-Signatures
 PORTVERSION=	1.003016
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-Method-Signatures/pkg-plist b/devel/p5-Parse-Method-Signatures/pkg-plist
index 9007b0340331..551560f3aae8 100644
--- a/devel/p5-Parse-Method-Signatures/pkg-plist
+++ b/devel/p5-Parse-Method-Signatures/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/Parse/Method/Signatures/Sig.pm
 %%SITE_PERL%%/Parse/Method/Signatures/TypeConstraint.pm
 %%SITE_PERL%%/Parse/Method/Signatures/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Method/Signatures/.packlist
 %%PERL5_MAN3%%/Parse::Method::Signatures.3.gz
 %%PERL5_MAN3%%/Parse::Method::Signatures::Param.3.gz
 %%PERL5_MAN3%%/Parse::Method::Signatures::Sig.3.gz
diff --git a/devel/p5-Parse-PerlConfig/Makefile b/devel/p5-Parse-PerlConfig/Makefile
index 34a6d970ad44..34ade5f423f2 100644
--- a/devel/p5-Parse-PerlConfig/Makefile
+++ b/devel/p5-Parse-PerlConfig/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Parse-PerlConfig
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-PerlConfig/pkg-plist b/devel/p5-Parse-PerlConfig/pkg-plist
index 2df7cf433cb3..a39c4d9d5210 100644
--- a/devel/p5-Parse-PerlConfig/pkg-plist
+++ b/devel/p5-Parse-PerlConfig/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Parse/PerlConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/PerlConfig/.packlist
 %%PERL5_MAN3%%/Parse::PerlConfig.3.gz
diff --git a/devel/p5-Parse-Pidl/Makefile b/devel/p5-Parse-Pidl/Makefile
index 165a9e0c759d..5a680da4dfb4 100644
--- a/devel/p5-Parse-Pidl/Makefile
+++ b/devel/p5-Parse-Pidl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		Parse-Pidl
 PORTVERSION=		${SAMBA4_VERSION}
-PORTREVISION=		0
+PORTREVISION=		1
 PORTEPOCH=		0
 CATEGORIES=		devel perl5
 PKGNAMEPREFIX=		p5-
diff --git a/devel/p5-Parse-Pidl/pkg-plist b/devel/p5-Parse-Pidl/pkg-plist
index 36e842671421..48ed2dfcac59 100644
--- a/devel/p5-Parse-Pidl/pkg-plist
+++ b/devel/p5-Parse-Pidl/pkg-plist
@@ -24,7 +24,6 @@ bin/pidl
 %%SITE_PERL%%/Parse/Pidl/Util.pm
 %%SITE_PERL%%/Parse/Pidl/Wireshark/Conformance.pm
 %%SITE_PERL%%/Parse/Pidl/Wireshark/NDR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Pidl/.packlist
 %%PERL5_MAN3%%/Parse::Pidl::Dump.3.gz
 %%PERL5_MAN3%%/Parse::Pidl::NDR.3.gz
 %%PERL5_MAN3%%/Parse::Pidl::Util.3.gz
diff --git a/devel/p5-Parse-PlainConfig/Makefile b/devel/p5-Parse-PlainConfig/Makefile
index 8ac33a48672c..c594db86a3cb 100644
--- a/devel/p5-Parse-PlainConfig/Makefile
+++ b/devel/p5-Parse-PlainConfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-PlainConfig
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-PlainConfig/pkg-plist b/devel/p5-Parse-PlainConfig/pkg-plist
index 5c7337d3a5cc..432bffc2eee2 100644
--- a/devel/p5-Parse-PlainConfig/pkg-plist
+++ b/devel/p5-Parse-PlainConfig/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Parse/PlainConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/PlainConfig/.packlist
 %%PERL5_MAN3%%/Parse::PlainConfig.3.gz
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index 99f732787c15..e9c2fbe00fac 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Parse-RecDescent
 PORTVERSION=	1.967.009
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-RecDescent/pkg-plist b/devel/p5-Parse-RecDescent/pkg-plist
index c267f1ed7564..a6f61ae13007 100644
--- a/devel/p5-Parse-RecDescent/pkg-plist
+++ b/devel/p5-Parse-RecDescent/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Parse/RecDescent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/RecDescent/.packlist
 %%PERL5_MAN3%%/Parse::RecDescent.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/TPJ-PRD-proc.gif
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/TPJ-yacc-proc.gif
diff --git a/devel/p5-Parse-Win32Registry/Makefile b/devel/p5-Parse-Win32Registry/Makefile
index fce2879a68ed..7d41b9d160b1 100644
--- a/devel/p5-Parse-Win32Registry/Makefile
+++ b/devel/p5-Parse-Win32Registry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Win32Registry
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-Win32Registry/pkg-plist b/devel/p5-Parse-Win32Registry/pkg-plist
index b2842fe32c72..825cf910c86d 100644
--- a/devel/p5-Parse-Win32Registry/pkg-plist
+++ b/devel/p5-Parse-Win32Registry/pkg-plist
@@ -31,5 +31,4 @@ bin/wxregview.pl
 %%SITE_PERL%%/Parse/Win32Registry/WinNT/Key.pm
 %%SITE_PERL%%/Parse/Win32Registry/WinNT/Security.pm
 %%SITE_PERL%%/Parse/Win32Registry/WinNT/Value.pm
-%%SITE_PERL%%/mach/auto/Parse/Win32Registry/.packlist
 %%PERL5_MAN3%%/Parse::Win32Registry.3.gz
diff --git a/devel/p5-Parse-Yapp/Makefile b/devel/p5-Parse-Yapp/Makefile
index f8f39300fc7b..cb7beeecd72b 100644
--- a/devel/p5-Parse-Yapp/Makefile
+++ b/devel/p5-Parse-Yapp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Yapp
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Parse-Yapp/pkg-plist b/devel/p5-Parse-Yapp/pkg-plist
index 5be775d9984b..b61b757e0a4b 100644
--- a/devel/p5-Parse-Yapp/pkg-plist
+++ b/devel/p5-Parse-Yapp/pkg-plist
@@ -6,6 +6,5 @@ bin/yapp
 %%SITE_PERL%%/Parse/Yapp/Lalr.pm
 %%SITE_PERL%%/Parse/Yapp/Parse.pm
 %%SITE_PERL%%/Parse/Yapp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Yapp/.packlist
 %%PERL5_MAN3%%/Parse::Yapp.3.gz
 man/man1/yapp.1.gz
diff --git a/devel/p5-ParseLex/Makefile b/devel/p5-ParseLex/Makefile
index 1583df9cfaf7..b85a9a04df36 100644
--- a/devel/p5-ParseLex/Makefile
+++ b/devel/p5-ParseLex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ParseLex
 PORTVERSION=	2.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN/Parse
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ParseLex/pkg-plist b/devel/p5-ParseLex/pkg-plist
index fb450761950e..51a0b6916f50 100644
--- a/devel/p5-ParseLex/pkg-plist
+++ b/devel/p5-ParseLex/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Parse/Trace.pm
 %%SITE_PERL%%/Parse/Token.pm
 %%SITE_PERL%%/Parse/Token-t.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Lex/.packlist
 %%PERL5_MAN3%%/Parse::ALex.3.gz
 %%PERL5_MAN3%%/Parse::Lex.3.gz
 %%PERL5_MAN3%%/Parse::Token.3.gz
diff --git a/devel/p5-ParseTemplate/Makefile b/devel/p5-ParseTemplate/Makefile
index ce5eae64ba8e..2bcaaa60028c 100644
--- a/devel/p5-ParseTemplate/Makefile
+++ b/devel/p5-ParseTemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ParseTemplate
 PORTVERSION=	3.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN/Parse
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ParseTemplate/pkg-plist b/devel/p5-ParseTemplate/pkg-plist
index b7e2028610c9..bf7b266534ae 100644
--- a/devel/p5-ParseTemplate/pkg-plist
+++ b/devel/p5-ParseTemplate/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Parse/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Template/.packlist
 %%PERL5_MAN3%%/Parse::Template.3.gz
diff --git a/devel/p5-PatchReader/Makefile b/devel/p5-PatchReader/Makefile
index a1485f0ebfc2..dedaff01c210 100644
--- a/devel/p5-PatchReader/Makefile
+++ b/devel/p5-PatchReader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PatchReader
 PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TMANNERM
diff --git a/devel/p5-PatchReader/pkg-plist b/devel/p5-PatchReader/pkg-plist
index 32a6c03f05b5..54abe08bc752 100644
--- a/devel/p5-PatchReader/pkg-plist
+++ b/devel/p5-PatchReader/pkg-plist
@@ -9,5 +9,4 @@
 %%SITE_PERL%%/PatchReader/NarrowPatch.pm
 %%SITE_PERL%%/PatchReader/PatchInfoGrabber.pm
 %%SITE_PERL%%/PatchReader/Raw.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PatchReader/.packlist
 %%PERL5_MAN3%%/PatchReader.3.gz
diff --git a/devel/p5-Path-Abstract/Makefile b/devel/p5-Path-Abstract/Makefile
index 67d1b3bacd64..8b0cc8ff1332 100644
--- a/devel/p5-Path-Abstract/Makefile
+++ b/devel/p5-Path-Abstract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Path-Abstract
 PORTVERSION=	0.096
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROKR
diff --git a/devel/p5-Path-Abstract/pkg-plist b/devel/p5-Path-Abstract/pkg-plist
index b858a96e3bc4..60fe643eadf5 100644
--- a/devel/p5-Path-Abstract/pkg-plist
+++ b/devel/p5-Path-Abstract/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/Path/Abstract/Fast.pm
 %%SITE_PERL%%/Path/Abstract/Underload.pm
 %%SITE_PERL%%/Path/Abstract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Abstract/.packlist
 %%PERL5_MAN3%%/Path::Abstract.3.gz
 %%PERL5_MAN3%%/Path::Abstract::Underload.3.gz
diff --git a/devel/p5-Path-Class-File-Lockable/Makefile b/devel/p5-Path-Class-File-Lockable/Makefile
index 8b678b6243ce..36a67ff74666 100644
--- a/devel/p5-Path-Class-File-Lockable/Makefile
+++ b/devel/p5-Path-Class-File-Lockable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Path-Class-File-Lockable
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KARMAN
diff --git a/devel/p5-Path-Class-File-Lockable/pkg-plist b/devel/p5-Path-Class-File-Lockable/pkg-plist
index 18982d4eed25..c711872beea9 100644
--- a/devel/p5-Path-Class-File-Lockable/pkg-plist
+++ b/devel/p5-Path-Class-File-Lockable/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Path/Class/File/Lockable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Class/File/Lockable/.packlist
 %%PERL5_MAN3%%/Path::Class::File::Lockable.3.gz
diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile
index d9e54bbb680f..89bb4b702853 100644
--- a/devel/p5-Path-Class/Makefile
+++ b/devel/p5-Path-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Path-Class
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KWILLIAMS
diff --git a/devel/p5-Path-Dispatcher-Declarative/Makefile b/devel/p5-Path-Dispatcher-Declarative/Makefile
index 77c49f0d9001..037453fc24b1 100644
--- a/devel/p5-Path-Dispatcher-Declarative/Makefile
+++ b/devel/p5-Path-Dispatcher-Declarative/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Path-Dispatcher-Declarative
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARTAK
diff --git a/devel/p5-Path-Dispatcher-Declarative/pkg-plist b/devel/p5-Path-Dispatcher-Declarative/pkg-plist
index bc43edcc5114..c57e6b1628c4 100644
--- a/devel/p5-Path-Dispatcher-Declarative/pkg-plist
+++ b/devel/p5-Path-Dispatcher-Declarative/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Path::Dispatcher::Declarative.3.gz
 %%SITE_PERL%%/Path/Dispatcher/Declarative.pm
 %%SITE_PERL%%/Path/Dispatcher/Declarative/Builder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher/Declarative/.packlist
diff --git a/devel/p5-Path-Dispatcher/Makefile b/devel/p5-Path-Dispatcher/Makefile
index 2ece26d12fba..2fd4e8cf57ca 100644
--- a/devel/p5-Path-Dispatcher/Makefile
+++ b/devel/p5-Path-Dispatcher/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Path-Dispatcher
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARTAK
diff --git a/devel/p5-Path-Dispatcher/pkg-plist b/devel/p5-Path-Dispatcher/pkg-plist
index 3c9e7f0ba7b5..a58c80eaa28d 100644
--- a/devel/p5-Path-Dispatcher/pkg-plist
+++ b/devel/p5-Path-Dispatcher/pkg-plist
@@ -39,4 +39,3 @@
 %%SITE_PERL%%/Path/Dispatcher/Rule/Sequence.pm
 %%SITE_PERL%%/Path/Dispatcher/Rule/Tokens.pm
 %%SITE_PERL%%/Path/Dispatcher/Rule/Under.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher/.packlist
diff --git a/devel/p5-Path-Extended/Makefile b/devel/p5-Path-Extended/Makefile
index b07e0e5e3481..da3ead729da9 100644
--- a/devel/p5-Path-Extended/Makefile
+++ b/devel/p5-Path-Extended/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Path-Extended
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ISHIGAKI
diff --git a/devel/p5-Path-Extended/pkg-plist b/devel/p5-Path-Extended/pkg-plist
index 64c6e012c516..1ec86a6fad63 100644
--- a/devel/p5-Path-Extended/pkg-plist
+++ b/devel/p5-Path-Extended/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/Path/Extended/Dir.pm
 %%SITE_PERL%%/Path/Extended/Entity.pm
 %%SITE_PERL%%/Path/Extended/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Extended/.packlist
diff --git a/devel/p5-Path-FindDev/Makefile b/devel/p5-Path-FindDev/Makefile
index 1497ea09b900..151e461cfda2 100644
--- a/devel/p5-Path-FindDev/Makefile
+++ b/devel/p5-Path-FindDev/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Path-FindDev
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KENTNL
diff --git a/devel/p5-Path-FindDev/pkg-plist b/devel/p5-Path-FindDev/pkg-plist
index ba9c0f399201..9fb3a20b5e2f 100644
--- a/devel/p5-Path-FindDev/pkg-plist
+++ b/devel/p5-Path-FindDev/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Path/FindDev/Object.pm
 %%PERL5_MAN3%%/Path::FindDev.3.gz
 %%PERL5_MAN3%%/Path::FindDev::Object.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/FindDev/.packlist
diff --git a/devel/p5-Path-IsDev/Makefile b/devel/p5-Path-IsDev/Makefile
index 14093c74d7bc..a0ec3a0eed14 100644
--- a/devel/p5-Path-IsDev/Makefile
+++ b/devel/p5-Path-IsDev/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Path-IsDev
 PORTVERSION=	1.001002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KENTNL
diff --git a/devel/p5-Path-IsDev/pkg-plist b/devel/p5-Path-IsDev/pkg-plist
index 59895fea7e7a..1fb130e2ff25 100644
--- a/devel/p5-Path-IsDev/pkg-plist
+++ b/devel/p5-Path-IsDev/pkg-plist
@@ -25,7 +25,6 @@
 %%PERL5_MAN3%%/Path::IsDev::Role::Matcher::Child::Exists::Any::File.3.gz
 %%PERL5_MAN3%%/Path::IsDev::Role::Matcher::FullPath::Is::Any.3.gz
 %%PERL5_MAN3%%/Path::IsDev::Role::NegativeHeuristic.3.gz
-%%SITE_ARCH%%/auto/Path/IsDev/.packlist
 %%SITE_PERL%%/Path/IsDev.pm
 %%SITE_PERL%%/Path/IsDev/Heuristic/Changelog.pm
 %%SITE_PERL%%/Path/IsDev/Heuristic/DevDirMarker.pm
diff --git a/devel/p5-Path-Iterator-Rule/Makefile b/devel/p5-Path-Iterator-Rule/Makefile
index 894c9b87ba30..2b47dca9c3a9 100644
--- a/devel/p5-Path-Iterator-Rule/Makefile
+++ b/devel/p5-Path-Iterator-Rule/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Path-Iterator-Rule
 PORTVERSION=	1.008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Path-Iterator-Rule/pkg-plist b/devel/p5-Path-Iterator-Rule/pkg-plist
index b2ecb9bc1434..66ef061fc395 100644
--- a/devel/p5-Path-Iterator-Rule/pkg-plist
+++ b/devel/p5-Path-Iterator-Rule/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/PIR.3.gz
 %%PERL5_MAN3%%/Path::Iterator::Rule.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Iterator/Rule/.packlist
 %%SITE_PERL%%/PIR.pm
 %%SITE_PERL%%/Path/Iterator/Rule.pm
diff --git a/devel/p5-Path-Resource/Makefile b/devel/p5-Path-Resource/Makefile
index e3a89ccdd222..a52d078a936e 100644
--- a/devel/p5-Path-Resource/Makefile
+++ b/devel/p5-Path-Resource/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Path-Resource
 PORTVERSION=	0.072
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RKRIMEN
diff --git a/devel/p5-Path-Resource/pkg-plist b/devel/p5-Path-Resource/pkg-plist
index 85122828e46a..b8a35717bbcf 100644
--- a/devel/p5-Path-Resource/pkg-plist
+++ b/devel/p5-Path-Resource/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Path/Resource/Base.pm
 %%SITE_PERL%%/Path/Resource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Resource/.packlist
 %%PERL5_MAN3%%/Path::Resource.3.gz
 %%PERL5_MAN3%%/Path::Resource::Base.3.gz
diff --git a/devel/p5-Path-Tiny/Makefile b/devel/p5-Path-Tiny/Makefile
index e5a98ec05b10..698076249371 100644
--- a/devel/p5-Path-Tiny/Makefile
+++ b/devel/p5-Path-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Path-Tiny
 PORTVERSION=	0.054
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Path-Tiny/pkg-plist b/devel/p5-Path-Tiny/pkg-plist
index 4e8931c7a9cc..8858f71779fb 100644
--- a/devel/p5-Path-Tiny/pkg-plist
+++ b/devel/p5-Path-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Path/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Tiny/.packlist
 %%PERL5_MAN3%%/Path::Tiny.3.gz
diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index 106e5a798cd7..f3c8e88b7947 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PathTools
 PORTVERSION=	3.4700
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist
index 6ba4dbdaade4..cd76c2c5e723 100644
--- a/devel/p5-PathTools/pkg-plist
+++ b/devel/p5-PathTools/pkg-plist
@@ -8,15 +8,14 @@
 %%PERL5_MAN3%%/File::Spec::Unix.3.gz
 %%PERL5_MAN3%%/File::Spec::VMS.3.gz
 %%PERL5_MAN3%%/File::Spec::Win32.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Cwd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Cygwin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Epoc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Functions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Mac.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/OS2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Unix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/VMS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.so
+%%SITE_ARCH%%/Cwd.pm
+%%SITE_ARCH%%/File/Spec.pm
+%%SITE_ARCH%%/File/Spec/Cygwin.pm
+%%SITE_ARCH%%/File/Spec/Epoc.pm
+%%SITE_ARCH%%/File/Spec/Functions.pm
+%%SITE_ARCH%%/File/Spec/Mac.pm
+%%SITE_ARCH%%/File/Spec/OS2.pm
+%%SITE_ARCH%%/File/Spec/Unix.pm
+%%SITE_ARCH%%/File/Spec/VMS.pm
+%%SITE_ARCH%%/File/Spec/Win32.pm
+%%SITE_ARCH%%/auto/Cwd/Cwd.so
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index 1e99756f14ba..ec0c4f84a623 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Penguin
 PORTVERSION=	3.00
+PORTREVISION=	1
 CATEGORIES=	devel security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Penguin/pkg-plist b/devel/p5-Penguin/pkg-plist
index 2fb433735179..e0ceb1a2652c 100644
--- a/devel/p5-Penguin/pkg-plist
+++ b/devel/p5-Penguin/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/Penguin/Trivial/Server.pm
 %%SITE_PERL%%/Penguin/Wrapper/PGP.pm
 %%SITE_PERL%%/Penguin/Wrapper/Transparent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin/.packlist
 lib/perl5/site_perl/Penguin/bin/.pen
 @owner root
 @group wheel
diff --git a/devel/p5-Perl-Critic-Deprecated/Makefile b/devel/p5-Perl-Critic-Deprecated/Makefile
index 6f16d49963c8..e1daa130ad8b 100644
--- a/devel/p5-Perl-Critic-Deprecated/Makefile
+++ b/devel/p5-Perl-Critic-Deprecated/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-Critic-Deprecated
 PORTVERSION=	1.119
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-Critic-Deprecated/pkg-plist b/devel/p5-Perl-Critic-Deprecated/pkg-plist
index 5eff184b4f51..245f256b2396 100644
--- a/devel/p5-Perl-Critic-Deprecated/pkg-plist
+++ b/devel/p5-Perl-Critic-Deprecated/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitMixedCaseSubs.pm
 %%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitMixedCaseVars.pm
 %%SITE_PERL%%/Perl/Critic/Utils/PPIRegexp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Critic/Deprecated/.packlist
 %%PERL5_MAN3%%/Perl::Critic::Deprecated.3.gz
 %%PERL5_MAN3%%/Perl::Critic::Policy::Miscellanea::RequireRcsKeywords.3.gz
 %%PERL5_MAN3%%/Perl::Critic::Policy::NamingConventions::ProhibitMixedCaseSubs.3.gz
diff --git a/devel/p5-Perl-Metrics-Lite/Makefile b/devel/p5-Perl-Metrics-Lite/Makefile
index cc27bef84e79..d8fd74c1f3df 100644
--- a/devel/p5-Perl-Metrics-Lite/Makefile
+++ b/devel/p5-Perl-Metrics-Lite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Perl-Metrics-Lite
 PORTVERSION=	0.080
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-Metrics-Lite/pkg-plist b/devel/p5-Perl-Metrics-Lite/pkg-plist
index cf03a60daafe..e50ce66fc8e3 100644
--- a/devel/p5-Perl-Metrics-Lite/pkg-plist
+++ b/devel/p5-Perl-Metrics-Lite/pkg-plist
@@ -2,7 +2,6 @@ bin/measureperl
 bin/measureperl-checkstyle
 man/man1/measureperl-checkstyle.1.gz
 man/man1/measureperl.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Metrics/Lite/.packlist
 %%SITE_PERL%%/Perl/Metrics/Lite.pm
 %%SITE_PERL%%/Perl/Metrics/Lite/Analysis.pm
 %%SITE_PERL%%/Perl/Metrics/Lite/Analysis/DocumentFactory.pm
diff --git a/devel/p5-Perl-Metrics-Simple/Makefile b/devel/p5-Perl-Metrics-Simple/Makefile
index 08eb68d60997..a3b35b7ba56b 100644
--- a/devel/p5-Perl-Metrics-Simple/Makefile
+++ b/devel/p5-Perl-Metrics-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Perl-Metrics-Simple
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-Metrics-Simple/pkg-plist b/devel/p5-Perl-Metrics-Simple/pkg-plist
index c63ab3b1ba2b..cc5e0e92f324 100644
--- a/devel/p5-Perl-Metrics-Simple/pkg-plist
+++ b/devel/p5-Perl-Metrics-Simple/pkg-plist
@@ -3,7 +3,6 @@ man/man1/countperl.1.gz
 %%PERL5_MAN3%%/Perl::Metrics::Simple.3.gz
 %%PERL5_MAN3%%/Perl::Metrics::Simple::Analysis.3.gz
 %%PERL5_MAN3%%/Perl::Metrics::Simple::Analysis::File.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Metrics/Simple/.packlist
 %%SITE_PERL%%/Perl/Metrics/Simple.pm
 %%SITE_PERL%%/Perl/Metrics/Simple/Analysis.pm
 %%SITE_PERL%%/Perl/Metrics/Simple/Analysis/File.pm
diff --git a/devel/p5-Perl-OSType/Makefile b/devel/p5-Perl-OSType/Makefile
index 6570f744a93f..c17a13682e0f 100644
--- a/devel/p5-Perl-OSType/Makefile
+++ b/devel/p5-Perl-OSType/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-OSType
 PORTVERSION=	1.007
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-OSType/pkg-plist b/devel/p5-Perl-OSType/pkg-plist
index d441091bb2c7..df404f2cd76a 100644
--- a/devel/p5-Perl-OSType/pkg-plist
+++ b/devel/p5-Perl-OSType/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Perl/OSType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/OSType/.packlist
 %%PERL5_MAN3%%/Perl::OSType.3.gz
diff --git a/devel/p5-Perl-PrereqScanner-Lite/Makefile b/devel/p5-Perl-PrereqScanner-Lite/Makefile
index 8f3dd7d2c099..67f9766b8183 100644
--- a/devel/p5-Perl-PrereqScanner-Lite/Makefile
+++ b/devel/p5-Perl-PrereqScanner-Lite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Perl-PrereqScanner-Lite
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-PrereqScanner/Makefile b/devel/p5-Perl-PrereqScanner/Makefile
index 4fab59a8d9ae..94572fbacd8e 100644
--- a/devel/p5-Perl-PrereqScanner/Makefile
+++ b/devel/p5-Perl-PrereqScanner/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-PrereqScanner
 PORTVERSION=	1.018
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-PrereqScanner/pkg-plist b/devel/p5-Perl-PrereqScanner/pkg-plist
index 4167417d8ca8..03045c0f74dc 100644
--- a/devel/p5-Perl-PrereqScanner/pkg-plist
+++ b/devel/p5-Perl-PrereqScanner/pkg-plist
@@ -8,7 +8,6 @@ bin/scan-perl-prereqs
 %%SITE_PERL%%/Perl/PrereqScanner/Scanner/Perl5.pm
 %%SITE_PERL%%/Perl/PrereqScanner/Scanner/Superclass.pm
 %%SITE_PERL%%/Perl/PrereqScanner/Scanner/TestMore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/PrereqScanner/.packlist
 man/man1/scan-perl-prereqs.1.gz
 man/man1/scan_prereqs.1.gz
 %%PERL5_MAN3%%/Perl::PrereqScanner.3.gz
diff --git a/devel/p5-Perl-Tidy/Makefile b/devel/p5-Perl-Tidy/Makefile
index 5747c649a740..034b2c31a5e7 100644
--- a/devel/p5-Perl-Tidy/Makefile
+++ b/devel/p5-Perl-Tidy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-Tidy
 PORTVERSION=	20140711
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Perl
diff --git a/devel/p5-Perl-Tidy/pkg-plist b/devel/p5-Perl-Tidy/pkg-plist
index a0e617a5d4ec..769d46001d1a 100644
--- a/devel/p5-Perl-Tidy/pkg-plist
+++ b/devel/p5-Perl-Tidy/pkg-plist
@@ -1,6 +1,5 @@
 bin/perltidy
 %%SITE_PERL%%/Perl/Tidy.pm
 %%SITE_PERL%%/Perl/Tidy.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Tidy/.packlist
 %%PERL5_MAN3%%/Perl::Tidy.3.gz
 man/man1/perltidy.1.gz
diff --git a/devel/p5-Perl-Unsafe-Signals/Makefile b/devel/p5-Perl-Unsafe-Signals/Makefile
index 6fd0a8dbfe68..c4f6152b264e 100644
--- a/devel/p5-Perl-Unsafe-Signals/Makefile
+++ b/devel/p5-Perl-Unsafe-Signals/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-Unsafe-Signals
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-Unsafe-Signals/pkg-plist b/devel/p5-Perl-Unsafe-Signals/pkg-plist
index 8c94291d97db..3f184460cf7e 100644
--- a/devel/p5-Perl-Unsafe-Signals/pkg-plist
+++ b/devel/p5-Perl-Unsafe-Signals/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Unsafe/Signals/Signals.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Unsafe/Signals/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Perl/Unsafe/Signals.pm
+%%SITE_ARCH%%/auto/Perl/Unsafe/Signals/Signals.so
+%%SITE_ARCH%%/Perl/Unsafe/Signals.pm
 %%PERL5_MAN3%%/Perl::Unsafe::Signals.3.gz
diff --git a/devel/p5-Perl-Version/Makefile b/devel/p5-Perl-Version/Makefile
index 93515603595b..e79ff47c07a4 100644
--- a/devel/p5-Perl-Version/Makefile
+++ b/devel/p5-Perl-Version/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-Version
 PORTVERSION=	1.013
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl-Version/pkg-plist b/devel/p5-Perl-Version/pkg-plist
index 795682cd93cb..ae9d1244135a 100644
--- a/devel/p5-Perl-Version/pkg-plist
+++ b/devel/p5-Perl-Version/pkg-plist
@@ -2,4 +2,3 @@ bin/perl-reversion
 man/man1/perl-reversion.1.gz
 %%PERL5_MAN3%%/Perl::Version.3.gz
 %%SITE_PERL%%/Perl/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Version/.packlist
diff --git a/devel/p5-Perl6-Builtins/Makefile b/devel/p5-Perl6-Builtins/Makefile
index 91f0266ea83b..4c9218b39cf3 100644
--- a/devel/p5-Perl6-Builtins/Makefile
+++ b/devel/p5-Perl6-Builtins/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl6-Builtins
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Builtins/pkg-plist b/devel/p5-Perl6-Builtins/pkg-plist
index f339da15c36e..e996aea12923 100644
--- a/devel/p5-Perl6-Builtins/pkg-plist
+++ b/devel/p5-Perl6-Builtins/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Perl6::Builtins.3.gz
 %%SITE_PERL%%/Perl6/Builtins.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Builtins/.packlist
diff --git a/devel/p5-Perl6-Export-Attrs/Makefile b/devel/p5-Perl6-Export-Attrs/Makefile
index d7364b68f3cd..67482de9b95c 100644
--- a/devel/p5-Perl6-Export-Attrs/Makefile
+++ b/devel/p5-Perl6-Export-Attrs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl6-Export-Attrs
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Export-Attrs/pkg-plist b/devel/p5-Perl6-Export-Attrs/pkg-plist
index bc8871d9d8aa..d9d68ab0576b 100644
--- a/devel/p5-Perl6-Export-Attrs/pkg-plist
+++ b/devel/p5-Perl6-Export-Attrs/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Perl6::Export::Attrs.3.gz
 %%SITE_PERL%%/Perl6/Export/Attrs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export/Attrs/.packlist
diff --git a/devel/p5-Perl6-Export/Makefile b/devel/p5-Perl6-Export/Makefile
index 4db30b565c89..8c8ce640499d 100644
--- a/devel/p5-Perl6-Export/Makefile
+++ b/devel/p5-Perl6-Export/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Perl6-Export
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Export/pkg-plist b/devel/p5-Perl6-Export/pkg-plist
index a79eb013b886..fae91ef873f7 100644
--- a/devel/p5-Perl6-Export/pkg-plist
+++ b/devel/p5-Perl6-Export/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Perl6/Export.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export/.packlist
 %%PERL5_MAN3%%/Perl6::Export.3.gz
diff --git a/devel/p5-Perl6-Form/Makefile b/devel/p5-Perl6-Form/Makefile
index aba0de61705f..9bf93fb50f05 100644
--- a/devel/p5-Perl6-Form/Makefile
+++ b/devel/p5-Perl6-Form/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl6-Form
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Form/pkg-plist b/devel/p5-Perl6-Form/pkg-plist
index 192605ec8188..08078b64d674 100644
--- a/devel/p5-Perl6-Form/pkg-plist
+++ b/devel/p5-Perl6-Form/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Perl6/Form.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Form/.packlist
 %%PERL5_MAN3%%/Perl6::Form.3.gz
diff --git a/devel/p5-Perl6-Junction/Makefile b/devel/p5-Perl6-Junction/Makefile
index f26aeda8f1fd..713b9469b815 100644
--- a/devel/p5-Perl6-Junction/Makefile
+++ b/devel/p5-Perl6-Junction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl6-Junction
 PORTVERSION=	1.60000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Junction/pkg-plist b/devel/p5-Perl6-Junction/pkg-plist
index 37637abd887f..0043df1f1302 100644
--- a/devel/p5-Perl6-Junction/pkg-plist
+++ b/devel/p5-Perl6-Junction/pkg-plist
@@ -5,4 +5,3 @@
 %%SITE_PERL%%/Perl6/Junction/Base.pm
 %%SITE_PERL%%/Perl6/Junction/None.pm
 %%SITE_PERL%%/Perl6/Junction/One.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Junction/.packlist
diff --git a/devel/p5-Perl6-Rules/Makefile b/devel/p5-Perl6-Rules/Makefile
index 9665ebdc2d60..293ecc1e27de 100644
--- a/devel/p5-Perl6-Rules/Makefile
+++ b/devel/p5-Perl6-Rules/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl6-Rules
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Rules/pkg-plist b/devel/p5-Perl6-Rules/pkg-plist
index fdd4a84a1cc4..8816451a4605 100644
--- a/devel/p5-Perl6-Rules/pkg-plist
+++ b/devel/p5-Perl6-Rules/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Perl6::Rules.3.gz
 %%SITE_PERL%%/Perl6/Rules.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Rules/.packlist
diff --git a/devel/p5-Perl6-Say/Makefile b/devel/p5-Perl6-Say/Makefile
index 53201edc1c1d..95c558df6d58 100644
--- a/devel/p5-Perl6-Say/Makefile
+++ b/devel/p5-Perl6-Say/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl6-Say
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Say/pkg-plist b/devel/p5-Perl6-Say/pkg-plist
index dcacc0e5b62d..d0482a9ec4a6 100644
--- a/devel/p5-Perl6-Say/pkg-plist
+++ b/devel/p5-Perl6-Say/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Perl6::Say.3.gz
 %%SITE_PERL%%/Perl6/Say.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Say/.packlist
diff --git a/devel/p5-Perl6-Slurp/Makefile b/devel/p5-Perl6-Slurp/Makefile
index 77a989dcfdff..517fab2a2882 100644
--- a/devel/p5-Perl6-Slurp/Makefile
+++ b/devel/p5-Perl6-Slurp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl6-Slurp
 PORTVERSION=	0.05.1005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Perl6-Slurp/pkg-plist b/devel/p5-Perl6-Slurp/pkg-plist
index dc0d4f908bfa..16c380a9aaab 100644
--- a/devel/p5-Perl6-Slurp/pkg-plist
+++ b/devel/p5-Perl6-Slurp/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Perl6/Slurp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Slurp/.packlist
 %%PERL5_MAN3%%/Perl6::Slurp.3.gz
diff --git a/devel/p5-PerlIO-Layers/Makefile b/devel/p5-PerlIO-Layers/Makefile
index 83939a270797..1e37f4abe0eb 100644
--- a/devel/p5-PerlIO-Layers/Makefile
+++ b/devel/p5-PerlIO-Layers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-Layers
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-Layers/pkg-plist b/devel/p5-PerlIO-Layers/pkg-plist
index 302d3d253a8a..8a452e0d6249 100644
--- a/devel/p5-PerlIO-Layers/pkg-plist
+++ b/devel/p5-PerlIO-Layers/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/Layers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/Layers/Layers.so
+%%SITE_ARCH%%/PerlIO/Layers.pm
+%%SITE_ARCH%%/auto/PerlIO/Layers/Layers.so
 %%PERL5_MAN3%%/PerlIO::Layers.3.gz
diff --git a/devel/p5-PerlIO-Util/Makefile b/devel/p5-PerlIO-Util/Makefile
index 4c6adedee841..69e2482b1ba9 100644
--- a/devel/p5-PerlIO-Util/Makefile
+++ b/devel/p5-PerlIO-Util/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PerlIO-Util
 PORTVERSION=	0.72
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-Util/pkg-plist b/devel/p5-PerlIO-Util/pkg-plist
index 379994efc9c2..7b352cef37e5 100644
--- a/devel/p5-PerlIO-Util/pkg-plist
+++ b/devel/p5-PerlIO-Util/pkg-plist
@@ -1,13 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/Util/JA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/creat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/dir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/excl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/flock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/reverse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/tee.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/Util/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/Util/Util.so
+%%SITE_ARCH%%/PerlIO/Util.pm
+%%SITE_ARCH%%/PerlIO/Util/JA.pod
+%%SITE_ARCH%%/PerlIO/creat.pm
+%%SITE_ARCH%%/PerlIO/dir.pm
+%%SITE_ARCH%%/PerlIO/excl.pm
+%%SITE_ARCH%%/PerlIO/flock.pm
+%%SITE_ARCH%%/PerlIO/reverse.pm
+%%SITE_ARCH%%/PerlIO/tee.pm
+%%SITE_ARCH%%/auto/PerlIO/Util/Util.so
 %%PERL5_MAN3%%/PerlIO::Util.3.gz
 %%PERL5_MAN3%%/PerlIO::Util::JA.3.gz
 %%PERL5_MAN3%%/PerlIO::creat.3.gz
diff --git a/devel/p5-PerlIO-eol/Makefile b/devel/p5-PerlIO-eol/Makefile
index ad5107a15cb0..8ab7563b2b13 100644
--- a/devel/p5-PerlIO-eol/Makefile
+++ b/devel/p5-PerlIO-eol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-eol
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-eol/pkg-plist b/devel/p5-PerlIO-eol/pkg-plist
index 5c690d2b79b2..618aaf1ecbd3 100644
--- a/devel/p5-PerlIO-eol/pkg-plist
+++ b/devel/p5-PerlIO-eol/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/eol/eol.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/eol/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/eol.pm
+%%SITE_ARCH%%/auto/PerlIO/eol/eol.so
+%%SITE_ARCH%%/PerlIO/eol.pm
 %%PERL5_MAN3%%/PerlIO::eol.3.gz
diff --git a/devel/p5-PerlIO-locale/Makefile b/devel/p5-PerlIO-locale/Makefile
index a1e8a268064f..ca9a1a5c63bc 100644
--- a/devel/p5-PerlIO-locale/Makefile
+++ b/devel/p5-PerlIO-locale/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-locale
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-locale/pkg-plist b/devel/p5-PerlIO-locale/pkg-plist
index 5164fb819e24..793a4b75fa11 100644
--- a/devel/p5-PerlIO-locale/pkg-plist
+++ b/devel/p5-PerlIO-locale/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/PerlIO::locale.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/locale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale/locale.so
+%%SITE_ARCH%%/PerlIO/locale.pm
+%%SITE_ARCH%%/auto/PerlIO/locale/locale.so
diff --git a/devel/p5-PerlIO-utf8_strict/Makefile b/devel/p5-PerlIO-utf8_strict/Makefile
index 9bb9ae44a481..f5fbd1610d1d 100644
--- a/devel/p5-PerlIO-utf8_strict/Makefile
+++ b/devel/p5-PerlIO-utf8_strict/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-utf8_strict
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-utf8_strict/pkg-plist b/devel/p5-PerlIO-utf8_strict/pkg-plist
index 710e8d571b9c..05fd7f4b8768 100644
--- a/devel/p5-PerlIO-utf8_strict/pkg-plist
+++ b/devel/p5-PerlIO-utf8_strict/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/utf8_strict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/utf8_strict/utf8_strict.so
+%%SITE_ARCH%%/PerlIO/utf8_strict.pm
+%%SITE_ARCH%%/auto/PerlIO/utf8_strict/utf8_strict.so
 %%PERL5_MAN3%%/PerlIO::utf8_strict.3.gz
diff --git a/devel/p5-PerlIO-via-MD5/Makefile b/devel/p5-PerlIO-via-MD5/Makefile
index 6df265b8ca66..98918ea562cb 100644
--- a/devel/p5-PerlIO-via-MD5/Makefile
+++ b/devel/p5-PerlIO-via-MD5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-via-MD5
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-via-MD5/pkg-plist b/devel/p5-PerlIO-via-MD5/pkg-plist
index 1e80e78b1d55..2a38965ecd09 100644
--- a/devel/p5-PerlIO-via-MD5/pkg-plist
+++ b/devel/p5-PerlIO-via-MD5/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/PerlIO::via::MD5.3.gz
 %%SITE_PERL%%/PerlIO/via/MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/MD5/.packlist
diff --git a/devel/p5-PerlIO-via-dynamic/Makefile b/devel/p5-PerlIO-via-dynamic/Makefile
index 9dd16d64435d..cc22bf0c0531 100644
--- a/devel/p5-PerlIO-via-dynamic/Makefile
+++ b/devel/p5-PerlIO-via-dynamic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-via-dynamic
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-via-dynamic/pkg-plist b/devel/p5-PerlIO-via-dynamic/pkg-plist
index 0107a5c7f393..d82407e043cb 100644
--- a/devel/p5-PerlIO-via-dynamic/pkg-plist
+++ b/devel/p5-PerlIO-via-dynamic/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/PerlIO/via/dynamic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/dynamic/.packlist
 %%PERL5_MAN3%%/PerlIO::via::dynamic.3.gz
diff --git a/devel/p5-PerlIO-via-symlink/Makefile b/devel/p5-PerlIO-via-symlink/Makefile
index 03a9ed0dd446..e9cb4633a0ab 100644
--- a/devel/p5-PerlIO-via-symlink/Makefile
+++ b/devel/p5-PerlIO-via-symlink/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlIO-via-symlink
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-PerlIO-via-symlink/pkg-plist b/devel/p5-PerlIO-via-symlink/pkg-plist
index d781355fc439..aa499de6b304 100644
--- a/devel/p5-PerlIO-via-symlink/pkg-plist
+++ b/devel/p5-PerlIO-via-symlink/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/PerlIO/via/symlink.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/symlink/.packlist
 %%PERL5_MAN3%%/PerlIO::via::symlink.3.gz
diff --git a/devel/p5-Pid-File-Flock/Makefile b/devel/p5-Pid-File-Flock/Makefile
index 1148a7e1449e..7f8d671f355e 100644
--- a/devel/p5-Pid-File-Flock/Makefile
+++ b/devel/p5-Pid-File-Flock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pid-File-Flock
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LONERR
diff --git a/devel/p5-Pid-File-Flock/pkg-plist b/devel/p5-Pid-File-Flock/pkg-plist
index e962ad5bcef6..de258038a393 100644
--- a/devel/p5-Pid-File-Flock/pkg-plist
+++ b/devel/p5-Pid-File-Flock/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Pid/File/Flock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pid/File/Flock/.packlist
 %%PERL5_MAN3%%/Pid::File::Flock.3.gz
diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile
index a13346ef0dff..763b39cded8f 100644
--- a/devel/p5-Pipeline/Makefile
+++ b/devel/p5-Pipeline/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pipeline
 PORTVERSION=	3.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RCLAMP
diff --git a/devel/p5-Pipeline/pkg-plist b/devel/p5-Pipeline/pkg-plist
index 32ec917ced59..b1977fd8eaf5 100644
--- a/devel/p5-Pipeline/pkg-plist
+++ b/devel/p5-Pipeline/pkg-plist
@@ -16,7 +16,6 @@
 %%SITE_PERL%%/Pipeline/Store.pm
 %%SITE_PERL%%/Pipeline/Store/ISA.pm
 %%SITE_PERL%%/Pipeline/Store/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pipeline/.packlist
 %%PERL5_MAN3%%/Pipeline::Segment.3.gz
 %%PERL5_MAN3%%/Pipeline::Store::ISA.3.gz
 %%PERL5_MAN3%%/Pipeline.3.gz
diff --git a/devel/p5-Pithub/Makefile b/devel/p5-Pithub/Makefile
index ebcb371e1c92..9a2e1e3c6b26 100644
--- a/devel/p5-Pithub/Makefile
+++ b/devel/p5-Pithub/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pithub
 PORTVERSION=	0.01025
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PLU
diff --git a/devel/p5-Pithub/pkg-plist b/devel/p5-Pithub/pkg-plist
index 3888c13b3b5a..ca9a97938bd1 100644
--- a/devel/p5-Pithub/pkg-plist
+++ b/devel/p5-Pithub/pkg-plist
@@ -40,7 +40,6 @@
 %%SITE_PERL%%/Pithub/Users/Emails.pm
 %%SITE_PERL%%/Pithub/Users/Followers.pm
 %%SITE_PERL%%/Pithub/Users/Keys.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pithub/.packlist
 %%PERL5_MAN3%%/Pithub.3.gz
 %%PERL5_MAN3%%/Pithub::Base.3.gz
 %%PERL5_MAN3%%/Pithub::Events.3.gz
diff --git a/devel/p5-PkgConfig/Makefile b/devel/p5-PkgConfig/Makefile
index c51220d4567b..50e8c66e66df 100644
--- a/devel/p5-PkgConfig/Makefile
+++ b/devel/p5-PkgConfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PkgConfig
 PORTVERSION=	0.08526
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PLICEASE
diff --git a/devel/p5-PkgConfig/pkg-plist b/devel/p5-PkgConfig/pkg-plist
index d9fad7d0dfb2..cbe4361951e4 100644
--- a/devel/p5-PkgConfig/pkg-plist
+++ b/devel/p5-PkgConfig/pkg-plist
@@ -1,7 +1,6 @@
 bin/pkg-config.pl
 bin/ppkg-config
 %%SITE_PERL%%/PkgConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PkgConfig/.packlist
 %%PERL5_MAN3%%/PkgConfig.3.gz
 man/man1/pkg-config.pl.1.gz
 man/man1/ppkg-config.1.gz
diff --git a/devel/p5-Pod-Coverage-Moose/Makefile b/devel/p5-Pod-Coverage-Moose/Makefile
index 57a4d51c5fbc..1f4c991743bb 100644
--- a/devel/p5-Pod-Coverage-Moose/Makefile
+++ b/devel/p5-Pod-Coverage-Moose/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Coverage-Moose
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Pod-Coverage-Moose/pkg-plist b/devel/p5-Pod-Coverage-Moose/pkg-plist
index cbb174df6990..d51d25c78265 100644
--- a/devel/p5-Pod-Coverage-Moose/pkg-plist
+++ b/devel/p5-Pod-Coverage-Moose/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Pod::Coverage::Moose.3.gz
 %%SITE_PERL%%/Pod/Coverage/Moose.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage/Moose/.packlist
diff --git a/devel/p5-Pod-Coverage-TrustPod/Makefile b/devel/p5-Pod-Coverage-TrustPod/Makefile
index a4d8605324e7..f34a854cc043 100644
--- a/devel/p5-Pod-Coverage-TrustPod/Makefile
+++ b/devel/p5-Pod-Coverage-TrustPod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Coverage-TrustPod
 PORTVERSION=	0.100003
+PORTREVISION=	1
 CATEGORIES=	devel textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Pod-Coverage-TrustPod/pkg-plist b/devel/p5-Pod-Coverage-TrustPod/pkg-plist
index 61562c72fd44..78dd7a5ead25 100644
--- a/devel/p5-Pod-Coverage-TrustPod/pkg-plist
+++ b/devel/p5-Pod-Coverage-TrustPod/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Pod/Coverage/TrustPod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage/TrustPod/.packlist
 %%PERL5_MAN3%%/Pod::Coverage::TrustPod.3.gz
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index 26d9e89f7db0..bc9266d68e9a 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Coverage
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Pod-Coverage/pkg-plist b/devel/p5-Pod-Coverage/pkg-plist
index 472cda076d3e..51a672723c5b 100644
--- a/devel/p5-Pod-Coverage/pkg-plist
+++ b/devel/p5-Pod-Coverage/pkg-plist
@@ -7,4 +7,3 @@ bin/pod_cover
 %%SITE_PERL%%/Pod/Coverage/CountParents.pm
 %%SITE_PERL%%/Pod/Coverage/ExportOnly.pm
 %%SITE_PERL%%/Pod/Coverage/Overloader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage/.packlist
diff --git a/devel/p5-Pod-Tests/Makefile b/devel/p5-Pod-Tests/Makefile
index 3209f3b97fb9..49c0e68be372 100644
--- a/devel/p5-Pod-Tests/Makefile
+++ b/devel/p5-Pod-Tests/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pod-Tests
 PORTVERSION=	1.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Pod-Tests/pkg-plist b/devel/p5-Pod-Tests/pkg-plist
index b9a7daa8a70e..faefcf8adbce 100644
--- a/devel/p5-Pod-Tests/pkg-plist
+++ b/devel/p5-Pod-Tests/pkg-plist
@@ -1,5 +1,4 @@
 bin/pod2test
 %%PERL5_MAN3%%/Pod::Tests.3.gz
 %%SITE_PERL%%/Pod/Tests.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tests/.packlist
 man/man1/pod2test.1.gz
diff --git a/devel/p5-Pragmatic/Makefile b/devel/p5-Pragmatic/Makefile
index bcd22092e53d..b6f99fc005bf 100644
--- a/devel/p5-Pragmatic/Makefile
+++ b/devel/p5-Pragmatic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pragmatic
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINKLEY
diff --git a/devel/p5-Pragmatic/pkg-plist b/devel/p5-Pragmatic/pkg-plist
index 3b74c5095e5c..b4667e115455 100644
--- a/devel/p5-Pragmatic/pkg-plist
+++ b/devel/p5-Pragmatic/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Pragmatic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pragmatic/.packlist
 %%PERL5_MAN3%%/Pragmatic.3.gz
diff --git a/devel/p5-Proc-BackOff/Makefile b/devel/p5-Proc-BackOff/Makefile
index 5171c0f4846b..6c8726032b4a 100644
--- a/devel/p5-Proc-BackOff/Makefile
+++ b/devel/p5-Proc-BackOff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-BackOff
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-BackOff/pkg-plist b/devel/p5-Proc-BackOff/pkg-plist
index 0ee04c5548bd..1b2e2ab82807 100644
--- a/devel/p5-Proc-BackOff/pkg-plist
+++ b/devel/p5-Proc-BackOff/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Proc/BackOff/Exponential.pm
 %%SITE_PERL%%/Proc/BackOff/Linear.pm
 %%SITE_PERL%%/Proc/BackOff/Random.pm
-%%SITE_PERL%%/mach/auto/Proc/BackOff/.packlist
diff --git a/devel/p5-Proc-Background/Makefile b/devel/p5-Proc-Background/Makefile
index 052ecf2badc9..ad71265e3efd 100644
--- a/devel/p5-Proc-Background/Makefile
+++ b/devel/p5-Proc-Background/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-Background
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Background/pkg-plist b/devel/p5-Proc-Background/pkg-plist
index b9382f8f924c..59efbfaa7fb7 100644
--- a/devel/p5-Proc-Background/pkg-plist
+++ b/devel/p5-Proc-Background/pkg-plist
@@ -3,7 +3,6 @@ man/man1/timed-process.1.gz
 %%SITE_PERL%%/Proc/Background.pm
 %%SITE_PERL%%/Proc/Background/Unix.pm
 %%SITE_PERL%%/Proc/Background/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Background/.packlist
 %%PERL5_MAN3%%/Proc::Background.3.gz
 %%PERL5_MAN3%%/Proc::Background::Unix.3.gz
 %%PERL5_MAN3%%/Proc::Background::Win32.3.gz
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index 018c1aa709d9..da0944aba5f8 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-Daemon
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Daemon/pkg-plist b/devel/p5-Proc-Daemon/pkg-plist
index d82939e0e5c7..8b0665a6d409 100644
--- a/devel/p5-Proc-Daemon/pkg-plist
+++ b/devel/p5-Proc-Daemon/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Proc/Daemon.pm
 %%SITE_PERL%%/Proc/Daemon.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Daemon/.packlist
 %%PERL5_MAN3%%/Proc::Daemon.3.gz
diff --git a/devel/p5-Proc-Fork/Makefile b/devel/p5-Proc-Fork/Makefile
index f5d96d8e3f54..36d64813be16 100644
--- a/devel/p5-Proc-Fork/Makefile
+++ b/devel/p5-Proc-Fork/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Proc-Fork
 PORTVERSION=	0.802
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Fork/pkg-plist b/devel/p5-Proc-Fork/pkg-plist
index 1501a2de3bf4..424c17bf2782 100644
--- a/devel/p5-Proc-Fork/pkg-plist
+++ b/devel/p5-Proc-Fork/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Proc::Fork.3.gz
 %%SITE_PERL%%/Proc/Fork.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Fork/.packlist
diff --git a/devel/p5-Proc-Guard/Makefile b/devel/p5-Proc-Guard/Makefile
index c7f224e74a4f..cb056a8166d1 100644
--- a/devel/p5-Proc-Guard/Makefile
+++ b/devel/p5-Proc-Guard/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Proc-Guard
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Guard/pkg-plist b/devel/p5-Proc-Guard/pkg-plist
index ad60d1f8ab7b..8a5de543734e 100644
--- a/devel/p5-Proc-Guard/pkg-plist
+++ b/devel/p5-Proc-Guard/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Guard/.packlist
 %%SITE_PERL%%/Proc/Guard.pm
 %%PERL5_MAN3%%/Proc::Guard.3.gz
diff --git a/devel/p5-Proc-PID-File/Makefile b/devel/p5-Proc-PID-File/Makefile
index acc08af574df..be19a7351520 100644
--- a/devel/p5-Proc-PID-File/Makefile
+++ b/devel/p5-Proc-PID-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-PID-File
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-PID-File/pkg-plist b/devel/p5-Proc-PID-File/pkg-plist
index 9ee09f06971b..b270448320c9 100644
--- a/devel/p5-Proc-PID-File/pkg-plist
+++ b/devel/p5-Proc-PID-File/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Proc/PID/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PID/File/.packlist
 %%PERL5_MAN3%%/Proc::PID::File.3.gz
diff --git a/devel/p5-Proc-Pidfile/Makefile b/devel/p5-Proc-Pidfile/Makefile
index 4cf5e7147868..c1ec9d589c6b 100644
--- a/devel/p5-Proc-Pidfile/Makefile
+++ b/devel/p5-Proc-Pidfile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Proc-Pidfile
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Pidfile/pkg-plist b/devel/p5-Proc-Pidfile/pkg-plist
index acfe918a5699..2069f2d8f35b 100644
--- a/devel/p5-Proc-Pidfile/pkg-plist
+++ b/devel/p5-Proc-Pidfile/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Proc::Pidfile.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Pidfile/.packlist
 %%SITE_PERL%%/Proc/Pidfile.pm
diff --git a/devel/p5-Proc-ProcessTable/Makefile b/devel/p5-Proc-ProcessTable/Makefile
index d1a796ecfcfc..7628b959bb28 100644
--- a/devel/p5-Proc-ProcessTable/Makefile
+++ b/devel/p5-Proc-ProcessTable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-ProcessTable
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JWB
diff --git a/devel/p5-Proc-ProcessTable/pkg-plist b/devel/p5-Proc-ProcessTable/pkg-plist
index 62a2e54ab281..71e53b97725d 100644
--- a/devel/p5-Proc-ProcessTable/pkg-plist
+++ b/devel/p5-Proc-ProcessTable/pkg-plist
@@ -2,11 +2,10 @@
 %%PERL5_MAN3%%/Proc::Killfam.3.gz
 %%PERL5_MAN3%%/Proc::ProcessTable.3.gz
 %%PERL5_MAN3%%/Proc::ProcessTable::Process.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Proc/Killall.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Proc/Killfam.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Proc/ProcessTable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Proc/ProcessTable/Process.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Proc/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable/Process/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable/ProcessTable.so
+%%SITE_ARCH%%/Proc/Killall.pm
+%%SITE_ARCH%%/Proc/Killfam.pm
+%%SITE_ARCH%%/Proc/ProcessTable.pm
+%%SITE_ARCH%%/Proc/ProcessTable/Process.pm
+%%SITE_ARCH%%/Proc/example.pl
+%%SITE_ARCH%%/auto/Proc/ProcessTable/Process/autosplit.ix
+%%SITE_ARCH%%/auto/Proc/ProcessTable/ProcessTable.so
diff --git a/devel/p5-Proc-Queue/Makefile b/devel/p5-Proc-Queue/Makefile
index cf739959e03a..7400ea8de0ef 100644
--- a/devel/p5-Proc-Queue/Makefile
+++ b/devel/p5-Proc-Queue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-Queue
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Queue/pkg-plist b/devel/p5-Proc-Queue/pkg-plist
index 50a70ccbf2a0..cf374d059f54 100644
--- a/devel/p5-Proc-Queue/pkg-plist
+++ b/devel/p5-Proc-Queue/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Proc/Queue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Queue/.packlist
 %%PERL5_MAN3%%/Proc::Queue.3.gz
diff --git a/devel/p5-Proc-Reliable/Makefile b/devel/p5-Proc-Reliable/Makefile
index d1f4d52b3fc6..44d5614fee0c 100644
--- a/devel/p5-Proc-Reliable/Makefile
+++ b/devel/p5-Proc-Reliable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-Reliable
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Reliable/pkg-plist b/devel/p5-Proc-Reliable/pkg-plist
index c09a8f7fdc68..090641c1889f 100644
--- a/devel/p5-Proc-Reliable/pkg-plist
+++ b/devel/p5-Proc-Reliable/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/Proc/Reliable.pm
 %%SITE_PERL%%/Proc/test_intercept.pl
 %%SITE_PERL%%/auto/Proc/Reliable/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Reliable/.packlist
diff --git a/devel/p5-Proc-SafeExec/Makefile b/devel/p5-Proc-SafeExec/Makefile
index 3b149e50f1c5..92c6d65294a7 100644
--- a/devel/p5-Proc-SafeExec/Makefile
+++ b/devel/p5-Proc-SafeExec/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-SafeExec
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-SafeExec/pkg-plist b/devel/p5-Proc-SafeExec/pkg-plist
index f6dbb4d534d2..8066ad451a9d 100644
--- a/devel/p5-Proc-SafeExec/pkg-plist
+++ b/devel/p5-Proc-SafeExec/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Proc/SafeExec.pm
 %%SITE_PERL%%/Proc/SafeExec/Queue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/SafeExec/.packlist
 %%PERL5_MAN3%%/Proc::SafeExec.3.gz
 %%PERL5_MAN3%%/Proc::SafeExec::Queue.3.gz
diff --git a/devel/p5-Proc-Simple/Makefile b/devel/p5-Proc-Simple/Makefile
index 061acb2b0c7f..70f83e64ee8c 100644
--- a/devel/p5-Proc-Simple/Makefile
+++ b/devel/p5-Proc-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-Simple
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-Simple/pkg-plist b/devel/p5-Proc-Simple/pkg-plist
index 1dbcac475b0c..c583a9c6a5dc 100644
--- a/devel/p5-Proc-Simple/pkg-plist
+++ b/devel/p5-Proc-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Proc/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Simple/.packlist
 %%PERL5_MAN3%%/Proc::Simple.3.gz
diff --git a/devel/p5-Proc-Wait3/Makefile b/devel/p5-Proc-Wait3/Makefile
index c3a8f8019023..d1b1a9b8b67c 100644
--- a/devel/p5-Proc-Wait3/Makefile
+++ b/devel/p5-Proc-Wait3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-Wait3
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Proc
diff --git a/devel/p5-Proc-Wait3/pkg-plist b/devel/p5-Proc-Wait3/pkg-plist
index 536803df1b5f..4bcd05349474 100644
--- a/devel/p5-Proc-Wait3/pkg-plist
+++ b/devel/p5-Proc-Wait3/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Proc/Wait3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Wait3/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Wait3/Wait3.so
+%%SITE_ARCH%%/Proc/Wait3.pm
+%%SITE_ARCH%%/auto/Proc/Wait3/Wait3.so
 %%PERL5_MAN3%%/Proc::Wait3.3.gz
diff --git a/devel/p5-Proc-WaitStat/Makefile b/devel/p5-Proc-WaitStat/Makefile
index 6129c47ee1dd..ab68e90fb0f4 100644
--- a/devel/p5-Proc-WaitStat/Makefile
+++ b/devel/p5-Proc-WaitStat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-WaitStat
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Proc-WaitStat/pkg-plist b/devel/p5-Proc-WaitStat/pkg-plist
index d4af8b7e28e4..0e506c64ecca 100644
--- a/devel/p5-Proc-WaitStat/pkg-plist
+++ b/devel/p5-Proc-WaitStat/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Proc/WaitStat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/WaitStat/.packlist
 %%PERL5_MAN3%%/Proc::WaitStat.3.gz
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index d8d5ba98c884..873265f6d7ef 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Project-Gantt
 PORTVERSION=	1.03
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Project-Gantt/pkg-plist b/devel/p5-Project-Gantt/pkg-plist
index d92e778214c6..95f41c1b4643 100644
--- a/devel/p5-Project-Gantt/pkg-plist
+++ b/devel/p5-Project-Gantt/pkg-plist
@@ -11,4 +11,3 @@
 %%SITE_PERL%%/Project/Gantt/TextUtils.pm
 %%SITE_PERL%%/Project/Gantt/TimeSpan.pm
 %%SITE_PERL%%/Project/Gantt/Vera.ttf
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Project/Gantt/.packlist
diff --git a/devel/p5-Project-Libs/Makefile b/devel/p5-Project-Libs/Makefile
index b0609c593197..c485024e8748 100644
--- a/devel/p5-Project-Libs/Makefile
+++ b/devel/p5-Project-Libs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Project-Libs
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Project-Libs/pkg-plist b/devel/p5-Project-Libs/pkg-plist
index 5ce44fae7d73..df575ced6405 100644
--- a/devel/p5-Project-Libs/pkg-plist
+++ b/devel/p5-Project-Libs/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Project::Libs.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Project/Libs/.packlist
 %%SITE_PERL%%/Project/Libs.pm
diff --git a/devel/p5-Qudo/Makefile b/devel/p5-Qudo/Makefile
index 19925bb46a0e..27f5c45196b9 100644
--- a/devel/p5-Qudo/Makefile
+++ b/devel/p5-Qudo/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Qudo
 PORTVERSION=	0.0213
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
diff --git a/devel/p5-Qudo/pkg-plist b/devel/p5-Qudo/pkg-plist
index 44668467d52d..05fabf3bc55c 100644
--- a/devel/p5-Qudo/pkg-plist
+++ b/devel/p5-Qudo/pkg-plist
@@ -1,5 +1,4 @@
 bin/qudo
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qudo/.packlist
 %%SITE_PERL%%/Qudo.pm
 %%SITE_PERL%%/Qudo/Driver/Skinny.pm
 %%SITE_PERL%%/Qudo/Driver/Skinny/Row/ExceptionLog.pm
diff --git a/devel/p5-RPSL-Parser/Makefile b/devel/p5-RPSL-Parser/Makefile
index f4509f47eb58..14204f73bcf4 100644
--- a/devel/p5-RPSL-Parser/Makefile
+++ b/devel/p5-RPSL-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		RPSL-Parser
 PORTVERSION=		0.04000
+PORTREVISION=	1
 CATEGORIES=		devel perl5
 MASTER_SITES=		CPAN
 MASTER_SITE_SUBDIR=	CPAN:LMC
diff --git a/devel/p5-RPSL-Parser/pkg-plist b/devel/p5-RPSL-Parser/pkg-plist
index b9ac3621617d..ffd5c156b021 100644
--- a/devel/p5-RPSL-Parser/pkg-plist
+++ b/devel/p5-RPSL-Parser/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/RPSL::Parser.3.gz
 %%SITE_PERL%%/RPSL/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPSL/Parser/.packlist
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index a293baea9e7e..d3514f5ad8ee 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RRDTool-OO
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-RRDTool-OO/pkg-plist b/devel/p5-RRDTool-OO/pkg-plist
index a92954b5a68f..d786f522a44c 100644
--- a/devel/p5-RRDTool-OO/pkg-plist
+++ b/devel/p5-RRDTool-OO/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/RRDTool/OO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDTool/OO/.packlist
 %%PERL5_MAN3%%/RRDTool::OO.3.gz
diff --git a/devel/p5-Range-String/Makefile b/devel/p5-Range-String/Makefile
index 320a4120c0ad..4fb8b0dbdf2c 100644
--- a/devel/p5-Range-String/Makefile
+++ b/devel/p5-Range-String/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Range-String
 PORTVERSION=	v0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Range-String/pkg-plist b/devel/p5-Range-String/pkg-plist
index eec3b47d8bcd..81f5ccfcb552 100644
--- a/devel/p5-Range-String/pkg-plist
+++ b/devel/p5-Range-String/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Range/String/Object.pm
 %%SITE_PERL%%/Range/Integer/Parse.pm
 %%SITE_PERL%%/Range/Integer/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Range/String/.packlist
 %%PERL5_MAN3%%/Range::Integer.3.gz
 %%PERL5_MAN3%%/Range::String.3.gz
 %%PERL5_MAN3%%/Range::String::Parse.3.gz
diff --git a/devel/p5-Rcs-Agent/Makefile b/devel/p5-Rcs-Agent/Makefile
index 50003e24a0f1..97d356a063c7 100644
--- a/devel/p5-Rcs-Agent/Makefile
+++ b/devel/p5-Rcs-Agent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rcs-Agent
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Rcs-Agent/pkg-plist b/devel/p5-Rcs-Agent/pkg-plist
index a583274df232..87ca0fbe7469 100644
--- a/devel/p5-Rcs-Agent/pkg-plist
+++ b/devel/p5-Rcs-Agent/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Rcs/Agent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs/Agent/.packlist
 %%PERL5_MAN3%%/Rcs::Agent.3.gz
diff --git a/devel/p5-Rcs/Makefile b/devel/p5-Rcs/Makefile
index 5af4e117b806..c81ceb9cc925 100644
--- a/devel/p5-Rcs/Makefile
+++ b/devel/p5-Rcs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rcs
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Rcs/pkg-plist b/devel/p5-Rcs/pkg-plist
index 50a2ca94e044..ceb782f0c1f8 100644
--- a/devel/p5-Rcs/pkg-plist
+++ b/devel/p5-Rcs/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs/.packlist
 %%SITE_PERL%%/Rcs.pm
 %%PERL5_MAN3%%/Rcs.3.gz
 share/examples/p5-Rcs/project/RCS/Rcs.pm,v
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index a7c30c7cb796..9c4a9a5fd4dc 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ReadLine-Gnu
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=Term
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist
index b4f294fc7288..05b86e38fa33 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-ReadLine-Gnu/pkg-plist
@@ -1,8 +1,7 @@
 bin/perlsh
 man/man1/perlsh.1.gz
 %%PERL5_MAN3%%/Term::ReadLine::Gnu.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine/Gnu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine/Gnu/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/Gnu.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/XS/autosplit.ix
+%%SITE_ARCH%%/Term/ReadLine/Gnu.pm
+%%SITE_ARCH%%/Term/ReadLine/Gnu/XS.pm
+%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/Gnu.so
+%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/autosplit.ix
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index aab273c036d0..88e8e1a15eb7 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ReadLine-Perl
 PORTVERSION=	1.0303
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Term
@@ -16,9 +16,4 @@ COMMENT=	Perl 5 module for Term::ReadLine editing without GNU readline
 USES=		perl5
 USE_PERL5=	configure
 
-post-install:
-	# this port and devel/p5-ReadLine-Perl-TTYtter both install same file
-	# teach this port don't install this file and resolve conflict
-	${RM} ${STAGEDIR}/${SITE_PERL}/${PERL_ARCH}/auto/Term/ReadLine/.packlist
-
 .include <bsd.port.mk>
diff --git a/devel/p5-ReadLine-TTYtter/Makefile b/devel/p5-ReadLine-TTYtter/Makefile
index 1db6d6142dd1..1f7d8b0de387 100644
--- a/devel/p5-ReadLine-TTYtter/Makefile
+++ b/devel/p5-ReadLine-TTYtter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ReadLine-TTYtter
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Term
diff --git a/devel/p5-ReadLine-TTYtter/pkg-plist b/devel/p5-ReadLine-TTYtter/pkg-plist
index 1c78dbce9e92..bf24c45cdddf 100644
--- a/devel/p5-ReadLine-TTYtter/pkg-plist
+++ b/devel/p5-ReadLine-TTYtter/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/ReadLine/TTYtter.pm
 %%SITE_PERL%%/Term/ReadLine/readline_ttytter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/.packlist
diff --git a/devel/p5-Readonly-XS/Makefile b/devel/p5-Readonly-XS/Makefile
index 35e6d77cdb46..8d87c71159b1 100644
--- a/devel/p5-Readonly-XS/Makefile
+++ b/devel/p5-Readonly-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Readonly-XS
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Readonly-XS/pkg-plist b/devel/p5-Readonly-XS/pkg-plist
index c631335e6199..7ffb8d440505 100644
--- a/devel/p5-Readonly-XS/pkg-plist
+++ b/devel/p5-Readonly-XS/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Readonly/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly/XS/XS.so
+%%SITE_ARCH%%/Readonly/XS.pm
+%%SITE_ARCH%%/auto/Readonly/XS/XS.so
 %%PERL5_MAN3%%/Readonly::XS.3.gz
diff --git a/devel/p5-Readonly/Makefile b/devel/p5-Readonly/Makefile
index 100dc88886fc..68bffce5c710 100644
--- a/devel/p5-Readonly/Makefile
+++ b/devel/p5-Readonly/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Readonly
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Reflex/Makefile b/devel/p5-Reflex/Makefile
index a892e9741402..dfea8b1fa9a5 100644
--- a/devel/p5-Reflex/Makefile
+++ b/devel/p5-Reflex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Reflex
 PORTVERSION=	0.099
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RCAPUTO
diff --git a/devel/p5-Reflex/pkg-plist b/devel/p5-Reflex/pkg-plist
index f668cb21987c..9525e30cd6d8 100644
--- a/devel/p5-Reflex/pkg-plist
+++ b/devel/p5-Reflex/pkg-plist
@@ -74,7 +74,6 @@
 %%SITE_PERL%%/Reflex/Trait/Watched.pm
 %%SITE_PERL%%/Reflex/UdpPeer.pm
 %%SITE_PERL%%/Reflex/Wakeup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Reflex/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/TODO.otl
 %%PORTDOCS%%%%DOCSDIR%%/continuation-passing.otl
 %%PORTDOCS%%%%DOCSDIR%%/intro/AfterAwhileClass.pm
diff --git a/devel/p5-Regexp-Assemble-Compressed/Makefile b/devel/p5-Regexp-Assemble-Compressed/Makefile
index 29598b71286e..10c678926d2a 100644
--- a/devel/p5-Regexp-Assemble-Compressed/Makefile
+++ b/devel/p5-Regexp-Assemble-Compressed/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Regexp-Assemble-Compressed
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-Assemble-Compressed/pkg-plist b/devel/p5-Regexp-Assemble-Compressed/pkg-plist
index e8855cb9ec67..7b176ec34ed6 100644
--- a/devel/p5-Regexp-Assemble-Compressed/pkg-plist
+++ b/devel/p5-Regexp-Assemble-Compressed/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Assemble/Compressed/.packlist
 %%SITE_PERL%%/Regexp/Assemble/Compressed.pm
 %%PERL5_MAN3%%/Regexp::Assemble::Compressed.3.gz
diff --git a/devel/p5-Regexp-Assemble/Makefile b/devel/p5-Regexp-Assemble/Makefile
index efd765ea2728..c8fd92d1e188 100644
--- a/devel/p5-Regexp-Assemble/Makefile
+++ b/devel/p5-Regexp-Assemble/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Assemble
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-Assemble/pkg-plist b/devel/p5-Regexp-Assemble/pkg-plist
index a0165647ab34..49520190396a 100644
--- a/devel/p5-Regexp-Assemble/pkg-plist
+++ b/devel/p5-Regexp-Assemble/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Regexp::Assemble.3.gz
 %%SITE_PERL%%/Regexp/Assemble.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Assemble/.packlist
diff --git a/devel/p5-Regexp-Bind/Makefile b/devel/p5-Regexp-Bind/Makefile
index 3e193866f468..26210c67c191 100644
--- a/devel/p5-Regexp-Bind/Makefile
+++ b/devel/p5-Regexp-Bind/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Bind
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-Bind/pkg-plist b/devel/p5-Regexp-Bind/pkg-plist
index bbd647748926..5b009feb551e 100644
--- a/devel/p5-Regexp-Bind/pkg-plist
+++ b/devel/p5-Regexp-Bind/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Regexp::Bind.3.gz
 %%SITE_PERL%%/Regexp/Bind.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Bind/.packlist
diff --git a/devel/p5-Regexp-Compare/Makefile b/devel/p5-Regexp-Compare/Makefile
index f22dda58b4d2..e10389118bcd 100644
--- a/devel/p5-Regexp-Compare/Makefile
+++ b/devel/p5-Regexp-Compare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Compare
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-Compare/pkg-plist b/devel/p5-Regexp-Compare/pkg-plist
index 2ca2f00a73bd..664011fe393e 100644
--- a/devel/p5-Regexp-Compare/pkg-plist
+++ b/devel/p5-Regexp-Compare/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Regexp/Compare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Compare/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Compare/Compare.so
+%%SITE_ARCH%%/Regexp/Compare.pm
+%%SITE_ARCH%%/auto/Regexp/Compare/Compare.so
 %%PERL5_MAN3%%/Regexp::Compare.3.gz
diff --git a/devel/p5-Regexp-Grammars/Makefile b/devel/p5-Regexp-Grammars/Makefile
index f7e1c769c61e..f7253d422d5b 100644
--- a/devel/p5-Regexp-Grammars/Makefile
+++ b/devel/p5-Regexp-Grammars/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Grammars
 PORTVERSION=	1.026
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-RegGrp/Makefile b/devel/p5-Regexp-RegGrp/Makefile
index 0a4a46d5cf7e..bf7eb9d44bf3 100644
--- a/devel/p5-Regexp-RegGrp/Makefile
+++ b/devel/p5-Regexp-RegGrp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-RegGrp
 PORTVERSION=	1.002.001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-RegGrp/pkg-plist b/devel/p5-Regexp-RegGrp/pkg-plist
index eea8e4cf8fa1..6fab1d2275ec 100644
--- a/devel/p5-Regexp-RegGrp/pkg-plist
+++ b/devel/p5-Regexp-RegGrp/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Regexp/RegGrp.pm
 %%SITE_PERL%%/Regexp/RegGrp/Data.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/RegGrp/.packlist
 %%PERL5_MAN3%%/Regexp::RegGrp.3.gz
diff --git a/devel/p5-Regexp-Shellish/Makefile b/devel/p5-Regexp-Shellish/Makefile
index adf5d686f242..54e44e07b6ac 100644
--- a/devel/p5-Regexp-Shellish/Makefile
+++ b/devel/p5-Regexp-Shellish/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Regexp-Shellish
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-Shellish/pkg-plist b/devel/p5-Regexp-Shellish/pkg-plist
index a20909a0d07d..d9c7ceeb6d22 100644
--- a/devel/p5-Regexp-Shellish/pkg-plist
+++ b/devel/p5-Regexp-Shellish/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Regexp/Shellish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Shellish/.packlist
 %%PERL5_MAN3%%/Regexp::Shellish.3.gz
diff --git a/devel/p5-Regexp-Subst-Parallel/Makefile b/devel/p5-Regexp-Subst-Parallel/Makefile
index c2fffe0f6028..650b9b218642 100644
--- a/devel/p5-Regexp-Subst-Parallel/Makefile
+++ b/devel/p5-Regexp-Subst-Parallel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Subst-Parallel
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Regexp-Subst-Parallel/pkg-plist b/devel/p5-Regexp-Subst-Parallel/pkg-plist
index fbdb4100fd69..cc1aa7b3c6dd 100644
--- a/devel/p5-Regexp-Subst-Parallel/pkg-plist
+++ b/devel/p5-Regexp-Subst-Parallel/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Regexp/Subst/Parallel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Subst/Parallel/.packlist
 %%PERL5_MAN3%%/Regexp::Subst::Parallel.3.gz
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index e4d6555f1a5d..c7bebf7f63c6 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Religion
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KJALB
diff --git a/devel/p5-Religion/pkg-plist b/devel/p5-Religion/pkg-plist
index f5fa5382720b..80cfca39adb9 100644
--- a/devel/p5-Religion/pkg-plist
+++ b/devel/p5-Religion/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Religion.3.gz
 %%SITE_PERL%%/Religion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Religion/.packlist
diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile
index 89154f5459aa..c7b0d43887d1 100644
--- a/devel/p5-ResourcePool/Makefile
+++ b/devel/p5-ResourcePool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ResourcePool
 PORTVERSION=	1.0107
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
diff --git a/devel/p5-ResourcePool/pkg-plist b/devel/p5-ResourcePool/pkg-plist
index 2c6f4899066c..0a5bf2da6ac9 100644
--- a/devel/p5-ResourcePool/pkg-plist
+++ b/devel/p5-ResourcePool/pkg-plist
@@ -36,4 +36,3 @@
 %%SITE_PERL%%/ResourcePool/Singleton.pm
 %%SITE_PERL%%/ResourcePool/Singleton.pod
 %%SITE_PERL%%/ResourcePool/UML.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/.packlist
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index f60971014f84..927b8e5ff5c4 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Resources
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Resources/pkg-plist b/devel/p5-Resources/pkg-plist
index f94659e4c98a..e6b0ef7ff2bb 100644
--- a/devel/p5-Resources/pkg-plist
+++ b/devel/p5-Resources/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Resources.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Resources/.packlist
 %%PERL5_MAN3%%/Resources.3.gz
diff --git a/devel/p5-Return-MultiLevel/Makefile b/devel/p5-Return-MultiLevel/Makefile
index 134c3b9d9271..5184b052076b 100644
--- a/devel/p5-Return-MultiLevel/Makefile
+++ b/devel/p5-Return-MultiLevel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Return-MultiLevel
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAUKE
diff --git a/devel/p5-Return-MultiLevel/pkg-plist b/devel/p5-Return-MultiLevel/pkg-plist
index fd0f16492900..8c35ce9866dc 100644
--- a/devel/p5-Return-MultiLevel/pkg-plist
+++ b/devel/p5-Return-MultiLevel/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Return/MultiLevel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Return/MultiLevel/.packlist
 %%PERL5_MAN3%%/Return::MultiLevel.3.gz
diff --git a/devel/p5-Return-Type/Makefile b/devel/p5-Return-Type/Makefile
index 3d7c9c13aaaa..a30fb771c474 100644
--- a/devel/p5-Return-Type/Makefile
+++ b/devel/p5-Return-Type/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Return-Type
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/devel/p5-Return-Type/pkg-plist b/devel/p5-Return-Type/pkg-plist
index dc0c02fdf8f3..f83bd9b803fa 100644
--- a/devel/p5-Return-Type/pkg-plist
+++ b/devel/p5-Return-Type/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Return/Type.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Return/Type/.packlist
 %%PERL5_MAN3%%/Return::Type.3.gz
diff --git a/devel/p5-Return-Value/Makefile b/devel/p5-Return-Value/Makefile
index 804ce13dbec9..0de0a522cc23 100644
--- a/devel/p5-Return-Value/Makefile
+++ b/devel/p5-Return-Value/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Return-Value
 PORTVERSION=	1.666002
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Return-Value/pkg-plist b/devel/p5-Return-Value/pkg-plist
index 52eb8f7394f6..3268bfa1bcf9 100644
--- a/devel/p5-Return-Value/pkg-plist
+++ b/devel/p5-Return-Value/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Return/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Return/Value/.packlist
 %%PERL5_MAN3%%/Return::Value.3.gz
diff --git a/devel/p5-Role-Basic/Makefile b/devel/p5-Role-Basic/Makefile
index 0a5a69bae51b..eca36f103341 100644
--- a/devel/p5-Role-Basic/Makefile
+++ b/devel/p5-Role-Basic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Role-Basic
 PORTVERSION=	0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OVID
diff --git a/devel/p5-Role-Basic/pkg-plist b/devel/p5-Role-Basic/pkg-plist
index 3a0378ee72f4..e925f8bd0b00 100644
--- a/devel/p5-Role-Basic/pkg-plist
+++ b/devel/p5-Role-Basic/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Role::Basic::Philosophy.3.gz
 %%SITE_PERL%%/Role/Basic.pm
 %%SITE_PERL%%/Role/Basic/Philosophy.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Role/Basic/.packlist
diff --git a/devel/p5-Role-HasMessage/Makefile b/devel/p5-Role-HasMessage/Makefile
index ee43a8b0295b..4ff809a6444f 100644
--- a/devel/p5-Role-HasMessage/Makefile
+++ b/devel/p5-Role-HasMessage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Role-HasMessage
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Role-HasMessage/pkg-plist b/devel/p5-Role-HasMessage/pkg-plist
index c28a22205d52..3329b253add7 100644
--- a/devel/p5-Role-HasMessage/pkg-plist
+++ b/devel/p5-Role-HasMessage/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Role/HasMessage.pm
 %%SITE_PERL%%/Role/HasMessage/Errf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Role/HasMessage/.packlist
 %%PERL5_MAN3%%/Role::HasMessage.3.gz
 %%PERL5_MAN3%%/Role::HasMessage::Errf.3.gz
diff --git a/devel/p5-Role-Identifiable/Makefile b/devel/p5-Role-Identifiable/Makefile
index 118dbd80ee14..2629588db265 100644
--- a/devel/p5-Role-Identifiable/Makefile
+++ b/devel/p5-Role-Identifiable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Role-Identifiable
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Role-Identifiable/pkg-plist b/devel/p5-Role-Identifiable/pkg-plist
index 416ba02e3d9b..ea5df0e7d47f 100644
--- a/devel/p5-Role-Identifiable/pkg-plist
+++ b/devel/p5-Role-Identifiable/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Role/Identifiable/HasIdent.pm
 %%SITE_PERL%%/Role/Identifiable/HasTags.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Role/Identifiable/.packlist
 %%PERL5_MAN3%%/Role::Identifiable::HasIdent.3.gz
 %%PERL5_MAN3%%/Role::Identifiable::HasTags.3.gz
diff --git a/devel/p5-Role-Tiny/Makefile b/devel/p5-Role-Tiny/Makefile
index bdcf7139a78f..e92f18c45c82 100644
--- a/devel/p5-Role-Tiny/Makefile
+++ b/devel/p5-Role-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Role-Tiny
 PORTVERSION=	1.003004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
diff --git a/devel/p5-Role-Tiny/pkg-plist b/devel/p5-Role-Tiny/pkg-plist
index 745fa5632afa..4eca30e0d48b 100644
--- a/devel/p5-Role-Tiny/pkg-plist
+++ b/devel/p5-Role-Tiny/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Role/Tiny.pm
 %%SITE_PERL%%/Role/Tiny/With.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Role/Tiny/.packlist
 %%PERL5_MAN3%%/Role::Tiny.3.gz
 %%PERL5_MAN3%%/Role::Tiny::With.3.gz
diff --git a/devel/p5-Rose-DateTime/Makefile b/devel/p5-Rose-DateTime/Makefile
index 8547273063ae..2df41ce4d9ea 100644
--- a/devel/p5-Rose-DateTime/Makefile
+++ b/devel/p5-Rose-DateTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-DateTime
 PORTVERSION=	0.540
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Rose-DateTime/pkg-plist b/devel/p5-Rose-DateTime/pkg-plist
index db5c29937e0e..7809f443c000 100644
--- a/devel/p5-Rose-DateTime/pkg-plist
+++ b/devel/p5-Rose-DateTime/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Rose/DateTime.pm
 %%SITE_PERL%%/Rose/DateTime/Parser.pm
 %%SITE_PERL%%/Rose/DateTime/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/DateTime/.packlist
 %%PERL5_MAN3%%/Rose::DateTime.3.gz
 %%PERL5_MAN3%%/Rose::DateTime::Parser.3.gz
 %%PERL5_MAN3%%/Rose::DateTime::Util.3.gz
diff --git a/devel/p5-Rose-Object/Makefile b/devel/p5-Rose-Object/Makefile
index 2ef06f22b5dc..98cbac5377a8 100644
--- a/devel/p5-Rose-Object/Makefile
+++ b/devel/p5-Rose-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-Object
 PORTVERSION=	0.860
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Rose-Object/pkg-plist b/devel/p5-Rose-Object/pkg-plist
index 41c68b76f6c2..7c2582ddf009 100644
--- a/devel/p5-Rose-Object/pkg-plist
+++ b/devel/p5-Rose-Object/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Rose/Object/MakeMethods/DateTime.pm
 %%SITE_PERL%%/Rose/Object/MakeMethods/Generic.pm
 %%SITE_PERL%%/Rose/Object/MixIn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/Object/.packlist
 %%PERL5_MAN3%%/Rose::Class.3.gz
 %%PERL5_MAN3%%/Rose::Class::MakeMethods::Generic.3.gz
 %%PERL5_MAN3%%/Rose::Class::MakeMethods::Set.3.gz
diff --git a/devel/p5-RunApp/Makefile b/devel/p5-RunApp/Makefile
index 9f9bc1bfdff7..bb6b5a7c5d89 100644
--- a/devel/p5-RunApp/Makefile
+++ b/devel/p5-RunApp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RunApp
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/devel/p5-RunApp/pkg-plist b/devel/p5-RunApp/pkg-plist
index 050c09f6dd35..aa0cae483427 100644
--- a/devel/p5-RunApp/pkg-plist
+++ b/devel/p5-RunApp/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/RunApp/Cron.pm
 %%SITE_PERL%%/RunApp/Template.pm
 %%SITE_PERL%%/RunApp/Template/Apache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RunApp/.packlist
 %%PERL5_MAN3%%/App::Control::Apache.3.gz
 %%PERL5_MAN3%%/RunApp.3.gz
 %%PERL5_MAN3%%/RunApp::Apache.3.gz
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index b8ae28005642..dbde5f1d29cc 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SDL
 PORTVERSION=	2.540
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SDL/pkg-plist b/devel/p5-SDL/pkg-plist
index 6fc0d4b927e3..0be2c61b84e2 100644
--- a/devel/p5-SDL/pkg-plist
+++ b/devel/p5-SDL/pkg-plist
@@ -69,207 +69,207 @@
 %%PERL5_MAN3%%/pods::SDLx::Sprite::Animated.3.gz
 %%PERL5_MAN3%%/pods::SDLx::Surface.3.gz
 %%PERL5_MAN3%%/pods::SDLx::Text.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Module/Build/SDL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Audio.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/AudioCVT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/AudioSpec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/CD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/CDROM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/CDTrack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Color.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/ConfigData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Cursor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Events.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GFX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GFX/BlitFunc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GFX/FPSManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GFX/Framerate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GFX/ImageFilter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GFX/Primitives.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GFX/Rotozoom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Image.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Internal/Loader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Joystick.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer/Channels.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer/Effects.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer/Groups.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer/MixChunk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer/MixMusic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer/Music.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer/Samples.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mouse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/MultiThread.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Net/IPaddress.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Net/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Net/UDP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Overlay.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Palette.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Pango.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Pango/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/PixelFormat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/RWOps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Rect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/SMPEG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/SMPEG/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Surface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/TTF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/TTF/Font.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/TTFont.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Time.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tutorial.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tutorial/Animation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tutorial/LunarLander.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Video.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/VideoInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL_perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/App.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Controller.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Controller/Interface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Controller/State.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Controller/Timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/FPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Layer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/LayerManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Music.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Music/Data.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Music/Default.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Rect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/SFont.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Sound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Sprite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Sprite/Animated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Surface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Surface/TiedMatrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Surface/TiedMatrixRow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/TTF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDLx/Validate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Audio/Audio.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/AudioCVT/AudioCVT.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/AudioSpec/AudioSpec.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/CD/CD.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/CDROM/CDROM.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/CDTrack/CDTrack.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Color/Color.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Cursor/Cursor.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Event/Event.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Events/Events.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/GFX/BlitFunc/BlitFunc.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/GFX/FPSManager/FPSManager.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/GFX/Framerate/Framerate.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/GFX/GFX.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/GFX/ImageFilter/ImageFilter.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/GFX/Primitives/Primitives.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/GFX/Rotozoom/Rotozoom.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Image/Image.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Joystick/Joystick.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/Channels/Channels.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/Effects/Effects.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/Groups/Groups.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/MixChunk/MixChunk.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/MixMusic/MixMusic.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/Mixer.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/Music/Music.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mixer/Samples/Samples.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Mouse/Mouse.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/MultiThread/MultiThread.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Overlay/Overlay.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Palette/Palette.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Pango/Context/Context.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Pango/Pango.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/PixelFormat/PixelFormat.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/RWOps/RWOps.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Rect/Rect.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Surface/Surface.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/TTF/Font/Font.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/TTF/TTF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Time/Time.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Version/Version.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/Video/Video.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/VideoInfo/VideoInfo.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/Controller/Interface/Interface.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/Controller/State/State.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/Controller/Timer/Timer.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/Layer/Layer.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/LayerManager/LayerManager.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/SFont/SFont.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/Surface/Surface.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDLx/Validate/Validate.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/SDL/GenBasR.ttf
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Audio.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/AudioCVT.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/AudioSpec.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/CD.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/CDROM.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/CDTrack.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Color.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Cookbook/OpenGL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Cookbook/PDL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Credits.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Cursor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Deprecated.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Event.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Events.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/GFX/BlitFunc.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/GFX/FPSManager.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/GFX/Framerate.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/GFX/ImageFilter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/GFX/Primitives.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/GFX/Rotozoom.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Image.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Joystick.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/MPEG.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer/Channels.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer/Effects.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer/Groups.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer/MixChunk.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer/MixMusic.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer/Music.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mixer/Samples.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Mouse.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/MultiThread.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Overlay.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Palette.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Pango.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Pango/Context.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/PixelFormat.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Platform.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/RWOps.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Rect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/SMPEG.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Surface.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/TTF.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/TTF/Font.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Time.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Tutorial/Animation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Tutorial/LunarLander.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/Video.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDL/VideoInfo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/App.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Controller.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Controller/Interface.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Controller/State.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Layer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/LayerManager.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Music.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Rect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/SFont.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Sound.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Sprite.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Sprite/Animated.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Surface.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/pods/SDLx/Text.pod
+%%SITE_ARCH%%/Module/Build/SDL.pm
+%%SITE_ARCH%%/SDL.pm
+%%SITE_ARCH%%/SDL/Audio.pm
+%%SITE_ARCH%%/SDL/AudioCVT.pm
+%%SITE_ARCH%%/SDL/AudioSpec.pm
+%%SITE_ARCH%%/SDL/CD.pm
+%%SITE_ARCH%%/SDL/CDROM.pm
+%%SITE_ARCH%%/SDL/CDTrack.pm
+%%SITE_ARCH%%/SDL/Color.pm
+%%SITE_ARCH%%/SDL/Config.pm
+%%SITE_ARCH%%/SDL/ConfigData.pm
+%%SITE_ARCH%%/SDL/Constants.pm
+%%SITE_ARCH%%/SDL/Cursor.pm
+%%SITE_ARCH%%/SDL/Event.pm
+%%SITE_ARCH%%/SDL/Events.pm
+%%SITE_ARCH%%/SDL/GFX.pm
+%%SITE_ARCH%%/SDL/GFX/BlitFunc.pm
+%%SITE_ARCH%%/SDL/GFX/FPSManager.pm
+%%SITE_ARCH%%/SDL/GFX/Framerate.pm
+%%SITE_ARCH%%/SDL/GFX/ImageFilter.pm
+%%SITE_ARCH%%/SDL/GFX/Primitives.pm
+%%SITE_ARCH%%/SDL/GFX/Rotozoom.pm
+%%SITE_ARCH%%/SDL/Image.pm
+%%SITE_ARCH%%/SDL/Internal/Loader.pm
+%%SITE_ARCH%%/SDL/Joystick.pm
+%%SITE_ARCH%%/SDL/Mixer.pm
+%%SITE_ARCH%%/SDL/Mixer/Channels.pm
+%%SITE_ARCH%%/SDL/Mixer/Effects.pm
+%%SITE_ARCH%%/SDL/Mixer/Groups.pm
+%%SITE_ARCH%%/SDL/Mixer/MixChunk.pm
+%%SITE_ARCH%%/SDL/Mixer/MixMusic.pm
+%%SITE_ARCH%%/SDL/Mixer/Music.pm
+%%SITE_ARCH%%/SDL/Mixer/Samples.pm
+%%SITE_ARCH%%/SDL/Mouse.pm
+%%SITE_ARCH%%/SDL/MultiThread.pm
+%%SITE_ARCH%%/SDL/Net.pm
+%%SITE_ARCH%%/SDL/Net/IPaddress.pm
+%%SITE_ARCH%%/SDL/Net/TCP.pm
+%%SITE_ARCH%%/SDL/Net/UDP.pm
+%%SITE_ARCH%%/SDL/Overlay.pm
+%%SITE_ARCH%%/SDL/Palette.pm
+%%SITE_ARCH%%/SDL/Pango.pm
+%%SITE_ARCH%%/SDL/Pango/Context.pm
+%%SITE_ARCH%%/SDL/PixelFormat.pm
+%%SITE_ARCH%%/SDL/RWOps.pm
+%%SITE_ARCH%%/SDL/Rect.pm
+%%SITE_ARCH%%/SDL/SMPEG.pm
+%%SITE_ARCH%%/SDL/SMPEG/Info.pm
+%%SITE_ARCH%%/SDL/Surface.pm
+%%SITE_ARCH%%/SDL/TTF.pm
+%%SITE_ARCH%%/SDL/TTF/Font.pm
+%%SITE_ARCH%%/SDL/TTFont.pm
+%%SITE_ARCH%%/SDL/Time.pm
+%%SITE_ARCH%%/SDL/Tutorial.pm
+%%SITE_ARCH%%/SDL/Tutorial/Animation.pm
+%%SITE_ARCH%%/SDL/Tutorial/LunarLander.pm
+%%SITE_ARCH%%/SDL/Version.pm
+%%SITE_ARCH%%/SDL/Video.pm
+%%SITE_ARCH%%/SDL/VideoInfo.pm
+%%SITE_ARCH%%/SDL/typemap
+%%SITE_ARCH%%/SDL_perl.pm
+%%SITE_ARCH%%/SDLx/App.pm
+%%SITE_ARCH%%/SDLx/Controller.pm
+%%SITE_ARCH%%/SDLx/Controller/Interface.pm
+%%SITE_ARCH%%/SDLx/Controller/State.pm
+%%SITE_ARCH%%/SDLx/Controller/Timer.pm
+%%SITE_ARCH%%/SDLx/FPS.pm
+%%SITE_ARCH%%/SDLx/Layer.pm
+%%SITE_ARCH%%/SDLx/LayerManager.pm
+%%SITE_ARCH%%/SDLx/Music.pm
+%%SITE_ARCH%%/SDLx/Music/Data.pm
+%%SITE_ARCH%%/SDLx/Music/Default.pm
+%%SITE_ARCH%%/SDLx/Rect.pm
+%%SITE_ARCH%%/SDLx/SFont.pm
+%%SITE_ARCH%%/SDLx/Sound.pm
+%%SITE_ARCH%%/SDLx/Sprite.pm
+%%SITE_ARCH%%/SDLx/Sprite/Animated.pm
+%%SITE_ARCH%%/SDLx/Surface.pm
+%%SITE_ARCH%%/SDLx/Surface/TiedMatrix.pm
+%%SITE_ARCH%%/SDLx/Surface/TiedMatrixRow.pm
+%%SITE_ARCH%%/SDLx/TTF.pm
+%%SITE_ARCH%%/SDLx/Text.pm
+%%SITE_ARCH%%/SDLx/Validate.pm
+%%SITE_ARCH%%/auto/SDL/Audio/Audio.so
+%%SITE_ARCH%%/auto/SDL/AudioCVT/AudioCVT.so
+%%SITE_ARCH%%/auto/SDL/AudioSpec/AudioSpec.so
+%%SITE_ARCH%%/auto/SDL/CD/CD.so
+%%SITE_ARCH%%/auto/SDL/CDROM/CDROM.so
+%%SITE_ARCH%%/auto/SDL/CDTrack/CDTrack.so
+%%SITE_ARCH%%/auto/SDL/Color/Color.so
+%%SITE_ARCH%%/auto/SDL/Cursor/Cursor.so
+%%SITE_ARCH%%/auto/SDL/Event/Event.so
+%%SITE_ARCH%%/auto/SDL/Events/Events.so
+%%SITE_ARCH%%/auto/SDL/GFX/BlitFunc/BlitFunc.so
+%%SITE_ARCH%%/auto/SDL/GFX/FPSManager/FPSManager.so
+%%SITE_ARCH%%/auto/SDL/GFX/Framerate/Framerate.so
+%%SITE_ARCH%%/auto/SDL/GFX/GFX.so
+%%SITE_ARCH%%/auto/SDL/GFX/ImageFilter/ImageFilter.so
+%%SITE_ARCH%%/auto/SDL/GFX/Primitives/Primitives.so
+%%SITE_ARCH%%/auto/SDL/GFX/Rotozoom/Rotozoom.so
+%%SITE_ARCH%%/auto/SDL/Image/Image.so
+%%SITE_ARCH%%/auto/SDL/Joystick/Joystick.so
+%%SITE_ARCH%%/auto/SDL/Mixer/Channels/Channels.so
+%%SITE_ARCH%%/auto/SDL/Mixer/Effects/Effects.so
+%%SITE_ARCH%%/auto/SDL/Mixer/Groups/Groups.so
+%%SITE_ARCH%%/auto/SDL/Mixer/MixChunk/MixChunk.so
+%%SITE_ARCH%%/auto/SDL/Mixer/MixMusic/MixMusic.so
+%%SITE_ARCH%%/auto/SDL/Mixer/Mixer.so
+%%SITE_ARCH%%/auto/SDL/Mixer/Music/Music.so
+%%SITE_ARCH%%/auto/SDL/Mixer/Samples/Samples.so
+%%SITE_ARCH%%/auto/SDL/Mouse/Mouse.so
+%%SITE_ARCH%%/auto/SDL/MultiThread/MultiThread.so
+%%SITE_ARCH%%/auto/SDL/Overlay/Overlay.so
+%%SITE_ARCH%%/auto/SDL/Palette/Palette.so
+%%SITE_ARCH%%/auto/SDL/Pango/Context/Context.so
+%%SITE_ARCH%%/auto/SDL/Pango/Pango.so
+%%SITE_ARCH%%/auto/SDL/PixelFormat/PixelFormat.so
+%%SITE_ARCH%%/auto/SDL/RWOps/RWOps.so
+%%SITE_ARCH%%/auto/SDL/Rect/Rect.so
+%%SITE_ARCH%%/auto/SDL/Surface/Surface.so
+%%SITE_ARCH%%/auto/SDL/TTF/Font/Font.so
+%%SITE_ARCH%%/auto/SDL/TTF/TTF.so
+%%SITE_ARCH%%/auto/SDL/Time/Time.so
+%%SITE_ARCH%%/auto/SDL/Version/Version.so
+%%SITE_ARCH%%/auto/SDL/Video/Video.so
+%%SITE_ARCH%%/auto/SDL/VideoInfo/VideoInfo.so
+%%SITE_ARCH%%/auto/SDL_perl/SDL_perl.so
+%%SITE_ARCH%%/auto/SDLx/Controller/Interface/Interface.so
+%%SITE_ARCH%%/auto/SDLx/Controller/State/State.so
+%%SITE_ARCH%%/auto/SDLx/Controller/Timer/Timer.so
+%%SITE_ARCH%%/auto/SDLx/Layer/Layer.so
+%%SITE_ARCH%%/auto/SDLx/LayerManager/LayerManager.so
+%%SITE_ARCH%%/auto/SDLx/SFont/SFont.so
+%%SITE_ARCH%%/auto/SDLx/Surface/Surface.so
+%%SITE_ARCH%%/auto/SDLx/Validate/Validate.so
+%%SITE_ARCH%%/auto/share/dist/SDL/GenBasR.ttf
+%%SITE_ARCH%%/pods/SDL.pod
+%%SITE_ARCH%%/pods/SDL/Audio.pod
+%%SITE_ARCH%%/pods/SDL/AudioCVT.pod
+%%SITE_ARCH%%/pods/SDL/AudioSpec.pod
+%%SITE_ARCH%%/pods/SDL/CD.pod
+%%SITE_ARCH%%/pods/SDL/CDROM.pod
+%%SITE_ARCH%%/pods/SDL/CDTrack.pod
+%%SITE_ARCH%%/pods/SDL/Color.pod
+%%SITE_ARCH%%/pods/SDL/Cookbook.pod
+%%SITE_ARCH%%/pods/SDL/Cookbook/OpenGL.pod
+%%SITE_ARCH%%/pods/SDL/Cookbook/PDL.pod
+%%SITE_ARCH%%/pods/SDL/Credits.pod
+%%SITE_ARCH%%/pods/SDL/Cursor.pod
+%%SITE_ARCH%%/pods/SDL/Deprecated.pod
+%%SITE_ARCH%%/pods/SDL/Event.pod
+%%SITE_ARCH%%/pods/SDL/Events.pod
+%%SITE_ARCH%%/pods/SDL/GFX/BlitFunc.pod
+%%SITE_ARCH%%/pods/SDL/GFX/FPSManager.pod
+%%SITE_ARCH%%/pods/SDL/GFX/Framerate.pod
+%%SITE_ARCH%%/pods/SDL/GFX/ImageFilter.pod
+%%SITE_ARCH%%/pods/SDL/GFX/Primitives.pod
+%%SITE_ARCH%%/pods/SDL/GFX/Rotozoom.pod
+%%SITE_ARCH%%/pods/SDL/Image.pod
+%%SITE_ARCH%%/pods/SDL/Joystick.pod
+%%SITE_ARCH%%/pods/SDL/MPEG.pod
+%%SITE_ARCH%%/pods/SDL/Mixer.pod
+%%SITE_ARCH%%/pods/SDL/Mixer/Channels.pod
+%%SITE_ARCH%%/pods/SDL/Mixer/Effects.pod
+%%SITE_ARCH%%/pods/SDL/Mixer/Groups.pod
+%%SITE_ARCH%%/pods/SDL/Mixer/MixChunk.pod
+%%SITE_ARCH%%/pods/SDL/Mixer/MixMusic.pod
+%%SITE_ARCH%%/pods/SDL/Mixer/Music.pod
+%%SITE_ARCH%%/pods/SDL/Mixer/Samples.pod
+%%SITE_ARCH%%/pods/SDL/Mouse.pod
+%%SITE_ARCH%%/pods/SDL/MultiThread.pod
+%%SITE_ARCH%%/pods/SDL/Overlay.pod
+%%SITE_ARCH%%/pods/SDL/Palette.pod
+%%SITE_ARCH%%/pods/SDL/Pango.pod
+%%SITE_ARCH%%/pods/SDL/Pango/Context.pod
+%%SITE_ARCH%%/pods/SDL/PixelFormat.pod
+%%SITE_ARCH%%/pods/SDL/Platform.pod
+%%SITE_ARCH%%/pods/SDL/RWOps.pod
+%%SITE_ARCH%%/pods/SDL/Rect.pod
+%%SITE_ARCH%%/pods/SDL/SMPEG.pod
+%%SITE_ARCH%%/pods/SDL/Surface.pod
+%%SITE_ARCH%%/pods/SDL/TTF.pod
+%%SITE_ARCH%%/pods/SDL/TTF/Font.pod
+%%SITE_ARCH%%/pods/SDL/Time.pod
+%%SITE_ARCH%%/pods/SDL/Tutorial.pod
+%%SITE_ARCH%%/pods/SDL/Tutorial/Animation.pod
+%%SITE_ARCH%%/pods/SDL/Tutorial/LunarLander.pod
+%%SITE_ARCH%%/pods/SDL/Version.pod
+%%SITE_ARCH%%/pods/SDL/Video.pod
+%%SITE_ARCH%%/pods/SDL/VideoInfo.pod
+%%SITE_ARCH%%/pods/SDLx/App.pod
+%%SITE_ARCH%%/pods/SDLx/Controller.pod
+%%SITE_ARCH%%/pods/SDLx/Controller/Interface.pod
+%%SITE_ARCH%%/pods/SDLx/Controller/State.pod
+%%SITE_ARCH%%/pods/SDLx/Layer.pod
+%%SITE_ARCH%%/pods/SDLx/LayerManager.pod
+%%SITE_ARCH%%/pods/SDLx/Music.pod
+%%SITE_ARCH%%/pods/SDLx/Rect.pod
+%%SITE_ARCH%%/pods/SDLx/SFont.pod
+%%SITE_ARCH%%/pods/SDLx/Sound.pod
+%%SITE_ARCH%%/pods/SDLx/Sprite.pod
+%%SITE_ARCH%%/pods/SDLx/Sprite/Animated.pod
+%%SITE_ARCH%%/pods/SDLx/Surface.pod
+%%SITE_ARCH%%/pods/SDLx/Text.pod
diff --git a/devel/p5-SNMP-Persist/Makefile b/devel/p5-SNMP-Persist/Makefile
index 594f6df62d92..d2985acc540d 100644
--- a/devel/p5-SNMP-Persist/Makefile
+++ b/devel/p5-SNMP-Persist/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SNMP-Persist
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SNMP-Persist/pkg-plist b/devel/p5-SNMP-Persist/pkg-plist
index 043d92f3c22a..a7305a154a8f 100644
--- a/devel/p5-SNMP-Persist/pkg-plist
+++ b/devel/p5-SNMP-Persist/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SNMP/Persist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Persist/.packlist
 %%PERL5_MAN3%%/SNMP::Persist.3
diff --git a/devel/p5-SOAP-WSDL/Makefile b/devel/p5-SOAP-WSDL/Makefile
index 9d01bfd14dbb..43d6c7c5b7b6 100644
--- a/devel/p5-SOAP-WSDL/Makefile
+++ b/devel/p5-SOAP-WSDL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SOAP-WSDL
 PORTVERSION=	2.00.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SSN-Validate/Makefile b/devel/p5-SSN-Validate/Makefile
index 8b5fc0c08f47..c1290ea5a9dc 100644
--- a/devel/p5-SSN-Validate/Makefile
+++ b/devel/p5-SSN-Validate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SSN-Validate
 PORTVERSION=	0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KMELTZ
diff --git a/devel/p5-SSN-Validate/pkg-plist b/devel/p5-SSN-Validate/pkg-plist
index b4816a015707..3599c61e8957 100644
--- a/devel/p5-SSN-Validate/pkg-plist
+++ b/devel/p5-SSN-Validate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/SSN::Validate.3.gz
 %%SITE_PERL%%/SSN/Validate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN/Validate/.packlist
diff --git a/devel/p5-SUPER/Makefile b/devel/p5-SUPER/Makefile
index 0032a38846c4..2ea6fee1810f 100644
--- a/devel/p5-SUPER/Makefile
+++ b/devel/p5-SUPER/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SUPER
 PORTVERSION=	1.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile
index bbe0bf1a8414..9f2fd6a5690f 100644
--- a/devel/p5-SVN-ACL/Makefile
+++ b/devel/p5-SVN-ACL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-ACL
 PORTVERSION=	0.02
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-ACL/pkg-plist b/devel/p5-SVN-ACL/pkg-plist
index 19412f3df4d5..a079e08c7150 100644
--- a/devel/p5-SVN-ACL/pkg-plist
+++ b/devel/p5-SVN-ACL/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/SVN::ACL.3.gz
 %%SITE_PERL%%/SVN/ACL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/ACL/.packlist
diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile
index 3a9f1364239b..27e4e7472408 100644
--- a/devel/p5-SVN-Access/Makefile
+++ b/devel/p5-SVN-Access/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Access
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Access/pkg-plist b/devel/p5-SVN-Access/pkg-plist
index c51ca6436e32..fb3c4d72a187 100644
--- a/devel/p5-SVN-Access/pkg-plist
+++ b/devel/p5-SVN-Access/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/SVN/Access.pm
 %%SITE_PERL%%/SVN/Access/Group.pm
 %%SITE_PERL%%/SVN/Access/Resource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Access/.packlist
 %%PERL5_MAN3%%/SVN::Access.3.gz
 %%PERL5_MAN3%%/SVN::Access::Group.3.gz
 %%PERL5_MAN3%%/SVN::Access::Resource.3.gz
diff --git a/devel/p5-SVN-Agent/Makefile b/devel/p5-SVN-Agent/Makefile
index 60536d1ac613..478af9cce0e2 100644
--- a/devel/p5-SVN-Agent/Makefile
+++ b/devel/p5-SVN-Agent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Agent
 PORTVERSION=	0.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Agent/pkg-plist b/devel/p5-SVN-Agent/pkg-plist
index 5ec188c85957..71e4776df26b 100644
--- a/devel/p5-SVN-Agent/pkg-plist
+++ b/devel/p5-SVN-Agent/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SVN/Agent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Agent/.packlist
 %%PERL5_MAN3%%/SVN::Agent.3.gz
diff --git a/devel/p5-SVN-Dump/Makefile b/devel/p5-SVN-Dump/Makefile
index e8b96c256513..e029886802b8 100644
--- a/devel/p5-SVN-Dump/Makefile
+++ b/devel/p5-SVN-Dump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Dump
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Dumpfile/Makefile b/devel/p5-SVN-Dumpfile/Makefile
index 020a08b04667..b3dccb31fade 100644
--- a/devel/p5-SVN-Dumpfile/Makefile
+++ b/devel/p5-SVN-Dumpfile/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Dumpfile
 PORTVERSION=	0.13.107
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Dumpfile/pkg-plist b/devel/p5-SVN-Dumpfile/pkg-plist
index 9b4960d0c3b0..f28e68980f75 100644
--- a/devel/p5-SVN-Dumpfile/pkg-plist
+++ b/devel/p5-SVN-Dumpfile/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/SVN/Dumpfile/Tutorial.pm
 %%SITE_PERL%%/SVN/Dumpfile/Node.pm
 %%SITE_PERL%%/SVN/Dumpfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Dumpfile/.packlist
diff --git a/devel/p5-SVN-Hook/Makefile b/devel/p5-SVN-Hook/Makefile
index 69732aa9000e..725a5618fbfd 100644
--- a/devel/p5-SVN-Hook/Makefile
+++ b/devel/p5-SVN-Hook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Hook
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Hook/pkg-plist b/devel/p5-SVN-Hook/pkg-plist
index 655266831ed2..b2cbab76a3b2 100644
--- a/devel/p5-SVN-Hook/pkg-plist
+++ b/devel/p5-SVN-Hook/pkg-plist
@@ -5,4 +5,3 @@ man/man1/svnhook.1.gz
 %%SITE_PERL%%/SVN/Hook/Redispatch.pm
 %%SITE_PERL%%/SVN/Hook/Script.pm
 %%PERL5_MAN3%%/SVN::Hook.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Hook/.packlist
diff --git a/devel/p5-SVN-Hooks/Makefile b/devel/p5-SVN-Hooks/Makefile
index 0ac86b69094f..a9ef810146a4 100644
--- a/devel/p5-SVN-Hooks/Makefile
+++ b/devel/p5-SVN-Hooks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Hooks
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Hooks/pkg-plist b/devel/p5-SVN-Hooks/pkg-plist
index 7b85ff8a484a..18896a0ef8ef 100644
--- a/devel/p5-SVN-Hooks/pkg-plist
+++ b/devel/p5-SVN-Hooks/pkg-plist
@@ -14,7 +14,6 @@
 %%SITE_PERL%%/SVN/Hooks/Mailer.pm
 %%SITE_PERL%%/SVN/Hooks/Notify.pm
 %%SITE_PERL%%/SVN/Hooks/UpdateConfFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Hooks/.packlist
 %%PERL5_MAN3%%/SVN::Hooks.3.gz
 %%PERL5_MAN3%%/SVN::Hooks::AllowLogChange.3.gz
 %%PERL5_MAN3%%/SVN::Hooks::AllowPropChange.3.gz
diff --git a/devel/p5-SVN-Log/Makefile b/devel/p5-SVN-Log/Makefile
index 6bb484014891..7c3ad6e418e0 100644
--- a/devel/p5-SVN-Log/Makefile
+++ b/devel/p5-SVN-Log/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Log
 PORTVERSION=	0.03
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Look/Makefile b/devel/p5-SVN-Look/Makefile
index 2d489b06ceea..9a5ddd9649e1 100644
--- a/devel/p5-SVN-Look/Makefile
+++ b/devel/p5-SVN-Look/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Look
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Look/pkg-plist b/devel/p5-SVN-Look/pkg-plist
index a361edd5f28f..c50c4b34905c 100644
--- a/devel/p5-SVN-Look/pkg-plist
+++ b/devel/p5-SVN-Look/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SVN/Look.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Look/.packlist
 %%PERL5_MAN3%%/SVN::Look.3.gz
diff --git a/devel/p5-SVN-Mirror/Makefile b/devel/p5-SVN-Mirror/Makefile
index 50f4f1007ad6..e4a44ae949d7 100644
--- a/devel/p5-SVN-Mirror/Makefile
+++ b/devel/p5-SVN-Mirror/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Mirror
 PORTVERSION=	0.75
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Mirror/pkg-plist b/devel/p5-SVN-Mirror/pkg-plist
index 183e8259711a..7ced91d0013b 100644
--- a/devel/p5-SVN-Mirror/pkg-plist
+++ b/devel/p5-SVN-Mirror/pkg-plist
@@ -5,4 +5,3 @@ man/man1/svm.1.gz
 %%SITE_PERL%%/SVN/Mirror/Ra.pm
 %%SITE_PERL%%/SVN/Mirror/Git.pm
 %%SITE_PERL%%/SVN/Mirror/VCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Mirror/.packlist
diff --git a/devel/p5-SVN-Notify-Config/Makefile b/devel/p5-SVN-Notify-Config/Makefile
index a95815483848..804573ef2f3d 100644
--- a/devel/p5-SVN-Notify-Config/Makefile
+++ b/devel/p5-SVN-Notify-Config/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Notify-Config
 PORTVERSION=	0.0911
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile b/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
index 94e2d9e5a4c0..e2f00d3850a7 100644
--- a/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
+++ b/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Notify-Filter-AuthZMail
 PORTVERSION=	1.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Notify-Filter-AuthZMail/pkg-plist b/devel/p5-SVN-Notify-Filter-AuthZMail/pkg-plist
index 51b708a0ce2f..9de465d9bab7 100644
--- a/devel/p5-SVN-Notify-Filter-AuthZMail/pkg-plist
+++ b/devel/p5-SVN-Notify-Filter-AuthZMail/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SVN/Notify/Filter/AuthZMail.pm
 %%PERL5_MAN3%%/SVN::Notify::Filter::AuthZMail.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Notify/Filter/AuthZMail/.packlist
diff --git a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
index f8fa4dd770d7..51c0e0693f2e 100644
--- a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
+++ b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Notify-Filter-EmailFlatFileDB
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/pkg-plist b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/pkg-plist
index 89392186bd09..a2a3ac8d9c93 100644
--- a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/pkg-plist
+++ b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SVN/Notify/Filter/EmailFlatFileDB.pm
 %%PERL5_MAN3%%/SVN::Notify::Filter::EmailFlatFileDB.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Notify/Filter/EmailFlatFileDB/.packlist
diff --git a/devel/p5-SVN-Notify-Filter-Markdown/Makefile b/devel/p5-SVN-Notify-Filter-Markdown/Makefile
index 5668fa52cbbb..3ade96fdeb2f 100644
--- a/devel/p5-SVN-Notify-Filter-Markdown/Makefile
+++ b/devel/p5-SVN-Notify-Filter-Markdown/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Notify-Filter-Markdown
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Notify-Filter-Watchers/Makefile b/devel/p5-SVN-Notify-Filter-Watchers/Makefile
index 7dfb1864d90b..faa94dfa6a02 100644
--- a/devel/p5-SVN-Notify-Filter-Watchers/Makefile
+++ b/devel/p5-SVN-Notify-Filter-Watchers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Notify-Filter-Watchers
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Notify-Filter-Watchers/pkg-plist b/devel/p5-SVN-Notify-Filter-Watchers/pkg-plist
index 78634f0c643e..d511ee7f3681 100644
--- a/devel/p5-SVN-Notify-Filter-Watchers/pkg-plist
+++ b/devel/p5-SVN-Notify-Filter-Watchers/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SVN/Notify/Filter/Watchers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Notify/Filter/Watchers/.packlist
 %%PERL5_MAN3%%/SVN::Notify::Filter::Watchers.3.gz
diff --git a/devel/p5-SVN-Notify-Mirror/Makefile b/devel/p5-SVN-Notify-Mirror/Makefile
index b93c5ddce516..fb344dcb6238 100644
--- a/devel/p5-SVN-Notify-Mirror/Makefile
+++ b/devel/p5-SVN-Notify-Mirror/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Notify-Mirror
 PORTVERSION=	0.040
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-SVN-Notify-Snapshot/Makefile b/devel/p5-SVN-Notify-Snapshot/Makefile
index 0cdb469df891..dacc73c324f4 100644
--- a/devel/p5-SVN-Notify-Snapshot/Makefile
+++ b/devel/p5-SVN-Notify-Snapshot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Notify-Snapshot
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Notify/Makefile b/devel/p5-SVN-Notify/Makefile
index ea00b4ffbeb4..76f29ddf5a7e 100644
--- a/devel/p5-SVN-Notify/Makefile
+++ b/devel/p5-SVN-Notify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-Notify
 PORTVERSION=	2.84
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-S4/Makefile b/devel/p5-SVN-S4/Makefile
index 7a4e2e7e2d75..7d6960c5e08f 100644
--- a/devel/p5-SVN-S4/Makefile
+++ b/devel/p5-SVN-S4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVN-S4
 PORTVERSION=	1.055
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-S4/pkg-plist b/devel/p5-SVN-S4/pkg-plist
index d3745c5e6a5c..b17d2b1ec5cc 100644
--- a/devel/p5-SVN-S4/pkg-plist
+++ b/devel/p5-SVN-S4/pkg-plist
@@ -28,4 +28,3 @@ man/man1/s4.1.gz
 %%SITE_PERL%%/SVN/S4/Update.pm
 %%SITE_PERL%%/SVN/S4/ViewSpec.pm
 %%SITE_PERL%%/SVN/S4/WorkProp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/S4/.packlist
diff --git a/devel/p5-SVN-Simple/Makefile b/devel/p5-SVN-Simple/Makefile
index acb26ebc819d..a9a0162da53e 100644
--- a/devel/p5-SVN-Simple/Makefile
+++ b/devel/p5-SVN-Simple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Simple
 PORTVERSION=	0.28
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Simple/pkg-plist b/devel/p5-SVN-Simple/pkg-plist
index adfe6e4a727d..6a968cf421ba 100644
--- a/devel/p5-SVN-Simple/pkg-plist
+++ b/devel/p5-SVN-Simple/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/SVN::Simple::Editor.3.gz
 %%SITE_PERL%%/SVN/Simple/Edit.pm
 %%SITE_PERL%%/SVN/Simple/Editor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Simple/Edit/.packlist
diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile
index 7a0d9442feb2..03b1be768fdb 100644
--- a/devel/p5-SVN-Statistics/Makefile
+++ b/devel/p5-SVN-Statistics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVN-Statistics
 PORTVERSION=	0.041
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Statistics/pkg-plist b/devel/p5-SVN-Statistics/pkg-plist
index 6445afff654f..4c2cf5d952f1 100644
--- a/devel/p5-SVN-Statistics/pkg-plist
+++ b/devel/p5-SVN-Statistics/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SVN/Statistics.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Statistics/.packlist
 %%PERL5_MAN3%%/SVN::Statistics.3.gz
diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile
index 97e456d4b307..6c63e210675a 100644
--- a/devel/p5-SVN-Web/Makefile
+++ b/devel/p5-SVN-Web/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	SVN-Web
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-SVN-Web/pkg-plist b/devel/p5-SVN-Web/pkg-plist
index 12b223487855..276268fad0ca 100644
--- a/devel/p5-SVN-Web/pkg-plist
+++ b/devel/p5-SVN-Web/pkg-plist
@@ -39,7 +39,6 @@ bin/svnweb-install
 %%SITE_PERL%%/SVN/Web/View.pm
 %%SITE_PERL%%/SVN/Web/X.pm
 %%SITE_PERL%%/SVN/Web/action.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Web/.packlist
 man/man1/svnweb-install.1.gz
 %%WWWDIR%%/SVN-Web.psgi
 %%WWWDIR%%/css/common.css
diff --git a/devel/p5-Safe-Isa/Makefile b/devel/p5-Safe-Isa/Makefile
index 9dcdfe36fd23..106aabd962a4 100644
--- a/devel/p5-Safe-Isa/Makefile
+++ b/devel/p5-Safe-Isa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Safe-Isa
 PORTVERSION=	1.000005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Safe-Isa/pkg-plist b/devel/p5-Safe-Isa/pkg-plist
index 662837802503..bc9aaac06dea 100644
--- a/devel/p5-Safe-Isa/pkg-plist
+++ b/devel/p5-Safe-Isa/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Safe/Isa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Isa/.packlist
 %%PERL5_MAN3%%/Safe::Isa.3.gz
diff --git a/devel/p5-Scalar-Defer/Makefile b/devel/p5-Scalar-Defer/Makefile
index a681b2098ef3..bdab5ecab973 100644
--- a/devel/p5-Scalar-Defer/Makefile
+++ b/devel/p5-Scalar-Defer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Scalar-Defer
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Scalar-Defer/pkg-plist b/devel/p5-Scalar-Defer/pkg-plist
index 0382d86dfc6b..6850fa1dc04d 100644
--- a/devel/p5-Scalar-Defer/pkg-plist
+++ b/devel/p5-Scalar-Defer/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Scalar::Defer.3.gz
 %%SITE_PERL%%/Scalar/Defer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Defer/.packlist
diff --git a/devel/p5-Scalar-Does/Makefile b/devel/p5-Scalar-Does/Makefile
index 91e5ab0538d9..f84bd1b61e0f 100644
--- a/devel/p5-Scalar-Does/Makefile
+++ b/devel/p5-Scalar-Does/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Scalar-Does
 PORTVERSION=	0.202
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Scalar-Does/pkg-plist b/devel/p5-Scalar-Does/pkg-plist
index 57d6facbec35..9f9072642830 100644
--- a/devel/p5-Scalar-Does/pkg-plist
+++ b/devel/p5-Scalar-Does/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/IO/Detect.pm
 %%SITE_PERL%%/Scalar/Does.pm
 %%SITE_PERL%%/Scalar/Does/MooseTypes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Does/.packlist
 %%PERL5_MAN3%%/IO::Detect.3.gz
 %%PERL5_MAN3%%/Scalar::Does.3.gz
 %%PERL5_MAN3%%/Scalar::Does::MooseTypes.3.gz
diff --git a/devel/p5-Scalar-Listify/Makefile b/devel/p5-Scalar-Listify/Makefile
index d97bb81dda13..b5d8b850c7ac 100644
--- a/devel/p5-Scalar-Listify/Makefile
+++ b/devel/p5-Scalar-Listify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Scalar-Listify
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Scalar-Listify/pkg-plist b/devel/p5-Scalar-Listify/pkg-plist
index 07919e500361..e29686becc97 100644
--- a/devel/p5-Scalar-Listify/pkg-plist
+++ b/devel/p5-Scalar-Listify/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Scalar::Listify.3.gz
 %%SITE_PERL%%/Scalar/Listify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Listify/.packlist
diff --git a/devel/p5-Scalar-String/Makefile b/devel/p5-Scalar-String/Makefile
index e4e1da81d5ca..56cf62347660 100644
--- a/devel/p5-Scalar-String/Makefile
+++ b/devel/p5-Scalar-String/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Scalar-String
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Scalar-String/pkg-plist b/devel/p5-Scalar-String/pkg-plist
index 06093842c92c..5ac553242e91 100644
--- a/devel/p5-Scalar-String/pkg-plist
+++ b/devel/p5-Scalar-String/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Scalar/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/String/String.so
+%%SITE_ARCH%%/Scalar/String.pm
+%%SITE_ARCH%%/auto/Scalar/String/String.so
 %%PERL5_MAN3%%/Scalar::String.3.gz
diff --git a/devel/p5-Scalar-Util-LooksLikeNumber/Makefile b/devel/p5-Scalar-Util-LooksLikeNumber/Makefile
index b94ad616256e..819e827c55ea 100644
--- a/devel/p5-Scalar-Util-LooksLikeNumber/Makefile
+++ b/devel/p5-Scalar-Util-LooksLikeNumber/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Scalar-Util-LooksLikeNumber
 PORTVERSION=	1.39.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,6 +14,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Scalar/Util/LooksLikeNumber/LooksLikeNumber.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Scalar/Util/LooksLikeNumber/LooksLikeNumber.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Scalar-Util-LooksLikeNumber/pkg-plist b/devel/p5-Scalar-Util-LooksLikeNumber/pkg-plist
index 5b423febb72c..52352b292e41 100644
--- a/devel/p5-Scalar-Util-LooksLikeNumber/pkg-plist
+++ b/devel/p5-Scalar-Util-LooksLikeNumber/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Scalar::Util::LooksLikeNumber.3.gz
 %%SITE_ARCH%%/Scalar/Util/LooksLikeNumber.pm
-%%SITE_ARCH%%/auto/Scalar/Util/LooksLikeNumber/.packlist
 %%SITE_ARCH%%/auto/Scalar/Util/LooksLikeNumber/LooksLikeNumber.so
diff --git a/devel/p5-Scope-Guard/Makefile b/devel/p5-Scope-Guard/Makefile
index c1b57637c04a..39cdeb92b994 100644
--- a/devel/p5-Scope-Guard/Makefile
+++ b/devel/p5-Scope-Guard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Scope-Guard
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHOCOLATE
diff --git a/devel/p5-Scope-Guard/pkg-plist b/devel/p5-Scope-Guard/pkg-plist
index d49d0c622272..e31dfc5f9921 100644
--- a/devel/p5-Scope-Guard/pkg-plist
+++ b/devel/p5-Scope-Guard/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope/Guard/.packlist
 %%SITE_PERL%%/Scope/Guard.pm
 %%PERL5_MAN3%%/Scope::Guard.3.gz
diff --git a/devel/p5-Scope-Upper/Makefile b/devel/p5-Scope-Upper/Makefile
index 63c5cde68372..d19779dd4a0a 100644
--- a/devel/p5-Scope-Upper/Makefile
+++ b/devel/p5-Scope-Upper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Scope-Upper
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VPIT
@@ -18,6 +19,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/Scope/Upper/Upper.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Scope/Upper/Upper.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Scope-Upper/pkg-plist b/devel/p5-Scope-Upper/pkg-plist
index af5e895a891f..99de83551d79 100644
--- a/devel/p5-Scope-Upper/pkg-plist
+++ b/devel/p5-Scope-Upper/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Scope::Upper.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Scope/Upper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope/Upper/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope/Upper/Upper.so
+%%SITE_ARCH%%/Scope/Upper.pm
+%%SITE_ARCH%%/auto/Scope/Upper/Upper.so
diff --git a/devel/p5-Script-isAperlScript/Makefile b/devel/p5-Script-isAperlScript/Makefile
index d504dc1b2e92..ef2a56ba814d 100644
--- a/devel/p5-Script-isAperlScript/Makefile
+++ b/devel/p5-Script-isAperlScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Script-isAperlScript
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Script-isAperlScript/pkg-plist b/devel/p5-Script-isAperlScript/pkg-plist
index 4f9b36995fa4..6b6af56a5554 100644
--- a/devel/p5-Script-isAperlScript/pkg-plist
+++ b/devel/p5-Script-isAperlScript/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Script::isAperlScript.3.gz
 %%SITE_PERL%%/Script/isAperlScript.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Script/isAperlScript/.packlist
diff --git a/devel/p5-Search-Binary/Makefile b/devel/p5-Search-Binary/Makefile
index d98dc4c85c72..803658325fe5 100644
--- a/devel/p5-Search-Binary/Makefile
+++ b/devel/p5-Search-Binary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Search-Binary
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Search-Binary/pkg-plist b/devel/p5-Search-Binary/pkg-plist
index 76dbd54e8b80..9d3797c7bb22 100644
--- a/devel/p5-Search-Binary/pkg-plist
+++ b/devel/p5-Search-Binary/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Binary/.packlist
 %%SITE_PERL%%/Search/Binary.pm
 %%PERL5_MAN3%%/Search::Binary.3.gz
diff --git a/devel/p5-Sentinel/Makefile b/devel/p5-Sentinel/Makefile
index b425a34cc272..c156725141c1 100644
--- a/devel/p5-Sentinel/Makefile
+++ b/devel/p5-Sentinel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sentinel
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/devel/p5-Sentinel/pkg-plist b/devel/p5-Sentinel/pkg-plist
index c63aaa496a06..aa0efe6d2373 100644
--- a/devel/p5-Sentinel/pkg-plist
+++ b/devel/p5-Sentinel/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sentinel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sentinel/Sentinel.so
+%%SITE_ARCH%%/Sentinel.pm
+%%SITE_ARCH%%/auto/Sentinel/Sentinel.so
 %%PERL5_MAN3%%/Sentinel.3.gz
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index 0ee075a76270..7e9e908d9e44 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Sepia
 PORTVERSION=	0.992
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sepia/pkg-plist b/devel/p5-Sepia/pkg-plist
index 7f76e5eef192..27848896501d 100644
--- a/devel/p5-Sepia/pkg-plist
+++ b/devel/p5-Sepia/pkg-plist
@@ -7,7 +7,6 @@ man/man1/sepl.1.gz
 %%SITE_PERL%%/Sepia/Xref.pm
 %%SITE_PERL%%/Sepia/ReadLine.pm
 %%SITE_PERL%%/Sepia.pm
-%%SITE_PERL%%/mach/auto/Sepia/.packlist
 %%EMACS_SITE_LISPDIR%%/sepia/sepia-cpan.el
 %%EMACS_SITE_LISPDIR%%/sepia/sepia-ido.el
 %%EMACS_SITE_LISPDIR%%/sepia/sepia-snippet.el
diff --git a/devel/p5-Set-Array/Makefile b/devel/p5-Set-Array/Makefile
index 5c5494054eab..35d5edbc1931 100644
--- a/devel/p5-Set-Array/Makefile
+++ b/devel/p5-Set-Array/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Array
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSAVAGE
diff --git a/devel/p5-Set-Array/pkg-plist b/devel/p5-Set-Array/pkg-plist
index 925b318559c2..afc730fe9fd9 100644
--- a/devel/p5-Set-Array/pkg-plist
+++ b/devel/p5-Set-Array/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Set::Array.3.gz
 %%SITE_PERL%%/Set/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Array/.packlist
diff --git a/devel/p5-Set-ConsistentHash/Makefile b/devel/p5-Set-ConsistentHash/Makefile
index 560a7e108751..9d666f946110 100644
--- a/devel/p5-Set-ConsistentHash/Makefile
+++ b/devel/p5-Set-ConsistentHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-ConsistentHash
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Set
diff --git a/devel/p5-Set-ConsistentHash/pkg-plist b/devel/p5-Set-ConsistentHash/pkg-plist
index 96d11b0e1b27..d07e98fc1eda 100644
--- a/devel/p5-Set-ConsistentHash/pkg-plist
+++ b/devel/p5-Set-ConsistentHash/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Set::ConsistentHash.3.gz
 %%SITE_PERL%%/Set/ConsistentHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/ConsistentHash/.packlist
diff --git a/devel/p5-Set-Crontab/Makefile b/devel/p5-Set-Crontab/Makefile
index 6a817829eed1..846c7289b497 100644
--- a/devel/p5-Set-Crontab/Makefile
+++ b/devel/p5-Set-Crontab/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Crontab
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Set-Crontab/pkg-plist b/devel/p5-Set-Crontab/pkg-plist
index cc16af5faecd..5d96e1023600 100644
--- a/devel/p5-Set-Crontab/pkg-plist
+++ b/devel/p5-Set-Crontab/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Set::Crontab.3.gz
 %%SITE_PERL%%/Set/Crontab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Crontab/.packlist
diff --git a/devel/p5-Set-CrossProduct/Makefile b/devel/p5-Set-CrossProduct/Makefile
index ee575292e63f..963f610825a9 100644
--- a/devel/p5-Set-CrossProduct/Makefile
+++ b/devel/p5-Set-CrossProduct/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-CrossProduct
 PORTVERSION=	1.95
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BDFOY
diff --git a/devel/p5-Set-CrossProduct/pkg-plist b/devel/p5-Set-CrossProduct/pkg-plist
index 7c43e2b77530..7d6eb570c8cc 100644
--- a/devel/p5-Set-CrossProduct/pkg-plist
+++ b/devel/p5-Set-CrossProduct/pkg-plist
@@ -2,4 +2,3 @@ bin/cross
 man/man1/cross.1.gz
 %%PERL5_MAN3%%/Set::CrossProduct.3.gz
 %%SITE_PERL%%/Set/CrossProduct.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/CrossProduct/.packlist
diff --git a/devel/p5-Set-Infinite/Makefile b/devel/p5-Set-Infinite/Makefile
index 47cbc81f23dc..63982ac6f3bb 100644
--- a/devel/p5-Set-Infinite/Makefile
+++ b/devel/p5-Set-Infinite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Infinite
 PORTVERSION=	0.65
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Set-Infinite/pkg-plist b/devel/p5-Set-Infinite/pkg-plist
index d220d0832faa..2c7842cde405 100644
--- a/devel/p5-Set-Infinite/pkg-plist
+++ b/devel/p5-Set-Infinite/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Set/Infinite.pm
 %%SITE_PERL%%/Set/Infinite/Arithmetic.pm
 %%SITE_PERL%%/Set/Infinite/Basic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Infinite/.packlist
diff --git a/devel/p5-Set-NestedGroups/Makefile b/devel/p5-Set-NestedGroups/Makefile
index cd590075bbe9..6000def936d5 100644
--- a/devel/p5-Set-NestedGroups/Makefile
+++ b/devel/p5-Set-NestedGroups/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-NestedGroups
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Set-NestedGroups/pkg-plist b/devel/p5-Set-NestedGroups/pkg-plist
index edba984bb8bd..fad86b8f0911 100644
--- a/devel/p5-Set-NestedGroups/pkg-plist
+++ b/devel/p5-Set-NestedGroups/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/NestedGroups/.packlist
 %%SITE_PERL%%/Set/NestedGroups.pm
 %%SITE_PERL%%/Set/NestedGroups/Member.pm
 %%PERL5_MAN3%%/Set::NestedGroups.3.gz
diff --git a/devel/p5-Set-Object/Makefile b/devel/p5-Set-Object/Makefile
index 3ff039cad052..0f6a61dfe266 100644
--- a/devel/p5-Set-Object/Makefile
+++ b/devel/p5-Set-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Object
 PORTVERSION=	1.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Set-Object/pkg-plist b/devel/p5-Set-Object/pkg-plist
index 2f18c6b91008..3492f9fd9e2f 100644
--- a/devel/p5-Set-Object/pkg-plist
+++ b/devel/p5-Set-Object/pkg-plist
@@ -1,9 +1,8 @@
 %%PERL5_MAN3%%/Set::Changes.3.gz
 %%PERL5_MAN3%%/Set::Object.3.gz
 %%PERL5_MAN3%%/Set::Object::Weak.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Set/Changes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Set/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Set/Object/Weak.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/Object.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/autosplit.ix
+%%SITE_ARCH%%/Set/Changes.pod
+%%SITE_ARCH%%/Set/Object.pm
+%%SITE_ARCH%%/Set/Object/Weak.pm
+%%SITE_ARCH%%/auto/Set/Object/Object.so
+%%SITE_ARCH%%/auto/Set/Object/autosplit.ix
diff --git a/devel/p5-Set-Scalar/Makefile b/devel/p5-Set-Scalar/Makefile
index 54ca53ac56b0..a91ff3dae847 100644
--- a/devel/p5-Set-Scalar/Makefile
+++ b/devel/p5-Set-Scalar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Scalar
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Set-Scalar/pkg-plist b/devel/p5-Set-Scalar/pkg-plist
index 35a90edebebe..1e43bb72c10d 100644
--- a/devel/p5-Set-Scalar/pkg-plist
+++ b/devel/p5-Set-Scalar/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Set/Scalar/Valued.pm
 %%SITE_PERL%%/Set/Scalar/Virtual.pm
 %%SITE_PERL%%/Set/Scalar/Universe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Scalar/.packlist
 %%PERL5_MAN3%%/Set::Scalar.3.gz
 %%PERL5_MAN3%%/Set::Scalar::Base.3.gz
 %%PERL5_MAN3%%/Set::Scalar::Null.3.gz
diff --git a/devel/p5-Set-Tiny/Makefile b/devel/p5-Set-Tiny/Makefile
index 50a9b62c60f8..02b0a2b64b33 100644
--- a/devel/p5-Set-Tiny/Makefile
+++ b/devel/p5-Set-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Tiny
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Set-Tiny/pkg-plist b/devel/p5-Set-Tiny/pkg-plist
index 737c9e2fe273..87372676e126 100644
--- a/devel/p5-Set-Tiny/pkg-plist
+++ b/devel/p5-Set-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Set::Tiny.3.gz
 %%SITE_PERL%%/Set/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Tiny/.packlist
diff --git a/devel/p5-Shape/Makefile b/devel/p5-Shape/Makefile
index d18120512b0a..3a68a0777d5e 100644
--- a/devel/p5-Shape/Makefile
+++ b/devel/p5-Shape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Shape
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://users.tkk.fi/~jolma/pub/
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Shape/pkg-plist b/devel/p5-Shape/pkg-plist
index 5ce662aa83a1..e110f41d5836 100644
--- a/devel/p5-Shape/pkg-plist
+++ b/devel/p5-Shape/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Shape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/Shape.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/.packlist
+%%SITE_ARCH%%/Shape.pm
+%%SITE_ARCH%%/auto/Shape/Shape.so
+%%SITE_ARCH%%/auto/Shape/autosplit.ix
 %%PERL5_MAN3%%/Shape.3.gz
diff --git a/devel/p5-Shell-Base/Makefile b/devel/p5-Shell-Base/Makefile
index f8c570867008..6fc5ee65a755 100644
--- a/devel/p5-Shell-Base/Makefile
+++ b/devel/p5-Shell-Base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Shell-Base
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Shell-Base/pkg-plist b/devel/p5-Shell-Base/pkg-plist
index 0d3891ebd6ca..c445e56d3294 100644
--- a/devel/p5-Shell-Base/pkg-plist
+++ b/devel/p5-Shell-Base/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Shell::Base.3.gz
 %%SITE_PERL%%/Shell/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Base/.packlist
diff --git a/devel/p5-Shell-EnvImporter/Makefile b/devel/p5-Shell-EnvImporter/Makefile
index c534d20accaf..6d39cbebe391 100644
--- a/devel/p5-Shell-EnvImporter/Makefile
+++ b/devel/p5-Shell-EnvImporter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Shell-EnvImporter
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Shell-EnvImporter/pkg-plist b/devel/p5-Shell-EnvImporter/pkg-plist
index f74785299da9..2cee934e0dd9 100644
--- a/devel/p5-Shell-EnvImporter/pkg-plist
+++ b/devel/p5-Shell-EnvImporter/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/EnvImporter/.packlist
 %%SITE_PERL%%/Shell/EnvImporter.pm
 %%SITE_PERL%%/Shell/EnvImporter/Shell.pm
 %%SITE_PERL%%/Shell/EnvImporter/Result.pm
diff --git a/devel/p5-Shell-Parser/Makefile b/devel/p5-Shell-Parser/Makefile
index 50da408fcb65..02876ddc7a88 100644
--- a/devel/p5-Shell-Parser/Makefile
+++ b/devel/p5-Shell-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Shell-Parser
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Shell-Parser/pkg-plist b/devel/p5-Shell-Parser/pkg-plist
index f0c4fa2c2286..d9139a7a771e 100644
--- a/devel/p5-Shell-Parser/pkg-plist
+++ b/devel/p5-Shell-Parser/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Shell::Parser.3.gz
 %%SITE_PERL%%/Shell/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Parser/.packlist
diff --git a/devel/p5-Shell-Source/Makefile b/devel/p5-Shell-Source/Makefile
index 08aa82a328c7..b6526cc9223e 100644
--- a/devel/p5-Shell-Source/Makefile
+++ b/devel/p5-Shell-Source/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Shell-Source
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Shell-Source/pkg-plist b/devel/p5-Shell-Source/pkg-plist
index 4170458efc56..92ee9668f796 100644
--- a/devel/p5-Shell-Source/pkg-plist
+++ b/devel/p5-Shell-Source/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Shell/Source.pm
 %%SITE_PERL%%/Shell/t/Basic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Source/.packlist
 %%PERL5_MAN3%%/Shell::Source.3.gz
diff --git a/devel/p5-ShipIt-Step-Manifest/Makefile b/devel/p5-ShipIt-Step-Manifest/Makefile
index 07cfb0e2843a..4af112e5b9a4 100644
--- a/devel/p5-ShipIt-Step-Manifest/Makefile
+++ b/devel/p5-ShipIt-Step-Manifest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ShipIt-Step-Manifest
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARCEL
diff --git a/devel/p5-ShipIt-Step-Manifest/pkg-plist b/devel/p5-ShipIt-Step-Manifest/pkg-plist
index 642fc640b8ef..e65eb11493e0 100644
--- a/devel/p5-ShipIt-Step-Manifest/pkg-plist
+++ b/devel/p5-ShipIt-Step-Manifest/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ShipIt/Step/Manifest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ShipIt/Step/Manifest/.packlist
 %%PERL5_MAN3%%/ShipIt::Step::Manifest.3.gz
diff --git a/devel/p5-ShipIt/Makefile b/devel/p5-ShipIt/Makefile
index 4f8ccc3ff844..446067e2385a 100644
--- a/devel/p5-ShipIt/Makefile
+++ b/devel/p5-ShipIt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ShipIt
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-ShipIt/pkg-plist b/devel/p5-ShipIt/pkg-plist
index a967f0b10af7..15e1735941c9 100644
--- a/devel/p5-ShipIt/pkg-plist
+++ b/devel/p5-ShipIt/pkg-plist
@@ -35,5 +35,4 @@ bin/shipit
 %%SITE_PERL%%/ShipIt/VC/Mercurial.pm
 %%SITE_PERL%%/ShipIt/VC/SVK.pm
 %%SITE_PERL%%/ShipIt/VC/SVN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ShipIt/.packlist
 man/man1/shipit.1.gz
diff --git a/devel/p5-Slurp/Makefile b/devel/p5-Slurp/Makefile
index 778578f34550..af8732903909 100644
--- a/devel/p5-Slurp/Makefile
+++ b/devel/p5-Slurp/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Slurp
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROBAU
diff --git a/devel/p5-Slurp/pkg-plist b/devel/p5-Slurp/pkg-plist
index cbf8d5bf23e9..a3e4fb11acbc 100644
--- a/devel/p5-Slurp/pkg-plist
+++ b/devel/p5-Slurp/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Slurp.3.gz
 %%SITE_PERL%%/Slurp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slurp/.packlist
diff --git a/devel/p5-Smart-Comments/Makefile b/devel/p5-Smart-Comments/Makefile
index ddb8ff3e885c..97ae383bb049 100644
--- a/devel/p5-Smart-Comments/Makefile
+++ b/devel/p5-Smart-Comments/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Smart-Comments
 PORTVERSION=	1.000005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DCONWAY
diff --git a/devel/p5-Sort-Array/Makefile b/devel/p5-Sort-Array/Makefile
index f8d54bbebe03..b14783bb26be 100644
--- a/devel/p5-Sort-Array/Makefile
+++ b/devel/p5-Sort-Array/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Array
 DISTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sort-Array/pkg-plist b/devel/p5-Sort-Array/pkg-plist
index 68c199f45913..cc8f8b2c30ec 100644
--- a/devel/p5-Sort-Array/pkg-plist
+++ b/devel/p5-Sort-Array/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sort/Array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Array/.packlist
 %%PERL5_MAN3%%/Sort::Array.3.gz
diff --git a/devel/p5-Sort-ArrayOfArrays/Makefile b/devel/p5-Sort-ArrayOfArrays/Makefile
index 33c1e14c503e..025e6b22688f 100644
--- a/devel/p5-Sort-ArrayOfArrays/Makefile
+++ b/devel/p5-Sort-ArrayOfArrays/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-ArrayOfArrays
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sort-ArrayOfArrays/pkg-plist b/devel/p5-Sort-ArrayOfArrays/pkg-plist
index 420c4a9663f5..a336990c7116 100644
--- a/devel/p5-Sort-ArrayOfArrays/pkg-plist
+++ b/devel/p5-Sort-ArrayOfArrays/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sort::ArrayOfArrays.3.gz
 %%SITE_PERL%%/Sort/ArrayOfArrays.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays/.packlist
diff --git a/devel/p5-Sort-Key-DateTime/Makefile b/devel/p5-Sort-Key-DateTime/Makefile
index 65cb2bf6a417..fd8d8c049fea 100644
--- a/devel/p5-Sort-Key-DateTime/Makefile
+++ b/devel/p5-Sort-Key-DateTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Key-DateTime
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sort-Key-DateTime/pkg-plist b/devel/p5-Sort-Key-DateTime/pkg-plist
index d459c8812036..34d0f838492c 100644
--- a/devel/p5-Sort-Key-DateTime/pkg-plist
+++ b/devel/p5-Sort-Key-DateTime/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sort::Key::DateTime.3.gz
 %%SITE_PERL%%/Sort/Key/DateTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/DateTime/.packlist
diff --git a/devel/p5-Sort-Key-Top/Makefile b/devel/p5-Sort-Key-Top/Makefile
index b32a25b96e5a..567ce8315d24 100644
--- a/devel/p5-Sort-Key-Top/Makefile
+++ b/devel/p5-Sort-Key-Top/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Key-Top
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SALVA
@@ -18,6 +19,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Sort/Key/Top/Top.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sort/Key/Top/Top.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Sort-Key-Top/pkg-plist b/devel/p5-Sort-Key-Top/pkg-plist
index 5d7ec8c01566..9117a30ffa42 100644
--- a/devel/p5-Sort-Key-Top/pkg-plist
+++ b/devel/p5-Sort-Key-Top/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Sort::Key::Top.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Top.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Top/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Top/Top.so
+%%SITE_ARCH%%/Sort/Key/Top.pm
+%%SITE_ARCH%%/auto/Sort/Key/Top/Top.so
diff --git a/devel/p5-Sort-Key/Makefile b/devel/p5-Sort-Key/Makefile
index 1eab37831fd9..280a157e511f 100644
--- a/devel/p5-Sort-Key/Makefile
+++ b/devel/p5-Sort-Key/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Key
 PORTVERSION=	1.33
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sort-Key/pkg-plist b/devel/p5-Sort-Key/pkg-plist
index 4437b58c7790..fb7788bad302 100644
--- a/devel/p5-Sort-Key/pkg-plist
+++ b/devel/p5-Sort-Key/pkg-plist
@@ -4,11 +4,10 @@
 %%PERL5_MAN3%%/Sort::Key::Natural.3.gz
 %%PERL5_MAN3%%/Sort::Key::Register.3.gz
 %%PERL5_MAN3%%/Sort::Key::Types.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Maker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Multi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Natural.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Register.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Key.so
+%%SITE_ARCH%%/Sort/Key.pm
+%%SITE_ARCH%%/Sort/Key/Maker.pm
+%%SITE_ARCH%%/Sort/Key/Multi.pm
+%%SITE_ARCH%%/Sort/Key/Natural.pm
+%%SITE_ARCH%%/Sort/Key/Register.pm
+%%SITE_ARCH%%/Sort/Key/Types.pm
+%%SITE_ARCH%%/auto/Sort/Key/Key.so
diff --git a/devel/p5-Sort-Maker/Makefile b/devel/p5-Sort-Maker/Makefile
index 1ef7b1763ec6..28ec162c5606 100644
--- a/devel/p5-Sort-Maker/Makefile
+++ b/devel/p5-Sort-Maker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Maker
 DISTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sort-Maker/pkg-plist b/devel/p5-Sort-Maker/pkg-plist
index d942b3f85038..3d4cf6d5d5ac 100644
--- a/devel/p5-Sort-Maker/pkg-plist
+++ b/devel/p5-Sort-Maker/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sort::Maker.3.gz
 %%SITE_PERL%%/Sort/Maker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/.packlist
diff --git a/devel/p5-Sort-Tree/Makefile b/devel/p5-Sort-Tree/Makefile
index 917ae47da689..900c724b2dab 100644
--- a/devel/p5-Sort-Tree/Makefile
+++ b/devel/p5-Sort-Tree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Tree
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sort-Tree/pkg-plist b/devel/p5-Sort-Tree/pkg-plist
index 7214f415b8f8..e602ab24f617 100644
--- a/devel/p5-Sort-Tree/pkg-plist
+++ b/devel/p5-Sort-Tree/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sort::Tree.3.gz
 %%SITE_PERL%%/Sort/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Tree/.packlist
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index 926f52dacad3..ab532454e3ef 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Versions
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sort-Versions/pkg-plist b/devel/p5-Sort-Versions/pkg-plist
index acb6d880c7d3..746379b964be 100644
--- a/devel/p5-Sort-Versions/pkg-plist
+++ b/devel/p5-Sort-Versions/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sort/Versions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Versions/.packlist
 %%PERL5_MAN3%%/Sort::Versions.3.gz
diff --git a/devel/p5-Specio/Makefile b/devel/p5-Specio/Makefile
index c524b7d39627..45af317bf220 100644
--- a/devel/p5-Specio/Makefile
+++ b/devel/p5-Specio/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Specio
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/devel/p5-Specio/pkg-plist b/devel/p5-Specio/pkg-plist
index 14c3e1102109..e44bda628850 100644
--- a/devel/p5-Specio/pkg-plist
+++ b/devel/p5-Specio/pkg-plist
@@ -25,7 +25,6 @@
 %%SITE_PERL%%/Specio/Role/Inlinable.pm
 %%SITE_PERL%%/Specio/TypeChecks.pm
 %%SITE_PERL%%/TODO.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Specio/.packlist
 %%PERL5_MAN3%%/Specio.3.gz
 %%PERL5_MAN3%%/Specio::Coercion.3.gz
 %%PERL5_MAN3%%/Specio::Constraint::AnyCan.3.gz
diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile
index 65658b0cb826..ecef496c3a6b 100644
--- a/devel/p5-Spiffy/Makefile
+++ b/devel/p5-Spiffy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spiffy
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/devel/p5-Spiffy/pkg-plist b/devel/p5-Spiffy/pkg-plist
index 74ca381d1230..4f54edb5078e 100644
--- a/devel/p5-Spiffy/pkg-plist
+++ b/devel/p5-Spiffy/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Spiffy.pm
 %%SITE_PERL%%/Spiffy.pod
 %%SITE_PERL%%/Spiffy/mixin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spiffy/.packlist
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index a2971944d834..ac370498a09e 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Spoon
 PORTVERSION=	0.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/devel/p5-Spoon/pkg-plist b/devel/p5-Spoon/pkg-plist
index 2a266c1ee6ab..1f88123ac166 100644
--- a/devel/p5-Spoon/pkg-plist
+++ b/devel/p5-Spoon/pkg-plist
@@ -37,4 +37,3 @@
 %%SITE_PERL%%/Spoon/Template/TT2.pm
 %%SITE_PERL%%/Spoon/Trace.pm
 %%SITE_PERL%%/Spoon/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spoon/.packlist
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index fd1c75dfc9d3..62c1b98e7d27 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Storable
 PORTVERSION=	2.45
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Storable/pkg-plist b/devel/p5-Storable/pkg-plist
index 9db3d1422c57..5e7c2eade809 100644
--- a/devel/p5-Storable/pkg-plist
+++ b/devel/p5-Storable/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Storable/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Storable/Storable.so
+%%SITE_ARCH%%/Storable.pm
+%%SITE_ARCH%%/auto/Storable/Storable.so
 %%PERL5_MAN3%%/Storable.3.gz
diff --git a/devel/p5-Stream-Buffered/Makefile b/devel/p5-Stream-Buffered/Makefile
index 478701c2eb1e..2c3a694c32a3 100644
--- a/devel/p5-Stream-Buffered/Makefile
+++ b/devel/p5-Stream-Buffered/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Stream-Buffered
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Stream-Buffered/pkg-plist b/devel/p5-Stream-Buffered/pkg-plist
index a9e1c2fa68ce..0b6ece631b62 100644
--- a/devel/p5-Stream-Buffered/pkg-plist
+++ b/devel/p5-Stream-Buffered/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stream/Buffered/.packlist
 %%SITE_PERL%%/Stream/Buffered.pm
 %%SITE_PERL%%/Stream/Buffered/Auto.pm
 %%SITE_PERL%%/Stream/Buffered/File.pm
diff --git a/devel/p5-Stream-Reader/Makefile b/devel/p5-Stream-Reader/Makefile
index edf974c7e67b..5d74be23e905 100644
--- a/devel/p5-Stream-Reader/Makefile
+++ b/devel/p5-Stream-Reader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Stream-Reader
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Stream
diff --git a/devel/p5-Stream-Reader/pkg-plist b/devel/p5-Stream-Reader/pkg-plist
index d29ffe246fdf..dc350fc09116 100644
--- a/devel/p5-Stream-Reader/pkg-plist
+++ b/devel/p5-Stream-Reader/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Stream/Reader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stream/Reader/.packlist
 %%PERL5_MAN3%%/Stream::Reader.3.gz
diff --git a/devel/p5-Stream/Makefile b/devel/p5-Stream/Makefile
index 54dfa6a966cf..c282dcf771ac 100644
--- a/devel/p5-Stream/Makefile
+++ b/devel/p5-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Stream
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Stream/pkg-plist b/devel/p5-Stream/pkg-plist
index 9176cccda001..3cb01e9888b6 100644
--- a/devel/p5-Stream/pkg-plist
+++ b/devel/p5-Stream/pkg-plist
@@ -7,4 +7,3 @@
 %%SITE_PERL%%/Stream/Streamable.pm
 %%SITE_PERL%%/Stream/StringInputStream.pm
 %%SITE_PERL%%/Stream/StringOutputStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stream/.packlist
diff --git a/devel/p5-String-Approx/Makefile b/devel/p5-String-Approx/Makefile
index 2c5e8405bc21..f8eec960b351 100644
--- a/devel/p5-String-Approx/Makefile
+++ b/devel/p5-String-Approx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Approx
 PORTVERSION=	3.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Approx/pkg-plist b/devel/p5-String-Approx/pkg-plist
index 4edbfc5d98c6..88a828a65097 100644
--- a/devel/p5-String-Approx/pkg-plist
+++ b/devel/p5-String-Approx/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/String::Approx.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/String/Approx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/Approx.so
+%%SITE_ARCH%%/String/Approx.pm
+%%SITE_ARCH%%/auto/String/Approx/Approx.so
diff --git a/devel/p5-String-CRC32/Makefile b/devel/p5-String-CRC32/Makefile
index eb06cb9050dd..83a1f5ba34a8 100644
--- a/devel/p5-String-CRC32/Makefile
+++ b/devel/p5-String-CRC32/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-CRC32
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-CRC32/pkg-plist b/devel/p5-String-CRC32/pkg-plist
index 5798ed559806..8eac7a90df32 100644
--- a/devel/p5-String-CRC32/pkg-plist
+++ b/devel/p5-String-CRC32/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/String::CRC32.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/String/CRC32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/String/CRC32.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.so
+%%SITE_ARCH%%/String/CRC32.pm
+%%SITE_ARCH%%/String/CRC32.pod
+%%SITE_ARCH%%/auto/String/CRC32/CRC32.so
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index 8a1c0830bd2c..7c1a9ee232b7 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Checker
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Checker/pkg-plist b/devel/p5-String-Checker/pkg-plist
index ffe1e08c1e32..97d245f458d9 100644
--- a/devel/p5-String-Checker/pkg-plist
+++ b/devel/p5-String-Checker/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/String::Checker.3.gz
 %%SITE_PERL%%/String/Checker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker/.packlist
diff --git a/devel/p5-String-Diff/Makefile b/devel/p5-String-Diff/Makefile
index 6a0628ea3fe4..46446b69350d 100644
--- a/devel/p5-String-Diff/Makefile
+++ b/devel/p5-String-Diff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Diff
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Diff/pkg-plist b/devel/p5-String-Diff/pkg-plist
index bc450ceda007..7e357298f02a 100644
--- a/devel/p5-String-Diff/pkg-plist
+++ b/devel/p5-String-Diff/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/String::Diff.3.gz
 %%SITE_PERL%%/String/Diff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Diff/.packlist
diff --git a/devel/p5-String-Dump/Makefile b/devel/p5-String-Dump/Makefile
index 14bc637291f8..b00dbdfd44da 100644
--- a/devel/p5-String-Dump/Makefile
+++ b/devel/p5-String-Dump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Dump
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PATCH
diff --git a/devel/p5-String-Ediff/Makefile b/devel/p5-String-Ediff/Makefile
index 1c2d2c6b1439..59c1dd0a1d71 100644
--- a/devel/p5-String-Ediff/Makefile
+++ b/devel/p5-String-Ediff/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	String-Ediff
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Ediff/pkg-plist b/devel/p5-String-Ediff/pkg-plist
index 3ef54cce41a5..665f614b001f 100644
--- a/devel/p5-String-Ediff/pkg-plist
+++ b/devel/p5-String-Ediff/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/String::Ediff.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/String/Ediff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/Ediff.so
+%%SITE_ARCH%%/String/Ediff.pm
+%%SITE_ARCH%%/auto/String/Ediff/Ediff.so
diff --git a/devel/p5-String-Errf/Makefile b/devel/p5-String-Errf/Makefile
index 0ce7fab211d2..cea0576bbb73 100644
--- a/devel/p5-String-Errf/Makefile
+++ b/devel/p5-String-Errf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Errf
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Errf/pkg-plist b/devel/p5-String-Errf/pkg-plist
index 5238a72306f4..4bd402da586e 100644
--- a/devel/p5-String-Errf/pkg-plist
+++ b/devel/p5-String-Errf/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/String/Errf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Errf/.packlist
 %%PERL5_MAN3%%/String::Errf.3.gz
diff --git a/devel/p5-String-Formatter/Makefile b/devel/p5-String-Formatter/Makefile
index 5e28a9f2d3af..16bfd9340be3 100644
--- a/devel/p5-String-Formatter/Makefile
+++ b/devel/p5-String-Formatter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Formatter
 PORTVERSION=	0.102082
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Formatter/pkg-plist b/devel/p5-String-Formatter/pkg-plist
index 2b2d62bc8fc6..33af4829a491 100644
--- a/devel/p5-String-Formatter/pkg-plist
+++ b/devel/p5-String-Formatter/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/String/bench.pl
 %%SITE_PERL%%/String/Formatter.pm
 %%SITE_PERL%%/String/Formatter/Cookbook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Formatter/.packlist
 %%PERL5_MAN3%%/String::Formatter.3.gz
 %%PERL5_MAN3%%/String::Formatter::Cookbook.3.gz
diff --git a/devel/p5-String-LRC/Makefile b/devel/p5-String-LRC/Makefile
index 8ed2aba43881..5865881f080b 100644
--- a/devel/p5-String-LRC/Makefile
+++ b/devel/p5-String-LRC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-LRC
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-LRC/pkg-plist b/devel/p5-String-LRC/pkg-plist
index 26e7cd4eda61..5b535c80ff9d 100644
--- a/devel/p5-String-LRC/pkg-plist
+++ b/devel/p5-String-LRC/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/String::LRC.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/String/LRC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/String/LRC.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/String/bench.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC/LRC.so
+%%SITE_ARCH%%/String/LRC.pm
+%%SITE_ARCH%%/String/LRC.pod
+%%SITE_ARCH%%/String/bench.pl
+%%SITE_ARCH%%/auto/String/LRC/LRC.so
diff --git a/devel/p5-String-Parity/Makefile b/devel/p5-String-Parity/Makefile
index 374c00840c25..11809ec72fb2 100644
--- a/devel/p5-String-Parity/Makefile
+++ b/devel/p5-String-Parity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Parity
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Parity/pkg-plist b/devel/p5-String-Parity/pkg-plist
index 41a8f5a03fdc..ec7e047757fe 100644
--- a/devel/p5-String-Parity/pkg-plist
+++ b/devel/p5-String-Parity/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/String::Parity.3.gz
 %%SITE_PERL%%/String/Parity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Parity/.packlist
diff --git a/devel/p5-String-Random/Makefile b/devel/p5-String-Random/Makefile
index cf33892ea5a1..fd9572f5fede 100644
--- a/devel/p5-String-Random/Makefile
+++ b/devel/p5-String-Random/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Random
 PORTVERSION=	0.26
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-String-RexxParse/Makefile b/devel/p5-String-RexxParse/Makefile
index fcf104ed67fd..89abd4b91585 100644
--- a/devel/p5-String-RexxParse/Makefile
+++ b/devel/p5-String-RexxParse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-RexxParse
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-RexxParse/pkg-plist b/devel/p5-String-RexxParse/pkg-plist
index 600fd9d2eaba..c5ee49d1e501 100644
--- a/devel/p5-String-RexxParse/pkg-plist
+++ b/devel/p5-String-RexxParse/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/String::RexxParse.3.gz
 %%SITE_PERL%%/String/RexxParse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse/.packlist
diff --git a/devel/p5-String-Similarity/Makefile b/devel/p5-String-Similarity/Makefile
index 21e9b3d5b5d5..2aebc8619339 100644
--- a/devel/p5-String-Similarity/Makefile
+++ b/devel/p5-String-Similarity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Similarity
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-Similarity/pkg-plist b/devel/p5-String-Similarity/pkg-plist
index 6039003f1b10..055b08b30867 100644
--- a/devel/p5-String-Similarity/pkg-plist
+++ b/devel/p5-String-Similarity/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/String/Similarity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity/Similarity.so
+%%SITE_ARCH%%/String/Similarity.pm
+%%SITE_ARCH%%/auto/String/Similarity/Similarity.so
 %%PERL5_MAN3%%/String::Similarity.3.gz
diff --git a/devel/p5-String-TT/Makefile b/devel/p5-String-TT/Makefile
index 42c88501deb7..feefe004a93e 100644
--- a/devel/p5-String-TT/Makefile
+++ b/devel/p5-String-TT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-TT
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-String-TT/pkg-plist b/devel/p5-String-TT/pkg-plist
index 0a2ae4707451..360e112c54ac 100644
--- a/devel/p5-String-TT/pkg-plist
+++ b/devel/p5-String-TT/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/String/TT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/TT/.packlist
 %%PERL5_MAN3%%/String::TT.3.gz
diff --git a/devel/p5-Struct-Dumb/Makefile b/devel/p5-Struct-Dumb/Makefile
index 9426604c43b7..1ae260441a7b 100644
--- a/devel/p5-Struct-Dumb/Makefile
+++ b/devel/p5-Struct-Dumb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Struct-Dumb
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/devel/p5-Struct-Dumb/pkg-plist b/devel/p5-Struct-Dumb/pkg-plist
index c05c02caba77..daca996ca751 100644
--- a/devel/p5-Struct-Dumb/pkg-plist
+++ b/devel/p5-Struct-Dumb/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Struct/Dumb.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Struct/Dumb/.packlist
 %%PERL5_MAN3%%/Struct::Dumb.3.gz
diff --git a/devel/p5-Sub-Alias/Makefile b/devel/p5-Sub-Alias/Makefile
index cb3de1812cf7..fa42f575053b 100644
--- a/devel/p5-Sub-Alias/Makefile
+++ b/devel/p5-Sub-Alias/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Alias
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Alias/pkg-plist b/devel/p5-Sub-Alias/pkg-plist
index f1036271118c..0f3e7b988c04 100644
--- a/devel/p5-Sub-Alias/pkg-plist
+++ b/devel/p5-Sub-Alias/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sub/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Alias/.packlist
 %%PERL5_MAN3%%/Sub::Alias.3.gz
diff --git a/devel/p5-Sub-Current/Makefile b/devel/p5-Sub-Current/Makefile
index 945447dd29cc..5cfb2592566d 100644
--- a/devel/p5-Sub-Current/Makefile
+++ b/devel/p5-Sub-Current/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Current
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RGARCIA
diff --git a/devel/p5-Sub-Current/pkg-plist b/devel/p5-Sub-Current/pkg-plist
index f874adedb3e5..cb679b12506a 100644
--- a/devel/p5-Sub-Current/pkg-plist
+++ b/devel/p5-Sub-Current/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Sub::Current.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Current.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Current/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Current/Current.so
+%%SITE_ARCH%%/Sub/Current.pm
+%%SITE_ARCH%%/auto/Sub/Current/Current.so
diff --git a/devel/p5-Sub-Delete/Makefile b/devel/p5-Sub-Delete/Makefile
index 40093182f976..1e5edce3995b 100644
--- a/devel/p5-Sub-Delete/Makefile
+++ b/devel/p5-Sub-Delete/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Delete
 PORTVERSION=	1.00002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Delete/pkg-plist b/devel/p5-Sub-Delete/pkg-plist
index 9a7180d76cca..41dda5a40d39 100644
--- a/devel/p5-Sub-Delete/pkg-plist
+++ b/devel/p5-Sub-Delete/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sub::Delete.3.gz
 %%SITE_PERL%%/Sub/Delete.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Delete/.packlist
diff --git a/devel/p5-Sub-Exporter-ForMethods/Makefile b/devel/p5-Sub-Exporter-ForMethods/Makefile
index dab519d6e9db..0099cd0c352f 100644
--- a/devel/p5-Sub-Exporter-ForMethods/Makefile
+++ b/devel/p5-Sub-Exporter-ForMethods/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Exporter-ForMethods
 PORTVERSION=	0.100051
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Exporter-ForMethods/pkg-plist b/devel/p5-Sub-Exporter-ForMethods/pkg-plist
index 21ebf5d5625e..c697570184f1 100644
--- a/devel/p5-Sub-Exporter-ForMethods/pkg-plist
+++ b/devel/p5-Sub-Exporter-ForMethods/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sub::Exporter::ForMethods.3.gz
 %%SITE_PERL%%/Sub/Exporter/ForMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Exporter/ForMethods/.packlist
diff --git a/devel/p5-Sub-Exporter-GlobExporter/Makefile b/devel/p5-Sub-Exporter-GlobExporter/Makefile
index f881568c95e8..e5e5a4d9568a 100644
--- a/devel/p5-Sub-Exporter-GlobExporter/Makefile
+++ b/devel/p5-Sub-Exporter-GlobExporter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Exporter-GlobExporter
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Sub-Exporter-GlobExporter/pkg-plist b/devel/p5-Sub-Exporter-GlobExporter/pkg-plist
index d9f344b187f7..37d887a4b467 100644
--- a/devel/p5-Sub-Exporter-GlobExporter/pkg-plist
+++ b/devel/p5-Sub-Exporter-GlobExporter/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sub/Exporter/GlobExporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Exporter/GlobExporter/.packlist
 %%PERL5_MAN3%%/Sub::Exporter::GlobExporter.3.gz
diff --git a/devel/p5-Sub-Exporter-Lexical/Makefile b/devel/p5-Sub-Exporter-Lexical/Makefile
index f91afac4b498..eab071dc8fab 100644
--- a/devel/p5-Sub-Exporter-Lexical/Makefile
+++ b/devel/p5-Sub-Exporter-Lexical/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Exporter-Lexical
 PORTVERSION=	0.092292
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Exporter-Lexical/pkg-plist b/devel/p5-Sub-Exporter-Lexical/pkg-plist
index 660f9217d34e..177897af8412 100644
--- a/devel/p5-Sub-Exporter-Lexical/pkg-plist
+++ b/devel/p5-Sub-Exporter-Lexical/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Sub/Exporter/Lexical.pm
 %%SITE_PERL%%/Sub/Exporter/snippet.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Exporter/Lexical/.packlist
 %%PERL5_MAN3%%/Sub::Exporter::Lexical.3.gz
diff --git a/devel/p5-Sub-Exporter-Progressive/Makefile b/devel/p5-Sub-Exporter-Progressive/Makefile
index ed36a1e0894f..1e6798aada76 100644
--- a/devel/p5-Sub-Exporter-Progressive/Makefile
+++ b/devel/p5-Sub-Exporter-Progressive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Exporter-Progressive
 PORTVERSION=	0.001.011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Exporter-Progressive/pkg-plist b/devel/p5-Sub-Exporter-Progressive/pkg-plist
index f4d697b91ca8..9024d98795d4 100644
--- a/devel/p5-Sub-Exporter-Progressive/pkg-plist
+++ b/devel/p5-Sub-Exporter-Progressive/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sub/Exporter/Progressive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Exporter/Progressive/.packlist
 %%PERL5_MAN3%%/Sub::Exporter::Progressive.3.gz
diff --git a/devel/p5-Sub-Exporter/Makefile b/devel/p5-Sub-Exporter/Makefile
index 5b4055248b5e..81354d6dfb97 100644
--- a/devel/p5-Sub-Exporter/Makefile
+++ b/devel/p5-Sub-Exporter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Exporter
 PORTVERSION=	0.987
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Exporter/pkg-plist b/devel/p5-Sub-Exporter/pkg-plist
index 53aec95f714b..54c48338c3d3 100644
--- a/devel/p5-Sub-Exporter/pkg-plist
+++ b/devel/p5-Sub-Exporter/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Sub/Exporter/Cookbook.pod
 %%SITE_PERL%%/Sub/Exporter/Tutorial.pod
 %%SITE_PERL%%/Sub/Exporter/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Exporter/.packlist
 %%PERL5_MAN3%%/Sub::Exporter.3.gz
 %%PERL5_MAN3%%/Sub::Exporter::Cookbook.3.gz
 %%PERL5_MAN3%%/Sub::Exporter::Tutorial.3.gz
diff --git a/devel/p5-Sub-Identify/Makefile b/devel/p5-Sub-Identify/Makefile
index e291351303a8..eca5aa562061 100644
--- a/devel/p5-Sub-Identify/Makefile
+++ b/devel/p5-Sub-Identify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Identify
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,6 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/Sub/Identify/Identify.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sub/Identify/Identify.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Identify/pkg-plist b/devel/p5-Sub-Identify/pkg-plist
index e2fadc4ea2d0..69fb0dd8ba60 100644
--- a/devel/p5-Sub-Identify/pkg-plist
+++ b/devel/p5-Sub-Identify/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Sub::Identify.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Identify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Identify/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Identify/Identify.so
+%%SITE_ARCH%%/Sub/Identify.pm
+%%SITE_ARCH%%/auto/Sub/Identify/Identify.so
diff --git a/devel/p5-Sub-Infix/Makefile b/devel/p5-Sub-Infix/Makefile
index 0306af94508b..6cfa29dcfc49 100644
--- a/devel/p5-Sub-Infix/Makefile
+++ b/devel/p5-Sub-Infix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Infix
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Infix/pkg-plist b/devel/p5-Sub-Infix/pkg-plist
index 00f411ee96a8..7a0625126b81 100644
--- a/devel/p5-Sub-Infix/pkg-plist
+++ b/devel/p5-Sub-Infix/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sub/Infix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Infix/.packlist
 %%PERL5_MAN3%%/Sub::Infix.3.gz
diff --git a/devel/p5-Sub-Install/Makefile b/devel/p5-Sub-Install/Makefile
index 7769a314e4e9..03d1b3847b11 100644
--- a/devel/p5-Sub-Install/Makefile
+++ b/devel/p5-Sub-Install/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Install
 PORTVERSION=	0.928
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Install/pkg-plist b/devel/p5-Sub-Install/pkg-plist
index 50a0941bbede..8b7ba9e4a118 100644
--- a/devel/p5-Sub-Install/pkg-plist
+++ b/devel/p5-Sub-Install/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sub/Install.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Install/.packlist
 %%PERL5_MAN3%%/Sub::Install.3.gz
diff --git a/devel/p5-Sub-Installer/Makefile b/devel/p5-Sub-Installer/Makefile
index f2f11ec8e65d..82d26d9a07f1 100644
--- a/devel/p5-Sub-Installer/Makefile
+++ b/devel/p5-Sub-Installer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Installer
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Installer/pkg-plist b/devel/p5-Sub-Installer/pkg-plist
index eec0ce38a4ef..c155681e2ea0 100644
--- a/devel/p5-Sub-Installer/pkg-plist
+++ b/devel/p5-Sub-Installer/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sub::Installer.3.gz
 %%SITE_PERL%%/Sub/Installer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Installer/.packlist
diff --git a/devel/p5-Sub-Multi/Makefile b/devel/p5-Sub-Multi/Makefile
index 681af4381e8c..d83ea2c141e1 100644
--- a/devel/p5-Sub-Multi/Makefile
+++ b/devel/p5-Sub-Multi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Multi
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Multi/pkg-plist b/devel/p5-Sub-Multi/pkg-plist
index e3bdf75882fa..2d7742312aaf 100644
--- a/devel/p5-Sub-Multi/pkg-plist
+++ b/devel/p5-Sub-Multi/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sub::Multi.3.gz
 %%SITE_PERL%%/Sub/Multi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Multi/.packlist
diff --git a/devel/p5-Sub-Name/Makefile b/devel/p5-Sub-Name/Makefile
index 604a87578d0e..88bb94e4a4b9 100644
--- a/devel/p5-Sub-Name/Makefile
+++ b/devel/p5-Sub-Name/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Name
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Name/pkg-plist b/devel/p5-Sub-Name/pkg-plist
index 2eee6a82624d..564a8742947c 100644
--- a/devel/p5-Sub-Name/pkg-plist
+++ b/devel/p5-Sub-Name/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Name.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/Name.so
+%%SITE_ARCH%%/Sub/Name.pm
+%%SITE_ARCH%%/auto/Sub/Name/Name.so
 %%PERL5_MAN3%%/Sub::Name.3.gz
diff --git a/devel/p5-Sub-Override/Makefile b/devel/p5-Sub-Override/Makefile
index 7359c2a16f89..2668a1e59810 100644
--- a/devel/p5-Sub-Override/Makefile
+++ b/devel/p5-Sub-Override/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Override
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Override/pkg-plist b/devel/p5-Sub-Override/pkg-plist
index a0bcdcb7f27c..666506cf1513 100644
--- a/devel/p5-Sub-Override/pkg-plist
+++ b/devel/p5-Sub-Override/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sub::Override.3.gz
 %%SITE_PERL%%/Sub/Override.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Override/.packlist
diff --git a/devel/p5-Sub-Prototype/Makefile b/devel/p5-Sub-Prototype/Makefile
index 2755d782cc26..026c1c50db87 100644
--- a/devel/p5-Sub-Prototype/Makefile
+++ b/devel/p5-Sub-Prototype/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Prototype
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Prototype/pkg-plist b/devel/p5-Sub-Prototype/pkg-plist
index 7689fde7b028..74a1b2f5ecb5 100644
--- a/devel/p5-Sub-Prototype/pkg-plist
+++ b/devel/p5-Sub-Prototype/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Sub::Prototype.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Prototype.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Prototype/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Prototype/Prototype.so
+%%SITE_ARCH%%/Sub/Prototype.pm
+%%SITE_ARCH%%/auto/Sub/Prototype/Prototype.so
diff --git a/devel/p5-Sub-Signatures/Makefile b/devel/p5-Sub-Signatures/Makefile
index daa924691243..1170ab114ed5 100644
--- a/devel/p5-Sub-Signatures/Makefile
+++ b/devel/p5-Sub-Signatures/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Sub-Signatures
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Signatures/pkg-plist b/devel/p5-Sub-Signatures/pkg-plist
index bbb33e7a3d48..2ab371471a42 100644
--- a/devel/p5-Sub-Signatures/pkg-plist
+++ b/devel/p5-Sub-Signatures/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Signatures/.packlist
 %%SITE_PERL%%/Sub/Signatures.pm
 %%PERL5_MAN3%%/Sub::Signatures.3.gz
diff --git a/devel/p5-Sub-Uplevel/Makefile b/devel/p5-Sub-Uplevel/Makefile
index 628c11ea09d4..c8e4e95f7b16 100644
--- a/devel/p5-Sub-Uplevel/Makefile
+++ b/devel/p5-Sub-Uplevel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-Uplevel
 PORTVERSION=	0.2400
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-Uplevel/pkg-plist b/devel/p5-Sub-Uplevel/pkg-plist
index 42a30e6de998..d60e9c82e5ad 100644
--- a/devel/p5-Sub-Uplevel/pkg-plist
+++ b/devel/p5-Sub-Uplevel/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sub::Uplevel.3.gz
 %%SITE_PERL%%/Sub/Uplevel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Uplevel/.packlist
diff --git a/devel/p5-Sub-WrapPackages/Makefile b/devel/p5-Sub-WrapPackages/Makefile
index f6c93ba454c5..15aef5fd9499 100644
--- a/devel/p5-Sub-WrapPackages/Makefile
+++ b/devel/p5-Sub-WrapPackages/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sub-WrapPackages
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sub-WrapPackages/pkg-plist b/devel/p5-Sub-WrapPackages/pkg-plist
index 0ebd24c83144..c631dc8d7ebc 100644
--- a/devel/p5-Sub-WrapPackages/pkg-plist
+++ b/devel/p5-Sub-WrapPackages/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sub::WrapPackages.3.gz
 %%SITE_PERL%%/Sub/WrapPackages.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/WrapPackages/.packlist
diff --git a/devel/p5-Symbol-Global-Name/Makefile b/devel/p5-Symbol-Global-Name/Makefile
index 48db6d38a735..8a116e095d38 100644
--- a/devel/p5-Symbol-Global-Name/Makefile
+++ b/devel/p5-Symbol-Global-Name/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Symbol-Global-Name
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Symbol-Global-Name/pkg-plist b/devel/p5-Symbol-Global-Name/pkg-plist
index 268208cb31b8..1d3d011ebc84 100644
--- a/devel/p5-Symbol-Global-Name/pkg-plist
+++ b/devel/p5-Symbol-Global-Name/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Symbol::Global::Name.3.gz
 %%SITE_PERL%%/Symbol/Global/Name.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Symbol/Global/Name/.packlist
 
diff --git a/devel/p5-Symbol-Util/Makefile b/devel/p5-Symbol-Util/Makefile
index a97eeb9954df..db15b0541277 100644
--- a/devel/p5-Symbol-Util/Makefile
+++ b/devel/p5-Symbol-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Symbol-Util
 PORTVERSION=	0.0203
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Symbol-Util/pkg-plist b/devel/p5-Symbol-Util/pkg-plist
index fc0b63bc3d44..1a6d9f1ec04d 100644
--- a/devel/p5-Symbol-Util/pkg-plist
+++ b/devel/p5-Symbol-Util/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Symbol::Util.3.gz
 %%SITE_PERL%%/Symbol/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Symbol/Util/.packlist
diff --git a/devel/p5-Syntax-Keyword-Junction/Makefile b/devel/p5-Syntax-Keyword-Junction/Makefile
index 09ab31a4424c..ad723ca148ce 100644
--- a/devel/p5-Syntax-Keyword-Junction/Makefile
+++ b/devel/p5-Syntax-Keyword-Junction/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Syntax-Keyword-Junction
 PORTVERSION=	0.003007
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Syntax-Keyword-Junction/pkg-plist b/devel/p5-Syntax-Keyword-Junction/pkg-plist
index b419e1bf5393..f5616a7eecb1 100644
--- a/devel/p5-Syntax-Keyword-Junction/pkg-plist
+++ b/devel/p5-Syntax-Keyword-Junction/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Syntax/Keyword/Junction/None.pm
 %%SITE_PERL%%/Syntax/Keyword/Junction/All.pm
 %%SITE_PERL%%/Syntax/Keyword/Junction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Keyword/Junction/.packlist
 %%PERL5_MAN3%%/Syntax::Feature::Junction.3.gz
 %%PERL5_MAN3%%/Syntax::Keyword::Junction.3.gz
 %%PERL5_MAN3%%/Syntax::Keyword::Junction::All.3.gz
diff --git a/devel/p5-Sys-Cpu/Makefile b/devel/p5-Sys-Cpu/Makefile
index 2dbabbd9e065..f792414859f3 100644
--- a/devel/p5-Sys-Cpu/Makefile
+++ b/devel/p5-Sys-Cpu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-CPU
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Cpu/pkg-plist b/devel/p5-Sys-Cpu/pkg-plist
index 62d13dbdcace..afe8e509c941 100644
--- a/devel/p5-Sys-Cpu/pkg-plist
+++ b/devel/p5-Sys-Cpu/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/CPU.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CPU/CPU.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CPU/.packlist
+%%SITE_ARCH%%/Sys/CPU.pm
+%%SITE_ARCH%%/auto/Sys/CPU/CPU.so
 %%PERL5_MAN3%%/Sys::CPU.3.gz
diff --git a/devel/p5-Sys-Info-Base/Makefile b/devel/p5-Sys-Info-Base/Makefile
index c753c0bffbc6..3db7a8cc3016 100644
--- a/devel/p5-Sys-Info-Base/Makefile
+++ b/devel/p5-Sys-Info-Base/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Sys-Info-Base
 PORTVERSION=	0.7803
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Info-Base/pkg-plist b/devel/p5-Sys-Info-Base/pkg-plist
index 266718a68d59..9e95acddecd6 100644
--- a/devel/p5-Sys-Info-Base/pkg-plist
+++ b/devel/p5-Sys-Info-Base/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Sys/Info/Driver.pm
 %%SITE_PERL%%/Sys/Info/Helper.pm
 %%SITE_PERL%%/Sys/Info/OS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Info/Base/.packlist
 %%PERL5_MAN3%%/Sys::Info::Base.3.gz
 %%PERL5_MAN3%%/Sys::Info::Constants.3.gz
 %%PERL5_MAN3%%/Sys::Info::Device.3.gz
diff --git a/devel/p5-Sys-Info-Driver-BSD/Makefile b/devel/p5-Sys-Info-Driver-BSD/Makefile
index 756293f35a78..2c3f9c7cc2a0 100644
--- a/devel/p5-Sys-Info-Driver-BSD/Makefile
+++ b/devel/p5-Sys-Info-Driver-BSD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Info-Driver-BSD
 PORTVERSION=	0.7801
+PORTREVISION=	1
 CATEGORIES=	devel sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Info-Driver-BSD/pkg-plist b/devel/p5-Sys-Info-Driver-BSD/pkg-plist
index 1ca23a64b2bf..07753b3714b5 100644
--- a/devel/p5-Sys-Info-Driver-BSD/pkg-plist
+++ b/devel/p5-Sys-Info-Driver-BSD/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Sys/Info/Driver/BSD/Device.pm
 %%SITE_PERL%%/Sys/Info/Driver/BSD/Device/CPU.pm
 %%SITE_PERL%%/Sys/Info/Driver/BSD/OS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Info/Driver/BSD/.packlist
 %%PERL5_MAN3%%/Sys::Info::Driver::BSD.3.gz
 %%PERL5_MAN3%%/Sys::Info::Driver::BSD::Device.3.gz
 %%PERL5_MAN3%%/Sys::Info::Driver::BSD::Device::CPU.3.gz
diff --git a/devel/p5-Sys-Info/Makefile b/devel/p5-Sys-Info/Makefile
index f14e9390617e..081cfeccbcc9 100644
--- a/devel/p5-Sys-Info/Makefile
+++ b/devel/p5-Sys-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Info
 PORTVERSION=	0.78
+PORTREVISION=	1
 CATEGORIES=	devel sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Info/pkg-plist b/devel/p5-Sys-Info/pkg-plist
index 6aac5c0bba9d..117ac75ceccf 100644
--- a/devel/p5-Sys-Info/pkg-plist
+++ b/devel/p5-Sys-Info/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sys/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Info/.packlist
 %%PERL5_MAN3%%/Sys::Info.3.gz
diff --git a/devel/p5-Sys-MemInfo/Makefile b/devel/p5-Sys-MemInfo/Makefile
index 13bcc9f0f781..5cacc2f70c11 100644
--- a/devel/p5-Sys-MemInfo/Makefile
+++ b/devel/p5-Sys-MemInfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-MemInfo
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-MemInfo/pkg-plist b/devel/p5-Sys-MemInfo/pkg-plist
index 1f22aaaae2bb..0ae217a260a7 100644
--- a/devel/p5-Sys-MemInfo/pkg-plist
+++ b/devel/p5-Sys-MemInfo/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/MemInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/MemInfo/MemInfo.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/MemInfo/.packlist
+%%SITE_ARCH%%/Sys/MemInfo.pm
+%%SITE_ARCH%%/auto/Sys/MemInfo/MemInfo.so
 %%PERL5_MAN3%%/Sys::MemInfo.3.gz
diff --git a/devel/p5-Sys-Mmap/Makefile b/devel/p5-Sys-Mmap/Makefile
index 34516abbf41a..559c2917da72 100644
--- a/devel/p5-Sys-Mmap/Makefile
+++ b/devel/p5-Sys-Mmap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Mmap
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Mmap/pkg-plist b/devel/p5-Sys-Mmap/pkg-plist
index 0f28ee68aea1..b90b404b3f90 100644
--- a/devel/p5-Sys-Mmap/pkg-plist
+++ b/devel/p5-Sys-Mmap/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Sys::Mmap.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Mmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/Mmap.so
+%%SITE_ARCH%%/Sys/Mmap.pm
+%%SITE_ARCH%%/auto/Sys/Mmap/Mmap.so
diff --git a/devel/p5-Sys-RunAlone/Makefile b/devel/p5-Sys-RunAlone/Makefile
index 999646b6c5af..af1f83676352 100644
--- a/devel/p5-Sys-RunAlone/Makefile
+++ b/devel/p5-Sys-RunAlone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-RunAlone
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Sys
diff --git a/devel/p5-Sys-RunAlone/pkg-plist b/devel/p5-Sys-RunAlone/pkg-plist
index 05c9c619d73c..2f053a688e37 100644
--- a/devel/p5-Sys-RunAlone/pkg-plist
+++ b/devel/p5-Sys-RunAlone/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sys/RunAlone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/RunAlone/.packlist
 %%PERL5_MAN3%%/Sys::RunAlone.3.gz
diff --git a/devel/p5-Sys-RunAlways/Makefile b/devel/p5-Sys-RunAlways/Makefile
index b239ee94dff1..5e6b35eeb2ea 100644
--- a/devel/p5-Sys-RunAlways/Makefile
+++ b/devel/p5-Sys-RunAlways/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-RunAlways
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Sys
diff --git a/devel/p5-Sys-RunAlways/pkg-plist b/devel/p5-Sys-RunAlways/pkg-plist
index ebbac9834875..c0b6b5d10289 100644
--- a/devel/p5-Sys-RunAlways/pkg-plist
+++ b/devel/p5-Sys-RunAlways/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sys/RunAlways.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/RunAlways/.packlist
 %%PERL5_MAN3%%/Sys::RunAlways.3.gz
diff --git a/devel/p5-Sys-Sendfile-FreeBSD/Makefile b/devel/p5-Sys-Sendfile-FreeBSD/Makefile
index faa3c79ca1df..43ee65381a91 100644
--- a/devel/p5-Sys-Sendfile-FreeBSD/Makefile
+++ b/devel/p5-Sys-Sendfile-FreeBSD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Sendfile-FreeBSD
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Sendfile-FreeBSD/pkg-plist b/devel/p5-Sys-Sendfile-FreeBSD/pkg-plist
index 584c4736b865..c97fa6742d7e 100644
--- a/devel/p5-Sys-Sendfile-FreeBSD/pkg-plist
+++ b/devel/p5-Sys-Sendfile-FreeBSD/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Sendfile/FreeBSD.pm
+%%SITE_ARCH%%/Sys/Sendfile/FreeBSD.pm
 %%PERL5_MAN3%%/Sys::Sendfile::FreeBSD.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sendfile/FreeBSD/FreeBSD.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sendfile/FreeBSD/.packlist
+%%SITE_ARCH%%/auto/Sys/Sendfile/FreeBSD/FreeBSD.so
diff --git a/devel/p5-Sys-Sendfile/Makefile b/devel/p5-Sys-Sendfile/Makefile
index b61652a48261..6b5d8048ce98 100644
--- a/devel/p5-Sys-Sendfile/Makefile
+++ b/devel/p5-Sys-Sendfile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Sys-Sendfile
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Sendfile/pkg-plist b/devel/p5-Sys-Sendfile/pkg-plist
index 4ec15ea8ef15..e7d454988b3e 100644
--- a/devel/p5-Sys-Sendfile/pkg-plist
+++ b/devel/p5-Sys-Sendfile/pkg-plist
@@ -1,3 +1,3 @@
 %%PERL5_MAN3%%/Sys::Sendfile.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Sendfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sendfile/Sendfile.so
+%%SITE_ARCH%%/Sys/Sendfile.pm
+%%SITE_ARCH%%/auto/Sys/Sendfile/Sendfile.so
diff --git a/devel/p5-Sys-Sig/Makefile b/devel/p5-Sys-Sig/Makefile
index 7c2b0d43ea2f..8ef96ca55ef0 100644
--- a/devel/p5-Sys-Sig/Makefile
+++ b/devel/p5-Sys-Sig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Sig
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Sig/pkg-plist b/devel/p5-Sys-Sig/pkg-plist
index 196c890778e3..f5e857d2d5f2 100644
--- a/devel/p5-Sys-Sig/pkg-plist
+++ b/devel/p5-Sys-Sig/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Sys::Sig.3.gz
 %%SITE_PERL%%/Sys/Sig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sig/.packlist
diff --git a/devel/p5-Sys-SigAction/Makefile b/devel/p5-Sys-SigAction/Makefile
index 53fa0dde74d2..ea801b09cd56 100644
--- a/devel/p5-Sys-SigAction/Makefile
+++ b/devel/p5-Sys-SigAction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-SigAction
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-SigAction/pkg-plist b/devel/p5-Sys-SigAction/pkg-plist
index c4526af04dd7..687f58b6073b 100644
--- a/devel/p5-Sys-SigAction/pkg-plist
+++ b/devel/p5-Sys-SigAction/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Sys/SigAction.pm
 %%SITE_PERL%%/Sys/SigAction/Alarm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/SigAction/.packlist
 %%PERL5_MAN3%%/Sys::SigAction.3.gz
diff --git a/devel/p5-Sys-Syscall/Makefile b/devel/p5-Sys-Syscall/Makefile
index 718d13f8b9b9..897ce2c9141c 100644
--- a/devel/p5-Sys-Syscall/Makefile
+++ b/devel/p5-Sys-Syscall/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Syscall
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Sys
diff --git a/devel/p5-Sys-Syscall/pkg-plist b/devel/p5-Sys-Syscall/pkg-plist
index 3b17be173b12..925cf176a312 100644
--- a/devel/p5-Sys-Syscall/pkg-plist
+++ b/devel/p5-Sys-Syscall/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Sys::Syscall.3.gz
 %%SITE_PERL%%/Sys/README.pod
 %%SITE_PERL%%/Sys/Syscall.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syscall/.packlist
diff --git a/devel/p5-Sys-Trace/Makefile b/devel/p5-Sys-Trace/Makefile
index 0d39de50d1c8..e2695c5bfa85 100644
--- a/devel/p5-Sys-Trace/Makefile
+++ b/devel/p5-Sys-Trace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Trace
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Sys-Trace/pkg-plist b/devel/p5-Sys-Trace/pkg-plist
index bab4f4cf4583..e9d4f96afeb1 100644
--- a/devel/p5-Sys-Trace/pkg-plist
+++ b/devel/p5-Sys-Trace/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Sys/Trace/Impl/Strace.pm
 %%SITE_PERL%%/Sys/Trace/Impl/Truss.pm
 %%SITE_PERL%%/Sys/Trace/Results.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Trace/.packlist
diff --git a/devel/p5-Sys-Virt/Makefile b/devel/p5-Sys-Virt/Makefile
index 170f219ca6b5..c56d6c8ca751 100644
--- a/devel/p5-Sys-Virt/Makefile
+++ b/devel/p5-Sys-Virt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Sys-Virt
 PORTVERSION=	1.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -35,7 +35,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.pl
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Sys/Virt/Virt.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sys/Virt/Virt.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/devel/p5-Sys-Virt/pkg-plist b/devel/p5-Sys-Virt/pkg-plist
index bc226a089667..ff8535b63890 100644
--- a/devel/p5-Sys-Virt/pkg-plist
+++ b/devel/p5-Sys-Virt/pkg-plist
@@ -1,18 +1,17 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/Domain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/DomainSnapshot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/Interface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/NWFilter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/Network.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/NodeDevice.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/Secret.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/StoragePool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/StorageVol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Virt/Stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Virt/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Virt/Virt.so
+%%SITE_ARCH%%/Sys/Virt.pm
+%%SITE_ARCH%%/Sys/Virt/Domain.pm
+%%SITE_ARCH%%/Sys/Virt/DomainSnapshot.pm
+%%SITE_ARCH%%/Sys/Virt/Error.pm
+%%SITE_ARCH%%/Sys/Virt/Event.pm
+%%SITE_ARCH%%/Sys/Virt/Interface.pm
+%%SITE_ARCH%%/Sys/Virt/NWFilter.pm
+%%SITE_ARCH%%/Sys/Virt/Network.pm
+%%SITE_ARCH%%/Sys/Virt/NodeDevice.pm
+%%SITE_ARCH%%/Sys/Virt/Secret.pm
+%%SITE_ARCH%%/Sys/Virt/StoragePool.pm
+%%SITE_ARCH%%/Sys/Virt/StorageVol.pm
+%%SITE_ARCH%%/Sys/Virt/Stream.pm
+%%SITE_ARCH%%/auto/Sys/Virt/Virt.so
 %%PERL5_MAN3%%/Sys::Virt.3.gz
 %%PERL5_MAN3%%/Sys::Virt::Domain.3.gz
 %%PERL5_MAN3%%/Sys::Virt::DomainSnapshot.3.gz
diff --git a/devel/p5-System-Command/Makefile b/devel/p5-System-Command/Makefile
index aca888a92f1c..c62bbfe5d058 100644
--- a/devel/p5-System-Command/Makefile
+++ b/devel/p5-System-Command/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	System-Command
 PORTVERSION=	1.110
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-System-Command/pkg-plist b/devel/p5-System-Command/pkg-plist
index 13eefbfad651..0dd9a7f819c4 100644
--- a/devel/p5-System-Command/pkg-plist
+++ b/devel/p5-System-Command/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/System/Command.pm
 %%SITE_PERL%%/System/Command/Reaper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/System/Command/.packlist
 %%PERL5_MAN3%%/System::Command.3.gz
 %%PERL5_MAN3%%/System::Command::Reaper.3.gz
diff --git a/devel/p5-System-Sub/Makefile b/devel/p5-System-Sub/Makefile
index db5c5e2f58a5..6ffcebead42f 100644
--- a/devel/p5-System-Sub/Makefile
+++ b/devel/p5-System-Sub/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	System-Sub
 PORTVERSION=	0.130210
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-System-Sub/pkg-plist b/devel/p5-System-Sub/pkg-plist
index f29effc747be..5934f98c76aa 100644
--- a/devel/p5-System-Sub/pkg-plist
+++ b/devel/p5-System-Sub/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/System::Sub::AutoLoad.3.gz
 %%SITE_PERL%%/System/Sub.pm
 %%SITE_PERL%%/System/Sub/AutoLoad.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/System/Sub/.packlist
diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index 3f31bf07ca73..4dbeb6a84c64 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	System2
 PORTVERSION=	0.84
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-System2/pkg-plist b/devel/p5-System2/pkg-plist
index 54db2aa325f4..7b07b07b53f1 100644
--- a/devel/p5-System2/pkg-plist
+++ b/devel/p5-System2/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/System2.3.gz
 %%SITE_PERL%%/System2.pm
 %%SITE_PERL%%/auto/System2/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/System2/.packlist
diff --git a/devel/p5-TAP-Formatter-JUnit/Makefile b/devel/p5-TAP-Formatter-JUnit/Makefile
index 66f7032af746..2028d570da2b 100644
--- a/devel/p5-TAP-Formatter-JUnit/Makefile
+++ b/devel/p5-TAP-Formatter-JUnit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	TAP-Formatter-JUnit
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-TAP-Harness-JUnit/Makefile b/devel/p5-TAP-Harness-JUnit/Makefile
index cb55cf682785..0872baa8815c 100644
--- a/devel/p5-TAP-Harness-JUnit/Makefile
+++ b/devel/p5-TAP-Harness-JUnit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	TAP-Harness-JUnit
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-TAP-SimpleOutput/Makefile b/devel/p5-TAP-SimpleOutput/Makefile
index 9bdbb4d88f5f..019f0722ecf6 100644
--- a/devel/p5-TAP-SimpleOutput/Makefile
+++ b/devel/p5-TAP-SimpleOutput/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	TAP-SimpleOutput
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	TAP
diff --git a/devel/p5-TAP-SimpleOutput/pkg-plist b/devel/p5-TAP-SimpleOutput/pkg-plist
index 84c34472b046..e75413e95180 100644
--- a/devel/p5-TAP-SimpleOutput/pkg-plist
+++ b/devel/p5-TAP-SimpleOutput/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/TAP/SimpleOutput.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TAP/SimpleOutput/.packlist
 %%PERL5_MAN3%%/TAP::SimpleOutput.3.gz
diff --git a/devel/p5-Taint-Runtime/Makefile b/devel/p5-Taint-Runtime/Makefile
index a6c1559b2258..0083d8617feb 100644
--- a/devel/p5-Taint-Runtime/Makefile
+++ b/devel/p5-Taint-Runtime/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Taint-Runtime
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Taint-Runtime/pkg-plist b/devel/p5-Taint-Runtime/pkg-plist
index ea6b827964b7..052144c52762 100644
--- a/devel/p5-Taint-Runtime/pkg-plist
+++ b/devel/p5-Taint-Runtime/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Taint::Runtime.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Taint/Runtime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Taint/is_taint_bench.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Taint/Runtime/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Taint/Runtime/Runtime.so
+%%SITE_ARCH%%/Taint/Runtime.pm
+%%SITE_ARCH%%/Taint/is_taint_bench.pl
+%%SITE_ARCH%%/auto/Taint/Runtime/Runtime.so
diff --git a/devel/p5-Taint-Util/Makefile b/devel/p5-Taint-Util/Makefile
index b2f160a6bbd4..bcb5063fb770 100644
--- a/devel/p5-Taint-Util/Makefile
+++ b/devel/p5-Taint-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Taint-Util
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Taint-Util/pkg-plist b/devel/p5-Taint-Util/pkg-plist
index 0a402cdc92f1..4e6373bad06b 100644
--- a/devel/p5-Taint-Util/pkg-plist
+++ b/devel/p5-Taint-Util/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Taint/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Taint/Util/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Taint/Util/Util.so
+%%SITE_ARCH%%/Taint/Util.pm
+%%SITE_ARCH%%/auto/Taint/Util/Util.so
 %%PERL5_MAN3%%/Taint::Util.3.gz
diff --git a/devel/p5-Task-Weaken/Makefile b/devel/p5-Task-Weaken/Makefile
index 7b0e3802a189..993b659de55a 100644
--- a/devel/p5-Task-Weaken/Makefile
+++ b/devel/p5-Task-Weaken/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Task-Weaken
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Task-Weaken/pkg-plist b/devel/p5-Task-Weaken/pkg-plist
index 8c9510aac80f..43e15e31a70e 100644
--- a/devel/p5-Task-Weaken/pkg-plist
+++ b/devel/p5-Task-Weaken/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Task::Weaken.3.gz
 %%SITE_PERL%%/Task/Weaken.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Weaken/.packlist
diff --git a/devel/p5-Tee/Makefile b/devel/p5-Tee/Makefile
index b2e1f5569b71..98aca5fee44b 100644
--- a/devel/p5-Tee/Makefile
+++ b/devel/p5-Tee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tee
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5 textproc
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Tee/pkg-plist b/devel/p5-Tee/pkg-plist
index 309fc783cff3..53d654e657fa 100644
--- a/devel/p5-Tee/pkg-plist
+++ b/devel/p5-Tee/pkg-plist
@@ -4,4 +4,3 @@ man/man1/ptee.1.gz
 %%PERL5_MAN3%%/Tee::App.3.gz
 %%SITE_PERL%%/Tee.pm
 %%SITE_PERL%%/Tee/App.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tee/.packlist
diff --git a/devel/p5-Template-Provider-Encode/Makefile b/devel/p5-Template-Provider-Encode/Makefile
index b40bb9abff01..0ddef03baf75 100644
--- a/devel/p5-Template-Provider-Encode/Makefile
+++ b/devel/p5-Template-Provider-Encode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Provider-Encode
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Template-Provider-Encode/pkg-plist b/devel/p5-Template-Provider-Encode/pkg-plist
index 01daf003905e..fa82ab7ce030 100644
--- a/devel/p5-Template-Provider-Encode/pkg-plist
+++ b/devel/p5-Template-Provider-Encode/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider/Encode/.packlist
 %%SITE_PERL%%/Template/Provider/Encode.pm
 %%SITE_PERL%%/Template/Provider/Encode/Guess.pm
 %%PERL5_MAN3%%/Template::Provider::Encode.3.gz
diff --git a/devel/p5-Term-ANSIColor/Makefile b/devel/p5-Term-ANSIColor/Makefile
index 03e425b12354..673468fbae95 100644
--- a/devel/p5-Term-ANSIColor/Makefile
+++ b/devel/p5-Term-ANSIColor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ANSIColor
 PORTVERSION=	3.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ANSIColor/pkg-plist b/devel/p5-Term-ANSIColor/pkg-plist
index 11c313df1a3f..1148f909ef7a 100644
--- a/devel/p5-Term-ANSIColor/pkg-plist
+++ b/devel/p5-Term-ANSIColor/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/ANSIColor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIColor/.packlist
 %%PERL5_MAN3%%/Term::ANSIColor.3.gz
diff --git a/devel/p5-Term-ANSIScreen/Makefile b/devel/p5-Term-ANSIScreen/Makefile
index 8b4130b601b0..6d0b1ea1eb62 100644
--- a/devel/p5-Term-ANSIScreen/Makefile
+++ b/devel/p5-Term-ANSIScreen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ANSIScreen
 PORTVERSION=	1.50
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AUDREYT
diff --git a/devel/p5-Term-ANSIScreen/pkg-plist b/devel/p5-Term-ANSIScreen/pkg-plist
index 8b1318755340..dfff7736a452 100644
--- a/devel/p5-Term-ANSIScreen/pkg-plist
+++ b/devel/p5-Term-ANSIScreen/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/ANSIScreen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIScreen/.packlist
 %%PERL5_MAN3%%/Term::ANSIScreen.3.gz
diff --git a/devel/p5-Term-Animation/Makefile b/devel/p5-Term-Animation/Makefile
index 955a42cbc796..ead5a7e82f30 100644
--- a/devel/p5-Term-Animation/Makefile
+++ b/devel/p5-Term-Animation/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Animation
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Animation/pkg-plist b/devel/p5-Term-Animation/pkg-plist
index da549bb9627e..fff84b549493 100644
--- a/devel/p5-Term-Animation/pkg-plist
+++ b/devel/p5-Term-Animation/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Term/Animation.pm
 %%SITE_PERL%%/Term/Animation/Entity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Animation/.packlist
 %%PERL5_MAN3%%/Term::Animation.3.gz
 %%PERL5_MAN3%%/Term::Animation::Entity.3.gz
diff --git a/devel/p5-Term-CallEditor/Makefile b/devel/p5-Term-CallEditor/Makefile
index ef6c675dbbd2..d7dd4e02d02c 100644
--- a/devel/p5-Term-CallEditor/Makefile
+++ b/devel/p5-Term-CallEditor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-CallEditor
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-CallEditor/pkg-plist b/devel/p5-Term-CallEditor/pkg-plist
index df3687ed80b4..91792c28d18e 100644
--- a/devel/p5-Term-CallEditor/pkg-plist
+++ b/devel/p5-Term-CallEditor/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Term::CallEditor.3.gz
 %%SITE_PERL%%/Term/CallEditor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/CallEditor/.packlist
diff --git a/devel/p5-Term-Clui/Makefile b/devel/p5-Term-Clui/Makefile
index 4c19b04ef972..0ef3adcc769a 100644
--- a/devel/p5-Term-Clui/Makefile
+++ b/devel/p5-Term-Clui/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Term-Clui
 PORTVERSION=	1.68
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Clui/pkg-plist b/devel/p5-Term-Clui/pkg-plist
index d6ba1d4409ce..853c4e47c953 100644
--- a/devel/p5-Term-Clui/pkg-plist
+++ b/devel/p5-Term-Clui/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Term/Clui/FileSelect.pm
 %%SITE_PERL%%/Term/Clui.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Clui/.packlist
 %%PERL5_MAN3%%/Term::Clui.3.gz
 %%PERL5_MAN3%%/Term::Clui::FileSelect.3.gz
diff --git a/devel/p5-Term-EditLine/Makefile b/devel/p5-Term-EditLine/Makefile
index 2ed1f327859f..989ff8860776 100644
--- a/devel/p5-Term-EditLine/Makefile
+++ b/devel/p5-Term-EditLine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-EditLine
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,6 +15,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Term/EditLine/EditLine.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Term/EditLine/EditLine.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Term-EditLine/pkg-plist b/devel/p5-Term-EditLine/pkg-plist
index 7c9efb9661f5..2053e4bf3735 100644
--- a/devel/p5-Term-EditLine/pkg-plist
+++ b/devel/p5-Term-EditLine/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Term::EditLine.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Term/EditLine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Term/EditLine.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/EditLine/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/EditLine/EditLine.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/EditLine/autosplit.ix
+%%SITE_ARCH%%/Term/EditLine.pm
+%%SITE_ARCH%%/Term/EditLine.pod
+%%SITE_ARCH%%/auto/Term/EditLine/EditLine.so
+%%SITE_ARCH%%/auto/Term/EditLine/autosplit.ix
diff --git a/devel/p5-Term-Encoding/Makefile b/devel/p5-Term-Encoding/Makefile
index 4987b3fc6e87..34d323ad6e1b 100644
--- a/devel/p5-Term-Encoding/Makefile
+++ b/devel/p5-Term-Encoding/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Encoding
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Encoding/pkg-plist b/devel/p5-Term-Encoding/pkg-plist
index 8c1b57e2b458..1d8fbe461a99 100644
--- a/devel/p5-Term-Encoding/pkg-plist
+++ b/devel/p5-Term-Encoding/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/Encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Encoding/.packlist
 %%PERL5_MAN3%%/Term::Encoding.3.gz
diff --git a/devel/p5-Term-Menus/Makefile b/devel/p5-Term-Menus/Makefile
index d6c2957027ef..cb548bca5ca2 100644
--- a/devel/p5-Term-Menus/Makefile
+++ b/devel/p5-Term-Menus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Menus
 PORTVERSION=	2.86
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:REEDFISH
diff --git a/devel/p5-Term-Menus/pkg-plist b/devel/p5-Term-Menus/pkg-plist
index a4a88a92afac..7b4e54b208de 100644
--- a/devel/p5-Term-Menus/pkg-plist
+++ b/devel/p5-Term-Menus/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/Menus.pm
 %%PERL5_MAN3%%/Term::Menus.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Menus/.packlist
diff --git a/devel/p5-Term-ProgressBar-Quiet/Makefile b/devel/p5-Term-ProgressBar-Quiet/Makefile
index 101a11692ade..9cad57e8c21e 100644
--- a/devel/p5-Term-ProgressBar-Quiet/Makefile
+++ b/devel/p5-Term-ProgressBar-Quiet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ProgressBar-Quiet
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ProgressBar-Quiet/pkg-plist b/devel/p5-Term-ProgressBar-Quiet/pkg-plist
index 77165f436cab..0c6b5841569b 100644
--- a/devel/p5-Term-ProgressBar-Quiet/pkg-plist
+++ b/devel/p5-Term-ProgressBar-Quiet/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Term::ProgressBar::Quiet.3.gz
 %%SITE_PERL%%/Term/ProgressBar/Quiet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ProgressBar/Quiet/.packlist
diff --git a/devel/p5-Term-ProgressBar-Simple/Makefile b/devel/p5-Term-ProgressBar-Simple/Makefile
index b8be40a3f6f4..151f71e934ce 100644
--- a/devel/p5-Term-ProgressBar-Simple/Makefile
+++ b/devel/p5-Term-ProgressBar-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ProgressBar-Simple
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ProgressBar-Simple/pkg-plist b/devel/p5-Term-ProgressBar-Simple/pkg-plist
index 75d7b248849c..64fbb068944c 100644
--- a/devel/p5-Term-ProgressBar-Simple/pkg-plist
+++ b/devel/p5-Term-ProgressBar-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Term::ProgressBar::Simple.3.gz
 %%SITE_PERL%%/Term/ProgressBar/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ProgressBar/Simple/.packlist
diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile
index c9581c23667f..0be183028e6d 100644
--- a/devel/p5-Term-ProgressBar/Makefile
+++ b/devel/p5-Term-ProgressBar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ProgressBar
 PORTVERSION=	2.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ProgressBar/pkg-plist b/devel/p5-Term-ProgressBar/pkg-plist
index dc69d4a6bba5..71ed646013e9 100644
--- a/devel/p5-Term-ProgressBar/pkg-plist
+++ b/devel/p5-Term-ProgressBar/pkg-plist
@@ -2,7 +2,6 @@
 %%PERL5_MAN3%%/Term::ProgressBar::IO.3.gz
 %%SITE_PERL%%/Term/ProgressBar.pm
 %%SITE_PERL%%/Term/ProgressBar/IO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ProgressBar/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/powers
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/powers2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/powers3
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index dd720fec0c6e..6066713adc63 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Prompt
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Prompt/pkg-plist b/devel/p5-Term-Prompt/pkg-plist
index ec972e0df562..25bbb04fc684 100644
--- a/devel/p5-Term-Prompt/pkg-plist
+++ b/devel/p5-Term-Prompt/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Prompt/.packlist
 %%SITE_PERL%%/Term/Prompt.pm
 %%PERL5_MAN3%%/Term::Prompt.3.gz
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index ea9aee25ea40..4eb4bc688111 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Query
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Query/pkg-plist b/devel/p5-Term-Query/pkg-plist
index 405775f2ef3f..49e4401b8847 100644
--- a/devel/p5-Term-Query/pkg-plist
+++ b/devel/p5-Term-Query/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Term/Query.pm
 %%SITE_PERL%%/Term/Query_Test.pl
 %%SITE_PERL%%/Term/Tester.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Query/.packlist
diff --git a/devel/p5-Term-RawInput/Makefile b/devel/p5-Term-RawInput/Makefile
index 427db3a3910f..db325c762b04 100644
--- a/devel/p5-Term-RawInput/Makefile
+++ b/devel/p5-Term-RawInput/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-RawInput
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:REEDFISH
diff --git a/devel/p5-Term-RawInput/pkg-plist b/devel/p5-Term-RawInput/pkg-plist
index 330e81b868ec..e564e4a60e5a 100644
--- a/devel/p5-Term-RawInput/pkg-plist
+++ b/devel/p5-Term-RawInput/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/RawInput/.packlist
 %%SITE_PERL%%/Term/RawInput.pm
 %%PERL5_MAN3%%/Term::RawInput.3.gz
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index f6bb4e35e866..3fe5411eb481 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ReadKey
 PORTVERSION=	2.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ReadKey/pkg-plist b/devel/p5-Term-ReadKey/pkg-plist
index d942e2fb4ec7..8255c48366ac 100644
--- a/devel/p5-Term-ReadKey/pkg-plist
+++ b/devel/p5-Term-ReadKey/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Term::ReadKey.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
+%%SITE_ARCH%%/Term/ReadKey.pm
+%%SITE_ARCH%%/auto/Term/ReadKey/autosplit.ix
+%%SITE_ARCH%%/auto/Term/ReadKey/ReadKey.so
diff --git a/devel/p5-Term-ReadLine-Perl/Makefile b/devel/p5-Term-ReadLine-Perl/Makefile
index 3b137ac8be46..e0ef4022a44a 100644
--- a/devel/p5-Term-ReadLine-Perl/Makefile
+++ b/devel/p5-Term-ReadLine-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ReadLine-Perl
 PORTVERSION=	1.0303
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ReadLine-Perl/pkg-plist b/devel/p5-Term-ReadLine-Perl/pkg-plist
index 0666a068a1b0..11c3f24b6556 100644
--- a/devel/p5-Term-ReadLine-Perl/pkg-plist
+++ b/devel/p5-Term-ReadLine-Perl/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/ReadLine/Perl.pm
 %%SITE_PERL%%/Term/ReadLine/readline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/.packlist
diff --git a/devel/p5-Term-ReadLine-Zoid/Makefile b/devel/p5-Term-ReadLine-Zoid/Makefile
index 1c1175e1b2b2..144871506d66 100644
--- a/devel/p5-Term-ReadLine-Zoid/Makefile
+++ b/devel/p5-Term-ReadLine-Zoid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ReadLine-Zoid
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN \
 		http://zoidberg.student.utwente.nl/downloads/Term-ReadLine-Zoid/
diff --git a/devel/p5-Term-ReadLine/Makefile b/devel/p5-Term-ReadLine/Makefile
index e6a3fb231b77..0aabcf9e8fea 100644
--- a/devel/p5-Term-ReadLine/Makefile
+++ b/devel/p5-Term-ReadLine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ReadLine
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/devel/p5-Term-ReadLine/pkg-plist b/devel/p5-Term-ReadLine/pkg-plist
index 21d5e7a5bc61..651c767ec97e 100644
--- a/devel/p5-Term-ReadLine/pkg-plist
+++ b/devel/p5-Term-ReadLine/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Term::ReadLine.3.gz
 %%SITE_PERL%%/Term/ReadLine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/.packlist
diff --git a/devel/p5-Term-ReadPassword/Makefile b/devel/p5-Term-ReadPassword/Makefile
index a7a1669b2148..f229fb051fe8 100644
--- a/devel/p5-Term-ReadPassword/Makefile
+++ b/devel/p5-Term-ReadPassword/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Term-ReadPassword
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ReadPassword/pkg-plist b/devel/p5-Term-ReadPassword/pkg-plist
index d481efa8f7be..ec85d9ff1122 100644
--- a/devel/p5-Term-ReadPassword/pkg-plist
+++ b/devel/p5-Term-ReadPassword/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/ReadPassword.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadPassword/.packlist
 %%PERL5_MAN3%%/Term::ReadPassword.3.gz
diff --git a/devel/p5-Term-Screen/Makefile b/devel/p5-Term-Screen/Makefile
index 187c7af75052..10b9a64e8e5e 100644
--- a/devel/p5-Term-Screen/Makefile
+++ b/devel/p5-Term-Screen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Screen
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Screen/pkg-plist b/devel/p5-Term-Screen/pkg-plist
index ac48c003bff8..3de54e1eef13 100644
--- a/devel/p5-Term-Screen/pkg-plist
+++ b/devel/p5-Term-Screen/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Term::Screen.3.gz
 %%SITE_PERL%%/Term/Screen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Screen/.packlist
diff --git a/devel/p5-Term-ScreenColor/Makefile b/devel/p5-Term-ScreenColor/Makefile
index 6067082900fd..0d94d85fd526 100644
--- a/devel/p5-Term-ScreenColor/Makefile
+++ b/devel/p5-Term-ScreenColor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-ScreenColor
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-ScreenColor/pkg-plist b/devel/p5-Term-ScreenColor/pkg-plist
index 28524c413634..6dc517907e74 100644
--- a/devel/p5-Term-ScreenColor/pkg-plist
+++ b/devel/p5-Term-ScreenColor/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Term::ScreenColor.3.gz
 %%SITE_PERL%%/Term/ScreenColor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ScreenColor/.packlist
diff --git a/devel/p5-Term-Shell/Makefile b/devel/p5-Term-Shell/Makefile
index cd340a75e6ad..1814eca54db8 100644
--- a/devel/p5-Term-Shell/Makefile
+++ b/devel/p5-Term-Shell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Shell
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Shell/pkg-plist b/devel/p5-Term-Shell/pkg-plist
index a6ea7170d78f..c9df3f77345d 100644
--- a/devel/p5-Term-Shell/pkg-plist
+++ b/devel/p5-Term-Shell/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Term::Shell.3.gz
 %%SITE_PERL%%/Term/Shell.pm
 %%SITE_PERL%%/Term/Shell.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Shell/.packlist
diff --git a/devel/p5-Term-Size-Any/Makefile b/devel/p5-Term-Size-Any/Makefile
index ce8273c394fb..c22cc2eefd5c 100644
--- a/devel/p5-Term-Size-Any/Makefile
+++ b/devel/p5-Term-Size-Any/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Size-Any
 PORTVERSION=	0.002
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Size-Any/pkg-plist b/devel/p5-Term-Size-Any/pkg-plist
index c1177705ecfd..ddf3a103dd0d 100644
--- a/devel/p5-Term-Size-Any/pkg-plist
+++ b/devel/p5-Term-Size-Any/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Term/Size/Any.pm
 %%SITE_PERL%%/Term/Size/Any.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/Any/.packlist
 %%PERL5_MAN3%%/Term::Size::Any.3.gz
diff --git a/devel/p5-Term-Size-Perl/Makefile b/devel/p5-Term-Size-Perl/Makefile
index 710859472ceb..f72173cadbeb 100644
--- a/devel/p5-Term-Size-Perl/Makefile
+++ b/devel/p5-Term-Size-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Size-Perl
 PORTVERSION=	0.029
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Size-Perl/pkg-plist b/devel/p5-Term-Size-Perl/pkg-plist
index ff83fd84c9fc..81a9c58302b0 100644
--- a/devel/p5-Term-Size-Perl/pkg-plist
+++ b/devel/p5-Term-Size-Perl/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Term/Size/Perl.pm
 %%SITE_PERL%%/Term/Size/Perl/Params.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/Perl/.packlist
 %%PERL5_MAN3%%/Term::Size::Params.3.gz
 %%PERL5_MAN3%%/Term::Size::Perl.3.gz
diff --git a/devel/p5-Term-Size/Makefile b/devel/p5-Term-Size/Makefile
index 3a4ac1a56fd4..b0c24b517ba6 100644
--- a/devel/p5-Term-Size/Makefile
+++ b/devel/p5-Term-Size/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Size
 PORTVERSION=	0.207
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Size/pkg-plist b/devel/p5-Term-Size/pkg-plist
index efa276066eb9..efaa6abdeae0 100644
--- a/devel/p5-Term-Size/pkg-plist
+++ b/devel/p5-Term-Size/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Term/Size.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/Size.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/autosplit.ix
+%%SITE_ARCH%%/Term/Size.pm
+%%SITE_ARCH%%/auto/Term/Size/Size.so
+%%SITE_ARCH%%/auto/Term/Size/autosplit.ix
 %%PERL5_MAN3%%/Term::Size.3.gz
diff --git a/devel/p5-Term-Sk/Makefile b/devel/p5-Term-Sk/Makefile
index d1db43c086b4..8f61838f5476 100644
--- a/devel/p5-Term-Sk/Makefile
+++ b/devel/p5-Term-Sk/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Term-Sk
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KEICHNER
diff --git a/devel/p5-Term-Sk/pkg-plist b/devel/p5-Term-Sk/pkg-plist
index cbbf75c0c403..a6ae235a9c2c 100644
--- a/devel/p5-Term-Sk/pkg-plist
+++ b/devel/p5-Term-Sk/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/Sk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Sk/.packlist
 %%PERL5_MAN3%%/Term::Sk.3.gz
diff --git a/devel/p5-Term-Title/Makefile b/devel/p5-Term-Title/Makefile
index 48e76b9153df..a4a3a649ca89 100644
--- a/devel/p5-Term-Title/Makefile
+++ b/devel/p5-Term-Title/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Title
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Term-Title/pkg-plist b/devel/p5-Term-Title/pkg-plist
index 77a28f8fddf7..73bf21a62141 100644
--- a/devel/p5-Term-Title/pkg-plist
+++ b/devel/p5-Term-Title/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Term/Title.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Title/.packlist
 %%PERL5_MAN3%%/Term::Title.3.gz
diff --git a/devel/p5-Term-UI/Makefile b/devel/p5-Term-UI/Makefile
index 53efd91bfb0d..01e5bec9954a 100644
--- a/devel/p5-Term-UI/Makefile
+++ b/devel/p5-Term-UI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-UI
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-UI/pkg-plist b/devel/p5-Term-UI/pkg-plist
index c8c42b53ff05..44e3c89f2c98 100644
--- a/devel/p5-Term-UI/pkg-plist
+++ b/devel/p5-Term-UI/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Term/UI.pm
 %%SITE_PERL%%/Term/UI/History.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/UI/.packlist
 %%PERL5_MAN3%%/Term::UI.3.gz
 %%PERL5_MAN3%%/Term::UI::History.3.gz
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index 690467524610..8edcefec8e40 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-VT102-Boundless
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Term
diff --git a/devel/p5-Term-VT102-Boundless/pkg-plist b/devel/p5-Term-VT102-Boundless/pkg-plist
index f4b0e2d3a156..cf396f67c239 100644
--- a/devel/p5-Term-VT102-Boundless/pkg-plist
+++ b/devel/p5-Term-VT102-Boundless/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Term::VT102::Boundless.3.gz
 %%SITE_PERL%%/Term/VT102/Boundless.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/VT102/Boundless/.packlist
diff --git a/devel/p5-Term-VT102/Makefile b/devel/p5-Term-VT102/Makefile
index f8c9fff2c473..20e46c5c7cb4 100644
--- a/devel/p5-Term-VT102/Makefile
+++ b/devel/p5-Term-VT102/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-VT102
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Term
diff --git a/devel/p5-Term-VT102/pkg-plist b/devel/p5-Term-VT102/pkg-plist
index 8325283656e2..c046c25fc88f 100644
--- a/devel/p5-Term-VT102/pkg-plist
+++ b/devel/p5-Term-VT102/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/Term/VT102/examples/sanitize-dump.pl
 %%SITE_PERL%%/Term/VT102/examples/ssh-usage.pl
 %%SITE_PERL%%/Term/VT102/examples/telnet-usage.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/VT102/.packlist
diff --git a/devel/p5-Term-Visual/Makefile b/devel/p5-Term-Visual/Makefile
index e9708f3bb2b9..4c8335555c23 100644
--- a/devel/p5-Term-Visual/Makefile
+++ b/devel/p5-Term-Visual/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-Visual
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Visual/pkg-plist b/devel/p5-Term-Visual/pkg-plist
index 6bb9fe3a4a27..bcf5da89fc7b 100644
--- a/devel/p5-Term-Visual/pkg-plist
+++ b/devel/p5-Term-Visual/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Term::Visual.3.gz
 %%SITE_PERL%%/Term/Visual.pm
 %%SITE_PERL%%/Term/Visual/StatusBar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Visual/.packlist
diff --git a/devel/p5-Test-Able-Runner/Makefile b/devel/p5-Test-Able-Runner/Makefile
index 8ca2624b6c35..d2c290f449ba 100644
--- a/devel/p5-Test-Able-Runner/Makefile
+++ b/devel/p5-Test-Able-Runner/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Able-Runner
 PORTVERSION=	1.001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Able-Runner/pkg-plist b/devel/p5-Test-Able-Runner/pkg-plist
index c46973fc9a04..fa160e424edc 100644
--- a/devel/p5-Test-Able-Runner/pkg-plist
+++ b/devel/p5-Test-Able-Runner/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Test/Able/Runner.pm
 %%SITE_PERL%%/Test/Able/Runner/Role/Meta/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Able/Runner/.packlist
 %%PERL5_MAN3%%/Test::Able::Runner.3.gz
 %%PERL5_MAN3%%/Test::Able::Runner::Role::Meta::Class.3.gz
diff --git a/devel/p5-Test-Able/Makefile b/devel/p5-Test-Able/Makefile
index fa5a059780b1..ef9620e2611c 100644
--- a/devel/p5-Test-Able/Makefile
+++ b/devel/p5-Test-Able/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Able
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Able/pkg-plist b/devel/p5-Test-Able/pkg-plist
index e4b28c6dcd46..07f2eb99e091 100644
--- a/devel/p5-Test-Able/pkg-plist
+++ b/devel/p5-Test-Able/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/Test/Able/Role.pm
 %%SITE_PERL%%/Test/Able/Role/Meta/Class.pm
 %%SITE_PERL%%/Test/Able/Role/Meta/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Able/.packlist
 %%PERL5_MAN3%%/Test::Able.3.gz
 %%PERL5_MAN3%%/Test::Able::Cookbook.3.gz
 %%PERL5_MAN3%%/Test::Able::FatalException.3.gz
diff --git a/devel/p5-Test-Aggregate/Makefile b/devel/p5-Test-Aggregate/Makefile
index faf0f87e9c85..02c1c9a01f5b 100644
--- a/devel/p5-Test-Aggregate/Makefile
+++ b/devel/p5-Test-Aggregate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Aggregate
 PORTVERSION=	0.371
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Aggregate/pkg-plist b/devel/p5-Test-Aggregate/pkg-plist
index 636c314e9429..4d027dadca8d 100644
--- a/devel/p5-Test-Aggregate/pkg-plist
+++ b/devel/p5-Test-Aggregate/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Aggregate/.packlist
 %%SITE_PERL%%/Test/Aggregate/Builder.pm
 %%SITE_PERL%%/Test/Aggregate/Base.pm
 %%SITE_PERL%%/Test/Aggregate/Nested.pm
diff --git a/devel/p5-Test-Assertions/Makefile b/devel/p5-Test-Assertions/Makefile
index c422c66f6cde..e1cc9359f204 100644
--- a/devel/p5-Test-Assertions/Makefile
+++ b/devel/p5-Test-Assertions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Assertions
 PORTVERSION=	1.054
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-Assertions/pkg-plist b/devel/p5-Test-Assertions/pkg-plist
index dc14f01efe1a..639e67f09528 100644
--- a/devel/p5-Test-Assertions/pkg-plist
+++ b/devel/p5-Test-Assertions/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Test/Assertions.pm
 %%SITE_PERL%%/Test/Assertions/Manual.pod
 %%SITE_PERL%%/Test/Assertions/TestScript.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Assertions/.packlist
 %%PERL5_MAN3%%/Test::Assertions.3.gz
 %%PERL5_MAN3%%/Test::Assertions::Manual.3.gz
 %%PERL5_MAN3%%/Test::Assertions::TestScript.3.gz
diff --git a/devel/p5-Test-Base/Makefile b/devel/p5-Test-Base/Makefile
index 64e99bfa220c..44f732fc209d 100644
--- a/devel/p5-Test-Base/Makefile
+++ b/devel/p5-Test-Base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Base
 PORTVERSION=	0.88
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Base/pkg-plist b/devel/p5-Test-Base/pkg-plist
index d355e65a5716..04e6f6778137 100644
--- a/devel/p5-Test-Base/pkg-plist
+++ b/devel/p5-Test-Base/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Test/Base.pod
 %%SITE_PERL%%/Test/Base/Filter.pm
 %%SITE_PERL%%/Test/Base/Filter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Base/.packlist
diff --git a/devel/p5-Test-Benchmark/Makefile b/devel/p5-Test-Benchmark/Makefile
index 6647b1a6c566..29764aef32f6 100644
--- a/devel/p5-Test-Benchmark/Makefile
+++ b/devel/p5-Test-Benchmark/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Benchmark
 PORTVERSION=	0.004
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Benchmark/pkg-plist b/devel/p5-Test-Benchmark/pkg-plist
index 040ae48aa2a2..b26e0c623c6b 100644
--- a/devel/p5-Test-Benchmark/pkg-plist
+++ b/devel/p5-Test-Benchmark/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Benchmark.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Benchmark/.packlist
 %%PERL5_MAN3%%/Test::Benchmark.3.gz
diff --git a/devel/p5-Test-BinaryData/Makefile b/devel/p5-Test-BinaryData/Makefile
index e7561ee07066..7a55f09c5e9c 100644
--- a/devel/p5-Test-BinaryData/Makefile
+++ b/devel/p5-Test-BinaryData/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-BinaryData
 PORTVERSION=	0.014
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-BinaryData/pkg-plist b/devel/p5-Test-BinaryData/pkg-plist
index 9d3bbe1df5f7..071007810bd0 100644
--- a/devel/p5-Test-BinaryData/pkg-plist
+++ b/devel/p5-Test-BinaryData/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/BinaryData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/BinaryData/.packlist
 %%PERL5_MAN3%%/Test::BinaryData.3.gz
diff --git a/devel/p5-Test-Bits/Makefile b/devel/p5-Test-Bits/Makefile
index 5f306d0fe70e..03331bbbf35e 100644
--- a/devel/p5-Test-Bits/Makefile
+++ b/devel/p5-Test-Bits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Bits
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Bits/pkg-plist b/devel/p5-Test-Bits/pkg-plist
index 0ee808358334..706bf4222ad4 100644
--- a/devel/p5-Test-Bits/pkg-plist
+++ b/devel/p5-Test-Bits/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Bits.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Bits/.packlist
 %%PERL5_MAN3%%/Test::Bits.3.gz
diff --git a/devel/p5-Test-Block/Makefile b/devel/p5-Test-Block/Makefile
index 30cab0743aa9..267bc614e0f2 100644
--- a/devel/p5-Test-Block/Makefile
+++ b/devel/p5-Test-Block/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Block
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Block/pkg-plist b/devel/p5-Test-Block/pkg-plist
index 791e7ffc4ae1..a8b8ddb16850 100644
--- a/devel/p5-Test-Block/pkg-plist
+++ b/devel/p5-Test-Block/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Block.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Block/.packlist
 %%PERL5_MAN3%%/Test::Block.3.gz
diff --git a/devel/p5-Test-CPAN-Meta-YAML/Makefile b/devel/p5-Test-CPAN-Meta-YAML/Makefile
index 1ed6787c37e7..37b874207942 100644
--- a/devel/p5-Test-CPAN-Meta-YAML/Makefile
+++ b/devel/p5-Test-CPAN-Meta-YAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-CPAN-Meta-YAML
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-CPAN-Meta-YAML/pkg-plist b/devel/p5-Test-CPAN-Meta-YAML/pkg-plist
index 9816d54c262a..6e7538155105 100644
--- a/devel/p5-Test-CPAN-Meta-YAML/pkg-plist
+++ b/devel/p5-Test-CPAN-Meta-YAML/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Test/CPAN/Meta/YAML.pm
 %%SITE_PERL%%/Test/CPAN/Meta/YAML/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CPAN/Meta/YAML/.packlist
 %%PERL5_MAN3%%/Test::CPAN::Meta::YAML.3.gz
 %%PERL5_MAN3%%/Test::CPAN::Meta::YAML::Version.3.gz
diff --git a/devel/p5-Test-CPAN-Meta/Makefile b/devel/p5-Test-CPAN-Meta/Makefile
index e4d965281c37..5481f913cbb1 100644
--- a/devel/p5-Test-CPAN-Meta/Makefile
+++ b/devel/p5-Test-CPAN-Meta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-CPAN-Meta
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-CPAN-Meta/pkg-plist b/devel/p5-Test-CPAN-Meta/pkg-plist
index dffbf0e40dd5..929a76cf2ea0 100644
--- a/devel/p5-Test-CPAN-Meta/pkg-plist
+++ b/devel/p5-Test-CPAN-Meta/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Test/CPAN/Meta.pm
 %%SITE_PERL%%/Test/CPAN/Meta/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CPAN/Meta/.packlist
 %%PERL5_MAN3%%/Test::CPAN::Meta.3.gz
 %%PERL5_MAN3%%/Test::CPAN::Meta::Version.3.gz
diff --git a/devel/p5-Test-CheckDeps/Makefile b/devel/p5-Test-CheckDeps/Makefile
index 4536439c5980..763a46faf67e 100644
--- a/devel/p5-Test-CheckDeps/Makefile
+++ b/devel/p5-Test-CheckDeps/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-CheckDeps
 PORTVERSION=	0.010
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-CheckDeps/pkg-plist b/devel/p5-Test-CheckDeps/pkg-plist
index 1618462ba535..dae5b46c072e 100644
--- a/devel/p5-Test-CheckDeps/pkg-plist
+++ b/devel/p5-Test-CheckDeps/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/CheckDeps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CheckDeps/.packlist
 %%PERL5_MAN3%%/Test::CheckDeps.3.gz
diff --git a/devel/p5-Test-CheckManifest/Makefile b/devel/p5-Test-CheckManifest/Makefile
index 822671e4992f..00202060c368 100644
--- a/devel/p5-Test-CheckManifest/Makefile
+++ b/devel/p5-Test-CheckManifest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-CheckManifest
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-CheckManifest/pkg-plist b/devel/p5-Test-CheckManifest/pkg-plist
index 23f3bbb5bb72..fafbc7f5378f 100644
--- a/devel/p5-Test-CheckManifest/pkg-plist
+++ b/devel/p5-Test-CheckManifest/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::CheckManifest.3.gz
 %%SITE_PERL%%/Test/CheckManifest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CheckManifest/.packlist
diff --git a/devel/p5-Test-Class-Most/Makefile b/devel/p5-Test-Class-Most/Makefile
index e89cb3bc6f5d..2fd642056d7b 100644
--- a/devel/p5-Test-Class-Most/Makefile
+++ b/devel/p5-Test-Class-Most/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Class-Most
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OVID
diff --git a/devel/p5-Test-Class/Makefile b/devel/p5-Test-Class/Makefile
index 1f94255b244e..4f85892a8ca5 100644
--- a/devel/p5-Test-Class/Makefile
+++ b/devel/p5-Test-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Class
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-ClassAPI/Makefile b/devel/p5-Test-ClassAPI/Makefile
index bc33ad675948..fd9c36588033 100644
--- a/devel/p5-Test-ClassAPI/Makefile
+++ b/devel/p5-Test-ClassAPI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-ClassAPI
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-ClassAPI/pkg-plist b/devel/p5-Test-ClassAPI/pkg-plist
index 7d5ecdca115b..abb6e5bf72a1 100644
--- a/devel/p5-Test-ClassAPI/pkg-plist
+++ b/devel/p5-Test-ClassAPI/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/ClassAPI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/ClassAPI/.packlist
 %%PERL5_MAN3%%/Test::ClassAPI.3.gz
diff --git a/devel/p5-Test-Classy/Makefile b/devel/p5-Test-Classy/Makefile
index 64b64877b800..9e4a97b221a0 100644
--- a/devel/p5-Test-Classy/Makefile
+++ b/devel/p5-Test-Classy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Classy
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:ISHIGAKI
diff --git a/devel/p5-Test-Classy/pkg-plist b/devel/p5-Test-Classy/pkg-plist
index f35a005c0786..5fcc28f550bf 100644
--- a/devel/p5-Test-Classy/pkg-plist
+++ b/devel/p5-Test-Classy/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Test/Classy.pm
 %%SITE_PERL%%/Test/Classy/Base.pm
 %%SITE_PERL%%/Test/Classy/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Classy/.packlist
diff --git a/devel/p5-Test-CleanNamespaces/Makefile b/devel/p5-Test-CleanNamespaces/Makefile
index 86d5965560e5..5ef98943b1f0 100644
--- a/devel/p5-Test-CleanNamespaces/Makefile
+++ b/devel/p5-Test-CleanNamespaces/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-CleanNamespaces
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -29,12 +30,7 @@ TEST_DEPENDS=	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CleanNamespaces/.packlist \
-		%%SITE_PERL%%/Test/CleanNamespaces.pm \
+PLIST_FILES=	%%SITE_PERL%%/Test/CleanNamespaces.pm \
 		%%PERL5_MAN3%%/Test::CleanNamespaces.3.gz
 
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/CleanNamespaces
-PLIST_DIRSTRY=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test \
-		%%SITE_PERL%%/Test
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Cmd/Makefile b/devel/p5-Test-Cmd/Makefile
index 00269d74aa0c..dcebc384d72b 100644
--- a/devel/p5-Test-Cmd/Makefile
+++ b/devel/p5-Test-Cmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Cmd
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Cmd/pkg-plist b/devel/p5-Test-Cmd/pkg-plist
index a844fe3547a7..4eff7d26896d 100644
--- a/devel/p5-Test-Cmd/pkg-plist
+++ b/devel/p5-Test-Cmd/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Test::Cmd::Common.3.gz
 %%SITE_PERL%%/Test/Cmd.pm
 %%SITE_PERL%%/Test/Cmd/Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Cmd/.packlist
diff --git a/devel/p5-Test-Command-Simple/Makefile b/devel/p5-Test-Command-Simple/Makefile
index e3826d1f6b72..16d19b2d3470 100644
--- a/devel/p5-Test-Command-Simple/Makefile
+++ b/devel/p5-Test-Command-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Command-Simple
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMCBRIDE
diff --git a/devel/p5-Test-Command-Simple/pkg-plist b/devel/p5-Test-Command-Simple/pkg-plist
index 8a5e0d4296a1..6b7988fceb7e 100644
--- a/devel/p5-Test-Command-Simple/pkg-plist
+++ b/devel/p5-Test-Command-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Command/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Command/Simple/.packlist
 %%PERL5_MAN3%%/Test::Command::Simple.3.gz
diff --git a/devel/p5-Test-Command/Makefile b/devel/p5-Test-Command/Makefile
index 837810ca8b22..3fa39a07d49c 100644
--- a/devel/p5-Test-Command/Makefile
+++ b/devel/p5-Test-Command/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Command
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Command/pkg-plist b/devel/p5-Test-Command/pkg-plist
index f203b482596e..204f9913d008 100644
--- a/devel/p5-Test-Command/pkg-plist
+++ b/devel/p5-Test-Command/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Command/.packlist
 %%PERL5_MAN3%%/Test::Command.3.gz
diff --git a/devel/p5-Test-Compile/Makefile b/devel/p5-Test-Compile/Makefile
index cfede4188e30..37cf2be75d55 100644
--- a/devel/p5-Test-Compile/Makefile
+++ b/devel/p5-Test-Compile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Compile
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EGILES
diff --git a/devel/p5-Test-Compile/pkg-plist b/devel/p5-Test-Compile/pkg-plist
index 07e2f96e8647..d2335abbc78b 100644
--- a/devel/p5-Test-Compile/pkg-plist
+++ b/devel/p5-Test-Compile/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Test/Compile.pm
 %%SITE_PERL%%/Test/Compile/Internal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Compile/.packlist
 %%PERL5_MAN3%%/Test::Compile.3.gz
 %%PERL5_MAN3%%/Test::Compile::Internal.3.gz
diff --git a/devel/p5-Test-DBIx-Class/Makefile b/devel/p5-Test-DBIx-Class/Makefile
index 34a3bbb8fb71..488c56647693 100644
--- a/devel/p5-Test-DBIx-Class/Makefile
+++ b/devel/p5-Test-DBIx-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-DBIx-Class
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-DBIx-Class/pkg-plist b/devel/p5-Test-DBIx-Class/pkg-plist
index 2fa6870a528e..cf42af7d21da 100644
--- a/devel/p5-Test-DBIx-Class/pkg-plist
+++ b/devel/p5-Test-DBIx-Class/pkg-plist
@@ -44,4 +44,3 @@
 %%SITE_PERL%%/Test/DBIx/Class/SchemaManager/Trait/Testmysqld.pm
 %%SITE_PERL%%/Test/DBIx/Class/SchemaManager/Trait/Testpostgresql.pm
 %%SITE_PERL%%/Test/DBIx/Class/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/DBIx/Class/.packlist
diff --git a/devel/p5-Test-Data/Makefile b/devel/p5-Test-Data/Makefile
index 75c8ef5dae41..f1f4bc42c5eb 100644
--- a/devel/p5-Test-Data/Makefile
+++ b/devel/p5-Test-Data/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Data
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BDFOY
diff --git a/devel/p5-Test-Data/pkg-plist b/devel/p5-Test-Data/pkg-plist
index 490c45af2f18..e772e87e33d1 100644
--- a/devel/p5-Test-Data/pkg-plist
+++ b/devel/p5-Test-Data/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Test/Data/Function.pm
 %%SITE_PERL%%/Test/Data/Hash.pm
 %%SITE_PERL%%/Test/Data/Scalar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Data/.packlist
 %%PERL5_MAN3%%/Test::Data.3.gz
 %%PERL5_MAN3%%/Test::Data::Array.3.gz
 %%PERL5_MAN3%%/Test::Data::Function.3.gz
diff --git a/devel/p5-Test-Debugger/Makefile b/devel/p5-Test-Debugger/Makefile
index 3c3e39481174..717c1d2a8917 100644
--- a/devel/p5-Test-Debugger/Makefile
+++ b/devel/p5-Test-Debugger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Debugger
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Debugger/pkg-plist b/devel/p5-Test-Debugger/pkg-plist
index 2ccec7b27cdf..bc4bafcc6627 100644
--- a/devel/p5-Test-Debugger/pkg-plist
+++ b/devel/p5-Test-Debugger/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Debugger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Debugger/.packlist
 %%PERL5_MAN3%%/Test::Debugger.3.gz
diff --git a/devel/p5-Test-Declare/Makefile b/devel/p5-Test-Declare/Makefile
index a9e0ace39ba8..b80ab26e9536 100644
--- a/devel/p5-Test-Declare/Makefile
+++ b/devel/p5-Test-Declare/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Declare
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Declare/pkg-plist b/devel/p5-Test-Declare/pkg-plist
index 8e51bd11f755..20bd9c31f15c 100644
--- a/devel/p5-Test-Declare/pkg-plist
+++ b/devel/p5-Test-Declare/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Declare/.packlist
 %%SITE_PERL%%/Test/Declare.pm
 %%PERL5_MAN3%%/Test::Declare.3.gz
diff --git a/devel/p5-Test-Deep/Makefile b/devel/p5-Test-Deep/Makefile
index 0ef278adef4e..bb5dc05475ca 100644
--- a/devel/p5-Test-Deep/Makefile
+++ b/devel/p5-Test-Deep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Deep
 PORTVERSION=	0.113
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Deep/pkg-plist b/devel/p5-Test-Deep/pkg-plist
index 46b92478b8f3..b9311e95984f 100644
--- a/devel/p5-Test-Deep/pkg-plist
+++ b/devel/p5-Test-Deep/pkg-plist
@@ -42,4 +42,3 @@
 %%SITE_PERL%%/Test/Deep/Shallow.pm
 %%SITE_PERL%%/Test/Deep/Stack.pm
 %%SITE_PERL%%/Test/Deep/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Deep/.packlist
diff --git a/devel/p5-Test-Dependencies/Makefile b/devel/p5-Test-Dependencies/Makefile
index bae2e48f8fdb..f759a1f711c7 100644
--- a/devel/p5-Test-Dependencies/Makefile
+++ b/devel/p5-Test-Dependencies/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Dependencies
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Dependencies/pkg-plist b/devel/p5-Test-Dependencies/pkg-plist
index 33fd64c83d83..684c521ee4ef 100644
--- a/devel/p5-Test-Dependencies/pkg-plist
+++ b/devel/p5-Test-Dependencies/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Test/Dependencies.pm
 %%SITE_PERL%%/Test/Dependencies/Heavy.pm
 %%SITE_PERL%%/Test/Dependencies/Light.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Dependencies/.packlist
diff --git a/devel/p5-Test-DependentModules/Makefile b/devel/p5-Test-DependentModules/Makefile
index 30becc811ab5..a4018265837a 100644
--- a/devel/p5-Test-DependentModules/Makefile
+++ b/devel/p5-Test-DependentModules/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-DependentModules
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-DependentModules/pkg-plist b/devel/p5-Test-DependentModules/pkg-plist
index 73415184ae42..0bc1c9f29cc7 100644
--- a/devel/p5-Test-DependentModules/pkg-plist
+++ b/devel/p5-Test-DependentModules/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/DependentModules.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/DependentModules/.packlist
 %%PERL5_MAN3%%/Test::DependentModules.3.gz
diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile
index b083ab0f281f..e62fa75ea4ff 100644
--- a/devel/p5-Test-Differences/Makefile
+++ b/devel/p5-Test-Differences/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Differences
 PORTVERSION=	0.620
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Test-Differences/pkg-plist b/devel/p5-Test-Differences/pkg-plist
index 6ff950446732..03c9798fed99 100644
--- a/devel/p5-Test-Differences/pkg-plist
+++ b/devel/p5-Test-Differences/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Differences.3.gz
 %%SITE_PERL%%/Test/Differences.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Differences/.packlist
diff --git a/devel/p5-Test-Distribution/Makefile b/devel/p5-Test-Distribution/Makefile
index 1050a3f696f5..4a2fb107ada2 100644
--- a/devel/p5-Test-Distribution/Makefile
+++ b/devel/p5-Test-Distribution/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Distribution
 PORTVERSION=	2.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-EOL/Makefile b/devel/p5-Test-EOL/Makefile
index 2d639ae296c2..2b12e40a7616 100644
--- a/devel/p5-Test-EOL/Makefile
+++ b/devel/p5-Test-EOL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-EOL
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/devel/p5-Test-EOL/pkg-plist b/devel/p5-Test-EOL/pkg-plist
index f0050f15e673..05b821e34426 100644
--- a/devel/p5-Test-EOL/pkg-plist
+++ b/devel/p5-Test-EOL/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/EOL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/EOL/.packlist
 %%PERL5_MAN3%%/Test::EOL.3.gz
diff --git a/devel/p5-Test-Exception-LessClever/Makefile b/devel/p5-Test-Exception-LessClever/Makefile
index 6d514eaa06c7..b75a27d53252 100644
--- a/devel/p5-Test-Exception-LessClever/Makefile
+++ b/devel/p5-Test-Exception-LessClever/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Exception-LessClever
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Exception/Makefile b/devel/p5-Test-Exception/Makefile
index 50904a41433e..c5edfd7b73a9 100644
--- a/devel/p5-Test-Exception/Makefile
+++ b/devel/p5-Test-Exception/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Exception
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Exception/pkg-plist b/devel/p5-Test-Exception/pkg-plist
index d78fc08e5502..79728f2d14f7 100644
--- a/devel/p5-Test-Exception/pkg-plist
+++ b/devel/p5-Test-Exception/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Exception.3.gz
 %%SITE_PERL%%/Test/Exception.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Exception/.packlist
diff --git a/devel/p5-Test-Expect/Makefile b/devel/p5-Test-Expect/Makefile
index d7b473f8873d..694f0973cad5 100644
--- a/devel/p5-Test-Expect/Makefile
+++ b/devel/p5-Test-Expect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Expect
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Expect/pkg-plist b/devel/p5-Test-Expect/pkg-plist
index ef4227e781e7..e8806f43ff5a 100644
--- a/devel/p5-Test-Expect/pkg-plist
+++ b/devel/p5-Test-Expect/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Expect.3.gz
 %%SITE_PERL%%/Test/Expect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Expect/.packlist
diff --git a/devel/p5-Test-FailWarnings/Makefile b/devel/p5-Test-FailWarnings/Makefile
index 755aa600a5f4..67d49d0d6cb1 100644
--- a/devel/p5-Test-FailWarnings/Makefile
+++ b/devel/p5-Test-FailWarnings/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-FailWarnings
 PORTVERSION=	0.008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-FailWarnings/pkg-plist b/devel/p5-Test-FailWarnings/pkg-plist
index c844ae3c4084..898ad6360cd8 100644
--- a/devel/p5-Test-FailWarnings/pkg-plist
+++ b/devel/p5-Test-FailWarnings/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/FailWarnings.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/FailWarnings/.packlist
 %%PERL5_MAN3%%/Test::FailWarnings.3.gz
diff --git a/devel/p5-Test-Fatal/Makefile b/devel/p5-Test-Fatal/Makefile
index 4eece249ae11..d20040766ea7 100644
--- a/devel/p5-Test-Fatal/Makefile
+++ b/devel/p5-Test-Fatal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Fatal
 PORTVERSION=	0.013
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Fatal/pkg-plist b/devel/p5-Test-Fatal/pkg-plist
index d8e447003104..aed0b99bc73c 100644
--- a/devel/p5-Test-Fatal/pkg-plist
+++ b/devel/p5-Test-Fatal/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Fatal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Fatal/.packlist
 %%PERL5_MAN3%%/Test::Fatal.3.gz
diff --git a/devel/p5-Test-File-Contents/Makefile b/devel/p5-Test-File-Contents/Makefile
index 8a69450c4f84..08563b3f7c9b 100644
--- a/devel/p5-Test-File-Contents/Makefile
+++ b/devel/p5-Test-File-Contents/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-File-Contents
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index 0a1005a688ab..06d2cb7acb87 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-File-ShareDir
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-File/Makefile b/devel/p5-Test-File/Makefile
index 0f0b52d0c71a..45d45e552a6c 100644
--- a/devel/p5-Test-File/Makefile
+++ b/devel/p5-Test-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-File
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-File/pkg-plist b/devel/p5-Test-File/pkg-plist
index 5be453beb976..c39c105942ba 100644
--- a/devel/p5-Test-File/pkg-plist
+++ b/devel/p5-Test-File/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/File/.packlist
 %%PERL5_MAN3%%/Test::File.3.gz
diff --git a/devel/p5-Test-Filename/Makefile b/devel/p5-Test-Filename/Makefile
index 698cff0b6886..4ea4ab5bd374 100644
--- a/devel/p5-Test-Filename/Makefile
+++ b/devel/p5-Test-Filename/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Filename
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Filename/pkg-plist b/devel/p5-Test-Filename/pkg-plist
index 4b8722a1054c..a8f1bf7b8bc1 100644
--- a/devel/p5-Test-Filename/pkg-plist
+++ b/devel/p5-Test-Filename/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Filename/.packlist
 %%SITE_PERL%%/Test/Filename.pm
 %%PERL5_MAN3%%/Test::Filename.3.gz
diff --git a/devel/p5-Test-Fixme/Makefile b/devel/p5-Test-Fixme/Makefile
index 8b65cb63fd84..96b0c9eb0c2c 100644
--- a/devel/p5-Test-Fixme/Makefile
+++ b/devel/p5-Test-Fixme/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Fixme
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Fixme/pkg-plist b/devel/p5-Test-Fixme/pkg-plist
index f33fc2aa3bab..c7846ef00d31 100644
--- a/devel/p5-Test-Fixme/pkg-plist
+++ b/devel/p5-Test-Fixme/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Fixme.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Fixme/.packlist
 %%PERL5_MAN3%%/Test::Fixme.3.gz
diff --git a/devel/p5-Test-Fixture-DBIC-Schema/Makefile b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
index 64f092b09fc2..503b5ef814c8 100644
--- a/devel/p5-Test-Fixture-DBIC-Schema/Makefile
+++ b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Fixture-DBIC-Schema
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Fixture-DBIC-Schema/pkg-plist b/devel/p5-Test-Fixture-DBIC-Schema/pkg-plist
index e0b0f41b0ca9..3535be7cc809 100644
--- a/devel/p5-Test-Fixture-DBIC-Schema/pkg-plist
+++ b/devel/p5-Test-Fixture-DBIC-Schema/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Fixture/DBIC/Schema.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Fixture/DBIC/Schema/.packlist
 %%PERL5_MAN3%%/Test::Fixture::DBIC::Schema.3.gz
diff --git a/devel/p5-Test-Group/Makefile b/devel/p5-Test-Group/Makefile
index 08df8d6b4181..1353e1f0ba92 100644
--- a/devel/p5-Test-Group/Makefile
+++ b/devel/p5-Test-Group/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Group
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-HTML-Tidy/Makefile b/devel/p5-Test-HTML-Tidy/Makefile
index 26f835e259c0..c4b44f1e1fbd 100644
--- a/devel/p5-Test-HTML-Tidy/Makefile
+++ b/devel/p5-Test-HTML-Tidy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-HTML-Tidy
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-HTML-Tidy/pkg-plist b/devel/p5-Test-HTML-Tidy/pkg-plist
index 862c085893c0..026749b12e00 100644
--- a/devel/p5-Test-HTML-Tidy/pkg-plist
+++ b/devel/p5-Test-HTML-Tidy/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTML/Tidy/.packlist
 %%SITE_PERL%%/Test/HTML/Tidy.pm
 %%PERL5_MAN3%%/Test::HTML::Tidy.3.gz
diff --git a/devel/p5-Test-Harness-Straps/Makefile b/devel/p5-Test-Harness-Straps/Makefile
index 1b4cf8009844..ad452648117b 100644
--- a/devel/p5-Test-Harness-Straps/Makefile
+++ b/devel/p5-Test-Harness-Straps/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Harness-Straps
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile
index 19722b973f3d..d0e759bd9639 100644
--- a/devel/p5-Test-Harness/Makefile
+++ b/devel/p5-Test-Harness/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Harness
 PORTVERSION=	3.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Harness/pkg-plist b/devel/p5-Test-Harness/pkg-plist
index bb0c970884bf..0a3ddea7a025 100644
--- a/devel/p5-Test-Harness/pkg-plist
+++ b/devel/p5-Test-Harness/pkg-plist
@@ -49,7 +49,6 @@ bin/p5prove
 %%SITE_PERL%%/TAP/Parser/YAMLish/Writer.pm
 %%SITE_PERL%%/Test/HACKING.pod
 %%SITE_PERL%%/Test/Harness.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Harness/.packlist
 %%PERL5_MAN3%%/App::Prove.3.gz
 %%PERL5_MAN3%%/App::Prove::State.3.gz
 %%PERL5_MAN3%%/App::Prove::State::Result.3.gz
diff --git a/devel/p5-Test-HasVersion/Makefile b/devel/p5-Test-HasVersion/Makefile
index d9bf5b7fdf59..534c010afd18 100644
--- a/devel/p5-Test-HasVersion/Makefile
+++ b/devel/p5-Test-HasVersion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-HasVersion
 PORTVERSION=	0.01.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-HasVersion/pkg-plist b/devel/p5-Test-HasVersion/pkg-plist
index b15b4ac87671..d4a46c1bfd18 100644
--- a/devel/p5-Test-HasVersion/pkg-plist
+++ b/devel/p5-Test-HasVersion/pkg-plist
@@ -1,4 +1,3 @@
 bin/test_version
 %%SITE_PERL%%/Test/HasVersion.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HasVersion/.packlist
 %%PERL5_MAN3%%/Test::HasVersion.3.gz
diff --git a/devel/p5-Test-HexString/Makefile b/devel/p5-Test-HexString/Makefile
index b96c1494a236..8512684d8411 100644
--- a/devel/p5-Test-HexString/Makefile
+++ b/devel/p5-Test-HexString/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-HexString
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-HexString/pkg-plist b/devel/p5-Test-HexString/pkg-plist
index 69fcd23b4bb3..b51db99403ee 100644
--- a/devel/p5-Test-HexString/pkg-plist
+++ b/devel/p5-Test-HexString/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::HexString.3.gz
 %%SITE_PERL%%/Test/HexString.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HexString/.packlist
diff --git a/devel/p5-Test-Identity/Makefile b/devel/p5-Test-Identity/Makefile
index 9431c453fcc1..f548ca5eb7f6 100644
--- a/devel/p5-Test-Identity/Makefile
+++ b/devel/p5-Test-Identity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Identity
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Identity/pkg-plist b/devel/p5-Test-Identity/pkg-plist
index 96a0fa465bfd..2b332acca1e1 100644
--- a/devel/p5-Test-Identity/pkg-plist
+++ b/devel/p5-Test-Identity/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Identity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Identity/.packlist
 %%PERL5_MAN3%%/Test::Identity.3.gz
diff --git a/devel/p5-Test-If/Makefile b/devel/p5-Test-If/Makefile
index 235da142b1ea..0113f8d69609 100644
--- a/devel/p5-Test-If/Makefile
+++ b/devel/p5-Test-If/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-If
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-If/pkg-plist b/devel/p5-Test-If/pkg-plist
index ffff44f11817..956a6b0a3d2b 100644
--- a/devel/p5-Test-If/pkg-plist
+++ b/devel/p5-Test-If/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::If.3.gz
 %%SITE_PERL%%/Test/If.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/If/.packlist
diff --git a/devel/p5-Test-InDistDir/Makefile b/devel/p5-Test-InDistDir/Makefile
index 039f81ff29b8..f89526dd9993 100644
--- a/devel/p5-Test-InDistDir/Makefile
+++ b/devel/p5-Test-InDistDir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-InDistDir
 PORTVERSION=	1.112071
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-InDistDir/pkg-plist b/devel/p5-Test-InDistDir/pkg-plist
index a3cd2abbc3e7..cb1be23e4abc 100644
--- a/devel/p5-Test-InDistDir/pkg-plist
+++ b/devel/p5-Test-InDistDir/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/InDistDir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/InDistDir/.packlist
 %%PERL5_MAN3%%/Test::InDistDir.3.gz
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index c2092198fbc4..42443cbbffbf 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Inline
 PORTVERSION=	2.213
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Inline/pkg-plist b/devel/p5-Test-Inline/pkg-plist
index 84afd77f0217..0704f217c27a 100644
--- a/devel/p5-Test-Inline/pkg-plist
+++ b/devel/p5-Test-Inline/pkg-plist
@@ -18,5 +18,4 @@ bin/inline2test
 %%SITE_PERL%%/Test/Inline/Script.pm
 %%SITE_PERL%%/Test/Inline/Section.pm
 %%SITE_PERL%%/Test/Inline/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Inline/.packlist
 man/man1/inline2test.1.gz
diff --git a/devel/p5-Test-Inter/Makefile b/devel/p5-Test-Inter/Makefile
index e1546d1e3b7a..58a1d349c17b 100644
--- a/devel/p5-Test-Inter/Makefile
+++ b/devel/p5-Test-Inter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Inter
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index cbaa1f1fb9bc..a75b6b3820ee 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-JSON
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-JSON/pkg-plist b/devel/p5-Test-JSON/pkg-plist
index 70c64a7fff20..695f39c2f883 100644
--- a/devel/p5-Test-JSON/pkg-plist
+++ b/devel/p5-Test-JSON/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/JSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/JSON/.packlist
 %%PERL5_MAN3%%/Test::JSON.3.gz
diff --git a/devel/p5-Test-Kwalitee/Makefile b/devel/p5-Test-Kwalitee/Makefile
index 1b225fcc69ca..fce69aa23ff7 100644
--- a/devel/p5-Test-Kwalitee/Makefile
+++ b/devel/p5-Test-Kwalitee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Kwalitee
 PORTVERSION=	1.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Lazy/Makefile b/devel/p5-Test-Lazy/Makefile
index d56d37881275..de6b068d9c3e 100644
--- a/devel/p5-Test-Lazy/Makefile
+++ b/devel/p5-Test-Lazy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Lazy
 PORTVERSION=	0.061
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Lazy/pkg-plist b/devel/p5-Test-Lazy/pkg-plist
index 525080864ca6..8a9cd8529363 100644
--- a/devel/p5-Test-Lazy/pkg-plist
+++ b/devel/p5-Test-Lazy/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Test/Lazy.pm
 %%SITE_PERL%%/Test/Lazy/Template.pm
 %%SITE_PERL%%/Test/Lazy/Tester.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Lazy/.packlist
diff --git a/devel/p5-Test-LeakTrace/Makefile b/devel/p5-Test-LeakTrace/Makefile
index 0bcb0f1e15ba..babeb59f40df 100644
--- a/devel/p5-Test-LeakTrace/Makefile
+++ b/devel/p5-Test-LeakTrace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-LeakTrace
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-LeakTrace/pkg-plist b/devel/p5-Test-LeakTrace/pkg-plist
index 6c09d5cb8fe4..48ecad9fdb5a 100644
--- a/devel/p5-Test-LeakTrace/pkg-plist
+++ b/devel/p5-Test-LeakTrace/pkg-plist
@@ -1,8 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Test/LeakTrace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Test/LeakTrace/JA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Test/LeakTrace/Script.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/LeakTrace/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/LeakTrace/LeakTrace.so
+%%SITE_ARCH%%/Test/LeakTrace.pm
+%%SITE_ARCH%%/Test/LeakTrace/JA.pod
+%%SITE_ARCH%%/Test/LeakTrace/Script.pm
+%%SITE_ARCH%%/auto/Test/LeakTrace/LeakTrace.so
 %%PERL5_MAN3%%/Test::LeakTrace.3.gz
 %%PERL5_MAN3%%/Test::LeakTrace::JA.3.gz
 %%PERL5_MAN3%%/Test::LeakTrace::Script.3.gz
diff --git a/devel/p5-Test-LectroTest/Makefile b/devel/p5-Test-LectroTest/Makefile
index 5ddf60711ad6..6265267e6c19 100644
--- a/devel/p5-Test-LectroTest/Makefile
+++ b/devel/p5-Test-LectroTest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-LectroTest
 PORTVERSION=	0.5001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-LectroTest/pkg-plist b/devel/p5-Test-LectroTest/pkg-plist
index 284b449316b1..43a74f7d14b1 100644
--- a/devel/p5-Test-LectroTest/pkg-plist
+++ b/devel/p5-Test-LectroTest/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Test/LectroTest/RegressionTesting.pod
 %%SITE_PERL%%/Test/LectroTest/TestRunner.pm
 %%SITE_PERL%%/Test/LectroTest/Tutorial.pod
-%%SITE_PERL%%/mach/auto/Test/LectroTest/.packlist
 %%PERL5_MAN3%%/Test::LectroTest.3.gz
 %%PERL5_MAN3%%/Test::LectroTest::Compat.3.gz
 %%PERL5_MAN3%%/Test::LectroTest::FailureRecorder.3.gz
diff --git a/devel/p5-Test-LoadAllModules/Makefile b/devel/p5-Test-LoadAllModules/Makefile
index 13496aef65c8..495be1e3e4da 100644
--- a/devel/p5-Test-LoadAllModules/Makefile
+++ b/devel/p5-Test-LoadAllModules/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-LoadAllModules
 PORTVERSION=	0.022
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-LoadAllModules/pkg-plist b/devel/p5-Test-LoadAllModules/pkg-plist
index c533e735234f..335f5baf5be4 100644
--- a/devel/p5-Test-LoadAllModules/pkg-plist
+++ b/devel/p5-Test-LoadAllModules/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/LoadAllModules/.packlist
 %%SITE_PERL%%/Test/LoadAllModules.pm
 %%PERL5_MAN3%%/Test::LoadAllModules.3.gz
diff --git a/devel/p5-Test-Log4perl/Makefile b/devel/p5-Test-Log4perl/Makefile
index ff2cd97602ea..798d9c593404 100644
--- a/devel/p5-Test-Log4perl/Makefile
+++ b/devel/p5-Test-Log4perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Log4perl
 PORTVERSION=	0.1001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Log4perl/pkg-plist b/devel/p5-Test-Log4perl/pkg-plist
index 71da0bfa527a..0acb9f19fc41 100644
--- a/devel/p5-Test-Log4perl/pkg-plist
+++ b/devel/p5-Test-Log4perl/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Log4perl.3.gz
 %%SITE_PERL%%/Test/Log4perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Log4perl/.packlist
diff --git a/devel/p5-Test-LongString/Makefile b/devel/p5-Test-LongString/Makefile
index 52211e6a75c7..6cb5c365d3ff 100644
--- a/devel/p5-Test-LongString/Makefile
+++ b/devel/p5-Test-LongString/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-LongString
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-LongString/pkg-plist b/devel/p5-Test-LongString/pkg-plist
index 5d0b41eec5d2..8031c2e05d8b 100644
--- a/devel/p5-Test-LongString/pkg-plist
+++ b/devel/p5-Test-LongString/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::LongString.3.gz
 %%SITE_PERL%%/Test/LongString.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/LongString/.packlist
diff --git a/devel/p5-Test-Manifest/Makefile b/devel/p5-Test-Manifest/Makefile
index a6ea69b5f2c8..c3d6b2228d95 100644
--- a/devel/p5-Test-Manifest/Makefile
+++ b/devel/p5-Test-Manifest/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Manifest
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Manifest/pkg-plist b/devel/p5-Test-Manifest/pkg-plist
index a51344f9efcd..614d4b208272 100644
--- a/devel/p5-Test-Manifest/pkg-plist
+++ b/devel/p5-Test-Manifest/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Manifest.3.gz
 %%SITE_PERL%%/Test/Manifest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Manifest/.packlist
diff --git a/devel/p5-Test-ManyParams/Makefile b/devel/p5-Test-ManyParams/Makefile
index 3bbfec5b756d..0ef18b29bef4 100644
--- a/devel/p5-Test-ManyParams/Makefile
+++ b/devel/p5-Test-ManyParams/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-ManyParams
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-ManyParams/pkg-plist b/devel/p5-Test-ManyParams/pkg-plist
index 249d11b0fa47..2b091f923dd1 100644
--- a/devel/p5-Test-ManyParams/pkg-plist
+++ b/devel/p5-Test-ManyParams/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::ManyParams.3.gz
 %%SITE_PERL%%/Test/ManyParams.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/ManyParams/.packlist
diff --git a/devel/p5-Test-Memory-Cycle/Makefile b/devel/p5-Test-Memory-Cycle/Makefile
index f901932bbeaf..512cfab502ac 100644
--- a/devel/p5-Test-Memory-Cycle/Makefile
+++ b/devel/p5-Test-Memory-Cycle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Memory-Cycle
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Memory-Cycle/pkg-plist b/devel/p5-Test-Memory-Cycle/pkg-plist
index 09955fb9a01c..541e9c279344 100644
--- a/devel/p5-Test-Memory-Cycle/pkg-plist
+++ b/devel/p5-Test-Memory-Cycle/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Memory::Cycle.3.gz
 %%SITE_PERL%%/Test/Memory/Cycle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Memory/Cycle/.packlist
diff --git a/devel/p5-Test-Mini-Unit/Makefile b/devel/p5-Test-Mini-Unit/Makefile
index f16e4612a697..f1a884724b2a 100644
--- a/devel/p5-Test-Mini-Unit/Makefile
+++ b/devel/p5-Test-Mini-Unit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Mini-Unit
 PORTVERSION=	v1.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PVANDE
diff --git a/devel/p5-Test-Mini-Unit/pkg-plist b/devel/p5-Test-Mini-Unit/pkg-plist
index b9560a7a745e..e9d0d12b1250 100644
--- a/devel/p5-Test-Mini-Unit/pkg-plist
+++ b/devel/p5-Test-Mini-Unit/pkg-plist
@@ -7,6 +7,5 @@
 %%SITE_PERL%%/Test/Mini/Unit/Sugar/Shared.pm
 %%SITE_PERL%%/Test/Mini/Unit/Sugar/Test.pm
 %%SITE_PERL%%/Test/Mini/Unit/Sugar/TestCase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Mini/Unit/.packlist
 %%PERL5_MAN3%%/Test::Mini::README.3.gz
 %%PERL5_MAN3%%/Test::Mini::Unit.3.gz
diff --git a/devel/p5-Test-Mini/Makefile b/devel/p5-Test-Mini/Makefile
index c1c59855a47a..62bf1f2549ca 100644
--- a/devel/p5-Test-Mini/Makefile
+++ b/devel/p5-Test-Mini/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Mini
 PORTVERSION=	v1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PVANDE
diff --git a/devel/p5-Test-Mini/pkg-plist b/devel/p5-Test-Mini/pkg-plist
index 5fb0c3718df1..d764f07f011e 100644
--- a/devel/p5-Test-Mini/pkg-plist
+++ b/devel/p5-Test-Mini/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/Test/Mini/TestCase.pm
 %%SITE_PERL%%/Test/Mini/TestCase.pod
 %%SITE_PERL%%/Test/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Mini/.packlist
 %%PERL5_MAN3%%/Test::Mini.3.gz
 %%PERL5_MAN3%%/Test::Mini::Assertions.3.gz
 %%PERL5_MAN3%%/Test::Mini::Logger.3.gz
diff --git a/devel/p5-Test-Mock-Guard/Makefile b/devel/p5-Test-Mock-Guard/Makefile
index 50ef026f0ac5..f2f3a2cddd3b 100644
--- a/devel/p5-Test-Mock-Guard/Makefile
+++ b/devel/p5-Test-Mock-Guard/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Mock-Guard
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Mock-LWP-Dispatch/Makefile b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
index 88bf55b02867..d5a6cfb595f4 100644
--- a/devel/p5-Test-Mock-LWP-Dispatch/Makefile
+++ b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Mock-LWP-Dispatch
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Mock-LWP-Dispatch/pkg-plist b/devel/p5-Test-Mock-LWP-Dispatch/pkg-plist
index d73e14c4e875..d3d48fd23a5b 100644
--- a/devel/p5-Test-Mock-LWP-Dispatch/pkg-plist
+++ b/devel/p5-Test-Mock-LWP-Dispatch/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Mock/LWP/Dispatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Mock/LWP/Dispatch/.packlist
 %%PERL5_MAN3%%/Test::Mock::LWP::Dispatch.3.gz
diff --git a/devel/p5-Test-Mock-LWP/Makefile b/devel/p5-Test-Mock-LWP/Makefile
index d48077eb21b2..a691eeb37ab3 100644
--- a/devel/p5-Test-Mock-LWP/Makefile
+++ b/devel/p5-Test-Mock-LWP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Mock-LWP
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Mock-LWP/pkg-plist b/devel/p5-Test-Mock-LWP/pkg-plist
index 7475d60e84cd..596369eb4e38 100644
--- a/devel/p5-Test-Mock-LWP/pkg-plist
+++ b/devel/p5-Test-Mock-LWP/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Test/Mock/HTTP/Response.pm
 %%SITE_PERL%%/Test/Mock/LWP.pm
 %%SITE_PERL%%/Test/Mock/LWP/UserAgent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Mock/LWP/.packlist
 %%PERL5_MAN3%%/Test::Mock::HTTP::Request.3.gz
 %%PERL5_MAN3%%/Test::Mock::HTTP::Response.3.gz
 %%PERL5_MAN3%%/Test::Mock::LWP.3.gz
diff --git a/devel/p5-Test-MockModule/Makefile b/devel/p5-Test-MockModule/Makefile
index 41d7bb434794..c23e4da17eb8 100644
--- a/devel/p5-Test-MockModule/Makefile
+++ b/devel/p5-Test-MockModule/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-MockModule
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-MockModule/pkg-plist b/devel/p5-Test-MockModule/pkg-plist
index 5d7ad75d1498..d6fc7be7f25f 100644
--- a/devel/p5-Test-MockModule/pkg-plist
+++ b/devel/p5-Test-MockModule/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/MockModule.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockModule/.packlist
 %%PERL5_MAN3%%/Test::MockModule.3.gz
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 2e24afb95477..27d7276513a2 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-MockObject
 PORTVERSION=	1.20140408
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-MockObject/pkg-plist b/devel/p5-Test-MockObject/pkg-plist
index dfc4b8777f85..984e4ab1fb2c 100644
--- a/devel/p5-Test-MockObject/pkg-plist
+++ b/devel/p5-Test-MockObject/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Test::MockObject::Extends.3.gz
 %%SITE_PERL%%/Test/MockObject.pm
 %%SITE_PERL%%/Test/MockObject/Extends.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockObject/.packlist
diff --git a/devel/p5-Test-MockRandom/Makefile b/devel/p5-Test-MockRandom/Makefile
index 71f1e69c9183..45e10d2ccd60 100644
--- a/devel/p5-Test-MockRandom/Makefile
+++ b/devel/p5-Test-MockRandom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-MockRandom
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-MockRandom/pkg-plist b/devel/p5-Test-MockRandom/pkg-plist
index c27cf9a71780..b31f53b82875 100644
--- a/devel/p5-Test-MockRandom/pkg-plist
+++ b/devel/p5-Test-MockRandom/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockRandom/.packlist
 %%SITE_PERL%%/Test/MockRandom.pm
 %%PERL5_MAN3%%/Test::MockRandom.3.gz
diff --git a/devel/p5-Test-MockTime/Makefile b/devel/p5-Test-MockTime/Makefile
index bf4d59f7a2ad..62b10f0e8ae9 100644
--- a/devel/p5-Test-MockTime/Makefile
+++ b/devel/p5-Test-MockTime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-MockTime
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-MockTime/pkg-plist b/devel/p5-Test-MockTime/pkg-plist
index fdc7d00ad035..bbda98c10227 100644
--- a/devel/p5-Test-MockTime/pkg-plist
+++ b/devel/p5-Test-MockTime/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Test/MockTime.pm
 %%SITE_PERL%%/Test/MockTime.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockTime/.packlist
 %%PERL5_MAN3%%/Test::MockTime.3.gz
diff --git a/devel/p5-Test-Module-Used/Makefile b/devel/p5-Test-Module-Used/Makefile
index dcec76f35e9f..bf7a3d28db03 100644
--- a/devel/p5-Test-Module-Used/Makefile
+++ b/devel/p5-Test-Module-Used/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Module-Used
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TSUCCHI
diff --git a/devel/p5-Test-Module-Used/pkg-plist b/devel/p5-Test-Module-Used/pkg-plist
index 577fa984d8d9..9d2f67db4717 100644
--- a/devel/p5-Test-Module-Used/pkg-plist
+++ b/devel/p5-Test-Module-Used/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Module/Used.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Module/Used/.packlist
 %%PERL5_MAN3%%/Test::Module::Used.3.gz
diff --git a/devel/p5-Test-Moose-More/Makefile b/devel/p5-Test-Moose-More/Makefile
index 9ad70913aed7..1ae76c23641c 100644
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Moose-More
 PORTVERSION=	0.020
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-Moose-More/pkg-plist b/devel/p5-Test-Moose-More/pkg-plist
index e2e71de324a2..617fd333c7ba 100644
--- a/devel/p5-Test-Moose-More/pkg-plist
+++ b/devel/p5-Test-Moose-More/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Moose/More.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Moose/More/.packlist
 %%PERL5_MAN3%%/Test::Moose::More.3.gz
diff --git a/devel/p5-Test-More-UTF8/Makefile b/devel/p5-Test-More-UTF8/Makefile
index 0978adf815c4..a607629efbc4 100644
--- a/devel/p5-Test-More-UTF8/Makefile
+++ b/devel/p5-Test-More-UTF8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-More-UTF8
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-More-UTF8/pkg-plist b/devel/p5-Test-More-UTF8/pkg-plist
index 3aab115ac301..440d0dfc900b 100644
--- a/devel/p5-Test-More-UTF8/pkg-plist
+++ b/devel/p5-Test-More-UTF8/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/More/UTF8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/More/UTF8/.packlist
 %%PERL5_MAN3%%/Test::More::UTF8.3.gz
diff --git a/devel/p5-Test-Most/Makefile b/devel/p5-Test-Most/Makefile
index 972a0c56646c..059ccf787277 100644
--- a/devel/p5-Test-Most/Makefile
+++ b/devel/p5-Test-Most/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Most
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Most/pkg-plist b/devel/p5-Test-Most/pkg-plist
index 42d10085c599..c609d7d4a7b5 100644
--- a/devel/p5-Test-Most/pkg-plist
+++ b/devel/p5-Test-Most/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Test::Most.3.gz
 %%PERL5_MAN3%%/Test::Most::Exception.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Most/.packlist
 %%SITE_PERL%%/Test/Most.pm
 %%SITE_PERL%%/Test/Most/Exception.pm
diff --git a/devel/p5-Test-Name-FromLine/Makefile b/devel/p5-Test-Name-FromLine/Makefile
index 79af08031684..dcd34704a74b 100644
--- a/devel/p5-Test-Name-FromLine/Makefile
+++ b/devel/p5-Test-Name-FromLine/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Name-FromLine
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Net-LDAP/Makefile b/devel/p5-Test-Net-LDAP/Makefile
index ae430c39de38..fd0ef1b7ca14 100644
--- a/devel/p5-Test-Net-LDAP/Makefile
+++ b/devel/p5-Test-Net-LDAP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Net-LDAP
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Net-LDAP/pkg-plist b/devel/p5-Test-Net-LDAP/pkg-plist
index c680504641f2..5627efff3bd2 100644
--- a/devel/p5-Test-Net-LDAP/pkg-plist
+++ b/devel/p5-Test-Net-LDAP/pkg-plist
@@ -1,7 +1,6 @@
 %%PERL5_MAN3%%/Test::Net::LDAP.3.gz
 %%PERL5_MAN3%%/Test::Net::LDAP::Mock.3.gz
 %%PERL5_MAN3%%/Test::Net::LDAP::Util.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Net/LDAP/.packlist
 %%SITE_PERL%%/Test/Net/LDAP.pm
 %%SITE_PERL%%/Test/Net/LDAP/Mixin.pm
 %%SITE_PERL%%/Test/Net/LDAP/Mock.pm
diff --git a/devel/p5-Test-Net-RabbitMQ/Makefile b/devel/p5-Test-Net-RabbitMQ/Makefile
index 30b490eb6650..798613723612 100644
--- a/devel/p5-Test-Net-RabbitMQ/Makefile
+++ b/devel/p5-Test-Net-RabbitMQ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Net-RabbitMQ
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GPHAT
diff --git a/devel/p5-Test-Net-RabbitMQ/pkg-plist b/devel/p5-Test-Net-RabbitMQ/pkg-plist
index 7c2443f187f7..a4ce8e4e5b87 100644
--- a/devel/p5-Test-Net-RabbitMQ/pkg-plist
+++ b/devel/p5-Test-Net-RabbitMQ/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Net/RabbitMQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Net/RabbitMQ/.packlist
 %%PERL5_MAN3%%/Test::Net::RabbitMQ.3.gz
diff --git a/devel/p5-Test-NoTabs/Makefile b/devel/p5-Test-NoTabs/Makefile
index 4a6cd1386779..80ac621ebcf7 100644
--- a/devel/p5-Test-NoTabs/Makefile
+++ b/devel/p5-Test-NoTabs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-NoTabs
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/devel/p5-Test-NoTabs/pkg-plist b/devel/p5-Test-NoTabs/pkg-plist
index 82eef58576cc..598e4bcf2de9 100644
--- a/devel/p5-Test-NoTabs/pkg-plist
+++ b/devel/p5-Test-NoTabs/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/NoTabs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/NoTabs/.packlist
 %%PERL5_MAN3%%/Test::NoTabs.3.gz
diff --git a/devel/p5-Test-NoWarnings/Makefile b/devel/p5-Test-NoWarnings/Makefile
index 8659dde7191f..aa7494a6f664 100644
--- a/devel/p5-Test-NoWarnings/Makefile
+++ b/devel/p5-Test-NoWarnings/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-NoWarnings
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-NoWarnings/pkg-plist b/devel/p5-Test-NoWarnings/pkg-plist
index 3c42dbd030b4..d32869cd0abb 100644
--- a/devel/p5-Test-NoWarnings/pkg-plist
+++ b/devel/p5-Test-NoWarnings/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/NoWarnings/.packlist
 %%SITE_PERL%%/Test/NoWarnings.pm
 %%SITE_PERL%%/Test/NoWarnings/Warning.pm
 %%PERL5_MAN3%%/Test::NoWarnings.3.gz
diff --git a/devel/p5-Test-Number-Delta/Makefile b/devel/p5-Test-Number-Delta/Makefile
index 23a53ef6fa0b..263b465fae01 100644
--- a/devel/p5-Test-Number-Delta/Makefile
+++ b/devel/p5-Test-Number-Delta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Number-Delta
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Number-Delta/pkg-plist b/devel/p5-Test-Number-Delta/pkg-plist
index 3f6f7288c8e8..b470abad4964 100644
--- a/devel/p5-Test-Number-Delta/pkg-plist
+++ b/devel/p5-Test-Number-Delta/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Number/Delta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Number/Delta/.packlist
 %%PERL5_MAN3%%/Test::Number::Delta.3.gz
diff --git a/devel/p5-Test-Object/Makefile b/devel/p5-Test-Object/Makefile
index cdebc1a10238..1e33e7b50161 100644
--- a/devel/p5-Test-Object/Makefile
+++ b/devel/p5-Test-Object/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Object
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/devel/p5-Test-Object/pkg-plist b/devel/p5-Test-Object/pkg-plist
index 47ccdbb374d3..2a086f09542a 100644
--- a/devel/p5-Test-Object/pkg-plist
+++ b/devel/p5-Test-Object/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Test/Object.pm
 %%SITE_PERL%%/Test/Object/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Object/.packlist
 %%PERL5_MAN3%%/Test::Object.3.gz
diff --git a/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile
index c21e95798111..df33829f44cd 100644
--- a/devel/p5-Test-OpenLDAP/Makefile
+++ b/devel/p5-Test-OpenLDAP/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Test-OpenLDAP
 PORTVERSION=	0.05
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-OpenLDAP/pkg-plist b/devel/p5-Test-OpenLDAP/pkg-plist
index 22b6b3dccb71..6aca8b012574 100644
--- a/devel/p5-Test-OpenLDAP/pkg-plist
+++ b/devel/p5-Test-OpenLDAP/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::OpenLDAP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/OpenLDAP/.packlist
 %%SITE_PERL%%/Test/OpenLDAP.pm
diff --git a/devel/p5-Test-Output/Makefile b/devel/p5-Test-Output/Makefile
index ebc4495c14e0..8e9504275781 100644
--- a/devel/p5-Test-Output/Makefile
+++ b/devel/p5-Test-Output/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Output
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Output/pkg-plist b/devel/p5-Test-Output/pkg-plist
index db80931b25ec..904685cad41e 100644
--- a/devel/p5-Test-Output/pkg-plist
+++ b/devel/p5-Test-Output/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Output.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Output/.packlist
 %%PERL5_MAN3%%/Test::Output.3.gz
diff --git a/devel/p5-Test-POE-Client-TCP/Makefile b/devel/p5-Test-POE-Client-TCP/Makefile
index 17b4421648b0..bf1ce6d0a363 100644
--- a/devel/p5-Test-POE-Client-TCP/Makefile
+++ b/devel/p5-Test-POE-Client-TCP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-POE-Client-TCP
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-POE-Client-TCP/pkg-plist b/devel/p5-Test-POE-Client-TCP/pkg-plist
index 9c803c662ef9..e5686dade7ae 100644
--- a/devel/p5-Test-POE-Client-TCP/pkg-plist
+++ b/devel/p5-Test-POE-Client-TCP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/POE/Client/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/POE/Client/TCP/.packlist
 %%PERL5_MAN3%%/Test::POE::Client::TCP.3.gz
diff --git a/devel/p5-Test-POE-Server-TCP/Makefile b/devel/p5-Test-POE-Server-TCP/Makefile
index 6ac41b558d61..fc51e1a75bf8 100644
--- a/devel/p5-Test-POE-Server-TCP/Makefile
+++ b/devel/p5-Test-POE-Server-TCP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-POE-Server-TCP
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-POE-Server-TCP/pkg-plist b/devel/p5-Test-POE-Server-TCP/pkg-plist
index 4f81a6b7a091..0d862fd9c5aa 100644
--- a/devel/p5-Test-POE-Server-TCP/pkg-plist
+++ b/devel/p5-Test-POE-Server-TCP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/POE/Server/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/POE/Server/TCP/.packlist
 %%PERL5_MAN3%%/Test::POE::Server::TCP.3.gz
diff --git a/devel/p5-Test-Parser/Makefile b/devel/p5-Test-Parser/Makefile
index be07d2887b34..3ba0a8db2e13 100644
--- a/devel/p5-Test-Parser/Makefile
+++ b/devel/p5-Test-Parser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Parser
 PORTVERSION=	1.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Parser/pkg-plist b/devel/p5-Test-Parser/pkg-plist
index d8a088dfec27..d98aef5bf252 100644
--- a/devel/p5-Test-Parser/pkg-plist
+++ b/devel/p5-Test-Parser/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Parser/.packlist
 %%SITE_PERL%%/Test/Metadata.pm
 %%SITE_PERL%%/Test/Parser.pm
 %%SITE_PERL%%/Test/Parser/Dbench.pm
diff --git a/devel/p5-Test-PerlTidy/Makefile b/devel/p5-Test-PerlTidy/Makefile
index fce5ee5a23ad..d66f538b3e78 100644
--- a/devel/p5-Test-PerlTidy/Makefile
+++ b/devel/p5-Test-PerlTidy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-PerlTidy
 PORTVERSION=	20130104
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-PerlTidy/pkg-plist b/devel/p5-Test-PerlTidy/pkg-plist
index ba36c250bc16..7e85215de744 100644
--- a/devel/p5-Test-PerlTidy/pkg-plist
+++ b/devel/p5-Test-PerlTidy/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/PerlTidy/.packlist
 %%SITE_PERL%%/Test/PerlTidy.pm
 %%PERL5_MAN3%%/Test::PerlTidy.3.gz
diff --git a/devel/p5-Test-Pod-Coverage-Permissive/Makefile b/devel/p5-Test-Pod-Coverage-Permissive/Makefile
index acf392f114ec..43d0e51258fc 100644
--- a/devel/p5-Test-Pod-Coverage-Permissive/Makefile
+++ b/devel/p5-Test-Pod-Coverage-Permissive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Pod-Coverage-Permissive
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Pod-Coverage-Permissive/pkg-plist b/devel/p5-Test-Pod-Coverage-Permissive/pkg-plist
index c4883282144f..ec3b13862389 100644
--- a/devel/p5-Test-Pod-Coverage-Permissive/pkg-plist
+++ b/devel/p5-Test-Pod-Coverage-Permissive/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Pod::Coverage::Permissive.3.gz
 %%SITE_PERL%%/Test/Pod/Coverage/Permissive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod/Coverage/Permissive/.packlist
diff --git a/devel/p5-Test-Pod-Coverage/Makefile b/devel/p5-Test-Pod-Coverage/Makefile
index 9b71f1803678..77ff52b34554 100644
--- a/devel/p5-Test-Pod-Coverage/Makefile
+++ b/devel/p5-Test-Pod-Coverage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Pod-Coverage
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Pod-Coverage/pkg-plist b/devel/p5-Test-Pod-Coverage/pkg-plist
index a046f97b548d..7a2276ae4fb0 100644
--- a/devel/p5-Test-Pod-Coverage/pkg-plist
+++ b/devel/p5-Test-Pod-Coverage/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Pod/Coverage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod/Coverage/.packlist
 %%PERL5_MAN3%%/Test::Pod::Coverage.3.gz
diff --git a/devel/p5-Test-Pod/Makefile b/devel/p5-Test-Pod/Makefile
index b8bb81566a73..eae88cd620c6 100644
--- a/devel/p5-Test-Pod/Makefile
+++ b/devel/p5-Test-Pod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Pod
 PORTVERSION=	1.48
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DWHEELER
diff --git a/devel/p5-Test-Portability-Files/Makefile b/devel/p5-Test-Portability-Files/Makefile
index 205ca7368220..2c28f4fcce50 100644
--- a/devel/p5-Test-Portability-Files/Makefile
+++ b/devel/p5-Test-Portability-Files/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Portability-Files
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Portability-Files/pkg-plist b/devel/p5-Test-Portability-Files/pkg-plist
index e5f6f2746bf1..8e784c2d4a00 100644
--- a/devel/p5-Test-Portability-Files/pkg-plist
+++ b/devel/p5-Test-Portability-Files/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Portability/Files/.packlist
 %%SITE_PERL%%/Test/Portability/Files.pm
 %%PERL5_MAN3%%/Test::Portability::Files.3.gz
diff --git a/devel/p5-Test-Prereq/Makefile b/devel/p5-Test-Prereq/Makefile
index a5daf2bca558..40db47364117 100644
--- a/devel/p5-Test-Prereq/Makefile
+++ b/devel/p5-Test-Prereq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Prereq
 PORTVERSION=	1.038
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Prereq/pkg-plist b/devel/p5-Test-Prereq/pkg-plist
index 1d3ee8e8491a..9e34c92e1002 100644
--- a/devel/p5-Test-Prereq/pkg-plist
+++ b/devel/p5-Test-Prereq/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Test::Prereq::Build.3.gz
 %%SITE_PERL%%/Test/Prereq.pm
 %%SITE_PERL%%/Test/Prereq/Build.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Prereq/.packlist
diff --git a/devel/p5-Test-RandomResults/Makefile b/devel/p5-Test-RandomResults/Makefile
index 58c5691275cc..d69c05addb51 100644
--- a/devel/p5-Test-RandomResults/Makefile
+++ b/devel/p5-Test-RandomResults/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-RandomResults
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-RandomResults/pkg-plist b/devel/p5-Test-RandomResults/pkg-plist
index b29fbbc113be..869edfadc6ce 100644
--- a/devel/p5-Test-RandomResults/pkg-plist
+++ b/devel/p5-Test-RandomResults/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::RandomResults.3.gz
 %%SITE_PERL%%/Test/RandomResults.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/RandomResults/.packlist
diff --git a/devel/p5-Test-Refcount/Makefile b/devel/p5-Test-Refcount/Makefile
index 7f20358f2e1f..fbf2ff8994e9 100644
--- a/devel/p5-Test-Refcount/Makefile
+++ b/devel/p5-Test-Refcount/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Refcount
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Refcount/pkg-plist b/devel/p5-Test-Refcount/pkg-plist
index d0ce8dbe2bbf..f445b39350e9 100644
--- a/devel/p5-Test-Refcount/pkg-plist
+++ b/devel/p5-Test-Refcount/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Refcount.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Refcount/.packlist
 %%PERL5_MAN3%%/Test::Refcount.3.gz
diff --git a/devel/p5-Test-Reporter-Transport-Metabase/Makefile b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
index 05da56d9fea9..f78b1adb5325 100644
--- a/devel/p5-Test-Reporter-Transport-Metabase/Makefile
+++ b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Reporter-Transport-Metabase
 PORTVERSION=	1.999008
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Test-Reporter-Transport-Metabase/pkg-plist b/devel/p5-Test-Reporter-Transport-Metabase/pkg-plist
index 3eac774b77ee..bc62b2b625e0 100644
--- a/devel/p5-Test-Reporter-Transport-Metabase/pkg-plist
+++ b/devel/p5-Test-Reporter-Transport-Metabase/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Reporter/Transport/Metabase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Reporter/Transport/Metabase/.packlist
 %%PERL5_MAN3%%/Test::Reporter::Transport::Metabase.3.gz
diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile
index e0d9f800fcc5..28719747d8fb 100644
--- a/devel/p5-Test-Reporter/Makefile
+++ b/devel/p5-Test-Reporter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Reporter
 PORTVERSION=	1.60
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Reporter/pkg-plist b/devel/p5-Test-Reporter/pkg-plist
index 9ed3ff056617..1f368e56264d 100644
--- a/devel/p5-Test-Reporter/pkg-plist
+++ b/devel/p5-Test-Reporter/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Test/Reporter/Transport/File.pm
 %%SITE_PERL%%/Test/Reporter/Transport/Null.pm
 %%SITE_PERL%%/Test/Reporter/Transport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Reporter/.packlist
 %%PERL5_MAN3%%/Test::Reporter.3.gz
 %%PERL5_MAN3%%/Test::Reporter::Transport.3.gz
 %%PERL5_MAN3%%/Test::Reporter::Transport::File.3.gz
diff --git a/devel/p5-Test-Requires/Makefile b/devel/p5-Test-Requires/Makefile
index 5adfbc3b3360..1237595b599f 100644
--- a/devel/p5-Test-Requires/Makefile
+++ b/devel/p5-Test-Requires/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Requires
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Requires/pkg-plist b/devel/p5-Test-Requires/pkg-plist
index c019c9f400d5..951370cb4e40 100644
--- a/devel/p5-Test-Requires/pkg-plist
+++ b/devel/p5-Test-Requires/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_ARCH%%/auto/Test/Requires/.packlist
 %%PERL5_MAN3%%/Test::Requires.3.gz
 %%SITE_PERL%%/Test/Requires.pm
diff --git a/devel/p5-Test-Script-Run/Makefile b/devel/p5-Test-Script-Run/Makefile
index 4e29347d59ff..7a603d811c66 100644
--- a/devel/p5-Test-Script-Run/Makefile
+++ b/devel/p5-Test-Script-Run/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Script-Run
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Script-Run/pkg-plist b/devel/p5-Test-Script-Run/pkg-plist
index 9fb94a3d4f3f..8e89a776978b 100644
--- a/devel/p5-Test-Script-Run/pkg-plist
+++ b/devel/p5-Test-Script-Run/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Script::Run.3.gz
 %%SITE_PERL%%/Test/Script/Run.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Script/Run/.packlist
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index e603393602d7..52075981543e 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Script
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-Script/pkg-plist b/devel/p5-Test-Script/pkg-plist
index ee42b38de52d..9144169782c3 100644
--- a/devel/p5-Test-Script/pkg-plist
+++ b/devel/p5-Test-Script/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Script.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Script/.packlist
 %%PERL5_MAN3%%/Test::Script.3.gz
diff --git a/devel/p5-Test-SharedFork/Makefile b/devel/p5-Test-SharedFork/Makefile
index 063fc47b89c3..968094b7d236 100644
--- a/devel/p5-Test-SharedFork/Makefile
+++ b/devel/p5-Test-SharedFork/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-SharedFork
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
diff --git a/devel/p5-Test-SharedFork/pkg-plist b/devel/p5-Test-SharedFork/pkg-plist
index b3e4238f1e87..e3c93673b855 100644
--- a/devel/p5-Test-SharedFork/pkg-plist
+++ b/devel/p5-Test-SharedFork/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/SharedFork/.packlist
 %%SITE_PERL%%/Test/SharedFork.pm
 %%SITE_PERL%%/Test/SharedFork/Array.pm
 %%SITE_PERL%%/Test/SharedFork/Scalar.pm
diff --git a/devel/p5-Test-Signature/Makefile b/devel/p5-Test-Signature/Makefile
index 09ae9766f149..9056c2bc64e7 100644
--- a/devel/p5-Test-Signature/Makefile
+++ b/devel/p5-Test-Signature/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Signature
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:AUDREYT
diff --git a/devel/p5-Test-Signature/pkg-plist b/devel/p5-Test-Signature/pkg-plist
index a7eb74dc5c65..e323e7468b17 100644
--- a/devel/p5-Test-Signature/pkg-plist
+++ b/devel/p5-Test-Signature/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Signature.3.gz
 %%SITE_PERL%%/Test/Signature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Signature/.packlist
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index 28fba3bfeb9e..a56960b0a6ac 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Simple
 PORTVERSION=	1.001.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
diff --git a/devel/p5-Test-Simple/pkg-plist b/devel/p5-Test-Simple/pkg-plist
index e221662c62fc..67c731f72ac8 100644
--- a/devel/p5-Test-Simple/pkg-plist
+++ b/devel/p5-Test-Simple/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Test/More.pm
 %%SITE_PERL%%/Test/Simple.pm
 %%SITE_PERL%%/Test/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Simple/.packlist
 %%PERL5_MAN3%%/Test::Builder.3.gz
 %%PERL5_MAN3%%/Test::Builder::IO::Scalar.3.gz
 %%PERL5_MAN3%%/Test::Builder::Module.3.gz
diff --git a/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
index 8c2ce3d154a7..bf2fd0b8c2fb 100644
--- a/devel/p5-Test-Singleton/Makefile
+++ b/devel/p5-Test-Singleton/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Singleton
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TPG
diff --git a/devel/p5-Test-Singleton/pkg-plist b/devel/p5-Test-Singleton/pkg-plist
index 26ddc1eb7edd..1234f0892f51 100644
--- a/devel/p5-Test-Singleton/pkg-plist
+++ b/devel/p5-Test-Singleton/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Singleton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Singleton/.packlist
 %%PERL5_MAN3%%/Test::Singleton.3.gz
diff --git a/devel/p5-Test-Spec/Makefile b/devel/p5-Test-Spec/Makefile
index d7e2cfca1904..b8cbae383812 100644
--- a/devel/p5-Test-Spec/Makefile
+++ b/devel/p5-Test-Spec/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Spec
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Spec/pkg-plist b/devel/p5-Test-Spec/pkg-plist
index f202cb782346..5b1d89fd7c4a 100644
--- a/devel/p5-Test-Spec/pkg-plist
+++ b/devel/p5-Test-Spec/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/Test/Spec/Context.pm
 %%SITE_PERL%%/Test/Spec/Mocks.pm
 %%SITE_PERL%%/Test/Spec/SharedHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Spec/.packlist
 %%PERL5_MAN3%%/Test::Spec.3.gz
 %%PERL5_MAN3%%/Test::Spec::Mocks.3.gz
diff --git a/devel/p5-Test-Spelling/Makefile b/devel/p5-Test-Spelling/Makefile
index b049dbb8cc48..874e465a7f50 100644
--- a/devel/p5-Test-Spelling/Makefile
+++ b/devel/p5-Test-Spelling/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Spelling
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Spelling/pkg-plist b/devel/p5-Test-Spelling/pkg-plist
index b8f6edfe9585..dc5230a18b11 100644
--- a/devel/p5-Test-Spelling/pkg-plist
+++ b/devel/p5-Test-Spelling/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Spelling.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Spelling/.packlist
 %%PERL5_MAN3%%/Test::Spelling.3.gz
diff --git a/devel/p5-Test-Strict/Makefile b/devel/p5-Test-Strict/Makefile
index 9f9ec513f909..dec7e2ccec7a 100644
--- a/devel/p5-Test-Strict/Makefile
+++ b/devel/p5-Test-Strict/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Strict
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Strict/pkg-plist b/devel/p5-Test-Strict/pkg-plist
index d2431a901d65..64658e0f7132 100644
--- a/devel/p5-Test-Strict/pkg-plist
+++ b/devel/p5-Test-Strict/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Strict.3.gz
 %%SITE_PERL%%/Test/Strict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Strict/.packlist
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index 14f668b4f9fb..8350f551fdf1 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-SubCalls
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-SubCalls/pkg-plist b/devel/p5-Test-SubCalls/pkg-plist
index f35a7f2b97ca..c88e11d67fec 100644
--- a/devel/p5-Test-SubCalls/pkg-plist
+++ b/devel/p5-Test-SubCalls/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/SubCalls.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/SubCalls/.packlist
 %%PERL5_MAN3%%/Test::SubCalls.3.gz
diff --git a/devel/p5-Test-Synopsis/Makefile b/devel/p5-Test-Synopsis/Makefile
index 6acf9b8a9c03..ba098c95f075 100644
--- a/devel/p5-Test-Synopsis/Makefile
+++ b/devel/p5-Test-Synopsis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Synopsis
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Synopsis/pkg-plist b/devel/p5-Test-Synopsis/pkg-plist
index 281aee75ab4d..a0572e5db5bf 100644
--- a/devel/p5-Test-Synopsis/pkg-plist
+++ b/devel/p5-Test-Synopsis/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Synopsis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Synopsis/.packlist
 %%PERL5_MAN3%%/Test::Synopsis.3.gz
diff --git a/devel/p5-Test-Sys-Info/Makefile b/devel/p5-Test-Sys-Info/Makefile
index 08c7fd075870..cdd6512f95ba 100644
--- a/devel/p5-Test-Sys-Info/Makefile
+++ b/devel/p5-Test-Sys-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Sys-Info
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Sys-Info/pkg-plist b/devel/p5-Test-Sys-Info/pkg-plist
index 692eaab73ac0..8fe0e5aca34a 100644
--- a/devel/p5-Test-Sys-Info/pkg-plist
+++ b/devel/p5-Test-Sys-Info/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Test/Sys/Info.pm
 %%SITE_PERL%%/Test/Sys/Info/Driver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Sys/Info/.packlist
 %%PERL5_MAN3%%/Test::Sys::Info.3.gz
 %%PERL5_MAN3%%/Test::Sys::Info::Driver.3.gz
diff --git a/devel/p5-Test-TAP-HTMLMatrix/Makefile b/devel/p5-Test-TAP-HTMLMatrix/Makefile
index dd630c7accb8..cb65439d1205 100644
--- a/devel/p5-Test-TAP-HTMLMatrix/Makefile
+++ b/devel/p5-Test-TAP-HTMLMatrix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-TAP-HTMLMatrix
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-TAP-HTMLMatrix/pkg-plist b/devel/p5-Test-TAP-HTMLMatrix/pkg-plist
index 8d5a9e1c46c7..a78a7f397b14 100644
--- a/devel/p5-Test-TAP-HTMLMatrix/pkg-plist
+++ b/devel/p5-Test-TAP-HTMLMatrix/pkg-plist
@@ -11,4 +11,3 @@
 %%SITE_PERL%%/Test/TAP/Model/File/Visual.pm
 %%SITE_PERL%%/Test/TAP/Model/Subtest/Visual.pm
 %%SITE_PERL%%/Test/TAP/Model/Visual.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/TAP/HTMLMatrix/.packlist
diff --git a/devel/p5-Test-TAP-Model/Makefile b/devel/p5-Test-TAP-Model/Makefile
index 8ba21807774e..cf6a4338c0c9 100644
--- a/devel/p5-Test-TAP-Model/Makefile
+++ b/devel/p5-Test-TAP-Model/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-TAP-Model
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-TAP-Model/pkg-plist b/devel/p5-Test-TAP-Model/pkg-plist
index 3753d63d98a2..76c8dfc69f66 100644
--- a/devel/p5-Test-TAP-Model/pkg-plist
+++ b/devel/p5-Test-TAP-Model/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Test/TAP/Model/File.pm
 %%SITE_PERL%%/Test/TAP/Model/File/Consolidated.pm
 %%SITE_PERL%%/Test/TAP/Model/Subtest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/TAP/Model/.packlist
diff --git a/devel/p5-Test-TCP/Makefile b/devel/p5-Test-TCP/Makefile
index 944a32f7afe5..f6cceacb3952 100644
--- a/devel/p5-Test-TCP/Makefile
+++ b/devel/p5-Test-TCP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-TCP
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/devel/p5-Test-TCP/pkg-plist b/devel/p5-Test-TCP/pkg-plist
index 2b6931ed375e..2a6fbcd0f35d 100644
--- a/devel/p5-Test-TCP/pkg-plist
+++ b/devel/p5-Test-TCP/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_ARCH%%/auto/Test/TCP/.packlist
 %%PERL5_MAN3%%/Net::EmptyPort.3.gz
 %%PERL5_MAN3%%/Test::TCP.3.gz
 %%PERL5_MAN3%%/Test::TCP::CheckPort.3.gz
diff --git a/devel/p5-Test-TableDriven/Makefile b/devel/p5-Test-TableDriven/Makefile
index 811a6d8a06c7..c3ff828880f2 100644
--- a/devel/p5-Test-TableDriven/Makefile
+++ b/devel/p5-Test-TableDriven/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-TableDriven
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-TableDriven/pkg-plist b/devel/p5-Test-TableDriven/pkg-plist
index 585e0eff92fe..1dcb3c745acf 100644
--- a/devel/p5-Test-TableDriven/pkg-plist
+++ b/devel/p5-Test-TableDriven/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/TableDriven.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/TableDriven/.packlist
 %%PERL5_MAN3%%/Test::TableDriven.3.gz
diff --git a/devel/p5-Test-Taint/Makefile b/devel/p5-Test-Taint/Makefile
index 93b521b21a40..bff5f9ef1810 100644
--- a/devel/p5-Test-Taint/Makefile
+++ b/devel/p5-Test-Taint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Taint
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Taint/pkg-plist b/devel/p5-Test-Taint/pkg-plist
index d32f41255092..994f196c04a7 100644
--- a/devel/p5-Test-Taint/pkg-plist
+++ b/devel/p5-Test-Taint/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Test::Taint.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Test/Taint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Taint/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Taint/Taint.so
+%%SITE_ARCH%%/Test/Taint.pm
+%%SITE_ARCH%%/auto/Test/Taint/Taint.so
diff --git a/devel/p5-Test-TempDir/Makefile b/devel/p5-Test-TempDir/Makefile
index e1f047fac44b..36c596f22360 100644
--- a/devel/p5-Test-TempDir/Makefile
+++ b/devel/p5-Test-TempDir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-TempDir
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-TempDir/pkg-plist b/devel/p5-Test-TempDir/pkg-plist
index 64b9214d05bb..93e234514e51 100644
--- a/devel/p5-Test-TempDir/pkg-plist
+++ b/devel/p5-Test-TempDir/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Test/TempDir.pm
 %%SITE_PERL%%/Test/TempDir/Factory.pm
 %%SITE_PERL%%/Test/TempDir/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/TempDir/.packlist
 %%PERL5_MAN3%%/Test::TempDir.3.gz
 %%PERL5_MAN3%%/Test::TempDir::Factory.3.gz
 %%PERL5_MAN3%%/Test::TempDir::Handle.3.gz
diff --git a/devel/p5-Test-Tester/Makefile b/devel/p5-Test-Tester/Makefile
index 7f12f122252c..c9e6a35b5bf4 100644
--- a/devel/p5-Test-Tester/Makefile
+++ b/devel/p5-Test-Tester/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Tester
 PORTVERSION=	0.10.9
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FDALY
diff --git a/devel/p5-Test-Tester/pkg-plist b/devel/p5-Test-Tester/pkg-plist
index 4a264d4204b6..0586893c383b 100644
--- a/devel/p5-Test-Tester/pkg-plist
+++ b/devel/p5-Test-Tester/pkg-plist
@@ -5,4 +5,3 @@
 %%SITE_PERL%%/Test/Tester/Capture.pm
 %%SITE_PERL%%/Test/Tester/CaptureRunner.pm
 %%SITE_PERL%%/Test/Tester/Delegate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Tester/.packlist
diff --git a/devel/p5-Test-Time/Makefile b/devel/p5-Test-Time/Makefile
index 13589e4e8d3a..d69e978fad3c 100644
--- a/devel/p5-Test-Time/Makefile
+++ b/devel/p5-Test-Time/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-Time
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Time/pkg-plist b/devel/p5-Test-Time/pkg-plist
index 34bb6ff03dc7..ff37d4de3e41 100644
--- a/devel/p5-Test-Time/pkg-plist
+++ b/devel/p5-Test-Time/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Time.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Time/.packlist
 %%SITE_PERL%%/Test/Time.pm
diff --git a/devel/p5-Test-Timer/Makefile b/devel/p5-Test-Timer/Makefile
index 0e1a775a329f..b8f41194f1b3 100644
--- a/devel/p5-Test-Timer/Makefile
+++ b/devel/p5-Test-Timer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Timer
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Timer/pkg-plist b/devel/p5-Test-Timer/pkg-plist
index b5d9665b58e8..c5ac49de4c3f 100644
--- a/devel/p5-Test-Timer/pkg-plist
+++ b/devel/p5-Test-Timer/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Test/Timer/TimeoutException.pm
 %%SITE_PERL%%/Test/Timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Timer/.packlist
 %%PERL5_MAN3%%/Test::Timer.3.gz
 %%PERL5_MAN3%%/Test::Timer::TimeoutException.3.gz
diff --git a/devel/p5-Test-TinyMocker/Makefile b/devel/p5-Test-TinyMocker/Makefile
index 7d5ef3f5be1c..ca294b03e28f 100644
--- a/devel/p5-Test-TinyMocker/Makefile
+++ b/devel/p5-Test-TinyMocker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-TinyMocker
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-TinyMocker/pkg-plist b/devel/p5-Test-TinyMocker/pkg-plist
index 6ca33ed35d5f..c4ad77a698b6 100644
--- a/devel/p5-Test-TinyMocker/pkg-plist
+++ b/devel/p5-Test-TinyMocker/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::TinyMocker.3.gz
 %%SITE_PERL%%/Test/TinyMocker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/TinyMocker/.packlist
diff --git a/devel/p5-Test-Trap/Makefile b/devel/p5-Test-Trap/Makefile
index 5a2cf61cd88a..3aa0ad36c6ee 100644
--- a/devel/p5-Test-Trap/Makefile
+++ b/devel/p5-Test-Trap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Trap
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Trap/pkg-plist b/devel/p5-Test-Trap/pkg-plist
index dd3c9a0fdd40..4dc66c0a0eab 100644
--- a/devel/p5-Test-Trap/pkg-plist
+++ b/devel/p5-Test-Trap/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Test/Trap/Builder/PerlIO.pm
 %%SITE_PERL%%/Test/Trap/Builder/SystemSafe.pm
 %%SITE_PERL%%/Test/Trap/Builder/TempFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Trap/.packlist
 %%PERL5_MAN3%%/Test::Trap.3.gz
 %%PERL5_MAN3%%/Test::Trap::Builder.3.gz
 %%PERL5_MAN3%%/Test::Trap::Builder::PerlIO.3.gz
diff --git a/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index 31e61e513aa8..96407904bf5e 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Unit
 PORTVERSION=	0.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Unit/pkg-plist b/devel/p5-Test-Unit/pkg-plist
index d8ac7dcfddc5..e9b675ac4e6f 100644
--- a/devel/p5-Test-Unit/pkg-plist
+++ b/devel/p5-Test-Unit/pkg-plist
@@ -57,4 +57,3 @@
 %%SITE_PERL%%/Test/Unit/Tutorial.pm
 %%SITE_PERL%%/Test/Unit/UnitHarness.pm
 %%SITE_PERL%%/Test/Unit/Warning.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Unit/.packlist
diff --git a/devel/p5-Test-UseAllModules/Makefile b/devel/p5-Test-UseAllModules/Makefile
index c7fac56fce87..c3d9c6a6c7ee 100644
--- a/devel/p5-Test-UseAllModules/Makefile
+++ b/devel/p5-Test-UseAllModules/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-UseAllModules
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-UseAllModules/pkg-plist b/devel/p5-Test-UseAllModules/pkg-plist
index 96ef10cf0e97..141d50de8908 100644
--- a/devel/p5-Test-UseAllModules/pkg-plist
+++ b/devel/p5-Test-UseAllModules/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/UseAllModules.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/UseAllModules/.packlist
 %%PERL5_MAN3%%/Test::UseAllModules.3.gz
diff --git a/devel/p5-Test-Version/Makefile b/devel/p5-Test-Version/Makefile
index 853818a4b32d..0badbf4d33b6 100644
--- a/devel/p5-Test-Version/Makefile
+++ b/devel/p5-Test-Version/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Version
 PORTVERSION=	1.002.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Version/pkg-plist b/devel/p5-Test-Version/pkg-plist
index b153106b11ec..74672ce968fe 100644
--- a/devel/p5-Test-Version/pkg-plist
+++ b/devel/p5-Test-Version/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Version/.packlist
 %%PERL5_MAN3%%/Test::Version.3.gz
diff --git a/devel/p5-Test-WWW-Declare/Makefile b/devel/p5-Test-WWW-Declare/Makefile
index a36160c72f91..7bb5e9bb7851 100644
--- a/devel/p5-Test-WWW-Declare/Makefile
+++ b/devel/p5-Test-WWW-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-WWW-Declare
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-WWW-Declare/pkg-plist b/devel/p5-Test-WWW-Declare/pkg-plist
index d625c13aa1b9..26d1229b7005 100644
--- a/devel/p5-Test-WWW-Declare/pkg-plist
+++ b/devel/p5-Test-WWW-Declare/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Test::WWW::Declare.3.gz
 %%SITE_PERL%%/Test/WWW/Declare.pm
 %%SITE_PERL%%/Test/WWW/Declare/Tester.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Declare/.packlist
diff --git a/devel/p5-Test-WWW-Mechanize-CGI/Makefile b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
index 29d8cd094cd4..a849391c3ec0 100644
--- a/devel/p5-Test-WWW-Mechanize-CGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-WWW-Mechanize-CGI
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-WWW-Mechanize-CGI/pkg-plist b/devel/p5-Test-WWW-Mechanize-CGI/pkg-plist
index b884a662ece6..7cc6ca4b576a 100644
--- a/devel/p5-Test-WWW-Mechanize-CGI/pkg-plist
+++ b/devel/p5-Test-WWW-Mechanize-CGI/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/WWW/Mechanize/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Mechanize/CGI/.packlist
 %%PERL5_MAN3%%/Test::WWW::Mechanize::CGI.3.gz
diff --git a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
index a0f340b03c5b..5bee70951bb6 100644
--- a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-WWW-Mechanize-CGIApp
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-WWW-Mechanize-CGIApp/pkg-plist b/devel/p5-Test-WWW-Mechanize-CGIApp/pkg-plist
index 6c59d3aba487..aa4d20db7228 100644
--- a/devel/p5-Test-WWW-Mechanize-CGIApp/pkg-plist
+++ b/devel/p5-Test-WWW-Mechanize-CGIApp/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::WWW::Mechanize::CGIApp.3.gz
 %%SITE_PERL%%/Test/WWW/Mechanize/CGIApp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Mechanize/CGIApp/.packlist
diff --git a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
index b227943d65ac..e226a3d44c59 100644
--- a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-WWW-Mechanize-Catalyst
 PORTVERSION=	0.59
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist b/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist
index 197a8aaff51c..c0ba688a80c2 100644
--- a/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist
+++ b/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::WWW::Mechanize::Catalyst.3.gz
 %%SITE_PERL%%/Test/WWW/Mechanize/Catalyst.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Mechanize/Catalyst/.packlist
diff --git a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
index 491668f9bcf7..83fe5b8c80eb 100644
--- a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-WWW-Mechanize-PSGI
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-WWW-Mechanize-PSGI/pkg-plist b/devel/p5-Test-WWW-Mechanize-PSGI/pkg-plist
index 6f02f50959ec..7ad01320f65e 100644
--- a/devel/p5-Test-WWW-Mechanize-PSGI/pkg-plist
+++ b/devel/p5-Test-WWW-Mechanize-PSGI/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Mechanize/PSGI/.packlist
 %%SITE_PERL%%/Test/WWW/Mechanize/PSGI.pm
 %%PERL5_MAN3%%/Test::WWW::Mechanize::PSGI.3.gz
diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile
index 3dc97d5bcb5c..5a4e1b9ed3f2 100644
--- a/devel/p5-Test-WWW-Mechanize/Makefile
+++ b/devel/p5-Test-WWW-Mechanize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-WWW-Mechanize
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PETDANCE
diff --git a/devel/p5-Test-WWW-Mechanize/pkg-plist b/devel/p5-Test-WWW-Mechanize/pkg-plist
index 1f3f32c9b6aa..686952d8ba8c 100644
--- a/devel/p5-Test-WWW-Mechanize/pkg-plist
+++ b/devel/p5-Test-WWW-Mechanize/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::WWW::Mechanize.3.gz
 %%SITE_PERL%%/Test/WWW/Mechanize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Mechanize/.packlist
diff --git a/devel/p5-Test-WWW-Selenium/Makefile b/devel/p5-Test-WWW-Selenium/Makefile
index 894056a730de..5ea4cc3bca0e 100644
--- a/devel/p5-Test-WWW-Selenium/Makefile
+++ b/devel/p5-Test-WWW-Selenium/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-WWW-Selenium
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-WWW-Selenium/pkg-plist b/devel/p5-Test-WWW-Selenium/pkg-plist
index 33a06ccccf47..b43d88a4aad7 100644
--- a/devel/p5-Test-WWW-Selenium/pkg-plist
+++ b/devel/p5-Test-WWW-Selenium/pkg-plist
@@ -7,4 +7,3 @@
 %%SITE_PERL%%/Test/WWW/mypod2html.pl
 %%SITE_PERL%%/WWW/Selenium.pm
 %%SITE_PERL%%/WWW/Selenium/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Selenium/.packlist
diff --git a/devel/p5-Test-Warn/Makefile b/devel/p5-Test-Warn/Makefile
index 20b24259c2ff..64cff0e7ec07 100644
--- a/devel/p5-Test-Warn/Makefile
+++ b/devel/p5-Test-Warn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Warn
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Warn/pkg-plist b/devel/p5-Test-Warn/pkg-plist
index c4f9936af39d..894892cc9d5e 100644
--- a/devel/p5-Test-Warn/pkg-plist
+++ b/devel/p5-Test-Warn/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Warn.3.gz
 %%SITE_PERL%%/Test/Warn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Warn/.packlist
diff --git a/devel/p5-Test-Warnings/Makefile b/devel/p5-Test-Warnings/Makefile
index 280a02fcee58..1ed3c9193772 100644
--- a/devel/p5-Test-Warnings/Makefile
+++ b/devel/p5-Test-Warnings/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Warnings
 PORTVERSION=	0.016
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Warnings/pkg-plist b/devel/p5-Test-Warnings/pkg-plist
index 089b25a71a75..b583315f010f 100644
--- a/devel/p5-Test-Warnings/pkg-plist
+++ b/devel/p5-Test-Warnings/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Warnings.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Warnings/.packlist
 %%PERL5_MAN3%%/Test::Warnings.3.gz
diff --git a/devel/p5-Test-Weaken/Makefile b/devel/p5-Test-Weaken/Makefile
index 8aead62983a4..b2ed239d6adb 100644
--- a/devel/p5-Test-Weaken/Makefile
+++ b/devel/p5-Test-Weaken/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Weaken
 PORTVERSION=	3.022000
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Weaken/pkg-plist b/devel/p5-Test-Weaken/pkg-plist
index 2d4f74841e76..6fa55a4bf7d7 100644
--- a/devel/p5-Test-Weaken/pkg-plist
+++ b/devel/p5-Test-Weaken/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/Weaken.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Weaken/.packlist
 %%PERL5_MAN3%%/Test::Weaken.3.gz
diff --git a/devel/p5-Test-Without-Module/Makefile b/devel/p5-Test-Without-Module/Makefile
index f1ab662b7507..bf4d7849e673 100644
--- a/devel/p5-Test-Without-Module/Makefile
+++ b/devel/p5-Test-Without-Module/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Without-Module
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=
diff --git a/devel/p5-Test-Without-Module/pkg-plist b/devel/p5-Test-Without-Module/pkg-plist
index 1413b8ae2c5b..20806f29fec9 100644
--- a/devel/p5-Test-Without-Module/pkg-plist
+++ b/devel/p5-Test-Without-Module/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Test::Without::Module.3.gz
 %%SITE_PERL%%/Test/Without/Module.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Without/Module/.packlist
diff --git a/devel/p5-Test-XML-Valid/Makefile b/devel/p5-Test-XML-Valid/Makefile
index c0685eb71fae..a919f83d1827 100644
--- a/devel/p5-Test-XML-Valid/Makefile
+++ b/devel/p5-Test-XML-Valid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-XML-Valid
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/p5-Test-XML/Makefile b/devel/p5-Test-XML/Makefile
index 06265d70ebe0..6ccc21e8a88c 100644
--- a/devel/p5-Test-XML/Makefile
+++ b/devel/p5-Test-XML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-XML
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-XML/pkg-plist b/devel/p5-Test-XML/pkg-plist
index 56368869a2bc..e59a84a92319 100644
--- a/devel/p5-Test-XML/pkg-plist
+++ b/devel/p5-Test-XML/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Test/XML/SAX.pm
 %%SITE_PERL%%/Test/XML/Twig.pm
 %%SITE_PERL%%/Test/XML/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/XML/.packlist
 %%PERL5_MAN3%%/Test::XML.3.gz
 %%PERL5_MAN3%%/Test::XML::SAX.3.gz
 %%PERL5_MAN3%%/Test::XML::Twig.3.gz
diff --git a/devel/p5-Test-YAML-Meta/Makefile b/devel/p5-Test-YAML-Meta/Makefile
index 4aeab7430a23..5258e9830787 100644
--- a/devel/p5-Test-YAML-Meta/Makefile
+++ b/devel/p5-Test-YAML-Meta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-YAML-Meta
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-YAML-Meta/pkg-plist b/devel/p5-Test-YAML-Meta/pkg-plist
index c627846e3389..3807bab8d42c 100644
--- a/devel/p5-Test-YAML-Meta/pkg-plist
+++ b/devel/p5-Test-YAML-Meta/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/YAML/Meta/.packlist
 %%SITE_PERL%%/Test/YAML/Meta.pm
 %%PERL5_MAN3%%/Test::YAML::Meta.3.gz
diff --git a/devel/p5-Test-YAML-Valid/Makefile b/devel/p5-Test-YAML-Valid/Makefile
index 81ed5b8857e3..2bf94d465d49 100644
--- a/devel/p5-Test-YAML-Valid/Makefile
+++ b/devel/p5-Test-YAML-Valid/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-YAML-Valid
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-YAML-Valid/pkg-plist b/devel/p5-Test-YAML-Valid/pkg-plist
index 0b65ddb3faa3..97f5caf80535 100644
--- a/devel/p5-Test-YAML-Valid/pkg-plist
+++ b/devel/p5-Test-YAML-Valid/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/YAML/Valid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/YAML/Valid/.packlist
 %%PERL5_MAN3%%/Test::YAML::Valid.3.gz
diff --git a/devel/p5-Test-YAML/Makefile b/devel/p5-Test-YAML/Makefile
index bd62f98a2559..7dc1be796b2c 100644
--- a/devel/p5-Test-YAML/Makefile
+++ b/devel/p5-Test-YAML/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-YAML
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-YAML/pkg-plist b/devel/p5-Test-YAML/pkg-plist
index a0b5b2e4aae7..b502c6a3fa0c 100644
--- a/devel/p5-Test-YAML/pkg-plist
+++ b/devel/p5-Test-YAML/pkg-plist
@@ -2,4 +2,3 @@ bin/test-yaml
 %%PERL5_MAN3%%/Test::YAML.3.gz
 %%SITE_PERL%%/Test/YAML.pm
 %%SITE_PERL%%/Test/YAML.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/YAML/.packlist
diff --git a/devel/p5-Test-use-ok/Makefile b/devel/p5-Test-use-ok/Makefile
index ebc45fcfc22f..707be8d7d9df 100644
--- a/devel/p5-Test-use-ok/Makefile
+++ b/devel/p5-Test-use-ok/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-use-ok
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-use-ok/pkg-plist b/devel/p5-Test-use-ok/pkg-plist
index 85d3e4b7e413..7e08ca2a856c 100644
--- a/devel/p5-Test-use-ok/pkg-plist
+++ b/devel/p5-Test-use-ok/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Test::use::ok.3.gz
 %%PERL5_MAN3%%/ok.3.gz
 %%SITE_PERL%%/Test/use/ok.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/use/ok/.packlist
 %%SITE_PERL%%/ok.pm
diff --git a/devel/p5-Test-utf8/Makefile b/devel/p5-Test-utf8/Makefile
index 11c8dfce47e5..619091fe67f2 100644
--- a/devel/p5-Test-utf8/Makefile
+++ b/devel/p5-Test-utf8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-utf8
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-utf8/pkg-plist b/devel/p5-Test-utf8/pkg-plist
index 7fd6a139da78..8658f6d332c9 100644
--- a/devel/p5-Test-utf8/pkg-plist
+++ b/devel/p5-Test-utf8/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Test/utf8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/utf8/.packlist
 %%PERL5_MAN3%%/Test::utf8.3.gz
diff --git a/devel/p5-Text-Levenshtein/Makefile b/devel/p5-Text-Levenshtein/Makefile
index c5ed448ecb72..3ef603507957 100644
--- a/devel/p5-Text-Levenshtein/Makefile
+++ b/devel/p5-Text-Levenshtein/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Levenshtein
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Text-Levenshtein/pkg-plist b/devel/p5-Text-Levenshtein/pkg-plist
index b7a97eaf9a4e..61aaf15b6535 100644
--- a/devel/p5-Text-Levenshtein/pkg-plist
+++ b/devel/p5-Text-Levenshtein/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Text/Levenshtein.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Levenshtein/.packlist
 %%PERL5_MAN3%%/Text::Levenshtein.3.gz
diff --git a/devel/p5-Text-LevenshteinXS/Makefile b/devel/p5-Text-LevenshteinXS/Makefile
index e73901dd27bf..0289bc534291 100644
--- a/devel/p5-Text-LevenshteinXS/Makefile
+++ b/devel/p5-Text-LevenshteinXS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-LevenshteinXS
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Text-LevenshteinXS/pkg-plist b/devel/p5-Text-LevenshteinXS/pkg-plist
index 708cd7afc86b..8ee9fcdf1763 100644
--- a/devel/p5-Text-LevenshteinXS/pkg-plist
+++ b/devel/p5-Text-LevenshteinXS/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS/LevenshteinXS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/LevenshteinXS.pm
+%%SITE_ARCH%%/auto/Text/LevenshteinXS/LevenshteinXS.so
+%%SITE_ARCH%%/auto/Text/LevenshteinXS/autosplit.ix
+%%SITE_ARCH%%/Text/LevenshteinXS.pm
 %%PERL5_MAN3%%/Text::LevenshteinXS.3.gz
diff --git a/devel/p5-Text-Outdent/Makefile b/devel/p5-Text-Outdent/Makefile
index 5b25121c187f..4e9aa0052bcb 100644
--- a/devel/p5-Text-Outdent/Makefile
+++ b/devel/p5-Text-Outdent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Outdent
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LODIN
diff --git a/devel/p5-Text-Outdent/pkg-plist b/devel/p5-Text-Outdent/pkg-plist
index 5b7069867f2f..673d369a5e7d 100644
--- a/devel/p5-Text-Outdent/pkg-plist
+++ b/devel/p5-Text-Outdent/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Text/Outdent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Outdent/.packlist
 %%PERL5_MAN3%%/Text::Outdent.3.gz
diff --git a/devel/p5-Text-vFile-asData/Makefile b/devel/p5-Text-vFile-asData/Makefile
index cf83849802b4..756e06b984cb 100644
--- a/devel/p5-Text-vFile-asData/Makefile
+++ b/devel/p5-Text-vFile-asData/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-vFile-asData
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Text-vFile-asData/pkg-plist b/devel/p5-Text-vFile-asData/pkg-plist
index 3c65a38d49e0..f6dd8ff4e787 100644
--- a/devel/p5-Text-vFile-asData/pkg-plist
+++ b/devel/p5-Text-vFile-asData/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Text/vFile/asData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/vFile/asData/.packlist
 %%PERL5_MAN3%%/Text::vFile::asData.3.gz
diff --git a/devel/p5-TheSchwartz-Simple/Makefile b/devel/p5-TheSchwartz-Simple/Makefile
index f0a819be2740..7b2ccbb860a0 100644
--- a/devel/p5-TheSchwartz-Simple/Makefile
+++ b/devel/p5-TheSchwartz-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	TheSchwartz-Simple
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-TheSchwartz-Simple/pkg-plist b/devel/p5-TheSchwartz-Simple/pkg-plist
index 6bbf3c342670..5d0695e666d6 100644
--- a/devel/p5-TheSchwartz-Simple/pkg-plist
+++ b/devel/p5-TheSchwartz-Simple/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/TheSchwartz::Simple.3.gz
 %%SITE_PERL%%/TheSchwartz/Simple.pm
 %%SITE_PERL%%/TheSchwartz/Simple/Job.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TheSchwartz/Simple/.packlist
diff --git a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
index 18cf069e0679..2b246f971063 100644
--- a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
+++ b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TheSchwartz-Worker-SendEmail
 PORTVERSION=	1.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
diff --git a/devel/p5-TheSchwartz-Worker-SendEmail/pkg-plist b/devel/p5-TheSchwartz-Worker-SendEmail/pkg-plist
index f666a5711ad1..107c25e44dde 100644
--- a/devel/p5-TheSchwartz-Worker-SendEmail/pkg-plist
+++ b/devel/p5-TheSchwartz-Worker-SendEmail/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/TheSchwartz::Worker::SendEmail.3.gz
 %%SITE_PERL%%/TheSchwartz/Worker/SendEmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TheSchwartz/Worker/SendEmail/.packlist
diff --git a/devel/p5-TheSchwartz/Makefile b/devel/p5-TheSchwartz/Makefile
index bcb9ecfe1463..6ba0630c9028 100644
--- a/devel/p5-TheSchwartz/Makefile
+++ b/devel/p5-TheSchwartz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TheSchwartz
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SIXAPART
diff --git a/devel/p5-TheSchwartz/pkg-plist b/devel/p5-TheSchwartz/pkg-plist
index 95b983b16891..88b2ab309031 100644
--- a/devel/p5-TheSchwartz/pkg-plist
+++ b/devel/p5-TheSchwartz/pkg-plist
@@ -11,7 +11,6 @@ bin/thetop
 %%SITE_PERL%%/TheSchwartz/Job.pm
 %%SITE_PERL%%/TheSchwartz/JobHandle.pm
 %%SITE_PERL%%/TheSchwartz/Worker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TheSchwartz/.packlist
 man/man1/schwartzmon.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/http-mappings.txt
 %%PORTDOCS%%%%DOCSDIR%%/notes.txt
diff --git a/devel/p5-Thread-Apartment/Makefile b/devel/p5-Thread-Apartment/Makefile
index 5eaa228f022c..faff57b599fc 100644
--- a/devel/p5-Thread-Apartment/Makefile
+++ b/devel/p5-Thread-Apartment/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Thread-Apartment
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Thread-Apartment/pkg-plist b/devel/p5-Thread-Apartment/pkg-plist
index 17a6647e10f9..b6de6f16d1b0 100644
--- a/devel/p5-Thread-Apartment/pkg-plist
+++ b/devel/p5-Thread-Apartment/pkg-plist
@@ -7,5 +7,4 @@
 %%SITE_PERL%%/Thread/Apartment/Client.pm
 %%SITE_PERL%%/Thread/Apartment.pod
 %%SITE_PERL%%/Thread/Apartment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thread/Apartment/.packlist
 %%PERL5_MAN3%%/Thread::Apartment.3.gz
diff --git a/devel/p5-Thread-Cancel/Makefile b/devel/p5-Thread-Cancel/Makefile
index c469c4380014..4e1d23db9663 100644
--- a/devel/p5-Thread-Cancel/Makefile
+++ b/devel/p5-Thread-Cancel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Thread-Cancel
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Thread-Cancel/pkg-plist b/devel/p5-Thread-Cancel/pkg-plist
index c4db5d3bb26e..4e7f4de31b32 100644
--- a/devel/p5-Thread-Cancel/pkg-plist
+++ b/devel/p5-Thread-Cancel/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Thread::Cancel.3.gz
 %%SITE_PERL%%/Thread/Cancel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thread/Cancel/.packlist
diff --git a/devel/p5-Thread-Pool-Simple/Makefile b/devel/p5-Thread-Pool-Simple/Makefile
index c9b38040b819..92a15fdfd460 100644
--- a/devel/p5-Thread-Pool-Simple/Makefile
+++ b/devel/p5-Thread-Pool-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Thread-Pool-Simple
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Thread-Pool-Simple/pkg-plist b/devel/p5-Thread-Pool-Simple/pkg-plist
index 2102f2f64a3e..f0ddc022b94d 100644
--- a/devel/p5-Thread-Pool-Simple/pkg-plist
+++ b/devel/p5-Thread-Pool-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Thread::Pool::Simple.3.gz
 %%SITE_PERL%%/Thread/Pool/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thread/Pool/Simple/.packlist
diff --git a/devel/p5-Thread-Queue-Duplex/Makefile b/devel/p5-Thread-Queue-Duplex/Makefile
index 8d6d726f656a..18e76aeef965 100644
--- a/devel/p5-Thread-Queue-Duplex/Makefile
+++ b/devel/p5-Thread-Queue-Duplex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Thread-Queue-Duplex
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Thread-Queue-Duplex/pkg-plist b/devel/p5-Thread-Queue-Duplex/pkg-plist
index c51cdc480d1a..06eb5fc79719 100644
--- a/devel/p5-Thread-Queue-Duplex/pkg-plist
+++ b/devel/p5-Thread-Queue-Duplex/pkg-plist
@@ -3,6 +3,5 @@
 %%SITE_PERL%%/Thread/Queue/Queueable.pm
 %%SITE_PERL%%/Thread/Queue/Duplex.pod
 %%SITE_PERL%%/Thread/Queue/Duplex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thread/Queue/Duplex/.packlist
 %%PERL5_MAN3%%/Thread::Queue::Duplex.3.gz
 %%PERL5_MAN3%%/Thread::Queue::Queueable.3.gz
diff --git a/devel/p5-Thread-Queue/Makefile b/devel/p5-Thread-Queue/Makefile
index 5d1c3aa0e57c..c028abd31f76 100644
--- a/devel/p5-Thread-Queue/Makefile
+++ b/devel/p5-Thread-Queue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Thread-Queue
 PORTVERSION=	3.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Thread-Queue/pkg-plist b/devel/p5-Thread-Queue/pkg-plist
index 83ede76b5261..e48c40962e35 100644
--- a/devel/p5-Thread-Queue/pkg-plist
+++ b/devel/p5-Thread-Queue/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Thread/Queue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thread/Queue/.packlist
 %%PERL5_MAN3%%/Thread::Queue.3.gz
diff --git a/devel/p5-Thread-Suspend/Makefile b/devel/p5-Thread-Suspend/Makefile
index e466930b7727..ae37a19c90f9 100644
--- a/devel/p5-Thread-Suspend/Makefile
+++ b/devel/p5-Thread-Suspend/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Thread-Suspend
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Thread
diff --git a/devel/p5-Thread-Suspend/pkg-plist b/devel/p5-Thread-Suspend/pkg-plist
index 3a37f473ecba..734cc708482d 100644
--- a/devel/p5-Thread-Suspend/pkg-plist
+++ b/devel/p5-Thread-Suspend/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Thread/Suspend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thread/Suspend/.packlist
 %%PERL5_MAN3%%/Thread::Suspend.3.gz
diff --git a/devel/p5-Thrift-XS/Makefile b/devel/p5-Thrift-XS/Makefile
index a48ae74cd359..80e1aa3764ea 100644
--- a/devel/p5-Thrift-XS/Makefile
+++ b/devel/p5-Thrift-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Thrift-XS
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AGRUNDMA
diff --git a/devel/p5-Thrift-XS/pkg-plist b/devel/p5-Thrift-XS/pkg-plist
index 5add76800eef..9683e754c92a 100644
--- a/devel/p5-Thrift-XS/pkg-plist
+++ b/devel/p5-Thrift-XS/pkg-plist
@@ -1,19 +1,18 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/BinaryProtocol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/BufferedTransport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/FramedTransport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/HttpClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/MemoryBuffer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/Protocol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/Transport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/XS/BinaryProtocol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/XS/CompactProtocol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Thrift/XS/MemoryBuffer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thrift/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thrift/XS/XS.so
+%%SITE_ARCH%%/Thrift.pm
+%%SITE_ARCH%%/Thrift/BinaryProtocol.pm
+%%SITE_ARCH%%/Thrift/BufferedTransport.pm
+%%SITE_ARCH%%/Thrift/FramedTransport.pm
+%%SITE_ARCH%%/Thrift/HttpClient.pm
+%%SITE_ARCH%%/Thrift/MemoryBuffer.pm
+%%SITE_ARCH%%/Thrift/Protocol.pm
+%%SITE_ARCH%%/Thrift/Server.pm
+%%SITE_ARCH%%/Thrift/Socket.pm
+%%SITE_ARCH%%/Thrift/Transport.pm
+%%SITE_ARCH%%/Thrift/XS.pm
+%%SITE_ARCH%%/Thrift/XS/BinaryProtocol.pm
+%%SITE_ARCH%%/Thrift/XS/CompactProtocol.pm
+%%SITE_ARCH%%/Thrift/XS/MemoryBuffer.pm
+%%SITE_ARCH%%/auto/Thrift/XS/XS.so
 %%PERL5_MAN3%%/Thrift::XS.3.gz
 %%PERL5_MAN3%%/Thrift::XS::BinaryProtocol.3.gz
 %%PERL5_MAN3%%/Thrift::XS::CompactProtocol.3.gz
diff --git a/devel/p5-Thrift/Makefile b/devel/p5-Thrift/Makefile
index 65d79f9f082e..05121c944b44 100644
--- a/devel/p5-Thrift/Makefile
+++ b/devel/p5-Thrift/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Thrift
 PORTVERSION=	${THRIFT_PORTVERSION}	# need to keep this in sync with ../thrift see ../thrift/bsd.thrift.mk
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Thrift/pkg-plist b/devel/p5-Thrift/pkg-plist
index adb6e24e2b20..31ec3702c1f2 100644
--- a/devel/p5-Thrift/pkg-plist
+++ b/devel/p5-Thrift/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Thrift/.packlist
 %%SITE_PERL%%/Thrift.pm
 %%SITE_PERL%%/Thrift/BinaryProtocol.pm
 %%SITE_PERL%%/Thrift/BufferedTransport.pm
diff --git a/devel/p5-Throwable/Makefile b/devel/p5-Throwable/Makefile
index d73601b76cfb..2a750f9d18d3 100644
--- a/devel/p5-Throwable/Makefile
+++ b/devel/p5-Throwable/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Throwable
 PORTVERSION=	0.200012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/devel/p5-Throwable/pkg-plist b/devel/p5-Throwable/pkg-plist
index f8634ee80087..b851d4567fcf 100644
--- a/devel/p5-Throwable/pkg-plist
+++ b/devel/p5-Throwable/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/StackTrace/Auto.pm
 %%SITE_PERL%%/Throwable.pm
 %%SITE_PERL%%/Throwable/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Throwable/.packlist
 %%PERL5_MAN3%%/StackTrace::Auto.3.gz
 %%PERL5_MAN3%%/Throwable.3.gz
 %%PERL5_MAN3%%/Throwable::Error.3.gz
diff --git a/devel/p5-Tie-Array-Pack/Makefile b/devel/p5-Tie-Array-Pack/Makefile
index 9929b663c50f..cc3160726dd2 100644
--- a/devel/p5-Tie-Array-Pack/Makefile
+++ b/devel/p5-Tie-Array-Pack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Array-Pack
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Array-Pack/pkg-plist b/devel/p5-Tie-Array-Pack/pkg-plist
index 3e0d5e121891..f239cd415049 100644
--- a/devel/p5-Tie-Array-Pack/pkg-plist
+++ b/devel/p5-Tie-Array-Pack/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Array/Pack/.packlist
 %%SITE_PERL%%/Tie/Array/Pack.pm
 %%PERL5_MAN3%%/Tie::Array::Pack.3.gz
diff --git a/devel/p5-Tie-Array-Sorted/Makefile b/devel/p5-Tie-Array-Sorted/Makefile
index 6865c5ee8269..a872595c5967 100644
--- a/devel/p5-Tie-Array-Sorted/Makefile
+++ b/devel/p5-Tie-Array-Sorted/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Array-Sorted
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Array-Sorted/pkg-plist b/devel/p5-Tie-Array-Sorted/pkg-plist
index d12ed0136b97..fa0749b5793d 100644
--- a/devel/p5-Tie-Array-Sorted/pkg-plist
+++ b/devel/p5-Tie-Array-Sorted/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Tie::Array::Sorted::Lazy.3.gz
 %%SITE_PERL%%/Tie/Array/Sorted.pm
 %%SITE_PERL%%/Tie/Array/Sorted/Lazy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Array/Sorted/.packlist
diff --git a/devel/p5-Tie-CPHash/Makefile b/devel/p5-Tie-CPHash/Makefile
index 4a2942451c0f..8273fc5a71af 100644
--- a/devel/p5-Tie-CPHash/Makefile
+++ b/devel/p5-Tie-CPHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-CPHash
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Cache/Makefile b/devel/p5-Tie-Cache/Makefile
index 9b896349e439..4417c261351e 100644
--- a/devel/p5-Tie-Cache/Makefile
+++ b/devel/p5-Tie-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Cache
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHAMAS
diff --git a/devel/p5-Tie-Cache/pkg-plist b/devel/p5-Tie-Cache/pkg-plist
index 4c36780373f0..6a777845762a 100644
--- a/devel/p5-Tie-Cache/pkg-plist
+++ b/devel/p5-Tie-Cache/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Tie::Cache.3.gz
 %%SITE_PERL%%/Tie/Cache.pm
 %%SITE_PERL%%/Tie/tie-cache-bench.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Cache/.packlist
diff --git a/devel/p5-Tie-DB_File-SplitHash/Makefile b/devel/p5-Tie-DB_File-SplitHash/Makefile
index 5b6f2ac90fad..911e5443965c 100644
--- a/devel/p5-Tie-DB_File-SplitHash/Makefile
+++ b/devel/p5-Tie-DB_File-SplitHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-DB_File-SplitHash
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-DB_FileLock/Makefile b/devel/p5-Tie-DB_FileLock/Makefile
index 091c68830b2b..37af44fffe42 100644
--- a/devel/p5-Tie-DB_FileLock/Makefile
+++ b/devel/p5-Tie-DB_FileLock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-DB_FileLock
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-DB_FileLock/pkg-plist b/devel/p5-Tie-DB_FileLock/pkg-plist
index f9b477257aba..8d653eefef9d 100644
--- a/devel/p5-Tie-DB_FileLock/pkg-plist
+++ b/devel/p5-Tie-DB_FileLock/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/DB_FileLock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DB_FileLock/.packlist
 %%PERL5_MAN3%%/Tie::DB_FileLock.3.gz
diff --git a/devel/p5-Tie-File-AsHash/Makefile b/devel/p5-Tie-File-AsHash/Makefile
index 2cdb2bd3bb47..a7014f1cfb85 100644
--- a/devel/p5-Tie-File-AsHash/Makefile
+++ b/devel/p5-Tie-File-AsHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-File-AsHash
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Tie
diff --git a/devel/p5-Tie-File-AsHash/pkg-plist b/devel/p5-Tie-File-AsHash/pkg-plist
index 2d8c145ce794..13847d1cb784 100644
--- a/devel/p5-Tie-File-AsHash/pkg-plist
+++ b/devel/p5-Tie-File-AsHash/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/File/AsHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/File/AsHash/.packlist
 %%PERL5_MAN3%%/Tie::File::AsHash.3.gz
diff --git a/devel/p5-Tie-File/Makefile b/devel/p5-Tie-File/Makefile
index 85addc8d041f..b575398a9d26 100644
--- a/devel/p5-Tie-File/Makefile
+++ b/devel/p5-Tie-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-File
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-File/pkg-plist b/devel/p5-Tie-File/pkg-plist
index 96027e59efcc..86431eeaf0c7 100644
--- a/devel/p5-Tie-File/pkg-plist
+++ b/devel/p5-Tie-File/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/File/.packlist
 %%PERL5_MAN3%%/Tie::File.3.gz
diff --git a/devel/p5-Tie-FileLRUCache/Makefile b/devel/p5-Tie-FileLRUCache/Makefile
index dc5a90e0c540..414f369c09ae 100644
--- a/devel/p5-Tie-FileLRUCache/Makefile
+++ b/devel/p5-Tie-FileLRUCache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-FileLRUCache
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-FileLRUCache/pkg-plist b/devel/p5-Tie-FileLRUCache/pkg-plist
index fb88bbd47382..b6c5df3b1f38 100644
--- a/devel/p5-Tie-FileLRUCache/pkg-plist
+++ b/devel/p5-Tie-FileLRUCache/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tie::FileLRUCache.3.gz
 %%SITE_PERL%%/Tie/FileLRUCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/FileLRUCache/.packlist
diff --git a/devel/p5-Tie-Function/Makefile b/devel/p5-Tie-Function/Makefile
index 07398783c237..71a8cb714cae 100644
--- a/devel/p5-Tie-Function/Makefile
+++ b/devel/p5-Tie-Function/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Function
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Function/pkg-plist b/devel/p5-Tie-Function/pkg-plist
index d7e389e9d62a..93ff9dbdfed8 100644
--- a/devel/p5-Tie-Function/pkg-plist
+++ b/devel/p5-Tie-Function/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/Function.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Function/.packlist
 %%PERL5_MAN3%%/Tie::Function.3.gz
diff --git a/devel/p5-Tie-Hash-Indexed/Makefile b/devel/p5-Tie-Hash-Indexed/Makefile
index 422068000e73..0beb4d7bfec3 100644
--- a/devel/p5-Tie-Hash-Indexed/Makefile
+++ b/devel/p5-Tie-Hash-Indexed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Hash-Indexed
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Hash-Indexed/pkg-plist b/devel/p5-Tie-Hash-Indexed/pkg-plist
index d0eadb17f6f5..2f53162c9566 100644
--- a/devel/p5-Tie-Hash-Indexed/pkg-plist
+++ b/devel/p5-Tie-Hash-Indexed/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Tie::Hash::Indexed.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Tie/Hash/Indexed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/Indexed/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/Indexed/Indexed.so
+%%SITE_ARCH%%/Tie/Hash/Indexed.pm
+%%SITE_ARCH%%/auto/Tie/Hash/Indexed/Indexed.so
diff --git a/devel/p5-Tie-Hash-MultiValue/Makefile b/devel/p5-Tie-Hash-MultiValue/Makefile
index 25b07ef0ad6e..c2e7e13a328e 100644
--- a/devel/p5-Tie-Hash-MultiValue/Makefile
+++ b/devel/p5-Tie-Hash-MultiValue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Hash-MultiValue
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Hash-MultiValue/pkg-plist b/devel/p5-Tie-Hash-MultiValue/pkg-plist
index 08f549599347..397a74c1c6ea 100644
--- a/devel/p5-Tie-Hash-MultiValue/pkg-plist
+++ b/devel/p5-Tie-Hash-MultiValue/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/Hash/MultiValue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/MultiValue/.packlist
 %%PERL5_MAN3%%/Tie::Hash::MultiValue.3.gz
diff --git a/devel/p5-Tie-Hash-Regex/Makefile b/devel/p5-Tie-Hash-Regex/Makefile
index 08a14175f00f..087e88bd3f6c 100644
--- a/devel/p5-Tie-Hash-Regex/Makefile
+++ b/devel/p5-Tie-Hash-Regex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Hash-Regex
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Hash-Regex/pkg-plist b/devel/p5-Tie-Hash-Regex/pkg-plist
index bf51b84de3d8..0f71d24a2e4f 100644
--- a/devel/p5-Tie-Hash-Regex/pkg-plist
+++ b/devel/p5-Tie-Hash-Regex/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/Hash/Regex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/Regex/.packlist
 %%PERL5_MAN3%%/Tie::Hash::Regex.3.gz
diff --git a/devel/p5-Tie-Hash-Sorted/Makefile b/devel/p5-Tie-Hash-Sorted/Makefile
index 5ca9c14655e3..9ca042ce3e94 100644
--- a/devel/p5-Tie-Hash-Sorted/Makefile
+++ b/devel/p5-Tie-Hash-Sorted/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Hash-Sorted
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Hash-Sorted/pkg-plist b/devel/p5-Tie-Hash-Sorted/pkg-plist
index c81b2d3703b5..53e8c885e9d3 100644
--- a/devel/p5-Tie-Hash-Sorted/pkg-plist
+++ b/devel/p5-Tie-Hash-Sorted/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tie::Hash::Sorted.3.gz
 %%SITE_PERL%%/Tie/Hash/Sorted.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/Sorted/.packlist
diff --git a/devel/p5-Tie-Hash-TwoWay/Makefile b/devel/p5-Tie-Hash-TwoWay/Makefile
index cd16f832d72b..ec3ab6da7e38 100644
--- a/devel/p5-Tie-Hash-TwoWay/Makefile
+++ b/devel/p5-Tie-Hash-TwoWay/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Hash-TwoWay
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Hash-TwoWay/pkg-plist b/devel/p5-Tie-Hash-TwoWay/pkg-plist
index 7ad2fd574d0a..ad4870c5b26c 100644
--- a/devel/p5-Tie-Hash-TwoWay/pkg-plist
+++ b/devel/p5-Tie-Hash-TwoWay/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/Hash/TwoWay.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/TwoWay/.packlist
 %%PERL5_MAN3%%/Tie::Hash::TwoWay.3.gz
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index 25d7ccd552c7..074a1f4aba67 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-IxHash
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-IxHash/pkg-plist b/devel/p5-Tie-IxHash/pkg-plist
index e488ddede50a..af19f19aa116 100644
--- a/devel/p5-Tie-IxHash/pkg-plist
+++ b/devel/p5-Tie-IxHash/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tie::IxHash.3.gz
 %%SITE_PERL%%/Tie/IxHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/IxHash/.packlist
diff --git a/devel/p5-Tie-LLHash/Makefile b/devel/p5-Tie-LLHash/Makefile
index fe6ef884fce4..bf6cbcfa1516 100644
--- a/devel/p5-Tie-LLHash/Makefile
+++ b/devel/p5-Tie-LLHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-LLHash
 PORTVERSION=	1.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KWILLIAMS
diff --git a/devel/p5-Tie-LLHash/pkg-plist b/devel/p5-Tie-LLHash/pkg-plist
index 66af5e4ab727..fa9614a1a4b4 100644
--- a/devel/p5-Tie-LLHash/pkg-plist
+++ b/devel/p5-Tie-LLHash/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/LLHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/LLHash/.packlist
 %%PERL5_MAN3%%/Tie::LLHash.3.gz
diff --git a/devel/p5-Tie-RefHash-Weak/Makefile b/devel/p5-Tie-RefHash-Weak/Makefile
index 6bf0decb6650..e4e25c019bf6 100644
--- a/devel/p5-Tie-RefHash-Weak/Makefile
+++ b/devel/p5-Tie-RefHash-Weak/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-RefHash-Weak
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-RefHash-Weak/pkg-plist b/devel/p5-Tie-RefHash-Weak/pkg-plist
index b9b2af3010f0..b1c47b5770d6 100644
--- a/devel/p5-Tie-RefHash-Weak/pkg-plist
+++ b/devel/p5-Tie-RefHash-Weak/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tie::RefHash::Weak.3.gz
 %%SITE_PERL%%/Tie/RefHash/Weak.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/RefHash/Weak/.packlist
diff --git a/devel/p5-Tie-RefHash/Makefile b/devel/p5-Tie-RefHash/Makefile
index a8b366e90a66..d87be8d37dee 100644
--- a/devel/p5-Tie-RefHash/Makefile
+++ b/devel/p5-Tie-RefHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-RefHash
 PORTVERSION=	1.39
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-RefHash/pkg-plist b/devel/p5-Tie-RefHash/pkg-plist
index 6af536228f2d..f087b759728a 100644
--- a/devel/p5-Tie-RefHash/pkg-plist
+++ b/devel/p5-Tie-RefHash/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tie::RefHash.3.gz
 %%SITE_PERL%%/Tie/RefHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/RefHash/.packlist
diff --git a/devel/p5-Tie-RegexpHash/Makefile b/devel/p5-Tie-RegexpHash/Makefile
index 88159e6c6e1b..78f0360e21ac 100644
--- a/devel/p5-Tie-RegexpHash/Makefile
+++ b/devel/p5-Tie-RegexpHash/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Tie-RegexpHash
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-RegexpHash/pkg-plist b/devel/p5-Tie-RegexpHash/pkg-plist
index fd223fc8c9ae..f420850e29ee 100644
--- a/devel/p5-Tie-RegexpHash/pkg-plist
+++ b/devel/p5-Tie-RegexpHash/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/RegexpHash/.packlist
 %%SITE_PERL%%/Tie/RegexpHash.pm
 %%PERL5_MAN3%%/Tie::RegexpHash.3.gz
diff --git a/devel/p5-Tie-Restore/Makefile b/devel/p5-Tie-Restore/Makefile
index e888586fc6d7..8b33b4779438 100644
--- a/devel/p5-Tie-Restore/Makefile
+++ b/devel/p5-Tie-Restore/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Restore
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Restore/pkg-plist b/devel/p5-Tie-Restore/pkg-plist
index f60743b23c95..f9fd0b7e4298 100644
--- a/devel/p5-Tie-Restore/pkg-plist
+++ b/devel/p5-Tie-Restore/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/Restore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Restore/.packlist
 %%PERL5_MAN3%%/Tie::Restore.3.gz
diff --git a/devel/p5-Tie-ShareLite/Makefile b/devel/p5-Tie-ShareLite/Makefile
index 4dbe3bef51ba..11c9455edf5a 100644
--- a/devel/p5-Tie-ShareLite/Makefile
+++ b/devel/p5-Tie-ShareLite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tie-ShareLite
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-ShareLite/pkg-plist b/devel/p5-Tie-ShareLite/pkg-plist
index 6d8d538df705..c45a1def6e57 100644
--- a/devel/p5-Tie-ShareLite/pkg-plist
+++ b/devel/p5-Tie-ShareLite/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/ShareLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/ShareLite/.packlist
 %%PERL5_MAN3%%/Tie::ShareLite.3.gz
diff --git a/devel/p5-Tie-Simple/Makefile b/devel/p5-Tie-Simple/Makefile
index 6dbb82e78da3..feb3dda6504f 100644
--- a/devel/p5-Tie-Simple/Makefile
+++ b/devel/p5-Tie-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Simple
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-Simple/pkg-plist b/devel/p5-Tie-Simple/pkg-plist
index bccc2c0f2885..ca4d150b90d4 100644
--- a/devel/p5-Tie-Simple/pkg-plist
+++ b/devel/p5-Tie-Simple/pkg-plist
@@ -4,5 +4,4 @@
 %%SITE_PERL%%/Tie/Simple/Hash.pm
 %%SITE_PERL%%/Tie/Simple/Scalar.pm
 %%SITE_PERL%%/Tie/Simple/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Simple/.packlist
 %%PERL5_MAN3%%/Tie::Simple.3.gz
diff --git a/devel/p5-Tie-ToObject/Makefile b/devel/p5-Tie-ToObject/Makefile
index 0f82b4123aef..e75883f0becf 100644
--- a/devel/p5-Tie-ToObject/Makefile
+++ b/devel/p5-Tie-ToObject/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tie-ToObject
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tie-ToObject/pkg-plist b/devel/p5-Tie-ToObject/pkg-plist
index e8992ed98df2..0774620250b7 100644
--- a/devel/p5-Tie-ToObject/pkg-plist
+++ b/devel/p5-Tie-ToObject/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/ToObject/.packlist
 %%SITE_PERL%%/Tie/ToObject.pm
 %%PERL5_MAN3%%/Tie::ToObject.3.gz
diff --git a/devel/p5-Tie-Util/Makefile b/devel/p5-Tie-Util/Makefile
index 689cc3eae308..85b3c6c3a122 100644
--- a/devel/p5-Tie-Util/Makefile
+++ b/devel/p5-Tie-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Util
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Tie
diff --git a/devel/p5-Tie-Util/pkg-plist b/devel/p5-Tie-Util/pkg-plist
index 8b61a1ecc1ce..90b3997c7bad 100644
--- a/devel/p5-Tie-Util/pkg-plist
+++ b/devel/p5-Tie-Util/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Util/.packlist
 %%PERL5_MAN3%%/Tie::Util.3.gz
diff --git a/devel/p5-Tie-iCal/Makefile b/devel/p5-Tie-iCal/Makefile
index 007c9b71b94b..b7fbccbde3b9 100644
--- a/devel/p5-Tie-iCal/Makefile
+++ b/devel/p5-Tie-iCal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-iCal
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BSDZ
diff --git a/devel/p5-Tie-iCal/pkg-plist b/devel/p5-Tie-iCal/pkg-plist
index 9d59e0c7ca2a..7d0acaa69273 100644
--- a/devel/p5-Tie-iCal/pkg-plist
+++ b/devel/p5-Tie-iCal/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tie/iCal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/iCal/.packlist
 %%PERL5_MAN3%%/Tie::iCal.3.gz
diff --git a/devel/p5-Time-Clock/Makefile b/devel/p5-Time-Clock/Makefile
index 191b2904fb71..24d0e6cecb8b 100644
--- a/devel/p5-Time-Clock/Makefile
+++ b/devel/p5-Time-Clock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Clock
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Clock/pkg-plist b/devel/p5-Time-Clock/pkg-plist
index 675b31e608cd..d9d35512e29c 100644
--- a/devel/p5-Time-Clock/pkg-plist
+++ b/devel/p5-Time-Clock/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Clock.3.gz
 %%SITE_PERL%%/Time/Clock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Clock/.packlist
diff --git a/devel/p5-Time-Crontab/Makefile b/devel/p5-Time-Crontab/Makefile
index 7930a2ce680b..f73c84ddffb6 100644
--- a/devel/p5-Time-Crontab/Makefile
+++ b/devel/p5-Time-Crontab/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Time-Crontab
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Duration-Parse/Makefile b/devel/p5-Time-Duration-Parse/Makefile
index 36b7969da1da..c6588919d48f 100644
--- a/devel/p5-Time-Duration-Parse/Makefile
+++ b/devel/p5-Time-Duration-Parse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Duration-Parse
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Duration-Parse/pkg-plist b/devel/p5-Time-Duration-Parse/pkg-plist
index c04ed77b05af..7e55d5b40c2e 100644
--- a/devel/p5-Time-Duration-Parse/pkg-plist
+++ b/devel/p5-Time-Duration-Parse/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Duration::Parse.3.gz
 %%SITE_PERL%%/Time/Duration/Parse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Duration/Parse/.packlist
diff --git a/devel/p5-Time-Duration/Makefile b/devel/p5-Time-Duration/Makefile
index 791d0c76fe63..01c3d60174b6 100644
--- a/devel/p5-Time-Duration/Makefile
+++ b/devel/p5-Time-Duration/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Duration
 PORTVERSION=	1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Time-Duration/pkg-plist b/devel/p5-Time-Duration/pkg-plist
index 811212598203..97fa99f7318e 100644
--- a/devel/p5-Time-Duration/pkg-plist
+++ b/devel/p5-Time-Duration/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Duration.3.gz
 %%SITE_PERL%%/Time/Duration.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Duration/.packlist
diff --git a/devel/p5-Time-Format/Makefile b/devel/p5-Time-Format/Makefile
index 2bd88e69244c..dd5c3d408500 100644
--- a/devel/p5-Time-Format/Makefile
+++ b/devel/p5-Time-Format/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Format
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Format/pkg-plist b/devel/p5-Time-Format/pkg-plist
index c6dd3c43ce71..068524e1bc72 100644
--- a/devel/p5-Time-Format/pkg-plist
+++ b/devel/p5-Time-Format/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Time/Format.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Format/.packlist
 %%PERL5_MAN3%%/Time::Format.3.gz
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 3ad806ee1530..e612b4870bbb 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-HiRes
 PORTVERSION=	1.9726
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Time-HiRes/pkg-plist b/devel/p5-Time-HiRes/pkg-plist
index 5f5cc234ee18..46df0b136ca7 100644
--- a/devel/p5-Time-HiRes/pkg-plist
+++ b/devel/p5-Time-HiRes/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Time/HiRes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/HiRes/HiRes.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/HiRes/.packlist
+%%SITE_ARCH%%/Time/HiRes.pm
+%%SITE_ARCH%%/auto/Time/HiRes/HiRes.so
 %%PERL5_MAN3%%/Time::HiRes.3.gz
diff --git a/devel/p5-Time-Interval/Makefile b/devel/p5-Time-Interval/Makefile
index 98bf886e1837..5c6def2f3b14 100644
--- a/devel/p5-Time-Interval/Makefile
+++ b/devel/p5-Time-Interval/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Interval
 PORTVERSION=	1.232
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Interval/pkg-plist b/devel/p5-Time-Interval/pkg-plist
index 0233b903bc43..e53d7560c87c 100644
--- a/devel/p5-Time-Interval/pkg-plist
+++ b/devel/p5-Time-Interval/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Time/Interval.pm
 %%SITE_PERL%%/Time/Interval.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Interval/.packlist
 %%PERL5_MAN3%%/Time::Interval.3.gz
diff --git a/devel/p5-Time-Local/Makefile b/devel/p5-Time-Local/Makefile
index 9fac86b791c1..b2dc45adf04f 100644
--- a/devel/p5-Time-Local/Makefile
+++ b/devel/p5-Time-Local/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Local
 PORTVERSION=	1.23.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Local/pkg-plist b/devel/p5-Time-Local/pkg-plist
index 18d53d4a13d8..a7c67e476cf9 100644
--- a/devel/p5-Time-Local/pkg-plist
+++ b/devel/p5-Time-Local/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Local.3.gz
 %%SITE_PERL%%/Time/Local.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Local/.packlist
diff --git a/devel/p5-Time-Mock/Makefile b/devel/p5-Time-Mock/Makefile
index 6a56ebd666ef..ca9c41db2108 100644
--- a/devel/p5-Time-Mock/Makefile
+++ b/devel/p5-Time-Mock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Mock
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Object/Makefile b/devel/p5-Time-Object/Makefile
index 976684001d12..0d00aaf0fd6d 100644
--- a/devel/p5-Time-Object/Makefile
+++ b/devel/p5-Time-Object/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Time-Object
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Object/pkg-plist b/devel/p5-Time-Object/pkg-plist
index 29de98486f55..5107bf40310f 100644
--- a/devel/p5-Time-Object/pkg-plist
+++ b/devel/p5-Time-Object/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Time::Object.3.gz
 %%PERL5_MAN3%%/Time::Seconds.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Time/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Time/Seconds.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Object/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Object/Object.so
+%%SITE_ARCH%%/Time/Object.pm
+%%SITE_ARCH%%/Time/Seconds.pm
+%%SITE_ARCH%%/auto/Time/Object/Object.so
diff --git a/devel/p5-Time-Out/Makefile b/devel/p5-Time-Out/Makefile
index 4a488711c0b5..d6223e56099e 100644
--- a/devel/p5-Time-Out/Makefile
+++ b/devel/p5-Time-Out/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Out
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Time
diff --git a/devel/p5-Time-Out/pkg-plist b/devel/p5-Time-Out/pkg-plist
index 421392919692..50bfe0b027dc 100644
--- a/devel/p5-Time-Out/pkg-plist
+++ b/devel/p5-Time-Out/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Time/Out.pm
 %%SITE_PERL%%/Time/Out.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Out/.packlist
 %%PERL5_MAN3%%/Time::Out.3.gz
diff --git a/devel/p5-Time-Period/Makefile b/devel/p5-Time-Period/Makefile
index aeab393dd72f..82f3d910bec6 100644
--- a/devel/p5-Time-Period/Makefile
+++ b/devel/p5-Time-Period/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Period
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PRYAN
diff --git a/devel/p5-Time-Period/pkg-plist b/devel/p5-Time-Period/pkg-plist
index 05c857c4866c..ed45a9e3d642 100644
--- a/devel/p5-Time-Period/pkg-plist
+++ b/devel/p5-Time-Period/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Period.3.gz
 %%SITE_PERL%%/Time/Period.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Period/.packlist
diff --git a/devel/p5-Time-Piece-Range/Makefile b/devel/p5-Time-Piece-Range/Makefile
index eb3b81696849..67446013d4f8 100644
--- a/devel/p5-Time-Piece-Range/Makefile
+++ b/devel/p5-Time-Piece-Range/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Piece-Range
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Piece-Range/pkg-plist b/devel/p5-Time-Piece-Range/pkg-plist
index 7677b7813ea7..0d8121f14668 100644
--- a/devel/p5-Time-Piece-Range/pkg-plist
+++ b/devel/p5-Time-Piece-Range/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Piece::Range.3.gz
 %%SITE_PERL%%/Time/Piece/Range.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/Range/.packlist
diff --git a/devel/p5-Time-Piece/Makefile b/devel/p5-Time-Piece/Makefile
index fa4a7d868882..b2b7e6663474 100644
--- a/devel/p5-Time-Piece/Makefile
+++ b/devel/p5-Time-Piece/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Piece
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Piece/pkg-plist b/devel/p5-Time-Piece/pkg-plist
index 87effdb33499..05a91e0f8e37 100644
--- a/devel/p5-Time-Piece/pkg-plist
+++ b/devel/p5-Time-Piece/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/Piece.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Time/Piece.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Time/Seconds.pm
+%%SITE_ARCH%%/auto/Time/Piece/Piece.so
+%%SITE_ARCH%%/Time/Piece.pm
+%%SITE_ARCH%%/Time/Seconds.pm
 %%PERL5_MAN3%%/Time::Piece.3.gz
 %%PERL5_MAN3%%/Time::Seconds.3.gz
diff --git a/devel/p5-Time-Progress/Makefile b/devel/p5-Time-Progress/Makefile
index 36f11e313c72..5d06a14c35e7 100644
--- a/devel/p5-Time-Progress/Makefile
+++ b/devel/p5-Time-Progress/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Progress
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Progress/pkg-plist b/devel/p5-Time-Progress/pkg-plist
index 22b8b9b3f3ba..55722a73dc28 100644
--- a/devel/p5-Time-Progress/pkg-plist
+++ b/devel/p5-Time-Progress/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Time::Progress.3.gz
 %%SITE_PERL%%/Time/Progress.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Progress/.packlist
diff --git a/devel/p5-Time-Stopwatch/Makefile b/devel/p5-Time-Stopwatch/Makefile
index c73aa3f26737..3478fe7093cf 100644
--- a/devel/p5-Time-Stopwatch/Makefile
+++ b/devel/p5-Time-Stopwatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Stopwatch
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Stopwatch/pkg-plist b/devel/p5-Time-Stopwatch/pkg-plist
index d31997006048..079c3a345847 100644
--- a/devel/p5-Time-Stopwatch/pkg-plist
+++ b/devel/p5-Time-Stopwatch/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Stopwatch/.packlist
 %%SITE_PERL%%/Time/Stopwatch.pm
 %%PERL5_MAN3%%/Time::Stopwatch.3.gz
diff --git a/devel/p5-Time-Warp/Makefile b/devel/p5-Time-Warp/Makefile
index 9b7c49345d5b..64234a347458 100644
--- a/devel/p5-Time-Warp/Makefile
+++ b/devel/p5-Time-Warp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Warp
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-Warp/pkg-plist b/devel/p5-Time-Warp/pkg-plist
index fadbc7101cdd..79b5863d2631 100644
--- a/devel/p5-Time-Warp/pkg-plist
+++ b/devel/p5-Time-Warp/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Time/Warp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Warp/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Warp/Warp.so
+%%SITE_ARCH%%/Time/Warp.pm
+%%SITE_ARCH%%/auto/Time/Warp/Warp.so
 %%PERL5_MAN3%%/Time::Warp.3.gz
diff --git a/devel/p5-Time-modules/Makefile b/devel/p5-Time-modules/Makefile
index 4c4923371360..351f36fd4f3b 100644
--- a/devel/p5-Time-modules/Makefile
+++ b/devel/p5-Time-modules/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-modules
 PORTVERSION=	2013.0912
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Time-modules/pkg-plist b/devel/p5-Time-modules/pkg-plist
index 74232b494052..2d5f7d223f56 100644
--- a/devel/p5-Time-modules/pkg-plist
+++ b/devel/p5-Time-modules/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Time/JulianDay.pm
 %%SITE_PERL%%/Time/ParseDate.pm
 %%SITE_PERL%%/Time/Timezone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time-modules/.packlist
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index c18494bc4898..648e5fc40377 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TimeDate
 PORTVERSION=	2.30
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-TimeDate/pkg-plist b/devel/p5-TimeDate/pkg-plist
index e50aa272d20e..f08c50c332a7 100644
--- a/devel/p5-TimeDate/pkg-plist
+++ b/devel/p5-TimeDate/pkg-plist
@@ -35,7 +35,6 @@
 %%SITE_PERL%%/Date/Language/Turkish.pm
 %%SITE_PERL%%/Date/Parse.pm
 %%SITE_PERL%%/Time/Zone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Parse/.packlist
 %%PERL5_MAN3%%/Date::Format.3.gz
 %%PERL5_MAN3%%/Date::Language.3.gz
 %%PERL5_MAN3%%/Date::Language::Bulgarian.3.gz
diff --git a/devel/p5-ToolSet/Makefile b/devel/p5-ToolSet/Makefile
index 105c145b78a4..45fb459e4065 100644
--- a/devel/p5-ToolSet/Makefile
+++ b/devel/p5-ToolSet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ToolSet
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-ToolSet/pkg-plist b/devel/p5-ToolSet/pkg-plist
index fadad555a3be..2bd9178a2093 100644
--- a/devel/p5-ToolSet/pkg-plist
+++ b/devel/p5-ToolSet/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/ToolSet.pod
 %%SITE_PERL%%/ToolSet/SWC.pm
 %%SITE_PERL%%/ToolSet/SWC.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ToolSet/.packlist
 %%PERL5_MAN3%%/ToolSet.3.gz
 %%PERL5_MAN3%%/ToolSet::SWC.3.gz
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 975712892f36..d17a5b209b29 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	TraceFuncs
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Devel
diff --git a/devel/p5-TraceFuncs/pkg-plist b/devel/p5-TraceFuncs/pkg-plist
index f77155c110e9..7c50824ed1a7 100644
--- a/devel/p5-TraceFuncs/pkg-plist
+++ b/devel/p5-TraceFuncs/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Devel::TraceFuncs.3.gz
 %%SITE_PERL%%/Devel/TraceFuncs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/.packlist
diff --git a/devel/p5-Tree-Binary-Dictionary/Makefile b/devel/p5-Tree-Binary-Dictionary/Makefile
index bc9c486e2ddc..7c557503d55f 100644
--- a/devel/p5-Tree-Binary-Dictionary/Makefile
+++ b/devel/p5-Tree-Binary-Dictionary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-Binary-Dictionary
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-Binary-Dictionary/pkg-plist b/devel/p5-Tree-Binary-Dictionary/pkg-plist
index e0e5efb146b7..b825ef950134 100644
--- a/devel/p5-Tree-Binary-Dictionary/pkg-plist
+++ b/devel/p5-Tree-Binary-Dictionary/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tree::Binary::Dictionary.3.gz
 %%SITE_PERL%%/Tree/Binary/Dictionary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Binary/Dictionary/.packlist
diff --git a/devel/p5-Tree-Binary/Makefile b/devel/p5-Tree-Binary/Makefile
index 30adf74dbffb..c6a8f0aade16 100644
--- a/devel/p5-Tree-Binary/Makefile
+++ b/devel/p5-Tree-Binary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-Binary
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-Binary/pkg-plist b/devel/p5-Tree-Binary/pkg-plist
index 1a3873f41747..9730c6118866 100644
--- a/devel/p5-Tree-Binary/pkg-plist
+++ b/devel/p5-Tree-Binary/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/Tree/Binary/Visitor/PostOrderTraversal.pm
 %%SITE_PERL%%/Tree/Binary/Visitor/PreOrderTraversal.pm
 %%SITE_PERL%%/Tree/Binary/VisitorFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Binary/.packlist
 %%PERL5_MAN3%%/Tree::Binary.3.gz
 %%PERL5_MAN3%%/Tree::Binary::Search.3.gz
 %%PERL5_MAN3%%/Tree::Binary::Search::Node.3.gz
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index 7e81dc4b7472..94776e4adb67 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-DAG_Node
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-DAG_Node/pkg-plist b/devel/p5-Tree-DAG_Node/pkg-plist
index 00af9ca8dd10..dfea443ca272 100644
--- a/devel/p5-Tree-DAG_Node/pkg-plist
+++ b/devel/p5-Tree-DAG_Node/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tree::DAG_Node.3.gz
 %%SITE_PERL%%/Tree/DAG_Node.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/DAG_Node/.packlist
diff --git a/devel/p5-Tree-Node/Makefile b/devel/p5-Tree-Node/Makefile
index 7598c5f4cbb7..9176f4528cfc 100644
--- a/devel/p5-Tree-Node/Makefile
+++ b/devel/p5-Tree-Node/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tree-Node
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-Node/pkg-plist b/devel/p5-Tree-Node/pkg-plist
index d867ce4cb09b..a7aa08b71da5 100644
--- a/devel/p5-Tree-Node/pkg-plist
+++ b/devel/p5-Tree-Node/pkg-plist
@@ -1,3 +1,3 @@
 %%PERL5_MAN3%%/Tree::Node.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Tree/Node.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Node/Node.so
+%%SITE_ARCH%%/Tree/Node.pm
+%%SITE_ARCH%%/auto/Tree/Node/Node.so
diff --git a/devel/p5-Tree-Parser/Makefile b/devel/p5-Tree-Parser/Makefile
index 40271142546e..f98573aa1c63 100644
--- a/devel/p5-Tree-Parser/Makefile
+++ b/devel/p5-Tree-Parser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tree-Parser
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-Parser/pkg-plist b/devel/p5-Tree-Parser/pkg-plist
index 21da4393aefc..5d9b842bfb0b 100644
--- a/devel/p5-Tree-Parser/pkg-plist
+++ b/devel/p5-Tree-Parser/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tree::Parser.3.gz
 %%SITE_PERL%%/Tree/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Parser/.packlist
diff --git a/devel/p5-Tree-R/Makefile b/devel/p5-Tree-R/Makefile
index 979377472b84..e0626cd866c7 100644
--- a/devel/p5-Tree-R/Makefile
+++ b/devel/p5-Tree-R/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-R
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-R/pkg-plist b/devel/p5-Tree-R/pkg-plist
index 316343399418..c74929a47dc4 100644
--- a/devel/p5-Tree-R/pkg-plist
+++ b/devel/p5-Tree-R/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Tree::R.3.gz
 %%SITE_PERL%%/Tree/R.pm
 %%SITE_PERL%%/auto/Tree/R/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/R/.packlist
diff --git a/devel/p5-Tree-RedBlack/Makefile b/devel/p5-Tree-RedBlack/Makefile
index 0536268e07db..a419c7271ed6 100644
--- a/devel/p5-Tree-RedBlack/Makefile
+++ b/devel/p5-Tree-RedBlack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-RedBlack
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-RedBlack/pkg-plist b/devel/p5-Tree-RedBlack/pkg-plist
index 8de1d9ba3fc0..4781fd0f11b3 100644
--- a/devel/p5-Tree-RedBlack/pkg-plist
+++ b/devel/p5-Tree-RedBlack/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Tree/RedBlack.pm
 %%SITE_PERL%%/Tree/RedBlack/Node.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/RedBlack/.packlist
 %%PERL5_MAN3%%/Tree::Node.3.gz
 %%PERL5_MAN3%%/Tree::RedBlack.3.gz
diff --git a/devel/p5-Tree-Simple-View/Makefile b/devel/p5-Tree-Simple-View/Makefile
index cd18eb21376f..a6b8cc7a29ac 100644
--- a/devel/p5-Tree-Simple-View/Makefile
+++ b/devel/p5-Tree-Simple-View/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tree-Simple-View
 PORTVERSION=	0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-Simple-View/pkg-plist b/devel/p5-Tree-Simple-View/pkg-plist
index 1b6d5f57d1d3..b2c063335a0b 100644
--- a/devel/p5-Tree-Simple-View/pkg-plist
+++ b/devel/p5-Tree-Simple-View/pkg-plist
@@ -8,4 +8,3 @@
 %%SITE_PERL%%/Tree/Simple/View/DHTML.pm
 %%SITE_PERL%%/Tree/Simple/View/Exceptions.pm
 %%SITE_PERL%%/Tree/Simple/View/HTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/View/.packlist
diff --git a/devel/p5-Tree-Simple-VisitorFactory/Makefile b/devel/p5-Tree-Simple-VisitorFactory/Makefile
index 054fb86338d5..079827a08aed 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/Makefile
+++ b/devel/p5-Tree-Simple-VisitorFactory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tree-Simple-VisitorFactory
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-Simple-VisitorFactory/pkg-plist b/devel/p5-Tree-Simple-VisitorFactory/pkg-plist
index b1736c56fbe2..770c3d3ece56 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/pkg-plist
+++ b/devel/p5-Tree-Simple-VisitorFactory/pkg-plist
@@ -34,4 +34,3 @@
 %%SITE_PERL%%/Tree/Simple/Visitor/ToNestedHash.pm
 %%SITE_PERL%%/Tree/Simple/Visitor/VariableDepthClone.pm
 %%SITE_PERL%%/Tree/Simple/VisitorFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/VisitorFactory/.packlist
diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile
index 9b0180e03b83..377f72991bde 100644
--- a/devel/p5-Tree-Simple/Makefile
+++ b/devel/p5-Tree-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-Simple
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-Simple/pkg-plist b/devel/p5-Tree-Simple/pkg-plist
index f636ffb36813..89a27be86e71 100644
--- a/devel/p5-Tree-Simple/pkg-plist
+++ b/devel/p5-Tree-Simple/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Tree/Simple.pm
 %%SITE_PERL%%/Tree/Simple/Visitor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/.packlist
 %%PERL5_MAN3%%/Tree::Simple.3.gz
 %%PERL5_MAN3%%/Tree::Simple::Visitor.3.gz
diff --git a/devel/p5-Type-Tie/Makefile b/devel/p5-Type-Tie/Makefile
index b70e38d36dda..38a176b2f5a1 100644
--- a/devel/p5-Type-Tie/Makefile
+++ b/devel/p5-Type-Tie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Type-Tie
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/devel/p5-Type-Tie/pkg-plist b/devel/p5-Type-Tie/pkg-plist
index ed0ed6528749..e2186166bb64 100644
--- a/devel/p5-Type-Tie/pkg-plist
+++ b/devel/p5-Type-Tie/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Type/Tie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Type/Tie/.packlist
 %%PERL5_MAN3%%/Type::Tie.3.gz
diff --git a/devel/p5-Type-Tiny-XS/Makefile b/devel/p5-Type-Tiny-XS/Makefile
index 32f263225158..e21a3b8c9630 100644
--- a/devel/p5-Type-Tiny-XS/Makefile
+++ b/devel/p5-Type-Tiny-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Type-Tiny-XS
 PORTVERSION=	0.012
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
@@ -18,8 +19,8 @@ USE_PERL5=	configure
 USES=		perl5
 
 post-install:
-	${CHMOD} u+w ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Type/Tiny/XS/XS.so
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Type/Tiny/XS/XS.so
-	${CHMOD} u-w ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Type/Tiny/XS/XS.so
+	${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Type/Tiny/XS/XS.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Type/Tiny/XS/XS.so
+	${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Type/Tiny/XS/XS.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Type-Tiny-XS/pkg-plist b/devel/p5-Type-Tiny-XS/pkg-plist
index ccf2a7ca4d15..ad071bd67332 100644
--- a/devel/p5-Type-Tiny-XS/pkg-plist
+++ b/devel/p5-Type-Tiny-XS/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Type/Tiny/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Type/Tiny/XS/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Type/Tiny/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Type/Tiny/XS/XS.so
+%%SITE_ARCH%%/Type/Tiny/XS.pm
+%%SITE_ARCH%%/Type/Tiny/XS/Util.pm
+%%SITE_ARCH%%/auto/Type/Tiny/XS/XS.so
 %%PERL5_MAN3%%/Type::Tiny::XS.3.gz
 %%PERL5_MAN3%%/Type::Tiny::XS::Util.3.gz
diff --git a/devel/p5-Type-Tiny/Makefile b/devel/p5-Type-Tiny/Makefile
index 0190bd3c36e0..2261da473c0a 100644
--- a/devel/p5-Type-Tiny/Makefile
+++ b/devel/p5-Type-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Type-Tiny
 PORTVERSION=	1.000005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/devel/p5-Type-Tiny/pkg-plist b/devel/p5-Type-Tiny/pkg-plist
index 93b9bb8774bc..4e1ec4891525 100644
--- a/devel/p5-Type-Tiny/pkg-plist
+++ b/devel/p5-Type-Tiny/pkg-plist
@@ -43,7 +43,6 @@
 %%SITE_PERL%%/Types/Standard/ScalarRef.pm
 %%SITE_PERL%%/Types/Standard/Tuple.pm
 %%SITE_PERL%%/Types/TypeTiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Type/Tiny/.packlist
 %%PERL5_MAN3%%/Devel::TypeTiny::Perl56Compat.3.gz
 %%PERL5_MAN3%%/Devel::TypeTiny::Perl58Compat.3.gz
 %%PERL5_MAN3%%/Error::TypeTiny.3.gz
diff --git a/devel/p5-Types-Path-Tiny/Makefile b/devel/p5-Types-Path-Tiny/Makefile
index 04b2969dd2b5..e89eb02e9083 100644
--- a/devel/p5-Types-Path-Tiny/Makefile
+++ b/devel/p5-Types-Path-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Types-Path-Tiny
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/devel/p5-Types-Path-Tiny/pkg-plist b/devel/p5-Types-Path-Tiny/pkg-plist
index 56013408d6c6..0cb3f041fc20 100644
--- a/devel/p5-Types-Path-Tiny/pkg-plist
+++ b/devel/p5-Types-Path-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Types/Path/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Types/Path/Tiny/.packlist
 %%PERL5_MAN3%%/Types::Path::Tiny.3.gz
diff --git a/devel/p5-Types-Serialiser/Makefile b/devel/p5-Types-Serialiser/Makefile
index f729dbb854a5..9825f8cb4d84 100644
--- a/devel/p5-Types-Serialiser/Makefile
+++ b/devel/p5-Types-Serialiser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Types-Serialiser
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MLEHMANN
diff --git a/devel/p5-Types-Serialiser/pkg-plist b/devel/p5-Types-Serialiser/pkg-plist
index 10530435c475..d6844dc78809 100644
--- a/devel/p5-Types-Serialiser/pkg-plist
+++ b/devel/p5-Types-Serialiser/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Types/Serialiser.pm
 %%SITE_PERL%%/Types/Serialiser/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Types/Serialiser/.packlist
 %%PERL5_MAN3%%/Types::Serialiser.3.gz
 %%PERL5_MAN3%%/Types::Serialiser::Error.3.gz
diff --git a/devel/p5-UDCode/Makefile b/devel/p5-UDCode/Makefile
index f484f7178fef..ab959d098730 100644
--- a/devel/p5-UDCode/Makefile
+++ b/devel/p5-UDCode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UDCode
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MJD
diff --git a/devel/p5-UDCode/pkg-plist b/devel/p5-UDCode/pkg-plist
index 38a7787ef2fa..c407e4be07b5 100644
--- a/devel/p5-UDCode/pkg-plist
+++ b/devel/p5-UDCode/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/UDCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UDCode/.packlist
 %%PERL5_MAN3%%/UDCode.3.gz
diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index 10710bd26990..a5729ad6891d 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UI-Dialog
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KCK
diff --git a/devel/p5-UI-Dialog/pkg-plist b/devel/p5-UI-Dialog/pkg-plist
index 8bb6415d3f1c..e83647cd0d1c 100644
--- a/devel/p5-UI-Dialog/pkg-plist
+++ b/devel/p5-UI-Dialog/pkg-plist
@@ -46,4 +46,3 @@
 %%SITE_PERL%%/UI/Dialog/KDE.pod
 %%SITE_PERL%%/UI/Dialog/Screen/Menu.pm
 %%SITE_PERL%%/UI/Dialog/Screen/Menu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UI/Dialog/.packlist
diff --git a/devel/p5-UNIVERSAL-can/Makefile b/devel/p5-UNIVERSAL-can/Makefile
index 4fb94f782149..1aa0942fb803 100644
--- a/devel/p5-UNIVERSAL-can/Makefile
+++ b/devel/p5-UNIVERSAL-can/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UNIVERSAL-can
 PORTVERSION=	1.20140328
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UNIVERSAL-can/pkg-plist b/devel/p5-UNIVERSAL-can/pkg-plist
index 820754f591e5..2244162500e4 100644
--- a/devel/p5-UNIVERSAL-can/pkg-plist
+++ b/devel/p5-UNIVERSAL-can/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/UNIVERSAL::can.3.gz
 %%SITE_PERL%%/UNIVERSAL/can.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/can/.packlist
diff --git a/devel/p5-UNIVERSAL-isa/Makefile b/devel/p5-UNIVERSAL-isa/Makefile
index 6a909670bb9e..bbe1ac11c330 100644
--- a/devel/p5-UNIVERSAL-isa/Makefile
+++ b/devel/p5-UNIVERSAL-isa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UNIVERSAL-isa
 PORTVERSION=	1.20140927
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UNIVERSAL-isa/pkg-plist b/devel/p5-UNIVERSAL-isa/pkg-plist
index 34233dc51c79..3841a4cbbcf0 100644
--- a/devel/p5-UNIVERSAL-isa/pkg-plist
+++ b/devel/p5-UNIVERSAL-isa/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/UNIVERSAL::isa.3.gz
 %%SITE_PERL%%/UNIVERSAL/isa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/isa/.packlist
diff --git a/devel/p5-UNIVERSAL-moniker/Makefile b/devel/p5-UNIVERSAL-moniker/Makefile
index 1dcb6a2314e2..362b5ee36da9 100644
--- a/devel/p5-UNIVERSAL-moniker/Makefile
+++ b/devel/p5-UNIVERSAL-moniker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UNIVERSAL-moniker
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UNIVERSAL-moniker/pkg-plist b/devel/p5-UNIVERSAL-moniker/pkg-plist
index 253968f6b45c..a16be5ed1bd1 100644
--- a/devel/p5-UNIVERSAL-moniker/pkg-plist
+++ b/devel/p5-UNIVERSAL-moniker/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/UNIVERSAL::moniker.3.gz
 %%SITE_PERL%%/UNIVERSAL/moniker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/moniker/.packlist
diff --git a/devel/p5-UNIVERSAL-ref/Makefile b/devel/p5-UNIVERSAL-ref/Makefile
index 78584e44315e..11195141c478 100644
--- a/devel/p5-UNIVERSAL-ref/Makefile
+++ b/devel/p5-UNIVERSAL-ref/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	UNIVERSAL-ref
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JJORE
diff --git a/devel/p5-UNIVERSAL-ref/pkg-plist b/devel/p5-UNIVERSAL-ref/pkg-plist
index b4273d75f08f..1b99edc64bc8 100644
--- a/devel/p5-UNIVERSAL-ref/pkg-plist
+++ b/devel/p5-UNIVERSAL-ref/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/UNIVERSAL/ref.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/ref/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/ref/ref.so
+%%SITE_ARCH%%/UNIVERSAL/ref.pm
+%%SITE_ARCH%%/auto/UNIVERSAL/ref/ref.so
 %%PERL5_MAN3%%/UNIVERSAL::ref.3.gz
diff --git a/devel/p5-UNIVERSAL-require/Makefile b/devel/p5-UNIVERSAL-require/Makefile
index 6af82abd792c..029357849c2c 100644
--- a/devel/p5-UNIVERSAL-require/Makefile
+++ b/devel/p5-UNIVERSAL-require/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	UNIVERSAL-require
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UNIVERSAL-require/pkg-plist b/devel/p5-UNIVERSAL-require/pkg-plist
index c853b692d377..ed0d27a05990 100644
--- a/devel/p5-UNIVERSAL-require/pkg-plist
+++ b/devel/p5-UNIVERSAL-require/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/UNIVERSAL::require.3.gz
 %%SITE_PERL%%/UNIVERSAL/require.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/require/.packlist
diff --git a/devel/p5-UNIVERSAL-which/Makefile b/devel/p5-UNIVERSAL-which/Makefile
index 5158e0ca1af4..e68f58ecd7fe 100644
--- a/devel/p5-UNIVERSAL-which/Makefile
+++ b/devel/p5-UNIVERSAL-which/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	UNIVERSAL-which
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UNIVERSAL-which/pkg-plist b/devel/p5-UNIVERSAL-which/pkg-plist
index cd38a0d56559..7dba361bb483 100644
--- a/devel/p5-UNIVERSAL-which/pkg-plist
+++ b/devel/p5-UNIVERSAL-which/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/UNIVERSAL/which.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/which/.packlist
 %%PERL5_MAN3%%/UNIVERSAL::which.3.gz
diff --git a/devel/p5-UUID-Random-Patch-UseMRS/Makefile b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
index c25183660b0b..121ba2dd18c5 100644
--- a/devel/p5-UUID-Random-Patch-UseMRS/Makefile
+++ b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UUID-Random-Patch-UseMRS
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UUID-Random/Makefile b/devel/p5-UUID-Random/Makefile
index 6dbde8dd7358..65a9f95bd7eb 100644
--- a/devel/p5-UUID-Random/Makefile
+++ b/devel/p5-UUID-Random/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UUID-Random
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UUID-Random/pkg-plist b/devel/p5-UUID-Random/pkg-plist
index 7356b376030a..4401668bd7c8 100644
--- a/devel/p5-UUID-Random/pkg-plist
+++ b/devel/p5-UUID-Random/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/UUID/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UUID/Random/.packlist
 %%PERL5_MAN3%%/UUID::Random.3.gz
diff --git a/devel/p5-UUID-Tiny/Makefile b/devel/p5-UUID-Tiny/Makefile
index 8004668210ae..27281d282a15 100644
--- a/devel/p5-UUID-Tiny/Makefile
+++ b/devel/p5-UUID-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UUID-Tiny
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-UUID-Tiny/pkg-plist b/devel/p5-UUID-Tiny/pkg-plist
index 1f7a083bd0fe..faeb1874dff1 100644
--- a/devel/p5-UUID-Tiny/pkg-plist
+++ b/devel/p5-UUID-Tiny/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UUID/Tiny/.packlist
 %%SITE_PERL%%/UUID/Tiny.pm
 %%PERL5_MAN3%%/UUID::Tiny.3.gz
diff --git a/devel/p5-UUID/Makefile b/devel/p5-UUID/Makefile
index 3a3a7080fe6b..87ae5cd4e284 100644
--- a/devel/p5-UUID/Makefile
+++ b/devel/p5-UUID/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UUID
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JNH
diff --git a/devel/p5-UUID/pkg-plist b/devel/p5-UUID/pkg-plist
index c1720f27db81..6c1f4b36339e 100644
--- a/devel/p5-UUID/pkg-plist
+++ b/devel/p5-UUID/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/UUID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UUID/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UUID/UUID.so
+%%SITE_ARCH%%/UUID.pm
+%%SITE_ARCH%%/auto/UUID/UUID.so
 %%PERL5_MAN3%%/UUID.3.gz
diff --git a/devel/p5-Uniq/Makefile b/devel/p5-Uniq/Makefile
index bed762b930d9..1995c9cefbd8 100644
--- a/devel/p5-Uniq/Makefile
+++ b/devel/p5-Uniq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Uniq
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SYAMAL
diff --git a/devel/p5-Uniq/pkg-plist b/devel/p5-Uniq/pkg-plist
index d9c5b188a9a0..60cba954371e 100644
--- a/devel/p5-Uniq/pkg-plist
+++ b/devel/p5-Uniq/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Uniq.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Uniq/.packlist
 %%PERL5_MAN3%%/Uniq.3.gz
diff --git a/devel/p5-Unix-Statgrab/Makefile b/devel/p5-Unix-Statgrab/Makefile
index edc317de1162..b6e69cc0cc03 100644
--- a/devel/p5-Unix-Statgrab/Makefile
+++ b/devel/p5-Unix-Statgrab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Unix-Statgrab
 PORTVERSION=	0.104
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Unix-Statgrab/pkg-plist b/devel/p5-Unix-Statgrab/pkg-plist
index d641e05d3abd..cf7d6718b598 100644
--- a/devel/p5-Unix-Statgrab/pkg-plist
+++ b/devel/p5-Unix-Statgrab/pkg-plist
@@ -1,6 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Statgrab/Statgrab.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Statgrab/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Statgrab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Statgrab/ConfigData.pm
+%%SITE_ARCH%%/auto/Unix/Statgrab/Statgrab.so
+%%SITE_ARCH%%/auto/Unix/Statgrab/autosplit.ix
+%%SITE_ARCH%%/Unix/Statgrab.pm
+%%SITE_ARCH%%/Unix/Statgrab/ConfigData.pm
 %%PERL5_MAN3%%/Unix::Statgrab.3.gz
 %%PERL5_MAN3%%/Unix::Statgrab::ConfigData.3.gz
diff --git a/devel/p5-Unix-Uptime/Makefile b/devel/p5-Unix-Uptime/Makefile
index 7aaa067836a8..fd78a8a4a124 100644
--- a/devel/p5-Unix-Uptime/Makefile
+++ b/devel/p5-Unix-Uptime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unix-Uptime
 PORTVERSION=	0.3701
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-Unix-Uptime/pkg-plist b/devel/p5-Unix-Uptime/pkg-plist
index ef05ac5cf51b..fe0cbb53cfdb 100644
--- a/devel/p5-Unix-Uptime/pkg-plist
+++ b/devel/p5-Unix-Uptime/pkg-plist
@@ -1,8 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Uptime/BSD/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Uptime/Linux.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Uptime/BSD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Uptime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Uptime/BSD/XS/XS.so
+%%SITE_ARCH%%/Unix/Uptime/BSD/XS.pm
+%%SITE_ARCH%%/Unix/Uptime/Linux.pm
+%%SITE_ARCH%%/Unix/Uptime/BSD.pm
+%%SITE_ARCH%%/Unix/Uptime.pm
+%%SITE_ARCH%%/auto/Unix/Uptime/BSD/XS/XS.so
 %%PERL5_MAN3%%/Unix::Uptime.3.gz
 %%PERL5_MAN3%%/Unix::Uptime::BSD.3.gz
 %%PERL5_MAN3%%/Unix::Uptime::Linux.3.gz
diff --git a/devel/p5-User-Identity/Makefile b/devel/p5-User-Identity/Makefile
index e785b77a4eeb..6c47a016fa6a 100644
--- a/devel/p5-User-Identity/Makefile
+++ b/devel/p5-User-Identity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	User-Identity
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-User-Identity/pkg-plist b/devel/p5-User-Identity/pkg-plist
index d43664e1a928..f067e7953ac5 100644
--- a/devel/p5-User-Identity/pkg-plist
+++ b/devel/p5-User-Identity/pkg-plist
@@ -22,7 +22,6 @@
 %%SITE_PERL%%/User/Identity/Location.pod
 %%SITE_PERL%%/User/Identity/System.pm
 %%SITE_PERL%%/User/Identity/System.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/User/Identity/.packlist
 %%PERL5_MAN3%%/Mail::Identity.3.gz
 %%PERL5_MAN3%%/User::Identity.3.gz
 %%PERL5_MAN3%%/User::Identity::Archive.3.gz
diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile
index 6222c7a33daf..e6609ed23b92 100644
--- a/devel/p5-VCP-Dest-svk/Makefile
+++ b/devel/p5-VCP-Dest-svk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	VCP-Dest-svk
 PORTVERSION=	0.29
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/devel/p5-VCP-Dest-svk/pkg-plist b/devel/p5-VCP-Dest-svk/pkg-plist
index 3aae4af19619..39bce5da2a89 100644
--- a/devel/p5-VCP-Dest-svk/pkg-plist
+++ b/devel/p5-VCP-Dest-svk/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/VCP/Dest/svk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Dest/svk/.packlist
 %%PERL5_MAN3%%/VCP::Dest::svk.3.gz
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index c50f323843e1..aac28ca161f2 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	VCP-Source-cvsbk
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/devel/p5-VCP-Source-cvsbk/pkg-plist b/devel/p5-VCP-Source-cvsbk/pkg-plist
index a25eb05369b3..e06674e8e8fb 100644
--- a/devel/p5-VCP-Source-cvsbk/pkg-plist
+++ b/devel/p5-VCP-Source-cvsbk/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/VCP/Source/cvsbk.pm
 %%SITE_PERL%%/VCP/Filter/cvsbkchangeset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Source/cvsbk/.packlist
 %%PERL5_MAN3%%/VCP::Source::cvsbk.3.gz
 %%PERL5_MAN3%%/VCP::Filter::cvsbkchangeset.3.gz
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index f3d2da464d01..c4088134ca3f 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	VCP
 PORTVERSION=	0.9.20050110
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AUTRIJUS
diff --git a/devel/p5-VCP-autrijus/pkg-plist b/devel/p5-VCP-autrijus/pkg-plist
index 6b63cb98742c..4799ae630834 100644
--- a/devel/p5-VCP-autrijus/pkg-plist
+++ b/devel/p5-VCP-autrijus/pkg-plist
@@ -143,5 +143,4 @@ bin/vcp
 %%SITE_PERL%%/VCP/Utils/p4.pm
 %%SITE_PERL%%/VCP/Utils/revml.pm
 %%SITE_PERL%%/VCP/Utils/vss.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/.packlist
 man/man1/vcp.1.gz
diff --git a/devel/p5-VCS-CVS/Makefile b/devel/p5-VCS-CVS/Makefile
index 1eaeb09e674f..9b2314e89546 100644
--- a/devel/p5-VCS-CVS/Makefile
+++ b/devel/p5-VCS-CVS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	VCS-CVS
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://savage.net.au/Perl-modules/ \
 		http://tolid.eu.org/VCSCVS/
diff --git a/devel/p5-VCS-Lite/Makefile b/devel/p5-VCS-Lite/Makefile
index 5dfc9ded6ae9..fea572379697 100644
--- a/devel/p5-VCS-Lite/Makefile
+++ b/devel/p5-VCS-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	VCS-Lite
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-VCS-Lite/pkg-plist b/devel/p5-VCS-Lite/pkg-plist
index 9558e5617e8c..e4ae06c02ee9 100644
--- a/devel/p5-VCS-Lite/pkg-plist
+++ b/devel/p5-VCS-Lite/pkg-plist
@@ -5,4 +5,3 @@ bin/vlpatch
 %%PERL5_MAN3%%/VCS::Lite::Delta.3.gz
 %%SITE_PERL%%/VCS/Lite.pm
 %%SITE_PERL%%/VCS/Lite/Delta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS/Lite/.packlist
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index d2e4fc435fa4..97753a767c75 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	VCS
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-VCS/pkg-plist b/devel/p5-VCS/pkg-plist
index 37d5bca40606..64d5ed69cb83 100644
--- a/devel/p5-VCS/pkg-plist
+++ b/devel/p5-VCS/pkg-plist
@@ -18,4 +18,3 @@
 %%SITE_PERL%%/VCS/Rcs/Version.pm
 %%SITE_PERL%%/VCS/Version.pm
 %%SITE_PERL%%/VCS_dev.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS/.packlist
diff --git a/devel/p5-Validation-Class/Makefile b/devel/p5-Validation-Class/Makefile
index e9aaeb0bd00b..13cad62044cb 100644
--- a/devel/p5-Validation-Class/Makefile
+++ b/devel/p5-Validation-Class/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Validation-Class
 PORTVERSION=	7.900056
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AWNCORP
diff --git a/devel/p5-Validation-Class/pkg-plist b/devel/p5-Validation-Class/pkg-plist
index 9e5ccf2109cc..a856299940d9 100644
--- a/devel/p5-Validation-Class/pkg-plist
+++ b/devel/p5-Validation-Class/pkg-plist
@@ -55,7 +55,6 @@
 %%PERL5_MAN3%%/Validation::Class::Simple.3.gz
 %%PERL5_MAN3%%/Validation::Class::Simple::Streamer.3.gz
 %%PERL5_MAN3%%/Validation::Class::Whitepaper.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Validation/Class/.packlist
 %%SITE_PERL%%/Validation/Class.pm
 %%SITE_PERL%%/Validation/Class/Configuration.pm
 %%SITE_PERL%%/Validation/Class/Cookbook.pod
diff --git a/devel/p5-Variable-Eject/Makefile b/devel/p5-Variable-Eject/Makefile
index e72febef10ba..880219e6dd11 100644
--- a/devel/p5-Variable-Eject/Makefile
+++ b/devel/p5-Variable-Eject/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Variable-Eject
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Variable-Eject/pkg-plist b/devel/p5-Variable-Eject/pkg-plist
index 4a4c1d4599c0..edba88f104c0 100644
--- a/devel/p5-Variable-Eject/pkg-plist
+++ b/devel/p5-Variable-Eject/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Variable::Eject.3.gz
 %%SITE_PERL%%/Variable/Eject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Variable/Eject/.packlist
diff --git a/devel/p5-Variable-Magic/Makefile b/devel/p5-Variable-Magic/Makefile
index 7d6751a11010..dfad0a00bedd 100644
--- a/devel/p5-Variable-Magic/Makefile
+++ b/devel/p5-Variable-Magic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Variable-Magic
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Variable-Magic/pkg-plist b/devel/p5-Variable-Magic/pkg-plist
index da59a936fe2d..762fb9e792c5 100644
--- a/devel/p5-Variable-Magic/pkg-plist
+++ b/devel/p5-Variable-Magic/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Variable::Magic.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Variable/Magic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Variable/Magic/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Variable/Magic/Magic.so
+%%SITE_ARCH%%/Variable/Magic.pm
+%%SITE_ARCH%%/auto/Variable/Magic/Magic.so
diff --git a/devel/p5-Want/Makefile b/devel/p5-Want/Makefile
index b0ab61abd794..094a6d94781f 100644
--- a/devel/p5-Want/Makefile
+++ b/devel/p5-Want/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Want
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROBIN
diff --git a/devel/p5-Want/pkg-plist b/devel/p5-Want/pkg-plist
index 91a320dccb51..9392059a8299 100644
--- a/devel/p5-Want/pkg-plist
+++ b/devel/p5-Want/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Want.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Want.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Want/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Want/Want.so
+%%SITE_ARCH%%/Want.pm
+%%SITE_ARCH%%/auto/Want/Want.so
diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index 8c36ea1dc5a0..75dbeba21068 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WeakRef
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LUKKA
@@ -15,8 +16,8 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/WeakRef/WeakRef.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/WeakRef/WeakRef.so
-	${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/WeakRef/WeakRef.so
+	${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/WeakRef/WeakRef.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/WeakRef/WeakRef.so
+	${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/WeakRef/WeakRef.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-WeakRef/pkg-plist b/devel/p5-WeakRef/pkg-plist
index 378dddd87a7c..d2d7943f759a 100644
--- a/devel/p5-WeakRef/pkg-plist
+++ b/devel/p5-WeakRef/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/WeakRef.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WeakRef/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WeakRef/WeakRef.so
-%%SITE_PERL%%/%%PERL_ARCH%%/WeakRef.pm
+%%SITE_ARCH%%/auto/WeakRef/WeakRef.so
+%%SITE_ARCH%%/WeakRef.pm
diff --git a/devel/p5-Workflow/Makefile b/devel/p5-Workflow/Makefile
index 62b780e7a4b0..7cb6483603ac 100644
--- a/devel/p5-Workflow/Makefile
+++ b/devel/p5-Workflow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Workflow
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Workflow/pkg-plist b/devel/p5-Workflow/pkg-plist
index 868f7e26f2d7..4d6b390371b3 100644
--- a/devel/p5-Workflow/pkg-plist
+++ b/devel/p5-Workflow/pkg-plist
@@ -68,7 +68,6 @@
 %%SITE_PERL%%/Workflow/Validator/HasRequiredField.pm
 %%SITE_PERL%%/Workflow/Validator/InEnumeratedType.pm
 %%SITE_PERL%%/Workflow/Validator/MatchesDateFormat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Workflow/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/Changes
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/devel/p5-XML-Compile-Tester/Makefile b/devel/p5-XML-Compile-Tester/Makefile
index c9ccb50f755b..c27494ca986f 100644
--- a/devel/p5-XML-Compile-Tester/Makefile
+++ b/devel/p5-XML-Compile-Tester/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Compile-Tester
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-XML-Compile-Tester/pkg-plist b/devel/p5-XML-Compile-Tester/pkg-plist
index 13d12572b7e8..0313cd7defe9 100644
--- a/devel/p5-XML-Compile-Tester/pkg-plist
+++ b/devel/p5-XML-Compile-Tester/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/XML::Compile::Tester.3.gz
 %%SITE_PERL%%/XML/Compile/Tester.pm
 %%SITE_PERL%%/XML/Compile/Tester.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/Tester/.packlist
diff --git a/devel/p5-XML-Pastor/Makefile b/devel/p5-XML-Pastor/Makefile
index 842afbda23c9..8efb523092a0 100644
--- a/devel/p5-XML-Pastor/Makefile
+++ b/devel/p5-XML-Pastor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Pastor
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-XML-Pastor/pkg-plist b/devel/p5-XML-Pastor/pkg-plist
index 0fa0d42bce60..60ae95079723 100644
--- a/devel/p5-XML-Pastor/pkg-plist
+++ b/devel/p5-XML-Pastor/pkg-plist
@@ -72,4 +72,3 @@ man/man1/pastorize.1.gz
 %%SITE_PERL%%/XML/Pastor/Stack.pm
 %%SITE_PERL%%/XML/Pastor/Type.pm
 %%SITE_PERL%%/XML/Pastor/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Pastor/.packlist
diff --git a/devel/p5-XS-Object-Magic/Makefile b/devel/p5-XS-Object-Magic/Makefile
index f07cdf6772b5..718e6db2c8bc 100644
--- a/devel/p5-XS-Object-Magic/Makefile
+++ b/devel/p5-XS-Object-Magic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XS-Object-Magic
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/devel/p5-XS-Object-Magic/pkg-plist b/devel/p5-XS-Object-Magic/pkg-plist
index ad8fc080489e..376bb67042ff 100644
--- a/devel/p5-XS-Object-Magic/pkg-plist
+++ b/devel/p5-XS-Object-Magic/pkg-plist
@@ -1,7 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XS/Object/Magic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XS/Object/Magic/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XS/Object/Magic/Install/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/XS/Object/Magic/Install/xs_object_magic.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XS/Object/Magic/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XS/Object/Magic/Magic.so
+%%SITE_ARCH%%/XS/Object/Magic.pm
+%%SITE_ARCH%%/XS/Object/Magic/Install/Files.pm
+%%SITE_ARCH%%/XS/Object/Magic/Install/typemap
+%%SITE_ARCH%%/XS/Object/Magic/Install/xs_object_magic.h
+%%SITE_ARCH%%/auto/XS/Object/Magic/Magic.so
 %%PERL5_MAN3%%/XS::Object::Magic.3.gz
diff --git a/devel/p5-XSLoader/Makefile b/devel/p5-XSLoader/Makefile
index e4f88460b6cb..885fbce9d740 100644
--- a/devel/p5-XSLoader/Makefile
+++ b/devel/p5-XSLoader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XSLoader
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAPER
diff --git a/devel/p5-XSLoader/pkg-plist b/devel/p5-XSLoader/pkg-plist
index 0def069cb740..042352aab04b 100644
--- a/devel/p5-XSLoader/pkg-plist
+++ b/devel/p5-XSLoader/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/XSLoader.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/XSLoader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XSLoader/.packlist
+%%SITE_ARCH%%/XSLoader.pm
diff --git a/devel/p5-YAML-AppConfig/Makefile b/devel/p5-YAML-AppConfig/Makefile
index fa15d07f133d..77a377a34ac1 100644
--- a/devel/p5-YAML-AppConfig/Makefile
+++ b/devel/p5-YAML-AppConfig/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	YAML-AppConfig
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-YAML-AppConfig/pkg-plist b/devel/p5-YAML-AppConfig/pkg-plist
index 7c545715e93a..be46828b8cf1 100644
--- a/devel/p5-YAML-AppConfig/pkg-plist
+++ b/devel/p5-YAML-AppConfig/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/AppConfig/.packlist
 %%SITE_PERL%%/YAML/AppConfig.pm
 %%PERL5_MAN3%%/YAML::AppConfig.3.gz
diff --git a/devel/p5-Yada-Yada-Yada/Makefile b/devel/p5-Yada-Yada-Yada/Makefile
index ac75a227095c..99c627c3630d 100644
--- a/devel/p5-Yada-Yada-Yada/Makefile
+++ b/devel/p5-Yada-Yada-Yada/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Yada-Yada-Yada
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TMTM
diff --git a/devel/p5-Yada-Yada-Yada/pkg-plist b/devel/p5-Yada-Yada-Yada/pkg-plist
index 8ee6ba6ce3b7..d81a8047966d 100644
--- a/devel/p5-Yada-Yada-Yada/pkg-plist
+++ b/devel/p5-Yada-Yada-Yada/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Yada::Yada::Yada.3.gz
 %%SITE_PERL%%/Yada/Yada/Yada.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Yada/Yada/Yada/.packlist
diff --git a/devel/p5-ZConf-GUI/Makefile b/devel/p5-ZConf-GUI/Makefile
index d3b3a7e3f9ce..20285ae6ed0a 100644
--- a/devel/p5-ZConf-GUI/Makefile
+++ b/devel/p5-ZConf-GUI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ZConf-GUI
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/devel/p5-ZConf-GUI/pkg-plist b/devel/p5-ZConf-GUI/pkg-plist
index e45c1493c8d0..8eab1ccd0dbf 100644
--- a/devel/p5-ZConf-GUI/pkg-plist
+++ b/devel/p5-ZConf-GUI/pkg-plist
@@ -6,5 +6,4 @@ bin/zcgui-get
 bin/zcgui-sux
 bin/zcgui-gux
 %%SITE_PERL%%/ZConf/GUI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/GUI/.packlist
 %%PERL5_MAN3%%/ZConf::GUI.3.gz
diff --git a/devel/p5-ZML/Makefile b/devel/p5-ZML/Makefile
index d839d7bbdefc..b27f44f01c29 100644
--- a/devel/p5-ZML/Makefile
+++ b/devel/p5-ZML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ZML
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/devel/p5-ZML/pkg-plist b/devel/p5-ZML/pkg-plist
index 99a15cc3c6eb..89d7693bb79f 100644
--- a/devel/p5-ZML/pkg-plist
+++ b/devel/p5-ZML/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ZML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZML/.packlist
 %%PERL5_MAN3%%/ZML.3.gz
diff --git a/devel/p5-accessors-fast/Makefile b/devel/p5-accessors-fast/Makefile
index a919cca2820a..6131b3f46692 100644
--- a/devel/p5-accessors-fast/Makefile
+++ b/devel/p5-accessors-fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	accessors-fast
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MONS
diff --git a/devel/p5-accessors-fast/pkg-plist b/devel/p5-accessors-fast/pkg-plist
index f73ccf2e7015..c341375a54f6 100644
--- a/devel/p5-accessors-fast/pkg-plist
+++ b/devel/p5-accessors-fast/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/accessors/cpants.pl
 %%SITE_PERL%%/accessors/fast.pm
 %%SITE_PERL%%/accessors/fast/tie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/accessors/fast/.packlist
 %%PERL5_MAN3%%/accessors::fast.3.gz
diff --git a/devel/p5-accessors/Makefile b/devel/p5-accessors/Makefile
index 44b9d217e503..7cf5b5b49a5f 100644
--- a/devel/p5-accessors/Makefile
+++ b/devel/p5-accessors/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	accessors
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SPURKIS
diff --git a/devel/p5-aliased/Makefile b/devel/p5-aliased/Makefile
index e9902758710e..fc5a9010369b 100644
--- a/devel/p5-aliased/Makefile
+++ b/devel/p5-aliased/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	aliased
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OVID
diff --git a/devel/p5-asa/Makefile b/devel/p5-asa/Makefile
index 7972156de465..ff341006b2c7 100644
--- a/devel/p5-asa/Makefile
+++ b/devel/p5-asa/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	asa
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/devel/p5-asa/pkg-plist b/devel/p5-asa/pkg-plist
index c651efb5bc01..214abab70ded 100644
--- a/devel/p5-asa/pkg-plist
+++ b/devel/p5-asa/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/asa/.packlist
 %%SITE_PERL%%/asa.pm
 %%PERL5_MAN3%%/asa.3.gz
diff --git a/devel/p5-autobox-Core/Makefile b/devel/p5-autobox-Core/Makefile
index cdc82099e6e3..00a71e5a897b 100644
--- a/devel/p5-autobox-Core/Makefile
+++ b/devel/p5-autobox-Core/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	autobox-Core
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-autobox-Core/pkg-plist b/devel/p5-autobox-Core/pkg-plist
index 455eb849eb0b..feb64c593697 100644
--- a/devel/p5-autobox-Core/pkg-plist
+++ b/devel/p5-autobox-Core/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/autobox::Core.3.gz
 %%SITE_PERL%%/autobox/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/autobox/Core/.packlist
diff --git a/devel/p5-autobox/Makefile b/devel/p5-autobox/Makefile
index d695b20363f4..0d0753c6325e 100644
--- a/devel/p5-autobox/Makefile
+++ b/devel/p5-autobox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	autobox
 PORTVERSION=	2.82
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHOCOLATE
diff --git a/devel/p5-autobox/pkg-plist b/devel/p5-autobox/pkg-plist
index b929742ed13e..db4ab9fc2c9f 100644
--- a/devel/p5-autobox/pkg-plist
+++ b/devel/p5-autobox/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/autobox/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/autobox/autobox.so
-%%SITE_PERL%%/%%PERL_ARCH%%/autobox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/autobox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/autobox/universal.pm
+%%SITE_ARCH%%/auto/autobox/autobox.so
+%%SITE_ARCH%%/autobox.pm
+%%SITE_ARCH%%/autobox.pod
+%%SITE_ARCH%%/autobox/universal.pm
 %%PERL5_MAN3%%/autobox.3.gz
diff --git a/devel/p5-autodie/Makefile b/devel/p5-autodie/Makefile
index 31cd7783a073..a509a66711bc 100644
--- a/devel/p5-autodie/Makefile
+++ b/devel/p5-autodie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	autodie
 PORTVERSION=	2.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-autodie/pkg-plist b/devel/p5-autodie/pkg-plist
index d4ce768b3fd7..675af4e8def8 100644
--- a/devel/p5-autodie/pkg-plist
+++ b/devel/p5-autodie/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/autodie/exception/system.pm
 %%SITE_PERL%%/autodie/hints.pm
 %%SITE_PERL%%/autodie/skip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/autodie/.packlist
diff --git a/devel/p5-autovivification/Makefile b/devel/p5-autovivification/Makefile
index 19b59a5b23ef..b039b2d0c540 100644
--- a/devel/p5-autovivification/Makefile
+++ b/devel/p5-autovivification/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	autovivification
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VPIT
diff --git a/devel/p5-autovivification/pkg-plist b/devel/p5-autovivification/pkg-plist
index 29faee55eecc..e0ecab733a2a 100644
--- a/devel/p5-autovivification/pkg-plist
+++ b/devel/p5-autovivification/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/autovivification.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/autovivification.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/autovivification/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/autovivification/autovivification.so
+%%SITE_ARCH%%/autovivification.pm
+%%SITE_ARCH%%/auto/autovivification/autovivification.so
diff --git a/devel/p5-bareword-filehandles/Makefile b/devel/p5-bareword-filehandles/Makefile
index a61b819431ac..9c491b27a233 100644
--- a/devel/p5-bareword-filehandles/Makefile
+++ b/devel/p5-bareword-filehandles/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bareword-filehandles
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ILMARI
diff --git a/devel/p5-bareword-filehandles/pkg-plist b/devel/p5-bareword-filehandles/pkg-plist
index fe553e76989c..daa7d983fcdc 100644
--- a/devel/p5-bareword-filehandles/pkg-plist
+++ b/devel/p5-bareword-filehandles/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/bareword/filehandles/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/bareword/filehandles/filehandles.so
-%%SITE_PERL%%/%%PERL_ARCH%%/bareword/filehandles.pm
+%%SITE_ARCH%%/auto/bareword/filehandles/filehandles.so
+%%SITE_ARCH%%/bareword/filehandles.pm
 %%PERL5_MAN3%%/bareword::filehandles.3.gz
diff --git a/devel/p5-base/Makefile b/devel/p5-base/Makefile
index 590d725f9a17..caaac4874b7e 100644
--- a/devel/p5-base/Makefile
+++ b/devel/p5-base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	base
 PORTVERSION=	2.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RGARCIA
diff --git a/devel/p5-base/pkg-plist b/devel/p5-base/pkg-plist
index 0c6de3ef855b..842d477adcfc 100644
--- a/devel/p5-base/pkg-plist
+++ b/devel/p5-base/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/fields.3.gz
 %%SITE_PERL%%/base.pm
 %%SITE_PERL%%/fields.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/base/.packlist
diff --git a/devel/p5-boolean/Makefile b/devel/p5-boolean/Makefile
index ae1385fd973c..a80783c267aa 100644
--- a/devel/p5-boolean/Makefile
+++ b/devel/p5-boolean/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	boolean
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/devel/p5-boolean/pkg-plist b/devel/p5-boolean/pkg-plist
index 47de12f4d723..6f7beac33c70 100644
--- a/devel/p5-boolean/pkg-plist
+++ b/devel/p5-boolean/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/boolean/.packlist
 %%PERL5_MAN3%%/boolean.3.gz
diff --git a/devel/p5-capitalization/Makefile b/devel/p5-capitalization/Makefile
index 77c6808a3871..a9b509ae3be9 100644
--- a/devel/p5-capitalization/Makefile
+++ b/devel/p5-capitalization/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	capitalization
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-capitalization/pkg-plist b/devel/p5-capitalization/pkg-plist
index c7fa41046ab9..ffae6fe927ab 100644
--- a/devel/p5-capitalization/pkg-plist
+++ b/devel/p5-capitalization/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/capitalization.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/capitalization/.packlist
 %%PERL5_MAN3%%/capitalization.3.gz
diff --git a/devel/p5-carton/Makefile b/devel/p5-carton/Makefile
index 448a96a2e72a..2d1291d4d7aa 100644
--- a/devel/p5-carton/Makefile
+++ b/devel/p5-carton/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	carton
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-common-sense/Makefile b/devel/p5-common-sense/Makefile
index f39acb4ab3c9..e149eaff7f01 100644
--- a/devel/p5-common-sense/Makefile
+++ b/devel/p5-common-sense/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	common-sense
 PORTVERSION=	3.73
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MLEHMANN
diff --git a/devel/p5-common-sense/pkg-plist b/devel/p5-common-sense/pkg-plist
index fd9ce083db04..50046b4b4bbc 100644
--- a/devel/p5-common-sense/pkg-plist
+++ b/devel/p5-common-sense/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/common::sense.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/common/sense/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/common/sense.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/common/sense.pod
+%%SITE_ARCH%%/common/sense.pm
+%%SITE_ARCH%%/common/sense.pod
diff --git a/devel/p5-constant-boolean/Makefile b/devel/p5-constant-boolean/Makefile
index 1a184da7a308..a24762c186e3 100644
--- a/devel/p5-constant-boolean/Makefile
+++ b/devel/p5-constant-boolean/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	constant-boolean
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-constant-boolean/pkg-plist b/devel/p5-constant-boolean/pkg-plist
index fe714b3559e7..a8155c1c23b0 100644
--- a/devel/p5-constant-boolean/pkg-plist
+++ b/devel/p5-constant-boolean/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/constant::boolean.3.gz
 %%SITE_PERL%%/constant/boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/constant/boolean/.packlist
diff --git a/devel/p5-constant-def/Makefile b/devel/p5-constant-def/Makefile
index 09cf7eaab368..1a849aa40f81 100644
--- a/devel/p5-constant-def/Makefile
+++ b/devel/p5-constant-def/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	constant-def
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-constant-def/pkg-plist b/devel/p5-constant-def/pkg-plist
index ed0508ae22ea..e455138987d3 100644
--- a/devel/p5-constant-def/pkg-plist
+++ b/devel/p5-constant-def/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/constant/abs.pm
 %%SITE_PERL%%/constant/def.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/constant/def/.packlist
 %%PERL5_MAN3%%/constant::def.3.gz
 %%PERL5_MAN3%%/constant::abs.3.gz
diff --git a/devel/p5-constant-lexical/Makefile b/devel/p5-constant-lexical/Makefile
index 0a025b205d99..a1fac3ac8293 100644
--- a/devel/p5-constant-lexical/Makefile
+++ b/devel/p5-constant-lexical/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	constant-lexical
 PORTVERSION=	2.0001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SPROUT
diff --git a/devel/p5-constant-lexical/pkg-plist b/devel/p5-constant-lexical/pkg-plist
index 841287ae9cb6..4378d4cb4c0e 100644
--- a/devel/p5-constant-lexical/pkg-plist
+++ b/devel/p5-constant-lexical/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/constant::lexical.3.gz
 %%SITE_PERL%%/constant/lexical.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/constant/lexical/.packlist
diff --git a/devel/p5-constant/Makefile b/devel/p5-constant/Makefile
index 2efe64265f9d..5164e9c30308 100644
--- a/devel/p5-constant/Makefile
+++ b/devel/p5-constant/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	constant
 PORTVERSION=	1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-constant/pkg-plist b/devel/p5-constant/pkg-plist
index 57c38fdb9cdf..baf429f430a2 100644
--- a/devel/p5-constant/pkg-plist
+++ b/devel/p5-constant/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/constant.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/constant/.packlist
 %%PERL5_MAN3%%/constant.3.gz
diff --git a/devel/p5-cpan-listchanges/Makefile b/devel/p5-cpan-listchanges/Makefile
index 8d79eb081610..3e7e24389bda 100644
--- a/devel/p5-cpan-listchanges/Makefile
+++ b/devel/p5-cpan-listchanges/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cpan-listchanges
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/devel/p5-enum/Makefile b/devel/p5-enum/Makefile
index fe9c59bd5756..e65ceb75349a 100644
--- a/devel/p5-enum/Makefile
+++ b/devel/p5-enum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	enum
 PORTVERSION=	1.090
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEILB
diff --git a/devel/p5-enum/pkg-plist b/devel/p5-enum/pkg-plist
index debce6134c64..b2579455320d 100644
--- a/devel/p5-enum/pkg-plist
+++ b/devel/p5-enum/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/enum.3.gz
 %%SITE_PERL%%/enum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/enum/.packlist
diff --git a/devel/p5-ex-lib/Makefile b/devel/p5-ex-lib/Makefile
index 718907f94c88..da129db4310d 100644
--- a/devel/p5-ex-lib/Makefile
+++ b/devel/p5-ex-lib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ex-lib
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ex-lib/pkg-plist b/devel/p5-ex-lib/pkg-plist
index 7594fa844929..a19928ba4f8a 100644
--- a/devel/p5-ex-lib/pkg-plist
+++ b/devel/p5-ex-lib/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ex/lib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ex/lib/.packlist
 %%PERL5_MAN3%%/ex::lib.3.gz
diff --git a/devel/p5-experimental/Makefile b/devel/p5-experimental/Makefile
index a3d2e369edd0..452ac4f87c7f 100644
--- a/devel/p5-experimental/Makefile
+++ b/devel/p5-experimental/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	experimental
 PORTVERSION=	0.013
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LEONT
diff --git a/devel/p5-experimental/pkg-plist b/devel/p5-experimental/pkg-plist
index e73dda259ade..aaa6e0a63ad0 100644
--- a/devel/p5-experimental/pkg-plist
+++ b/devel/p5-experimental/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/experimental.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/experimental/.packlist
 %%PERL5_MAN3%%/experimental.3.gz
diff --git a/devel/p5-forks/Makefile b/devel/p5-forks/Makefile
index b96619ff6397..69f35c7b4672 100644
--- a/devel/p5-forks/Makefile
+++ b/devel/p5-forks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	forks
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	SOAP/RYBSKEJ
diff --git a/devel/p5-forks/pkg-plist b/devel/p5-forks/pkg-plist
index 6be938660181..ab18cefe96dc 100644
--- a/devel/p5-forks/pkg-plist
+++ b/devel/p5-forks/pkg-plist
@@ -6,15 +6,14 @@
 %%PERL5_MAN3%%/threads::shared::handle.3.gz
 %%PERL5_MAN3%%/threads::shared::hash.3.gz
 %%PERL5_MAN3%%/threads::shared::scalar.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/forks/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/forks/forks.so
-%%SITE_PERL%%/%%PERL_ARCH%%/forks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/forks/Devel/Symdump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/forks/shared.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/forks/shared/attributes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/forks/shared/global_filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/forks/signals.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/threads/shared/array.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/threads/shared/handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/threads/shared/hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/threads/shared/scalar.pm
+%%SITE_ARCH%%/auto/forks/forks.so
+%%SITE_ARCH%%/forks.pm
+%%SITE_ARCH%%/forks/Devel/Symdump.pm
+%%SITE_ARCH%%/forks/shared.pm
+%%SITE_ARCH%%/forks/shared/attributes.pm
+%%SITE_ARCH%%/forks/shared/global_filter.pm
+%%SITE_ARCH%%/forks/signals.pm
+%%SITE_ARCH%%/threads/shared/array.pm
+%%SITE_ARCH%%/threads/shared/handle.pm
+%%SITE_ARCH%%/threads/shared/hash.pm
+%%SITE_ARCH%%/threads/shared/scalar.pm
diff --git a/devel/p5-github_creator/Makefile b/devel/p5-github_creator/Makefile
index 1a315e44e7af..89f7a34bacb3 100644
--- a/devel/p5-github_creator/Makefile
+++ b/devel/p5-github_creator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	github_creator
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BDFOY
diff --git a/devel/p5-github_creator/pkg-plist b/devel/p5-github_creator/pkg-plist
index 75629c2b3f88..48cc1e3b2797 100644
--- a/devel/p5-github_creator/pkg-plist
+++ b/devel/p5-github_creator/pkg-plist
@@ -1,3 +1,2 @@
 bin/github_creator
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/github_creator/.packlist
 man/man1/github_creator.1.gz
diff --git a/devel/p5-iCal-Parser/Makefile b/devel/p5-iCal-Parser/Makefile
index 98953846c575..d3cd06dbbe39 100644
--- a/devel/p5-iCal-Parser/Makefile
+++ b/devel/p5-iCal-Parser/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	iCal-Parser
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-iCal-Parser/pkg-plist b/devel/p5-iCal-Parser/pkg-plist
index ffdee9dc5e88..844342834f58 100644
--- a/devel/p5-iCal-Parser/pkg-plist
+++ b/devel/p5-iCal-Parser/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/iCal/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/iCal/Parser/.packlist
 %%PERL5_MAN3%%/iCal::Parser.3.gz
diff --git a/devel/p5-indirect/Makefile b/devel/p5-indirect/Makefile
index 182cc0d42cd8..a8c68ce57b5f 100644
--- a/devel/p5-indirect/Makefile
+++ b/devel/p5-indirect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	indirect
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VPIT
diff --git a/devel/p5-indirect/pkg-plist b/devel/p5-indirect/pkg-plist
index 1be20f7cc19a..fa63b515cd71 100644
--- a/devel/p5-indirect/pkg-plist
+++ b/devel/p5-indirect/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/indirect.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/indirect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/indirect/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/indirect/indirect.so
+%%SITE_ARCH%%/indirect.pm
+%%SITE_ARCH%%/auto/indirect/indirect.so
diff --git a/devel/p5-interface/Makefile b/devel/p5-interface/Makefile
index f6f39fd49be4..40a814eaa8ce 100644
--- a/devel/p5-interface/Makefile
+++ b/devel/p5-interface/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	interface
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SWALTERS
diff --git a/devel/p5-interface/pkg-plist b/devel/p5-interface/pkg-plist
index 0d368e3b3b42..412f4c0d15b4 100644
--- a/devel/p5-interface/pkg-plist
+++ b/devel/p5-interface/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/interface/.packlist
 %%SITE_PERL%%/interface.pm
 %%PERL5_MAN3%%/interface.3.gz
diff --git a/devel/p5-latest/Makefile b/devel/p5-latest/Makefile
index 9c567532cd10..598ca31b7cf9 100644
--- a/devel/p5-latest/Makefile
+++ b/devel/p5-latest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	latest
 PORTVERSION=	0.03
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ANDYA
diff --git a/devel/p5-lexical-underscore/Makefile b/devel/p5-lexical-underscore/Makefile
index 56fff1ddc9ad..be3dbfa394d4 100644
--- a/devel/p5-lexical-underscore/Makefile
+++ b/devel/p5-lexical-underscore/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lexical-underscore
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/devel/p5-lexical-underscore/pkg-plist b/devel/p5-lexical-underscore/pkg-plist
index 3b93e029ad07..5c6c16019bbc 100644
--- a/devel/p5-lexical-underscore/pkg-plist
+++ b/devel/p5-lexical-underscore/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/lexical/underscore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/lexical/underscore/.packlist
 %%PERL5_MAN3%%/lexical::underscore.3.gz
diff --git a/devel/p5-lib-abs/Makefile b/devel/p5-lib-abs/Makefile
index c16c7b039026..40f1d8a2aacd 100644
--- a/devel/p5-lib-abs/Makefile
+++ b/devel/p5-lib-abs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lib-abs
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-lib-abs/pkg-plist b/devel/p5-lib-abs/pkg-plist
index c87372db349b..47422eab3b14 100644
--- a/devel/p5-lib-abs/pkg-plist
+++ b/devel/p5-lib-abs/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/lib/abs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/lib/abs/.packlist
 %%PERL5_MAN3%%/lib::abs.3.gz
diff --git a/devel/p5-libalarm/Makefile b/devel/p5-libalarm/Makefile
index ba6ca9d595c9..7a5fee28423d 100644
--- a/devel/p5-libalarm/Makefile
+++ b/devel/p5-libalarm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libalarm
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN/Alarm
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-libalarm/pkg-plist b/devel/p5-libalarm/pkg-plist
index ee8e28af585e..e4fa3a09d639 100644
--- a/devel/p5-libalarm/pkg-plist
+++ b/devel/p5-libalarm/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Alarm/Concurrent.pm
 %%SITE_PERL%%/Alarm/Queued.pm
 %%SITE_PERL%%/Alarm/_TieSIG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libalarm/.packlist
 %%PERL5_MAN3%%/Alarm::_TieSIG.3.gz
 %%PERL5_MAN3%%/Alarm::Concurrent.3.gz
 %%PERL5_MAN3%%/Alarm::Queued.3.gz
diff --git a/devel/p5-libxml-enno/Makefile b/devel/p5-libxml-enno/Makefile
index 4ce4b4cca04f..33fd75e0ffa9 100644
--- a/devel/p5-libxml-enno/Makefile
+++ b/devel/p5-libxml-enno/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libxml-enno
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	devel textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ENNO
diff --git a/devel/p5-libxml-enno/pkg-plist b/devel/p5-libxml-enno/pkg-plist
index 2cf1345a31c8..f6ba86adbfbf 100644
--- a/devel/p5-libxml-enno/pkg-plist
+++ b/devel/p5-libxml-enno/pkg-plist
@@ -48,7 +48,6 @@ bin/xql.pl
 %%SITE_PERL%%/XML/XQL/Plus.pm
 %%SITE_PERL%%/XML/XQL/Parser.pm
 %%SITE_PERL%%/XML/XQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-enno/.packlist
 %%PERL5_MAN3%%/XML::Checker.3.gz
 %%PERL5_MAN3%%/XML::Checker::Parser.3.gz
 %%PERL5_MAN3%%/XML::DOM.3.gz
diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index 75001b414a80..1e99bf4cb1f5 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	local-lib
 PORTVERSION=	2.000014
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
diff --git a/devel/p5-local-lib/pkg-plist b/devel/p5-local-lib/pkg-plist
index 7cf058e85a13..73f348bd9cb8 100644
--- a/devel/p5-local-lib/pkg-plist
+++ b/devel/p5-local-lib/pkg-plist
@@ -2,7 +2,6 @@
 %%PERL5_MAN3%%/POD2::PT_BR::local::lib.3.gz
 %%PERL5_MAN3%%/lib::core::only.3.gz
 %%PERL5_MAN3%%/local::lib.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/local/lib/.packlist
 %%SITE_PERL%%/lib/core/only.pm
 %%SITE_PERL%%/local/lib.pm
 %%SITE_PERL%%/POD2/DE/local/lib.pod
diff --git a/devel/p5-match-simple/Makefile b/devel/p5-match-simple/Makefile
index e08ef6a24eda..8a54c685ff65 100644
--- a/devel/p5-match-simple/Makefile
+++ b/devel/p5-match-simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	match-simple
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/devel/p5-match-simple/pkg-plist b/devel/p5-match-simple/pkg-plist
index 31da3b86ad75..a177c505b29b 100644
--- a/devel/p5-match-simple/pkg-plist
+++ b/devel/p5-match-simple/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/match/simple/.packlist
 %%SITE_PERL%%/match/simple.pm
 %%SITE_PERL%%/match/smart.pm
 %%PERL5_MAN3%%/match::simple.3.gz
diff --git a/devel/p5-mixin/Makefile b/devel/p5-mixin/Makefile
index a2b01cecd37a..cecb2882fcc1 100644
--- a/devel/p5-mixin/Makefile
+++ b/devel/p5-mixin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mixin
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSCHWERN
diff --git a/devel/p5-mocked/Makefile b/devel/p5-mocked/Makefile
index f945f0c5d682..d2149823876c 100644
--- a/devel/p5-mocked/Makefile
+++ b/devel/p5-mocked/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mocked
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LUKEC
diff --git a/devel/p5-mocked/pkg-plist b/devel/p5-mocked/pkg-plist
index fee8e96cd479..cc8d3b114798 100644
--- a/devel/p5-mocked/pkg-plist
+++ b/devel/p5-mocked/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mocked/.packlist
 %%SITE_PERL%%/mocked.pm
 %%SITE_PERL%%/unmocked.pm
 %%PERL5_MAN3%%/mocked.3.gz
diff --git a/devel/p5-multidimensional/Makefile b/devel/p5-multidimensional/Makefile
index 0f47b47b3989..17e18b6e3d2f 100644
--- a/devel/p5-multidimensional/Makefile
+++ b/devel/p5-multidimensional/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	multidimensional
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ILMARI
diff --git a/devel/p5-multidimensional/pkg-plist b/devel/p5-multidimensional/pkg-plist
index 4ac5e83dba04..c919beeaef95 100644
--- a/devel/p5-multidimensional/pkg-plist
+++ b/devel/p5-multidimensional/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/multidimensional/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/multidimensional/multidimensional.so
-%%SITE_PERL%%/%%PERL_ARCH%%/multidimensional.pm
+%%SITE_ARCH%%/auto/multidimensional/multidimensional.so
+%%SITE_ARCH%%/multidimensional.pm
 %%PERL5_MAN3%%/multidimensional.3.gz
diff --git a/devel/p5-namespace-autoclean/Makefile b/devel/p5-namespace-autoclean/Makefile
index 7dcb4c7780df..5b31c7577aee 100644
--- a/devel/p5-namespace-autoclean/Makefile
+++ b/devel/p5-namespace-autoclean/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	namespace-autoclean
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/devel/p5-namespace-autoclean/pkg-plist b/devel/p5-namespace-autoclean/pkg-plist
index ec79efbf25a2..e5baacb3f128 100644
--- a/devel/p5-namespace-autoclean/pkg-plist
+++ b/devel/p5-namespace-autoclean/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/namespace::autoclean.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/namespace/autoclean/.packlist
 %%SITE_PERL%%/namespace/autoclean.pm
diff --git a/devel/p5-namespace-clean/Makefile b/devel/p5-namespace-clean/Makefile
index 8dbe75d5a845..81ad8fbc00cb 100644
--- a/devel/p5-namespace-clean/Makefile
+++ b/devel/p5-namespace-clean/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	namespace-clean
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-namespace-clean/pkg-plist b/devel/p5-namespace-clean/pkg-plist
index 52cf0ce18230..35ecbd15f081 100644
--- a/devel/p5-namespace-clean/pkg-plist
+++ b/devel/p5-namespace-clean/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/namespace::clean.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/namespace/clean/.packlist
 %%SITE_PERL%%/namespace/clean.pm
diff --git a/devel/p5-namespace-sweep/Makefile b/devel/p5-namespace-sweep/Makefile
index 1beb676f11bb..35959dd038ad 100644
--- a/devel/p5-namespace-sweep/Makefile
+++ b/devel/p5-namespace-sweep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	namespace-sweep
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-namespace-sweep/pkg-plist b/devel/p5-namespace-sweep/pkg-plist
index 201414827ff5..4f6005a4f800 100644
--- a/devel/p5-namespace-sweep/pkg-plist
+++ b/devel/p5-namespace-sweep/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/namespace/sweep/.packlist
 %%SITE_PERL%%/namespace/sweep.pm
 %%PERL5_MAN3%%/namespace::sweep.3.gz
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index c80d097aecb3..cbaaab4d229a 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	orz
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN/INGY
diff --git a/devel/p5-orz/pkg-plist b/devel/p5-orz/pkg-plist
index e47393b90f99..b4aef2257d04 100644
--- a/devel/p5-orz/pkg-plist
+++ b/devel/p5-orz/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/orz.pm
 %%SITE_PERL%%/orz.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/orz/.packlist
 %%PERL5_MAN3%%/orz.3.gz
diff --git a/devel/p5-parent/Makefile b/devel/p5-parent/Makefile
index 1e1ed6cc3158..e5158d4b4af7 100644
--- a/devel/p5-parent/Makefile
+++ b/devel/p5-parent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	parent
 PORTVERSION=	0.228
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CORION
diff --git a/devel/p5-parent/pkg-plist b/devel/p5-parent/pkg-plist
index a4e0e1cb5246..0af2237985d4 100644
--- a/devel/p5-parent/pkg-plist
+++ b/devel/p5-parent/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/parent/.packlist
 %%SITE_PERL%%/parent.pm
 %%PERL5_MAN3%%/parent.3.gz
diff --git a/devel/p5-perlbrew/Makefile b/devel/p5-perlbrew/Makefile
index 52974b512791..113ac77ea0b6 100644
--- a/devel/p5-perlbrew/Makefile
+++ b/devel/p5-perlbrew/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	perlbrew
 PORTVERSION=	0.59
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GUGOD
diff --git a/devel/p5-perlbrew/pkg-plist b/devel/p5-perlbrew/pkg-plist
index da3bb605b07c..86a59598ed9d 100644
--- a/devel/p5-perlbrew/pkg-plist
+++ b/devel/p5-perlbrew/pkg-plist
@@ -2,4 +2,3 @@ bin/perlbrew
 man/man1/perlbrew.1.gz
 %%PERL5_MAN3%%/App::perlbrew.3.gz
 %%SITE_PERL%%/App/perlbrew.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/perlbrew/.packlist
diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde/Makefile
index 708416aa3519..a7fae320c41b 100644
--- a/devel/p5-perlkde/Makefile
+++ b/devel/p5-perlkde/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	perlkde
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde perl5
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	p5-
@@ -16,7 +17,7 @@ USE_QT4=	network opengl sql svg xml \
 USES=		cmake:outsource compiler:c++11-lib perl5 tar:xz
 
 # Respect PREFIX
-CMAKE_ARGS+=	-DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}
+CMAKE_ARGS+=	-DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_ARCH_REL}
 
 # Fix build PREFIX != KDE4_PREFIX
 CMAKE_ARGS+=	-DSmoke_DIR=${KDE4_PREFIX}/lib/cmake/smoke \
diff --git a/devel/p5-perlkde/pkg-plist b/devel/p5-perlkde/pkg-plist
index 504884cc7d3e..7789b90b5a1c 100644
--- a/devel/p5-perlkde/pkg-plist
+++ b/devel/p5-perlkde/pkg-plist
@@ -1,43 +1,43 @@
 lib/kde4/kperlpluginfactory.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Akonadi.pm
-%%ATTICA%%%%SITE_PERL%%/%%PERL_ARCH%%/Attica.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KDECore4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KDEUi4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KHTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KIO4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KNewStuff2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KNewStuff3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KParts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KTextEditor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Kate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Nepomuk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NepomukQuery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Okular.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Plasma4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Solid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Soprano.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SopranoClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SopranoServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Akonadi/Akonadi.so
-%%ATTICA%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attica/Attica.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KDECore4/KDECore4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KDEUi4/KDEUi4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KFile/KFile.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KHTML/KHTML.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KIO4/KIO4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KNewStuff2/KNewStuff2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KNewStuff3/KNewStuff3.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KParts/KParts.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KTextEditor/KTextEditor.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KUtils/KUtils.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kate/Kate.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nepomuk/Nepomuk.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NepomukQuery/NepomukQuery.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Okular/Okular.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plasma4/Plasma4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Solid/Solid.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Soprano/Soprano.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SopranoClient/SopranoClient.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SopranoServer/SopranoServer.so
+%%SITE_ARCH%%/Akonadi.pm
+%%ATTICA%%%%SITE_ARCH%%/Attica.pm
+%%SITE_ARCH%%/KDECore4.pm
+%%SITE_ARCH%%/KDEUi4.pm
+%%SITE_ARCH%%/KFile.pm
+%%SITE_ARCH%%/KHTML.pm
+%%SITE_ARCH%%/KIO4.pm
+%%SITE_ARCH%%/KNewStuff2.pm
+%%SITE_ARCH%%/KNewStuff3.pm
+%%SITE_ARCH%%/KParts.pm
+%%SITE_ARCH%%/KTextEditor.pm
+%%SITE_ARCH%%/KUtils.pm
+%%SITE_ARCH%%/Kate.pm
+%%SITE_ARCH%%/Nepomuk.pm
+%%SITE_ARCH%%/NepomukQuery.pm
+%%SITE_ARCH%%/Okular.pm
+%%SITE_ARCH%%/Plasma4.pm
+%%SITE_ARCH%%/Solid.pm
+%%SITE_ARCH%%/Soprano.pm
+%%SITE_ARCH%%/SopranoClient.pm
+%%SITE_ARCH%%/SopranoServer.pm
+%%SITE_ARCH%%/auto/Akonadi/Akonadi.so
+%%ATTICA%%%%SITE_ARCH%%/auto/Attica/Attica.so
+%%SITE_ARCH%%/auto/KDECore4/KDECore4.so
+%%SITE_ARCH%%/auto/KDEUi4/KDEUi4.so
+%%SITE_ARCH%%/auto/KFile/KFile.so
+%%SITE_ARCH%%/auto/KHTML/KHTML.so
+%%SITE_ARCH%%/auto/KIO4/KIO4.so
+%%SITE_ARCH%%/auto/KNewStuff2/KNewStuff2.so
+%%SITE_ARCH%%/auto/KNewStuff3/KNewStuff3.so
+%%SITE_ARCH%%/auto/KParts/KParts.so
+%%SITE_ARCH%%/auto/KTextEditor/KTextEditor.so
+%%SITE_ARCH%%/auto/KUtils/KUtils.so
+%%SITE_ARCH%%/auto/Kate/Kate.so
+%%SITE_ARCH%%/auto/Nepomuk/Nepomuk.so
+%%SITE_ARCH%%/auto/NepomukQuery/NepomukQuery.so
+%%SITE_ARCH%%/auto/Okular/Okular.so
+%%SITE_ARCH%%/auto/Plasma4/Plasma4.so
+%%SITE_ARCH%%/auto/Solid/Solid.so
+%%SITE_ARCH%%/auto/Soprano/Soprano.so
+%%SITE_ARCH%%/auto/SopranoClient/SopranoClient.so
+%%SITE_ARCH%%/auto/SopranoServer/SopranoServer.so
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index 6694f30555dc..9ff8ec6fe2b2 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	perlqt
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde perl5
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	p5-
@@ -19,12 +20,12 @@ USE_QT4=	corelib dbus gui network xml \
 USES=		cmake:outsource perl5 tar:xz
 
 # Respect PREFIX
-CMAKE_ARGS+=	-DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}
+CMAKE_ARGS+=	-DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_ARCH_REL}
 # Fix build PREFIX != KDE4_PREFIX
 CMAKE_ARGS+=	-DSmoke_DIR=${KDE4_PREFIX}/lib/cmake/smoke
 
 SUB_FILES=	perl-kdebindings-env.sh pkg-message
-SUB_LIST+=	PERL5LIBDIR="${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}:\
+SUB_LIST+=	PERL5LIBDIR="${PREFIX}/${SITE_ARCH_REL}:\
 				${PREFIX}/${SITE_PERL_REL}"
 
 post-install:
diff --git a/devel/p5-perlqt/pkg-plist b/devel/p5-perlqt/pkg-plist
index b3ee07fdeba8..a866ea4edc2f 100644
--- a/devel/p5-perlqt/pkg-plist
+++ b/devel/p5-perlqt/pkg-plist
@@ -17,53 +17,53 @@ include/perlqt/ppport.h
 include/perlqt/smokehelp.h
 include/perlqt/smokeperl.h
 include/perlqt/util.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Phonon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QImageBlitz.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Qsci.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Qt3Support4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtCore4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtCore4/classinfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtCore4/debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtCore4/isa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtCore4/signals.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtCore4/slots.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtDBus4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtDeclarative4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtGui4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtHelp4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtMultimedia4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtNetwork4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtOpenGL4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtScript4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtSql4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtSvg4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtTest4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtUiTools4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtWebKit4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtXml4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/QtXmlPatterns4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Qwt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Phonon/Phonon.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QImageBlitz/QImageBlitz.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qsci/Qsci.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qt3Support4/Qt3Support4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtCore4/QtCore4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtDBus4/QtDBus4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtDeclarative4/QtDeclarative4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtGui4/QtGui4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtHelp4/QtHelp4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtMultimedia4/QtMultimedia4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtNetwork4/QtNetwork4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtOpenGL4/QtOpenGL4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtScript4/QtScript4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtSql4/QtSql4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtSvg4/QtSvg4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtTest4/QtTest4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtUiTools4/QtUiTools4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtWebKit4/QtWebKit4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtXml4/QtXml4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/QtXmlPatterns4/QtXmlPatterns4.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qwt/Qwt.so
+%%SITE_ARCH%%/Phonon.pm
+%%SITE_ARCH%%/QImageBlitz.pm
+%%SITE_ARCH%%/Qsci.pm
+%%SITE_ARCH%%/Qt3Support4.pm
+%%SITE_ARCH%%/QtCore4.pm
+%%SITE_ARCH%%/QtCore4/classinfo.pm
+%%SITE_ARCH%%/QtCore4/debug.pm
+%%SITE_ARCH%%/QtCore4/isa.pm
+%%SITE_ARCH%%/QtCore4/signals.pm
+%%SITE_ARCH%%/QtCore4/slots.pm
+%%SITE_ARCH%%/QtDBus4.pm
+%%SITE_ARCH%%/QtDeclarative4.pm
+%%SITE_ARCH%%/QtGui4.pm
+%%SITE_ARCH%%/QtHelp4.pm
+%%SITE_ARCH%%/QtMultimedia4.pm
+%%SITE_ARCH%%/QtNetwork4.pm
+%%SITE_ARCH%%/QtOpenGL4.pm
+%%SITE_ARCH%%/QtScript4.pm
+%%SITE_ARCH%%/QtSql4.pm
+%%SITE_ARCH%%/QtSvg4.pm
+%%SITE_ARCH%%/QtTest4.pm
+%%SITE_ARCH%%/QtUiTools4.pm
+%%SITE_ARCH%%/QtWebKit4.pm
+%%SITE_ARCH%%/QtXml4.pm
+%%SITE_ARCH%%/QtXmlPatterns4.pm
+%%SITE_ARCH%%/Qwt.pm
+%%SITE_ARCH%%/auto/Phonon/Phonon.so
+%%SITE_ARCH%%/auto/QImageBlitz/QImageBlitz.so
+%%SITE_ARCH%%/auto/Qsci/Qsci.so
+%%SITE_ARCH%%/auto/Qt3Support4/Qt3Support4.so
+%%SITE_ARCH%%/auto/QtCore4/QtCore4.so
+%%SITE_ARCH%%/auto/QtDBus4/QtDBus4.so
+%%SITE_ARCH%%/auto/QtDeclarative4/QtDeclarative4.so
+%%SITE_ARCH%%/auto/QtGui4/QtGui4.so
+%%SITE_ARCH%%/auto/QtHelp4/QtHelp4.so
+%%SITE_ARCH%%/auto/QtMultimedia4/QtMultimedia4.so
+%%SITE_ARCH%%/auto/QtNetwork4/QtNetwork4.so
+%%SITE_ARCH%%/auto/QtOpenGL4/QtOpenGL4.so
+%%SITE_ARCH%%/auto/QtScript4/QtScript4.so
+%%SITE_ARCH%%/auto/QtSql4/QtSql4.so
+%%SITE_ARCH%%/auto/QtSvg4/QtSvg4.so
+%%SITE_ARCH%%/auto/QtTest4/QtTest4.so
+%%SITE_ARCH%%/auto/QtUiTools4/QtUiTools4.so
+%%SITE_ARCH%%/auto/QtWebKit4/QtWebKit4.so
+%%SITE_ARCH%%/auto/QtXml4/QtXml4.so
+%%SITE_ARCH%%/auto/QtXmlPatterns4/QtXmlPatterns4.so
+%%SITE_ARCH%%/auto/Qwt/Qwt.so
 share/perlqt/cmake/FindPerlMore.cmake
 share/perlqt/cmake/PerlQtConfig.cmake
 share/perlqt/cmake/PerlQtExport-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/devel/p5-pip/Makefile b/devel/p5-pip/Makefile
index aa52a4922c49..ba11df1b2141 100644
--- a/devel/p5-pip/Makefile
+++ b/devel/p5-pip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pip
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/devel/p5-pip/pkg-plist b/devel/p5-pip/pkg-plist
index ecd3b24a1e5c..b0a21de82b8b 100644
--- a/devel/p5-pip/pkg-plist
+++ b/devel/p5-pip/pkg-plist
@@ -4,7 +4,6 @@ bin/pip-perl
 %%SITE_PERL%%/Module/Plan/Archive.pm
 %%SITE_PERL%%/Module/P5Z.pm
 %%SITE_PERL%%/pip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pip/.packlist
 %%PERL5_MAN3%%/Module::Plan::Base.3.gz
 %%PERL5_MAN3%%/Module::Plan::Lite.3.gz
 %%PERL5_MAN3%%/pip.3.gz
diff --git a/devel/p5-prefork/Makefile b/devel/p5-prefork/Makefile
index 28ae9581dd77..edd688b63b46 100644
--- a/devel/p5-prefork/Makefile
+++ b/devel/p5-prefork/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	prefork
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/devel/p5-prefork/pkg-plist b/devel/p5-prefork/pkg-plist
index 3e99add2432e..7663a7a3b295 100644
--- a/devel/p5-prefork/pkg-plist
+++ b/devel/p5-prefork/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/prefork.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/prefork/.packlist
 %%SITE_PERL%%/prefork.pm
diff --git a/devel/p5-reaper/Makefile b/devel/p5-reaper/Makefile
index 055d24544090..c6acf2b6966c 100644
--- a/devel/p5-reaper/Makefile
+++ b/devel/p5-reaper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	reaper
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JGS
diff --git a/devel/p5-reaper/pkg-plist b/devel/p5-reaper/pkg-plist
index 46dce1b5fd49..92130222443f 100644
--- a/devel/p5-reaper/pkg-plist
+++ b/devel/p5-reaper/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Reaper.3.gz
 %%PERL5_MAN3%%/reaper.3.gz
 %%SITE_PERL%%/Reaper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Reaper/.packlist
 %%SITE_PERL%%/reaper.pm
diff --git a/devel/p5-relative/Makefile b/devel/p5-relative/Makefile
index e21d2cc6614a..80f5f069b609 100644
--- a/devel/p5-relative/Makefile
+++ b/devel/p5-relative/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	relative
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAPER
diff --git a/devel/p5-relative/pkg-plist b/devel/p5-relative/pkg-plist
index 17730999f9d2..e5a9f95097b4 100644
--- a/devel/p5-relative/pkg-plist
+++ b/devel/p5-relative/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/relative.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/relative/.packlist
 %%PERL5_MAN3%%/relative.3.gz
diff --git a/devel/p5-rpm-build-perl/Makefile b/devel/p5-rpm-build-perl/Makefile
index ef2ba951e3a2..aad4c1de4407 100644
--- a/devel/p5-rpm-build-perl/Makefile
+++ b/devel/p5-rpm-build-perl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rpm-build-perl
 PORTVERSION=	0.82
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ATOURBIN
diff --git a/devel/p5-rpm-build-perl/pkg-plist b/devel/p5-rpm-build-perl/pkg-plist
index 62380b56b77f..92e8126f873e 100644
--- a/devel/p5-rpm-build-perl/pkg-plist
+++ b/devel/p5-rpm-build-perl/pkg-plist
@@ -7,13 +7,12 @@ bin/perl.req.files
 %%PERL5_MAN3%%/B::PerlReq.3.gz
 %%PERL5_MAN3%%/B::Walker.3.gz
 %%PERL5_MAN3%%/PerlReq::Utils.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Clobbers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/ConstOptree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/PerlReq.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Walker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlReq/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/ConstOptree/ConstOptree.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/rpm-build-perl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/fake.pm
+%%SITE_ARCH%%/B/Clobbers.pm
+%%SITE_ARCH%%/B/ConstOptree.pm
+%%SITE_ARCH%%/B/PerlReq.pm
+%%SITE_ARCH%%/B/Walker.pm
+%%SITE_ARCH%%/PerlReq/Utils.pm
+%%SITE_ARCH%%/auto/B/ConstOptree/ConstOptree.so
+%%SITE_ARCH%%/fake.pm
 man/man1/perl.prov.1.gz
 man/man1/perl.req.1.gz
diff --git a/devel/p5-self-init/Makefile b/devel/p5-self-init/Makefile
index 5d67dde0bc27..8df396e98771 100644
--- a/devel/p5-self-init/Makefile
+++ b/devel/p5-self-init/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	self-init
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MONS
diff --git a/devel/p5-self-init/pkg-plist b/devel/p5-self-init/pkg-plist
index 3bb47402e8f2..2d23a982e591 100644
--- a/devel/p5-self-init/pkg-plist
+++ b/devel/p5-self-init/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/self::init.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/self/init/.packlist
 %%SITE_PERL%%/self/init.pm
diff --git a/devel/p5-self/Makefile b/devel/p5-self/Makefile
index 891e63f31ac3..b4fbdf1b3ff7 100644
--- a/devel/p5-self/Makefile
+++ b/devel/p5-self/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	self
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GUGOD
diff --git a/devel/p5-self/pkg-plist b/devel/p5-self/pkg-plist
index a3e0f559773d..9141bf0d57bc 100644
--- a/devel/p5-self/pkg-plist
+++ b/devel/p5-self/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/self.3.gz
 %%PERL5_MAN3%%/self::implicit.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/self/.packlist
 %%SITE_PERL%%/self.pm
 %%SITE_PERL%%/self/implicit.pm
diff --git a/devel/p5-strictures/Makefile b/devel/p5-strictures/Makefile
index a4e5a866f7f3..d0737cc7bd1b 100644
--- a/devel/p5-strictures/Makefile
+++ b/devel/p5-strictures/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	strictures
 PORTVERSION=	1.005005
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
diff --git a/devel/p5-strictures/pkg-plist b/devel/p5-strictures/pkg-plist
index c3d2367840f5..d0be6e334a06 100644
--- a/devel/p5-strictures/pkg-plist
+++ b/devel/p5-strictures/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/strictures.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/strictures/.packlist
 %%SITE_PERL%%/strictures.pm
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 56c3feb48d1d..5c8d7f408c74 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
 
 USES=		perl5
-USE_PERL5=	build run fixpacklist
+USE_PERL5=	build run
 
 SVN_BUILD_BINDINGS=	yes
 SVN_BUILD_ADDONS=	yes
diff --git a/devel/p5-subversion/pkg-plist b/devel/p5-subversion/pkg-plist
index 7b275ea7a0d2..90ad30e4b864 100644
--- a/devel/p5-subversion/pkg-plist
+++ b/devel/p5-subversion/pkg-plist
@@ -10,19 +10,18 @@ lib/libsvn_swig_perl-1.so.0.0.0
 %%PERL5_MAN3%%/SVN::Ra.3.gz
 %%PERL5_MAN3%%/SVN::Repos.3.gz
 %%PERL5_MAN3%%/SVN::Wc.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so
+%%SITE_ARCH%%/SVN/Base.pm
+%%SITE_ARCH%%/SVN/Client.pm
+%%SITE_ARCH%%/SVN/Core.pm
+%%SITE_ARCH%%/SVN/Delta.pm
+%%SITE_ARCH%%/SVN/Fs.pm
+%%SITE_ARCH%%/SVN/Ra.pm
+%%SITE_ARCH%%/SVN/Repos.pm
+%%SITE_ARCH%%/SVN/Wc.pm
+%%SITE_ARCH%%/auto/SVN/_Client/_Client.so
+%%SITE_ARCH%%/auto/SVN/_Core/_Core.so
+%%SITE_ARCH%%/auto/SVN/_Delta/_Delta.so
+%%SITE_ARCH%%/auto/SVN/_Fs/_Fs.so
+%%SITE_ARCH%%/auto/SVN/_Ra/_Ra.so
+%%SITE_ARCH%%/auto/SVN/_Repos/_Repos.so
+%%SITE_ARCH%%/auto/SVN/_Wc/_Wc.so
diff --git a/devel/p5-syntax/Makefile b/devel/p5-syntax/Makefile
index f1968a7363a9..d50dd1cddd83 100644
--- a/devel/p5-syntax/Makefile
+++ b/devel/p5-syntax/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	syntax
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PHAYLON
diff --git a/devel/p5-syntax/pkg-plist b/devel/p5-syntax/pkg-plist
index add14d9d3537..0d6c7eecd4c2 100644
--- a/devel/p5-syntax/pkg-plist
+++ b/devel/p5-syntax/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/syntax.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/syntax/.packlist
 %%PERL5_MAN3%%/syntax.3.gz
diff --git a/devel/p5-threads-shared/Makefile b/devel/p5-threads-shared/Makefile
index f79ba183dfd3..4e9dd4ae5f1a 100644
--- a/devel/p5-threads-shared/Makefile
+++ b/devel/p5-threads-shared/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	threads-shared
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JDHEDDEN
diff --git a/devel/p5-threads-shared/pkg-plist b/devel/p5-threads-shared/pkg-plist
index 3eb3f0d0732a..1af5083d1780 100644
--- a/devel/p5-threads-shared/pkg-plist
+++ b/devel/p5-threads-shared/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/threads/shared/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/threads/shared/shared.so
-%%SITE_PERL%%/%%PERL_ARCH%%/threads/shared.pm
+%%SITE_ARCH%%/auto/threads/shared/shared.so
+%%SITE_ARCH%%/threads/shared.pm
 %%PERL5_MAN3%%/threads::shared.3.gz
diff --git a/devel/p5-threads/Makefile b/devel/p5-threads/Makefile
index f0fb92e209b7..14e369204954 100644
--- a/devel/p5-threads/Makefile
+++ b/devel/p5-threads/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	threads
 PORTVERSION=	1.96
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JDHEDDEN
diff --git a/devel/p5-threads/pkg-plist b/devel/p5-threads/pkg-plist
index f916c1baebc1..3f7d8adfbc52 100644
--- a/devel/p5-threads/pkg-plist
+++ b/devel/p5-threads/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/threads/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/threads/threads.so
-%%SITE_PERL%%/%%PERL_ARCH%%/threads.pm
+%%SITE_ARCH%%/auto/threads/threads.so
+%%SITE_ARCH%%/threads.pm
 %%PERL5_MAN3%%/threads.3.gz
diff --git a/devel/p5-true/Makefile b/devel/p5-true/Makefile
index f0127b1e62da..57448b160529 100644
--- a/devel/p5-true/Makefile
+++ b/devel/p5-true/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	true
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHOCOLATE
diff --git a/devel/p5-true/pkg-plist b/devel/p5-true/pkg-plist
index f4a1a1789db0..57253d21ffa9 100644
--- a/devel/p5-true/pkg-plist
+++ b/devel/p5-true/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/true/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/true/true.so
-%%SITE_PERL%%/%%PERL_ARCH%%/true.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/true/VERSION.pm
+%%SITE_ARCH%%/auto/true/true.so
+%%SITE_ARCH%%/true.pm
+%%SITE_ARCH%%/true/VERSION.pm
 %%PERL5_MAN3%%/true.3.gz
 %%PERL5_MAN3%%/true::VERSION.3.gz
diff --git a/devel/p5-uni-perl/Makefile b/devel/p5-uni-perl/Makefile
index a6a1a288ed4d..3c990f1d2272 100644
--- a/devel/p5-uni-perl/Makefile
+++ b/devel/p5-uni-perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	uni-perl
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MONS
diff --git a/devel/p5-uni-perl/pkg-plist b/devel/p5-uni-perl/pkg-plist
index 1da2d86c9e69..51d1b9e7c542 100644
--- a/devel/p5-uni-perl/pkg-plist
+++ b/devel/p5-uni-perl/pkg-plist
@@ -5,4 +5,3 @@
 %%SITE_PERL%%/uni/perl/ua.pm
 %%SITE_PERL%%/uni/perl/utf.pm
 %%SITE_PERL%%/uni/perl/xd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/uni/perl/.packlist
diff --git a/devel/p5-version/Makefile b/devel/p5-version/Makefile
index 303e072bae6b..1f9495ccf67c 100644
--- a/devel/p5-version/Makefile
+++ b/devel/p5-version/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	version
 PORTVERSION=	0.99.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-version/pkg-plist b/devel/p5-version/pkg-plist
index 284bcf96f592..977382e598b2 100644
--- a/devel/p5-version/pkg-plist
+++ b/devel/p5-version/pkg-plist
@@ -1,10 +1,9 @@
 %%PERL5_MAN3%%/version.3.gz
 %%PERL5_MAN3%%/version::Internals.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/version/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/version/vxs/vxs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/version/Internals.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/version/regex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/version/vpp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/version/vxs.pm
+%%SITE_ARCH%%/auto/version/vxs/vxs.so
+%%SITE_ARCH%%/version.pm
+%%SITE_ARCH%%/version.pod
+%%SITE_ARCH%%/version/Internals.pod
+%%SITE_ARCH%%/version/regex.pm
+%%SITE_ARCH%%/version/vpp.pm
+%%SITE_ARCH%%/version/vxs.pm
diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile
index 05061edb120d..8427c670e082 100644
--- a/devel/perlconsole/Makefile
+++ b/devel/perlconsole/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	perlconsole
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SUKRIA
diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile
index 2c7fe7833222..2f5a66131a4f 100644
--- a/devel/pushmi/Makefile
+++ b/devel/pushmi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pushmi
 PORTVERSION=	1.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/devel/pushmi/pkg-plist b/devel/pushmi/pkg-plist
index da0c5fcfed1e..69b5dd9b8882 100644
--- a/devel/pushmi/pkg-plist
+++ b/devel/pushmi/pkg-plist
@@ -1,5 +1,4 @@
 bin/pushmi
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pushmi/.packlist
 %%SITE_PERL%%/Pushmi.pm
 %%SITE_PERL%%/Pushmi/Command.pm
 %%SITE_PERL%%/Pushmi/Config.pm
diff --git a/devel/ruby-korundum/Makefile b/devel/ruby-korundum/Makefile
index b47e40229fc6..63c54003fea7 100644
--- a/devel/ruby-korundum/Makefile
+++ b/devel/ruby-korundum/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	korundum
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde ruby
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index 1ac93b2769f1..7eca6a0c99c0 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qtruby
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde ruby
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 7ad832ff688a..cd52b8259f7e 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	svk
 PORTVERSION=	2.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/devel/svk/pkg-plist b/devel/svk/pkg-plist
index 9e9d7ad615ed..d9c941bc0a18 100644
--- a/devel/svk/pkg-plist
+++ b/devel/svk/pkg-plist
@@ -140,7 +140,6 @@ bin/svk
 %%SITE_PERL%%/SVK/Version.pm
 %%SITE_PERL%%/SVK/View.pm
 %%SITE_PERL%%/SVK/XD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVK/.packlist
 %%PERL5_MAN3%%/SVK.3.gz
 %%PERL5_MAN3%%/SVK::Command.3.gz
 %%PERL5_MAN3%%/SVK::Command::Add.3.gz
diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile
index e7362d785de0..693c29778b22 100644
--- a/dns/dnscheckengine/Makefile
+++ b/dns/dnscheckengine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dnscheckengine
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns perl5
 MASTER_SITES=	ftp://www.ns.gen.tx.us/pub/software/dnscheck-se/
 DISTNAME=	DNSCheck-1.1
diff --git a/dns/dnscheckengine/pkg-plist b/dns/dnscheckengine/pkg-plist
index 5c8191dde997..c4e617414620 100644
--- a/dns/dnscheckengine/pkg-plist
+++ b/dns/dnscheckengine/pkg-plist
@@ -52,7 +52,6 @@ man/man1/dnscheck-12hourmailer.1.gz
 %%SITE_PERL%%/DNSCheck/Lookup/ASN.pm
 %%SITE_PERL%%/DNSCheck/Lookup/DNS.pm
 %%SITE_PERL%%/DNSCheck/Lookup/Resolver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNSCheck/.packlist
 share/dnscheck/locale/en.yaml
 share/dnscheck/locale/sv.yaml
 share/dnscheck/config.yaml
diff --git a/dns/fpdns/Makefile b/dns/fpdns/Makefile
index 1ddefe3cac4e..d6bd2e5c3f09 100644
--- a/dns/fpdns/Makefile
+++ b/dns/fpdns/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fpdns
 PORTVERSION=	0.10.0.${GH_TAGNAME}
+PORTREVISION=	1
 CATEGORIES=	dns net perl5
 MASTER_SITES=	GH
 
diff --git a/dns/fpdns/pkg-plist b/dns/fpdns/pkg-plist
index 024e25fa91a0..8bbeb6e91fde 100644
--- a/dns/fpdns/pkg-plist
+++ b/dns/fpdns/pkg-plist
@@ -2,4 +2,3 @@ bin/fpdns
 man/man1/fpdns.1.gz
 %%SITE_PERL%%/Net/DNS/Fingerprint.pm
 %%SITE_PERL%%/Net/DNS/REPLACE
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Fingerprint/.packlist
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 5375b7cd4e8c..63ba506e02ac 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ldns
 PORTVERSION=	1.6.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/ \
 		CRITICAL
@@ -54,6 +54,7 @@ post-patch:
 	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
 .elif defined(BUILD_P5PERL)
 USES+=		perl5
+USE_PERL5=	build run
 PKGNAMEPREFIX=	p5-DNS-
 
 ALL_TARGET=	p5-dns-ldns
@@ -141,9 +142,4 @@ post-install:
 
 .endif # BUILD_PYLDNS || BUILD_P5PERL
 
-.if defined(BUILD_P5PERL)
-post-stage::
-	${SED} -i '' 's|^${STAGEDIR}||' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DNS/LDNS/.packlist
-.endif
-
 .include <bsd.port.mk>
diff --git a/dns/p5-BIND-Conf_Parser/Makefile b/dns/p5-BIND-Conf_Parser/Makefile
index 7d77052a0ed5..19ddb1183005 100644
--- a/dns/p5-BIND-Conf_Parser/Makefile
+++ b/dns/p5-BIND-Conf_Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BIND-Conf_Parser
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PGUEN
diff --git a/dns/p5-BIND-Conf_Parser/pkg-plist b/dns/p5-BIND-Conf_Parser/pkg-plist
index 4d50b830d33d..fcb4e5cf0802 100644
--- a/dns/p5-BIND-Conf_Parser/pkg-plist
+++ b/dns/p5-BIND-Conf_Parser/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/BIND::Conf_Parser.3.gz
 %%SITE_PERL%%/BIND/Conf_Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser/.packlist
diff --git a/dns/p5-BIND-Config-Parser/Makefile b/dns/p5-BIND-Config-Parser/Makefile
index 68a1216481b5..9a5747e42a55 100644
--- a/dns/p5-BIND-Config-Parser/Makefile
+++ b/dns/p5-BIND-Config-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BIND-Config-Parser
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MATTD
diff --git a/dns/p5-BIND-Config-Parser/pkg-plist b/dns/p5-BIND-Config-Parser/pkg-plist
index 4e2dfd426d99..31e32c97a2d7 100644
--- a/dns/p5-BIND-Config-Parser/pkg-plist
+++ b/dns/p5-BIND-Config-Parser/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/BIND::Config::Parser.3.gz
 %%SITE_PERL%%/BIND/Config/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND/Config/Parser/.packlist
diff --git a/dns/p5-DNS-Config/Makefile b/dns/p5-DNS-Config/Makefile
index 23e2972c7e99..6e89c5a34b8f 100644
--- a/dns/p5-DNS-Config/Makefile
+++ b/dns/p5-DNS-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DNS-Config
 PORTVERSION=	0.66
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-DNS-Config/pkg-plist b/dns/p5-DNS-Config/pkg-plist
index faea05a94e89..4426b897b309 100644
--- a/dns/p5-DNS-Config/pkg-plist
+++ b/dns/p5-DNS-Config/pkg-plist
@@ -7,5 +7,4 @@
 %%SITE_PERL%%/DNS/Config/Statement/Key.pm
 %%SITE_PERL%%/DNS/Config/Statement/Options.pm
 %%SITE_PERL%%/DNS/Config/Statement/Zone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Config/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/dns/p5-DNS-EasyDNS/Makefile b/dns/p5-DNS-EasyDNS/Makefile
index deb59256378a..300592c7c9cb 100644
--- a/dns/p5-DNS-EasyDNS/Makefile
+++ b/dns/p5-DNS-EasyDNS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DNS-EasyDNS
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-DNS-EasyDNS/pkg-plist b/dns/p5-DNS-EasyDNS/pkg-plist
index 3a99dc07ca4b..aa3586395d9e 100644
--- a/dns/p5-DNS-EasyDNS/pkg-plist
+++ b/dns/p5-DNS-EasyDNS/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/DNS::EasyDNS.3.gz
 %%SITE_PERL%%/DNS/EasyDNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/EasyDNS/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/easydns-by-interface
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/easydns-from-router
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/easydns-simple
diff --git a/dns/p5-DNS-Ldns/pkg-plist b/dns/p5-DNS-Ldns/pkg-plist
index ff3c0a03cfb1..bb7093a69b9e 100644
--- a/dns/p5-DNS-Ldns/pkg-plist
+++ b/dns/p5-DNS-Ldns/pkg-plist
@@ -1,4 +1,3 @@
-@comment lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod.gz
 %%PERL5_MAN3%%/DNS::LDNS.3.gz
 %%PERL5_MAN3%%/DNS::LDNS::DNSSecDataChain.3.gz
 %%PERL5_MAN3%%/DNS::LDNS::DNSSecName.3.gz
@@ -17,24 +16,23 @@
 %%PERL5_MAN3%%/DNS::LDNS::RRList.3.gz
 %%PERL5_MAN3%%/DNS::LDNS::Resolver.3.gz
 %%PERL5_MAN3%%/DNS::LDNS::Zone.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecDataChain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecRRSets.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecRRs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecTrustTree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecZone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/GC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Key.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/KeyList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Packet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RBNode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RBTree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RRList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Resolver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Zone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS/LDNS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS/autosplit.ix
+%%SITE_ARCH%%/DNS/LDNS.pm
+%%SITE_ARCH%%/DNS/LDNS/DNSSecDataChain.pm
+%%SITE_ARCH%%/DNS/LDNS/DNSSecName.pm
+%%SITE_ARCH%%/DNS/LDNS/DNSSecRRSets.pm
+%%SITE_ARCH%%/DNS/LDNS/DNSSecRRs.pm
+%%SITE_ARCH%%/DNS/LDNS/DNSSecTrustTree.pm
+%%SITE_ARCH%%/DNS/LDNS/DNSSecZone.pm
+%%SITE_ARCH%%/DNS/LDNS/GC.pm
+%%SITE_ARCH%%/DNS/LDNS/Key.pm
+%%SITE_ARCH%%/DNS/LDNS/KeyList.pm
+%%SITE_ARCH%%/DNS/LDNS/Packet.pm
+%%SITE_ARCH%%/DNS/LDNS/RBNode.pm
+%%SITE_ARCH%%/DNS/LDNS/RBTree.pm
+%%SITE_ARCH%%/DNS/LDNS/RData.pm
+%%SITE_ARCH%%/DNS/LDNS/RR.pm
+%%SITE_ARCH%%/DNS/LDNS/RRList.pm
+%%SITE_ARCH%%/DNS/LDNS/Resolver.pm
+%%SITE_ARCH%%/DNS/LDNS/Zone.pm
+%%SITE_ARCH%%/auto/DNS/LDNS/LDNS.so
+%%SITE_ARCH%%/auto/DNS/LDNS/autosplit.ix
diff --git a/dns/p5-DNS-Zone/Makefile b/dns/p5-DNS-Zone/Makefile
index 51edc0a5271c..4e6395abaf18 100644
--- a/dns/p5-DNS-Zone/Makefile
+++ b/dns/p5-DNS-Zone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DNS-Zone
 PORTVERSION=	0.85
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-DNS-Zone/pkg-plist b/dns/p5-DNS-Zone/pkg-plist
index f6843cedd144..155ddb558a46 100644
--- a/dns/p5-DNS-Zone/pkg-plist
+++ b/dns/p5-DNS-Zone/pkg-plist
@@ -3,5 +3,4 @@
 %%SITE_PERL%%/DNS/Zone/File/Default.pm
 %%SITE_PERL%%/DNS/Zone/Label.pm
 %%SITE_PERL%%/DNS/Zone/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Zone/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/dns/p5-DNS-ZoneParse/Makefile b/dns/p5-DNS-ZoneParse/Makefile
index 84fcf7aa59f4..3098feb23c6d 100644
--- a/dns/p5-DNS-ZoneParse/Makefile
+++ b/dns/p5-DNS-ZoneParse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DNS-ZoneParse
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-DNS-ZoneParse/pkg-plist b/dns/p5-DNS-ZoneParse/pkg-plist
index 11ba44536c5e..514684bc8319 100644
--- a/dns/p5-DNS-ZoneParse/pkg-plist
+++ b/dns/p5-DNS-ZoneParse/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/DNS::ZoneParse.3.gz
 %%SITE_PERL%%/DNS/ZoneParse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/ZoneParse/.packlist
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index 2eaf67a107b2..acfa2b65558f 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Validate-Domain
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEELY
diff --git a/dns/p5-Data-Validate-Domain/pkg-plist b/dns/p5-Data-Validate-Domain/pkg-plist
index f1f6db585147..2822e2ad4fa6 100644
--- a/dns/p5-Data-Validate-Domain/pkg-plist
+++ b/dns/p5-Data-Validate-Domain/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Validate/Domain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/Domain/.packlist
 %%PERL5_MAN3%%/Data::Validate::Domain.3.gz
diff --git a/dns/p5-Mozilla-PublicSuffix/Makefile b/dns/p5-Mozilla-PublicSuffix/Makefile
index bfebdefada58..14825338498f 100644
--- a/dns/p5-Mozilla-PublicSuffix/Makefile
+++ b/dns/p5-Mozilla-PublicSuffix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mozilla-PublicSuffix
 PORTVERSION=	0.1.19
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-Amazon-Route53/Makefile b/dns/p5-Net-Amazon-Route53/Makefile
index 9392d04994fc..387f55413314 100644
--- a/dns/p5-Net-Amazon-Route53/Makefile
+++ b/dns/p5-Net-Amazon-Route53/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Amazon-Route53
 PORTVERSION=	0.122310
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-Amazon-Route53/pkg-plist b/dns/p5-Net-Amazon-Route53/pkg-plist
index 8eddf70b72c0..bbc7d80046a7 100644
--- a/dns/p5-Net-Amazon-Route53/pkg-plist
+++ b/dns/p5-Net-Amazon-Route53/pkg-plist
@@ -10,4 +10,3 @@ man/man1/route53.1.gz
 %%SITE_PERL%%/Net/Amazon/Route53/HostedZone.pm
 %%SITE_PERL%%/Net/Amazon/Route53/ResourceRecordSet.pm
 %%SITE_PERL%%/Net/Amazon/Route53/ResourceRecordSet/Change.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/Route53/.packlist
diff --git a/dns/p5-Net-Bonjour/Makefile b/dns/p5-Net-Bonjour/Makefile
index e90b5a8fb749..877f38ed9385 100644
--- a/dns/p5-Net-Bonjour/Makefile
+++ b/dns/p5-Net-Bonjour/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-Bonjour
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	dns net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHLIGE
diff --git a/dns/p5-Net-Bonjour/pkg-plist b/dns/p5-Net-Bonjour/pkg-plist
index 3b4c3d8c9dca..df50afc1ebe6 100644
--- a/dns/p5-Net-Bonjour/pkg-plist
+++ b/dns/p5-Net-Bonjour/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/Net/Bonjour/Entry.pm
 %%SITE_PERL%%/Net/Rendezvous.pm
 %%SITE_PERL%%/Net/Rendezvous/Entry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Bonjour/.packlist
diff --git a/dns/p5-Net-DNS-Async/Makefile b/dns/p5-Net-DNS-Async/Makefile
index 032ba1698503..ef63b55a50c2 100644
--- a/dns/p5-Net-DNS-Async/Makefile
+++ b/dns/p5-Net-DNS-Async/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-Async
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-Async/pkg-plist b/dns/p5-Net-DNS-Async/pkg-plist
index 73bda36d20d0..2f28746b559d 100644
--- a/dns/p5-Net-DNS-Async/pkg-plist
+++ b/dns/p5-Net-DNS-Async/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Async/.packlist
 %%SITE_PERL%%/Net/DNS/Async.pm
 %%PERL5_MAN3%%/Net::DNS::Async.3.gz
diff --git a/dns/p5-Net-DNS-Check/Makefile b/dns/p5-Net-DNS-Check/Makefile
index 9b60ec30dc70..341c0d8bfa3e 100644
--- a/dns/p5-Net-DNS-Check/Makefile
+++ b/dns/p5-Net-DNS-Check/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-Check
 PORTVERSION=	0.45
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-Check/pkg-plist b/dns/p5-Net-DNS-Check/pkg-plist
index 370043e8499d..db61e45ab3d1 100644
--- a/dns/p5-Net-DNS-Check/pkg-plist
+++ b/dns/p5-Net-DNS-Check/pkg-plist
@@ -24,7 +24,6 @@
 %%SITE_PERL%%/Net/DNS/Check/Host.pm
 %%SITE_PERL%%/Net/DNS/Check/Test.pm
 %%SITE_PERL%%/Net/DNS/Check.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Check/.packlist
 %%PERL5_MAN3%%/Net::DNS::Check::Test::ns_count.3.gz
 %%PERL5_MAN3%%/Net::DNS::Check::Test::soa_expire_compare.3.gz
 %%PERL5_MAN3%%/Net::DNS::Check::NSQuery.3.gz
diff --git a/dns/p5-Net-DNS-Codes/Makefile b/dns/p5-Net-DNS-Codes/Makefile
index 28bd02d28af9..d7dae9214889 100644
--- a/dns/p5-Net-DNS-Codes/Makefile
+++ b/dns/p5-Net-DNS-Codes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-Codes
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-Codes/pkg-plist b/dns/p5-Net-DNS-Codes/pkg-plist
index a54ed4bcb93c..a102b22bf5d2 100644
--- a/dns/p5-Net-DNS-Codes/pkg-plist
+++ b/dns/p5-Net-DNS-Codes/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Net::DNS::Codes.3.gz
 %%SITE_PERL%%/Net/DNS/Codes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Codes/.packlist
diff --git a/dns/p5-Net-DNS-Lite/Makefile b/dns/p5-Net-DNS-Lite/Makefile
index 0d8a7302ca07..1d203a451694 100644
--- a/dns/p5-Net-DNS-Lite/Makefile
+++ b/dns/p5-Net-DNS-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-Lite
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-Lite/pkg-plist b/dns/p5-Net-DNS-Lite/pkg-plist
index d0e500e82486..2904a3849850 100644
--- a/dns/p5-Net-DNS-Lite/pkg-plist
+++ b/dns/p5-Net-DNS-Lite/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Net::DNS::Lite.3.gz
 %%SITE_PERL%%/Net/DNS/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Lite/.packlist
diff --git a/dns/p5-Net-DNS-Match/Makefile b/dns/p5-Net-DNS-Match/Makefile
index f63f48b162dc..3c4217ca5eb9 100644
--- a/dns/p5-Net-DNS-Match/Makefile
+++ b/dns/p5-Net-DNS-Match/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-DNS-Match
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-Match/pkg-plist b/dns/p5-Net-DNS-Match/pkg-plist
index 626e3475b1eb..405d07086557 100644
--- a/dns/p5-Net-DNS-Match/pkg-plist
+++ b/dns/p5-Net-DNS-Match/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Net::DNS::Match.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Match/.packlist
 %%SITE_PERL%%/Net/DNS/Match.pm
diff --git a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
index dd0cb2ad3157..d3be14f46485 100644
--- a/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
+++ b/dns/p5-Net-DNS-RR-SRV-Helper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-DNS-RR-SRV-Helper
 PORTVERSION=	0.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/dns/p5-Net-DNS-RR-SRV-Helper/pkg-plist b/dns/p5-Net-DNS-RR-SRV-Helper/pkg-plist
index f350037cb2c7..1453989f6da8 100644
--- a/dns/p5-Net-DNS-RR-SRV-Helper/pkg-plist
+++ b/dns/p5-Net-DNS-RR-SRV-Helper/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/DNS/RR/SRV/Helper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/RR/SRV/Helper/.packlist
 %%PERL5_MAN3%%/Net::DNS::RR::SRV::Helper.3.gz
diff --git a/dns/p5-Net-DNS-Resolver-Programmable/Makefile b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
index 27e0d1f68c49..fa078d15acb4 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-DNS-Resolver-Programmable
 PORTVERSION=	0.003
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile
index 5960807e29bb..c2b17eff8a01 100644
--- a/dns/p5-Net-DNS-SEC/Makefile
+++ b/dns/p5-Net-DNS-SEC/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-DNS-SEC
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN \
 		http://www.ripe.net/ripencc/pub-services/np/DISI/SRC/
diff --git a/dns/p5-Net-DNS-SEC/pkg-plist b/dns/p5-Net-DNS-SEC/pkg-plist
index 06df10161501..a93ed9aa3257 100644
--- a/dns/p5-Net-DNS-SEC/pkg-plist
+++ b/dns/p5-Net-DNS-SEC/pkg-plist
@@ -22,4 +22,3 @@
 %%SITE_PERL%%/Net/DNS/RR/SIG.pm
 %%SITE_PERL%%/Net/DNS/SEC.pm
 %%SITE_PERL%%/Net/DNS/SEC/Private.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/SEC/.packlist
diff --git a/dns/p5-Net-DNS-TestNS/Makefile b/dns/p5-Net-DNS-TestNS/Makefile
index c39a310dcc3e..1fa565665780 100644
--- a/dns/p5-Net-DNS-TestNS/Makefile
+++ b/dns/p5-Net-DNS-TestNS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-DNS-TestNS
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OLAF
diff --git a/dns/p5-Net-DNS-TestNS/pkg-plist b/dns/p5-Net-DNS-TestNS/pkg-plist
index 7bd41df38c94..fbec09ad3e1e 100644
--- a/dns/p5-Net-DNS-TestNS/pkg-plist
+++ b/dns/p5-Net-DNS-TestNS/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/Net/DNS/TestNS/DTD.pm
 %%SITE_PERL%%/Net/DNS/TestNS/Nameserver.pm
 %%SITE_PERL%%/Net/DNS/TestNS/Packet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/TestNS/.packlist
 %%PERL5_MAN3%%/Net::DNS::TestNS.3.gz
 %%PERL5_MAN3%%/Net::DNS::TestNS::DTD.3.gz
diff --git a/dns/p5-Net-DNS-ToolKit/Makefile b/dns/p5-Net-DNS-ToolKit/Makefile
index 5f67f3683f95..30bc941d6913 100644
--- a/dns/p5-Net-DNS-ToolKit/Makefile
+++ b/dns/p5-Net-DNS-ToolKit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-ToolKit
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-ToolKit/pkg-plist b/dns/p5-Net-DNS-ToolKit/pkg-plist
index 6a6c2a77ad52..be187b0ae6b4 100644
--- a/dns/p5-Net-DNS-ToolKit/pkg-plist
+++ b/dns/p5-Net-DNS-ToolKit/pkg-plist
@@ -27,66 +27,65 @@
 %%PERL5_MAN3%%/Net::DNS::ToolKit::RR::Template.3.gz
 %%PERL5_MAN3%%/Net::DNS::ToolKit::RR::X25.3.gz
 %%PERL5_MAN3%%/Net::DNS::ToolKit::Utilities.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/Debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/Question.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/A.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/AAAA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/AFSDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/CNAME.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/HINFO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/ISDN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/MB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/MD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/MF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/MG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/MINFO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/MR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/MX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/NS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/NULL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/PTR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/RP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/RT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/SOA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/SRV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/TXT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/TYPE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/RR/X25.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/Utilities.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Debug/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Debug/print_buf.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Debug/print_head.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/ToolKit.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_ans.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_ns.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_ptr.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_udpresp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_udpsend.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/id.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/query.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/question.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/revIP.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/rlook_rcv.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/Utilities/rlook_send.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/collapse.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/get_ancount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/get_arcount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/get_ns.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/get_nscount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/get_qdcount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/getflags.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/newhead.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/put_ancount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/put_arcount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/put_nscount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/put_qdcount.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/putflags.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/sec2time.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/strip.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ToolKit/ttlAlpha2Num.al
+%%SITE_ARCH%%/Net/DNS/ToolKit.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/Debug.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/Question.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/A.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/AAAA.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/AFSDB.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/CNAME.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/HINFO.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/ISDN.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/MB.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/MD.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/MF.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/MG.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/MINFO.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/MR.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/MX.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/NS.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/NULL.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/PTR.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/RP.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/RT.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/SOA.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/SRV.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/TXT.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/TYPE.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/Template.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/RR/X25.pm
+%%SITE_ARCH%%/Net/DNS/ToolKit/Utilities.pm
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Debug/autosplit.ix
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Debug/print_buf.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Debug/print_head.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/ToolKit.so
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/autosplit.ix
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_ans.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_ns.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_ptr.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_udpresp.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/dns_udpsend.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/id.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/query.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/question.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/revIP.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/rlook_rcv.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/Utilities/rlook_send.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/autosplit.ix
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/collapse.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/get_ancount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/get_arcount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/get_ns.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/get_nscount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/get_qdcount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/getflags.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/newhead.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/put_ancount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/put_arcount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/put_nscount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/put_qdcount.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/putflags.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/sec2time.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/strip.al
+%%SITE_ARCH%%/auto/Net/DNS/ToolKit/ttlAlpha2Num.al
diff --git a/dns/p5-Net-DNS-Zone-Parser/Makefile b/dns/p5-Net-DNS-Zone-Parser/Makefile
index 7bfb6eefa173..201e0bf2edd0 100644
--- a/dns/p5-Net-DNS-Zone-Parser/Makefile
+++ b/dns/p5-Net-DNS-Zone-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-Zone-Parser
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-Zone-Parser/pkg-plist b/dns/p5-Net-DNS-Zone-Parser/pkg-plist
index e95b3056f4f2..0e64e4457001 100644
--- a/dns/p5-Net-DNS-Zone-Parser/pkg-plist
+++ b/dns/p5-Net-DNS-Zone-Parser/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/DNS/Zone/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Zone/Parser/.packlist
 %%PERL5_MAN3%%/Net::DNS::Zone::Parser.3.gz
diff --git a/dns/p5-Net-DNS-ZoneCheck/Makefile b/dns/p5-Net-DNS-ZoneCheck/Makefile
index 2359fbf0ba82..a04b4c5ba243 100644
--- a/dns/p5-Net-DNS-ZoneCheck/Makefile
+++ b/dns/p5-Net-DNS-ZoneCheck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-ZoneCheck
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-ZoneCheck/pkg-plist b/dns/p5-Net-DNS-ZoneCheck/pkg-plist
index 444acc3bba24..a054657e658f 100644
--- a/dns/p5-Net-DNS-ZoneCheck/pkg-plist
+++ b/dns/p5-Net-DNS-ZoneCheck/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/DNS/ZoneCheck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneCheck/.packlist
 %%PERL5_MAN3%%/Net::DNS::ZoneCheck.3.gz
diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
index fa46f03f9514..b127b3b1ed19 100644
--- a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS-ZoneFile-Fast
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist b/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist
index 2852378b9db6..a02fc25eb9d2 100644
--- a/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist
+++ b/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Net::DNS::ZoneFile::Fast.3.gz
 %%SITE_PERL%%/Net/DNS/ZoneFile/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/Fast/.packlist
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index 87a887cb1531..e4fb10ff2d2f 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNS
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	dns net perl5 ipv6
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -30,6 +31,6 @@ IPV6_BUILD_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/DNS/DNS.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/DNS/DNS.so
 
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS/pkg-plist b/dns/p5-Net-DNS/pkg-plist
index 893f3c8f5244..b2f4756c7133 100644
--- a/dns/p5-Net-DNS/pkg-plist
+++ b/dns/p5-Net-DNS/pkg-plist
@@ -65,72 +65,71 @@
 %%PERL5_MAN3%%/Net::DNS::Text.3.gz
 %%PERL5_MAN3%%/Net::DNS::Update.3.gz
 %%PERL5_MAN3%%/Net::DNS::ZoneFile.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Domain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/DomainName.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Mailbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Nameserver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Packet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Parameters.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Question.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/A.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/AAAA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/AFSDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/APL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/CAA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/CERT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/CNAME.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/DHCID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/DNAME.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/EUI48.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/EUI64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/GPOS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/HINFO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/HIP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/IPSECKEY.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/ISDN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/KX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/L32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/L64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/LOC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/LP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/MB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/MG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/MINFO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/MR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/MX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/NAPTR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/NID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/NS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/NULL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/OPENPGPKEY.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/OPT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/PTR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/PX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/RP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/RT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/SOA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/SPF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/SRV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/SSHFP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TKEY.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TLSA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TSIG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TXT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/X25.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/android.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/MSWin32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/Recurse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/UNIX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/cygwin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/os2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Update.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ZoneFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/DNS.so
+%%SITE_ARCH%%/Net/DNS.pm
+%%SITE_ARCH%%/Net/DNS/Domain.pm
+%%SITE_ARCH%%/Net/DNS/DomainName.pm
+%%SITE_ARCH%%/Net/DNS/FAQ.pod
+%%SITE_ARCH%%/Net/DNS/Header.pm
+%%SITE_ARCH%%/Net/DNS/Mailbox.pm
+%%SITE_ARCH%%/Net/DNS/Nameserver.pm
+%%SITE_ARCH%%/Net/DNS/Packet.pm
+%%SITE_ARCH%%/Net/DNS/Parameters.pm
+%%SITE_ARCH%%/Net/DNS/Question.pm
+%%SITE_ARCH%%/Net/DNS/RR.pm
+%%SITE_ARCH%%/Net/DNS/RR/A.pm
+%%SITE_ARCH%%/Net/DNS/RR/AAAA.pm
+%%SITE_ARCH%%/Net/DNS/RR/AFSDB.pm
+%%SITE_ARCH%%/Net/DNS/RR/APL.pm
+%%SITE_ARCH%%/Net/DNS/RR/CAA.pm
+%%SITE_ARCH%%/Net/DNS/RR/CERT.pm
+%%SITE_ARCH%%/Net/DNS/RR/CNAME.pm
+%%SITE_ARCH%%/Net/DNS/RR/DHCID.pm
+%%SITE_ARCH%%/Net/DNS/RR/DNAME.pm
+%%SITE_ARCH%%/Net/DNS/RR/EUI48.pm
+%%SITE_ARCH%%/Net/DNS/RR/EUI64.pm
+%%SITE_ARCH%%/Net/DNS/RR/GPOS.pm
+%%SITE_ARCH%%/Net/DNS/RR/HINFO.pm
+%%SITE_ARCH%%/Net/DNS/RR/HIP.pm
+%%SITE_ARCH%%/Net/DNS/RR/IPSECKEY.pm
+%%SITE_ARCH%%/Net/DNS/RR/ISDN.pm
+%%SITE_ARCH%%/Net/DNS/RR/KX.pm
+%%SITE_ARCH%%/Net/DNS/RR/L32.pm
+%%SITE_ARCH%%/Net/DNS/RR/L64.pm
+%%SITE_ARCH%%/Net/DNS/RR/LOC.pm
+%%SITE_ARCH%%/Net/DNS/RR/LP.pm
+%%SITE_ARCH%%/Net/DNS/RR/MB.pm
+%%SITE_ARCH%%/Net/DNS/RR/MG.pm
+%%SITE_ARCH%%/Net/DNS/RR/MINFO.pm
+%%SITE_ARCH%%/Net/DNS/RR/MR.pm
+%%SITE_ARCH%%/Net/DNS/RR/MX.pm
+%%SITE_ARCH%%/Net/DNS/RR/NAPTR.pm
+%%SITE_ARCH%%/Net/DNS/RR/NID.pm
+%%SITE_ARCH%%/Net/DNS/RR/NS.pm
+%%SITE_ARCH%%/Net/DNS/RR/NULL.pm
+%%SITE_ARCH%%/Net/DNS/RR/OPENPGPKEY.pm
+%%SITE_ARCH%%/Net/DNS/RR/OPT.pm
+%%SITE_ARCH%%/Net/DNS/RR/PTR.pm
+%%SITE_ARCH%%/Net/DNS/RR/PX.pm
+%%SITE_ARCH%%/Net/DNS/RR/RP.pm
+%%SITE_ARCH%%/Net/DNS/RR/RT.pm
+%%SITE_ARCH%%/Net/DNS/RR/SOA.pm
+%%SITE_ARCH%%/Net/DNS/RR/SPF.pm
+%%SITE_ARCH%%/Net/DNS/RR/SRV.pm
+%%SITE_ARCH%%/Net/DNS/RR/SSHFP.pm
+%%SITE_ARCH%%/Net/DNS/RR/TKEY.pm
+%%SITE_ARCH%%/Net/DNS/RR/TLSA.pm
+%%SITE_ARCH%%/Net/DNS/RR/TSIG.pm
+%%SITE_ARCH%%/Net/DNS/RR/TXT.pm
+%%SITE_ARCH%%/Net/DNS/RR/X25.pm
+%%SITE_ARCH%%/Net/DNS/Resolver.pm
+%%SITE_ARCH%%/Net/DNS/Resolver/android.pm
+%%SITE_ARCH%%/Net/DNS/Resolver/Base.pm
+%%SITE_ARCH%%/Net/DNS/Resolver/MSWin32.pm
+%%SITE_ARCH%%/Net/DNS/Resolver/Recurse.pm
+%%SITE_ARCH%%/Net/DNS/Resolver/UNIX.pm
+%%SITE_ARCH%%/Net/DNS/Resolver/cygwin.pm
+%%SITE_ARCH%%/Net/DNS/Resolver/os2.pm
+%%SITE_ARCH%%/Net/DNS/Text.pm
+%%SITE_ARCH%%/Net/DNS/Update.pm
+%%SITE_ARCH%%/Net/DNS/ZoneFile.pm
+%%SITE_ARCH%%/auto/Net/DNS/DNS.so
diff --git a/dns/p5-Net-DNSBL-MultiDaemon/Makefile b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
index 70ca4b65166f..41b0801233b6 100644
--- a/dns/p5-Net-DNSBL-MultiDaemon/Makefile
+++ b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNSBL-MultiDaemon
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	dns mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist b/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist
index 6fc1241410b2..cc3c4cfa2cc2 100644
--- a/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist
+++ b/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist
@@ -24,4 +24,3 @@
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/setRA.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/statinit.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/write_stats.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNSBL/MultiDaemon/.packlist
diff --git a/dns/p5-Net-DNSBL-Statistics/Makefile b/dns/p5-Net-DNSBL-Statistics/Makefile
index 864c02d9f3bf..9954971ae002 100644
--- a/dns/p5-Net-DNSBL-Statistics/Makefile
+++ b/dns/p5-Net-DNSBL-Statistics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DNSBL-Statistics
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	dns mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DNSBL-Statistics/pkg-plist b/dns/p5-Net-DNSBL-Statistics/pkg-plist
index cfb55e7b0a4e..cce34494b8c1 100644
--- a/dns/p5-Net-DNSBL-Statistics/pkg-plist
+++ b/dns/p5-Net-DNSBL-Statistics/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/DNSBL/Statistics.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNSBL/Statistics/.packlist
 %%PERL5_MAN3%%/Net::DNSBL::Statistics.3.gz
diff --git a/dns/p5-Net-DRI/Makefile b/dns/p5-Net-DRI/Makefile
index f11ffc072ab9..9d2448af2366 100644
--- a/dns/p5-Net-DRI/Makefile
+++ b/dns/p5-Net-DRI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DRI
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-DRI/pkg-plist b/dns/p5-Net-DRI/pkg-plist
index 6e37dfee8a31..e5aaea7cd7df 100644
--- a/dns/p5-Net-DRI/pkg-plist
+++ b/dns/p5-Net-DRI/pkg-plist
@@ -664,4 +664,3 @@
 %%SITE_PERL%%/Net/DRI/Transport/Socket.pm
 %%SITE_PERL%%/Net/DRI/Util.pm
 %%SITE_PERL%%/Net/DRI.pm
-%%SITE_PERL%%/mach/auto/Net/DRI/.packlist
diff --git a/dns/p5-Net-Domain-ExpireDate/Makefile b/dns/p5-Net-Domain-ExpireDate/Makefile
index e13460e8cc4f..d8fdb42685cd 100644
--- a/dns/p5-Net-Domain-ExpireDate/Makefile
+++ b/dns/p5-Net-Domain-ExpireDate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Domain-ExpireDate
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	dns net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NALOBIN
diff --git a/dns/p5-Net-Domain-ExpireDate/pkg-plist b/dns/p5-Net-Domain-ExpireDate/pkg-plist
index 08d38a5ce3dd..c714afd3f8b3 100644
--- a/dns/p5-Net-Domain-ExpireDate/pkg-plist
+++ b/dns/p5-Net-Domain-ExpireDate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Net::Domain::ExpireDate.3.gz
 %%SITE_PERL%%/Net/Domain/ExpireDate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Domain/ExpireDate/.packlist
diff --git a/dns/p5-Net-Domain-TLD/Makefile b/dns/p5-Net-Domain-TLD/Makefile
index 3537f81db42a..1ee176916a2d 100644
--- a/dns/p5-Net-Domain-TLD/Makefile
+++ b/dns/p5-Net-Domain-TLD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Domain-TLD
 PORTVERSION=	1.72
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-Domain-TLD/pkg-plist b/dns/p5-Net-Domain-TLD/pkg-plist
index 068f63ede5b1..9c4647d9130d 100644
--- a/dns/p5-Net-Domain-TLD/pkg-plist
+++ b/dns/p5-Net-Domain-TLD/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/Domain/TLD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Domain/TLD/.packlist
 %%PERL5_MAN3%%/Net::Domain::TLD.3.gz
diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile
index 8a91f65ea9bf..d8382987f1d7 100644
--- a/dns/p5-Net-LibIDN/Makefile
+++ b/dns/p5-Net-LibIDN/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-LibIDN
 PORTVERSION=	0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-LibIDN/pkg-plist b/dns/p5-Net-LibIDN/pkg-plist
index 530d4e97390c..beb835c80fbb 100644
--- a/dns/p5-Net-LibIDN/pkg-plist
+++ b/dns/p5-Net-LibIDN/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Net::LibIDN.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/LibIDN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/LibIDN.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/autosplit.ix
+%%SITE_ARCH%%/Net/LibIDN.pm
+%%SITE_ARCH%%/auto/Net/LibIDN/LibIDN.so
+%%SITE_ARCH%%/auto/Net/LibIDN/autosplit.ix
diff --git a/dns/p5-Net-Nslookup/Makefile b/dns/p5-Net-Nslookup/Makefile
index c81ee9aef0ca..5aabd0dc218e 100644
--- a/dns/p5-Net-Nslookup/Makefile
+++ b/dns/p5-Net-Nslookup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Nslookup
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-Nslookup/pkg-plist b/dns/p5-Net-Nslookup/pkg-plist
index 5fcbaaaabdba..9eae604b59df 100644
--- a/dns/p5-Net-Nslookup/pkg-plist
+++ b/dns/p5-Net-Nslookup/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Net::Nslookup.3.gz
 %%SITE_PERL%%/Net/Nslookup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nslookup/.packlist
diff --git a/dns/p5-Net-RBLClient/Makefile b/dns/p5-Net-RBLClient/Makefile
index 282e089e88e3..58166a48e659 100644
--- a/dns/p5-Net-RBLClient/Makefile
+++ b/dns/p5-Net-RBLClient/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-RBLClient
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Net-RBLClient/pkg-plist b/dns/p5-Net-RBLClient/pkg-plist
index 4229621e1626..6190f96944a8 100644
--- a/dns/p5-Net-RBLClient/pkg-plist
+++ b/dns/p5-Net-RBLClient/pkg-plist
@@ -1,5 +1,4 @@
 bin/spamalyze
 %%SITE_PERL%%/Net/RBLClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RBLClient/.packlist
 %%PERL5_MAN3%%/Net::RBLClient.3.gz
 man/man1/spamalyze.1.gz
diff --git a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
index 7e13c4ac393f..f4b2d0739680 100644
--- a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
+++ b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-DNS-Recursive
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist b/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist
index 439655cf9ef3..d35e81c3aac2 100644
--- a/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist
+++ b/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Client::DNS::Recursive.3.gz
 %%SITE_PERL%%/POE/Component/Client/DNS/Recursive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNS/Recursive/.packlist
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index 416cf0da25aa..8bfa6412097d 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-DNS
 PORTVERSION=	1.053
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	dns perl5 devel
 MASTER_SITES=	CPAN
diff --git a/dns/p5-POE-Component-Client-DNS/pkg-plist b/dns/p5-POE-Component-Client-DNS/pkg-plist
index 69b10e6cef41..32687d034da6 100644
--- a/dns/p5-POE-Component-Client-DNS/pkg-plist
+++ b/dns/p5-POE-Component-Client-DNS/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Client::DNS.3.gz
 %%SITE_PERL%%/POE/Component/Client/DNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNS/.packlist
diff --git a/dns/p5-POE-Component-Client-DNSBL/Makefile b/dns/p5-POE-Component-Client-DNSBL/Makefile
index 742455a8c8f3..4cbfd9112d86 100644
--- a/dns/p5-POE-Component-Client-DNSBL/Makefile
+++ b/dns/p5-POE-Component-Client-DNSBL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-DNSBL
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-POE-Component-Client-DNSBL/pkg-plist b/dns/p5-POE-Component-Client-DNSBL/pkg-plist
index fcfc5be29be4..4093ab0940e9 100644
--- a/dns/p5-POE-Component-Client-DNSBL/pkg-plist
+++ b/dns/p5-POE-Component-Client-DNSBL/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Client::DNSBL.3.gz
 %%SITE_PERL%%/POE/Component/Client/DNSBL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNSBL/.packlist
diff --git a/dns/p5-POE-Component-Resolver/Makefile b/dns/p5-POE-Component-Resolver/Makefile
index 0490dbc3a033..c5ca6d3d266d 100644
--- a/dns/p5-POE-Component-Resolver/Makefile
+++ b/dns/p5-POE-Component-Resolver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Resolver
 PORTVERSION=	0.921
+PORTREVISION=	1
 CATEGORIES=	dns devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RCAPUTO
diff --git a/dns/p5-POE-Component-Resolver/pkg-plist b/dns/p5-POE-Component-Resolver/pkg-plist
index d48b525c6134..eb5ddcb02c19 100644
--- a/dns/p5-POE-Component-Resolver/pkg-plist
+++ b/dns/p5-POE-Component-Resolver/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Resolver/.packlist
 %%SITE_PERL%%/POE/Component/Resolver/Sidecar.pm
 %%SITE_PERL%%/POE/Component/Resolver.pm
 %%PERL5_MAN3%%/POE::Component::Resolver.3.gz
diff --git a/dns/p5-POE-Component-Server-DNS/Makefile b/dns/p5-POE-Component-Server-DNS/Makefile
index 0bbe9fdd38d2..b3486293b11b 100644
--- a/dns/p5-POE-Component-Server-DNS/Makefile
+++ b/dns/p5-POE-Component-Server-DNS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Server-DNS
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-POE-Component-Server-DNS/pkg-plist b/dns/p5-POE-Component-Server-DNS/pkg-plist
index 26b6c8717854..f17562819987 100644
--- a/dns/p5-POE-Component-Server-DNS/pkg-plist
+++ b/dns/p5-POE-Component-Server-DNS/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Server::DNS.3.gz
 %%SITE_PERL%%/POE/Component/Server/DNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/DNS/.packlist
diff --git a/dns/p5-POE-Filter-DNS-TCP/Makefile b/dns/p5-POE-Filter-DNS-TCP/Makefile
index 258773b899c2..6d4fdab62c0f 100644
--- a/dns/p5-POE-Filter-DNS-TCP/Makefile
+++ b/dns/p5-POE-Filter-DNS-TCP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-DNS-TCP
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-POE-Filter-DNS-TCP/pkg-plist b/dns/p5-POE-Filter-DNS-TCP/pkg-plist
index d6c37c640070..c02eebbd1b09 100644
--- a/dns/p5-POE-Filter-DNS-TCP/pkg-plist
+++ b/dns/p5-POE-Filter-DNS-TCP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Filter/DNS/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/DNS/TCP/.packlist
 %%PERL5_MAN3%%/POE::Filter::DNS::TCP.3.gz
diff --git a/dns/p5-Stanford-DNSserver/Makefile b/dns/p5-Stanford-DNSserver/Makefile
index 1d4176dcec12..96846e47b0e3 100644
--- a/dns/p5-Stanford-DNSserver/Makefile
+++ b/dns/p5-Stanford-DNSserver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Stanford-DNSserver
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	http://www.stanford.edu/~riepel/lbnamed/Stanford-DNSserver/
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-Stanford-DNSserver/pkg-plist b/dns/p5-Stanford-DNSserver/pkg-plist
index 8943de0d4093..4669fb99e051 100644
--- a/dns/p5-Stanford-DNSserver/pkg-plist
+++ b/dns/p5-Stanford-DNSserver/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Stanford::DNSserver.3.gz
 %%SITE_PERL%%/Stanford/DNS.pm
 %%SITE_PERL%%/Stanford/DNSserver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stanford/DNSserver/.packlist
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index 48d9d0e92074..6a6ce44bf72f 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-DNS
 PORTVERSION=	1.133.260
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
diff --git a/dns/p5-Tie-DNS/pkg-plist b/dns/p5-Tie-DNS/pkg-plist
index e999007c50e7..f9e1262823c3 100644
--- a/dns/p5-Tie-DNS/pkg-plist
+++ b/dns/p5-Tie-DNS/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tie::DNS.3.gz
 %%SITE_PERL%%/Tie/DNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS/.packlist
diff --git a/dns/p5-URBL-Prepare/Makefile b/dns/p5-URBL-Prepare/Makefile
index dd00510edbbc..34d6599acad7 100644
--- a/dns/p5-URBL-Prepare/Makefile
+++ b/dns/p5-URBL-Prepare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URBL-Prepare
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIKER
diff --git a/dns/p5-URBL-Prepare/pkg-plist b/dns/p5-URBL-Prepare/pkg-plist
index 6725224ea7a6..902f11b56b72 100644
--- a/dns/p5-URBL-Prepare/pkg-plist
+++ b/dns/p5-URBL-Prepare/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/URBL/Prepare.pm
 %%SITE_PERL%%/auto/URBL/Prepare/autosplit.ix
 %%SITE_PERL%%/auto/URBL/Prepare/loadcache.al
-%%SITE_PERL%%/mach/auto/URBL/Prepare/.packlist
 %%PERL5_MAN3%%/URBL::Prepare.3.gz
diff --git a/dns/p5-pgeodns/Makefile b/dns/p5-pgeodns/Makefile
index 59295338ca5e..fa369a54bdfd 100644
--- a/dns/p5-pgeodns/Makefile
+++ b/dns/p5-pgeodns/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pgeodns
 PORTVERSION=	1.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns perl5
 MASTER_SITES=	http://cloud.github.com/downloads/abh/pgeodns/
 PKGNAMEPREFIX=	p5-
diff --git a/dns/p5-pgeodns/pkg-plist b/dns/p5-pgeodns/pkg-plist
index 16528ceb2d7e..59629c65c5e3 100644
--- a/dns/p5-pgeodns/pkg-plist
+++ b/dns/p5-pgeodns/pkg-plist
@@ -1,6 +1,5 @@
 bin/pgeodns
 %%SITE_PERL%%/Countries.pm
 %%SITE_PERL%%/GeoDNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pgeodns/.packlist
 %%SITE_PERL%%/pgeodns.pl
 man/man1/pgeodns.1.gz
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index c68d90144364..f82f2eb17b87 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Padre
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} ${MASTER_SITE_PERL_CPAN:S/$/:wxsc/}
 MASTER_SITE_SUBDIR=	${PORTNAME}/:DEFAULT Wx/:wxsc
@@ -110,7 +110,7 @@ post-patch:
 		 s|-lgtk-x11-2.0.*-lpangoft2-1.0|-lm| ; \
 		 /-lgobject-2.0/d ; \
 		 /-lglib-2.0/d ; \
-		 s|\\$$ORIGIN|${SITE_PERL}/${PERL_ARCH}/auto/Wx/Scintilla|' \
+		 s|\\$$ORIGIN|${SITE_ARCH}/auto/Wx/Scintilla|' \
 		${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla/GTK.pm
 
 pre-configure:
@@ -126,7 +126,7 @@ pre-install:
 		${PERL} Build install)
 
 post-install:
-	@(cd ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Wx/Scintilla && \
+	@(cd ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Wx/Scintilla && \
 		${STRIP_CMD} libwx_gtk2u_scintilla.so)
 
 .include <bsd.port.post.mk>
diff --git a/editors/p5-Padre/pkg-plist b/editors/p5-Padre/pkg-plist
index 14929f85923a..d6c101aeeb46 100644
--- a/editors/p5-Padre/pkg-plist
+++ b/editors/p5-Padre/pkg-plist
@@ -579,12 +579,10 @@ bin/padre
 %%SITE_PERL%%/auto/share/dist/Padre/themes/solarized_dark.txt
 %%SITE_PERL%%/auto/share/dist/Padre/themes/solarized_light.txt
 %%SITE_PERL%%/auto/share/dist/Padre/themes/ultraedit.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/Constant.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/Manual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/TextCtrl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/TextEvent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Padre/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Scintilla/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Scintilla/Scintilla.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Scintilla/libwx_gtk2u_scintilla.so
+%%SITE_ARCH%%/Wx/Scintilla.pm
+%%SITE_ARCH%%/Wx/Scintilla/Constant.pm
+%%SITE_ARCH%%/Wx/Scintilla/Manual.pod
+%%SITE_ARCH%%/Wx/Scintilla/TextCtrl.pm
+%%SITE_ARCH%%/Wx/Scintilla/TextEvent.pm
+%%SITE_ARCH%%/auto/Wx/Scintilla/Scintilla.so
+%%SITE_ARCH%%/auto/Wx/Scintilla/libwx_gtk2u_scintilla.so
diff --git a/editors/p5-Proc-InvokeEditor/Makefile b/editors/p5-Proc-InvokeEditor/Makefile
index b1aacb3dbcb2..b77d5cc244f7 100644
--- a/editors/p5-Proc-InvokeEditor/Makefile
+++ b/editors/p5-Proc-InvokeEditor/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Proc-InvokeEditor
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	editors perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSTEVENS
diff --git a/editors/p5-Proc-InvokeEditor/pkg-plist b/editors/p5-Proc-InvokeEditor/pkg-plist
index a3469d46152d..de630d7d4f66 100644
--- a/editors/p5-Proc-InvokeEditor/pkg-plist
+++ b/editors/p5-Proc-InvokeEditor/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Proc::InvokeEditor.3.gz
 %%SITE_PERL%%/Proc/InvokeEditor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/InvokeEditor/.packlist
diff --git a/editors/p5-Vimana/Makefile b/editors/p5-Vimana/Makefile
index e2a61c13d261..c08db2e705d2 100644
--- a/editors/p5-Vimana/Makefile
+++ b/editors/p5-Vimana/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Vimana
 PORTVERSION=	2010.09303
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CORNELIUS
diff --git a/editors/p5-Vimana/pkg-plist b/editors/p5-Vimana/pkg-plist
index 3152e6473fe6..7be287f2cc1b 100644
--- a/editors/p5-Vimana/pkg-plist
+++ b/editors/p5-Vimana/pkg-plist
@@ -28,7 +28,6 @@
 %%SITE_PERL%%/Vimana/VimOnline.pm
 %%SITE_PERL%%/Vimana/VimOnline/ScriptPage.pm
 %%SITE_PERL%%/Vimana/VimOnline/Search.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Vimana/.packlist
 %%PERL5_MAN3%%/Vimana.3.gz
 %%PERL5_MAN3%%/Vimana::Command::Download.3.gz
 %%PERL5_MAN3%%/Vimana::Command::Install.3.gz
diff --git a/emulators/p5-Acme-6502/Makefile b/emulators/p5-Acme-6502/Makefile
index 88880f57b97c..ad8cd8f8ac87 100644
--- a/emulators/p5-Acme-6502/Makefile
+++ b/emulators/p5-Acme-6502/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Acme-6502
 PORTVERSION=	0.77
+PORTREVISION=	1
 CATEGORIES=	emulators perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index d335904e386a..b43850bd2bfe 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-CreditCard
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-CreditCard/pkg-plist b/finance/p5-Business-CreditCard/pkg-plist
index 4e47f490391b..365d6e552034 100644
--- a/finance/p5-Business-CreditCard/pkg-plist
+++ b/finance/p5-Business-CreditCard/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Business/CreditCard.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/CreditCard/.packlist
 %%PERL5_MAN3%%/Business::CreditCard.3.gz
diff --git a/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile b/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
index c046ef50c027..0a93fc6f0539 100644
--- a/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
+++ b/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-MaxMind-CreditCardFraudDetection
 PORTVERSION=	1.54
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BORISZ
@@ -26,15 +26,8 @@ PLIST_FILES=	\
 	%%SITE_PERL%%/Business/MaxMind/TelephoneVerification.pm \
 	%%SITE_PERL%%/Business/example.pl \
 	%%SITE_PERL%%/Business/example_telv.pl \
-	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/MaxMind/.packlist \
 	%%PERL5_MAN3%%/Business::MaxMind::CreditCardFraudDetection.3.gz \
 	%%PERL5_MAN3%%/Business::MaxMind::HTTPBase.3.gz \
 	%%PERL5_MAN3%%/Business::MaxMind::TelephoneVerification.3.gz
 
-PLIST_DIRS=	\
-	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/MaxMind \
-	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business \
-	%%SITE_PERL%%/Business/MaxMind \
-	%%SITE_PERL%%/Business
-
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-OCV/Makefile b/finance/p5-Business-OCV/Makefile
index 67224c0fcaf3..7dedf12b1e85 100644
--- a/finance/p5-Business-OCV/Makefile
+++ b/finance/p5-Business-OCV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OCV
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BENL
diff --git a/finance/p5-Business-OCV/pkg-plist b/finance/p5-Business-OCV/pkg-plist
index ffdf2e8dbb3f..87f74a2e62d5 100644
--- a/finance/p5-Business-OCV/pkg-plist
+++ b/finance/p5-Business-OCV/pkg-plist
@@ -1,2 +1 @@
 %%SITE_PERL%%/Business/OCV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OCV/.packlist
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
index f2a87b0fdeef..3b39119a2cb1 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-2CheckOut
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
index d401af7bf214..e8b4a3874673 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Business::OnlinePayment::2CheckOut.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/2CheckOut.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/2CheckOut/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut/.packlist
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
index dea569ad45de..d8261ee5592a 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-AuthorizeNet
 PORTVERSION=	3.22
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
index 1d7187230df7..27b4587cef55 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
@@ -2,7 +2,6 @@
 %%SITE_PERL%%/Business/OnlinePayment/AuthorizeNet/AIM.pm
 %%SITE_PERL%%/Business/OnlinePayment/AuthorizeNet/AIM/ErrorCodes.pm
 %%SITE_PERL%%/Business/OnlinePayment/AuthorizeNet/ARB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::AuthorizeNet.3.gz
 %%PERL5_MAN3%%/Business::OnlinePayment::AuthorizeNet::AIM.3.gz
 %%PERL5_MAN3%%/Business::OnlinePayment::AuthorizeNet::AIM::ErrorCodes.3.gz
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
index 61425a79416b..6573922875bd 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-BankOfAmerica
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
index bd5145d16cc7..729c3e2a8dd6 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/BankOfAmerica.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/BankOfAmerica/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::BankOfAmerica.3.gz
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/Makefile b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
index 6352b82dc8d9..ac585fface2d 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Beanstream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-Beanstream
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ILYALIT
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
index 0a03f3a5480d..9395634fe8ea 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/auto/Business/OnlinePayment/Beanstream/autosplit.ix
 %%SITE_PERL%%/Business/OnlinePayment/Beanstream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::Beanstream.3.gz
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/Makefile b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
index 25f41bd074e0..935b9a64ee6f 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/Makefile
+++ b/finance/p5-Business-OnlinePayment-Cardstream/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-Cardstream
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
index cf56120cda7b..1ff9493ac232 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/Cardstream.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/Cardstream/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::Cardstream.3.gz
diff --git a/finance/p5-Business-OnlinePayment-Jettis/Makefile b/finance/p5-Business-OnlinePayment-Jettis/Makefile
index 5c5ec932e807..9979d29c21f3 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/Makefile
+++ b/finance/p5-Business-OnlinePayment-Jettis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-Jettis
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
index ccb631936bf2..a5689e84d47a 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/Jettis.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/Jettis/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::Jettis.3.gz
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
index 9b4f3f210190..1245cec38268 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-LinkPoint
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
index 8b174ebfa17e..0e45b8891af5 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Business/OnlinePayment/LinkPoint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::LinkPoint.3.gz
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
index da07512dbb9c..6678fd5c0267 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-MerchantCommerce
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
index 5b6306a523d6..46cbec8fd5b0 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/MerchantCommerce.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/MerchantCommerce/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::MerchantCommerce.3.gz
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
index fa7ee835cd18..ad5121f213fd 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-Network1Financial
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
index 4a1fa28ada0f..0a517e98083b 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/Network1Financial.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/Network1Financial/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::Network1Financial.3.gz
diff --git a/finance/p5-Business-OnlinePayment-OCV/Makefile b/finance/p5-Business-OnlinePayment-OCV/Makefile
index 708a4a3eef1a..450d26b511f5 100644
--- a/finance/p5-Business-OnlinePayment-OCV/Makefile
+++ b/finance/p5-Business-OnlinePayment-OCV/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-OCV
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-OCV/pkg-plist b/finance/p5-Business-OnlinePayment-OCV/pkg-plist
index ac0fdaab8f3d..ea0ea2add46e 100644
--- a/finance/p5-Business-OnlinePayment-OCV/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-OCV/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Business::OnlinePayment::OCV.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/OCV.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/OCV/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/OCV/.packlist
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/Makefile b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
index 64636e31608e..706c24cf13d1 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayConnect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-PayConnect
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
index fc9039e9ef0c..4de8d9d828f5 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/PayConnect.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/PayConnect/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::PayConnect.3.gz
diff --git a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
index e7be34c14945..f47837f474b5 100644
--- a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-PaymenTech
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist b/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist
index 4115282a76e2..f480f80f775c 100644
--- a/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Business::OnlinePayment::PaymenTech.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/PaymenTech.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymenTech/.packlist
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
index 1733c9175af1..5d26c6fc22e6 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-PaymentsGateway
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
index 3df18cb91453..ea3f9f957e5d 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Business/OnlinePayment/PaymentsGateway.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::PaymentsGateway.3.gz
diff --git a/finance/p5-Business-OnlinePayment-SurePay/Makefile b/finance/p5-Business-OnlinePayment-SurePay/Makefile
index f621d3fced68..9007d868a003 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/Makefile
+++ b/finance/p5-Business-OnlinePayment-SurePay/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-SurePay
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
index ede57483d5f3..f83fd333d026 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Business::OnlinePayment::SurePay.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/SurePay.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay/.packlist
diff --git a/finance/p5-Business-OnlinePayment-TCLink/Makefile b/finance/p5-Business-OnlinePayment-TCLink/Makefile
index a927e9b3b8de..653f06a2bda8 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/Makefile
+++ b/finance/p5-Business-OnlinePayment-TCLink/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-TCLink
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
index a446ab12becc..d6697e60b24b 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/TCLink.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/TCLink/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::TCLink.3.gz
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
index 8bb2974233c5..46e4b470eafc 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-VirtualNet
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
index 623cf392ee64..1d99d2811459 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/VirtualNet.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/VirtualNet/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::VirtualNet.3.gz
diff --git a/finance/p5-Business-OnlinePayment-eSec/Makefile b/finance/p5-Business-OnlinePayment-eSec/Makefile
index e6c2235a4743..aab4e4f476f3 100644
--- a/finance/p5-Business-OnlinePayment-eSec/Makefile
+++ b/finance/p5-Business-OnlinePayment-eSec/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-eSec
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-eSec/pkg-plist b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
index 3d2f5039050a..10dcbff73290 100644
--- a/finance/p5-Business-OnlinePayment-eSec/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/eSec.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/eSec/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::eSec.3.gz
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
index d89079a73cd6..3e6d103fe24e 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment-iAuthorizer
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist b/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
index eeeb9054e4f9..cce46b1efd56 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Business/OnlinePayment/certification.pl
 %%SITE_PERL%%/Business/OnlinePayment/iAuthorizer.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/iAuthorizer/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/iAuthorizer/.packlist
diff --git a/finance/p5-Business-OnlinePayment/Makefile b/finance/p5-Business-OnlinePayment/Makefile
index 3caba1c75b0f..44012d9e493c 100644
--- a/finance/p5-Business-OnlinePayment/Makefile
+++ b/finance/p5-Business-OnlinePayment/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-OnlinePayment
 PORTVERSION=	3.02
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:IVAN
diff --git a/finance/p5-Business-OnlinePayment/pkg-plist b/finance/p5-Business-OnlinePayment/pkg-plist
index 7147b51ea151..b88c1ecab925 100644
--- a/finance/p5-Business-OnlinePayment/pkg-plist
+++ b/finance/p5-Business-OnlinePayment/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist
 %%SITE_PERL%%/Business/FraudDetect.pm
 %%SITE_PERL%%/Business/FraudDetect/preCharge.pm
 %%SITE_PERL%%/Business/OnlinePayment.pm
diff --git a/finance/p5-Business-PayPal-IPN/Makefile b/finance/p5-Business-PayPal-IPN/Makefile
index 9d509c43e626..4e77966ff6d8 100644
--- a/finance/p5-Business-PayPal-IPN/Makefile
+++ b/finance/p5-Business-PayPal-IPN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-PayPal-IPN
 PORTVERSION=	1.94
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-PayPal-IPN/pkg-plist b/finance/p5-Business-PayPal-IPN/pkg-plist
index 94515082d905..6d28304dba25 100644
--- a/finance/p5-Business-PayPal-IPN/pkg-plist
+++ b/finance/p5-Business-PayPal-IPN/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Business/PayPal/IPN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal/IPN/.packlist
 %%PERL5_MAN3%%/Business::PayPal::IPN.3.gz
diff --git a/finance/p5-Business-Stripe/Makefile b/finance/p5-Business-Stripe/Makefile
index 1eaa6fc9cf35..5ba9c8b78a8b 100644
--- a/finance/p5-Business-Stripe/Makefile
+++ b/finance/p5-Business-Stripe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-Stripe
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-Stripe/pkg-plist b/finance/p5-Business-Stripe/pkg-plist
index b00e9856210e..ab336178403d 100644
--- a/finance/p5-Business-Stripe/pkg-plist
+++ b/finance/p5-Business-Stripe/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Business/README.pod
 %%SITE_PERL%%/Business/Stripe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/Stripe/.packlist
 %%PERL5_MAN3%%/Business::Stripe.3.gz
 %%PERL5_MAN3%%/Business::README.3.gz
diff --git a/finance/p5-Business-TW-Invoice-U420/Makefile b/finance/p5-Business-TW-Invoice-U420/Makefile
index ba099cbdd826..3c1d979989db 100644
--- a/finance/p5-Business-TW-Invoice-U420/Makefile
+++ b/finance/p5-Business-TW-Invoice-U420/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-TW-Invoice-U420
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-TW-Invoice-U420/pkg-plist b/finance/p5-Business-TW-Invoice-U420/pkg-plist
index d44add1ed904..e321956398fe 100644
--- a/finance/p5-Business-TW-Invoice-U420/pkg-plist
+++ b/finance/p5-Business-TW-Invoice-U420/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/TW/Invoice/U420/.packlist
 %%SITE_PERL%%/Business/TW/Invoice/U420.pm
 %%PERL5_MAN3%%/Business::TW::Invoice::U420.3.gz
diff --git a/finance/p5-Business-TW-TSIB-CStorePayment/Makefile b/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
index ca59d2ff69b6..4d9eadd55081 100644
--- a/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
+++ b/finance/p5-Business-TW-TSIB-CStorePayment/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-TW-TSIB-CStorePayment
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-TW-TSIB-CStorePayment/pkg-plist b/finance/p5-Business-TW-TSIB-CStorePayment/pkg-plist
index 5cc125aadf0d..d46c9179678d 100644
--- a/finance/p5-Business-TW-TSIB-CStorePayment/pkg-plist
+++ b/finance/p5-Business-TW-TSIB-CStorePayment/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/TW/TSIB/CStorePayment/.packlist
 %%SITE_PERL%%/Business/TW/TSIB/CStorePayment.pm
 %%SITE_PERL%%/Business/TW/TSIB/CStorePayment/Entry.pm
 %%PERL5_MAN3%%/Business::TW::TSIB::CStorePayment.3.gz
diff --git a/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile b/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
index 27e12f117304..b8c538866837 100644
--- a/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
+++ b/finance/p5-Business-TW-TSIB-VirtualAccount/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-TW-TSIB-VirtualAccount
 PORTVERSION=	0.04b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-TW-TSIB-VirtualAccount/pkg-plist b/finance/p5-Business-TW-TSIB-VirtualAccount/pkg-plist
index 4c80a973440d..f5ed64a6c332 100644
--- a/finance/p5-Business-TW-TSIB-VirtualAccount/pkg-plist
+++ b/finance/p5-Business-TW-TSIB-VirtualAccount/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/TW/TSIB/VirtualAccount/.packlist
 %%SITE_PERL%%/Business/TW/TSIB/VirtualAccount.pm
 %%SITE_PERL%%/Business/TW/TSIB/VirtualAccount/Entry.pm
 %%PERL5_MAN3%%/Business::TW::TSIB::VirtualAccount.3.gz
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 38f5db713095..2c59acc1c150 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-WorldPay-Junior
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Business-WorldPay-Junior/pkg-plist b/finance/p5-Business-WorldPay-Junior/pkg-plist
index e1125f26d610..07e482616146 100644
--- a/finance/p5-Business-WorldPay-Junior/pkg-plist
+++ b/finance/p5-Business-WorldPay-Junior/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/auto/Business/WorldPay/Junior/new.al
 %%SITE_PERL%%/auto/Business/WorldPay/Junior/register.al
 %%SITE_PERL%%/auto/Business/WorldPay/Junior/valid_callback_host.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay/Junior/.packlist
diff --git a/finance/p5-Data-Currency/Makefile b/finance/p5-Data-Currency/Makefile
index 9fb57a5e8566..ba45f4164025 100644
--- a/finance/p5-Data-Currency/Makefile
+++ b/finance/p5-Data-Currency/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Currency
 PORTVERSION=	0.06000
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Data-Currency/pkg-plist b/finance/p5-Data-Currency/pkg-plist
index 0599a4e37118..831c2a5ed364 100644
--- a/finance/p5-Data-Currency/pkg-plist
+++ b/finance/p5-Data-Currency/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Data/Currency.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Currency/.packlist
 %%PERL5_MAN3%%/Data::Currency.3.gz
diff --git a/finance/p5-Finance-Amortization/Makefile b/finance/p5-Finance-Amortization/Makefile
index e9f837eb3440..2d78695cb594 100644
--- a/finance/p5-Finance-Amortization/Makefile
+++ b/finance/p5-Finance-Amortization/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-Amortization
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-Amortization/pkg-plist b/finance/p5-Finance-Amortization/pkg-plist
index 608ecb0a94a8..8bba9036e905 100644
--- a/finance/p5-Finance-Amortization/pkg-plist
+++ b/finance/p5-Finance-Amortization/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Finance::Amortization.3.gz
 %%SITE_PERL%%/Finance/Amortization.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Amortization/.packlist
diff --git a/finance/p5-Finance-Bitcoin/Makefile b/finance/p5-Finance-Bitcoin/Makefile
index 019c812ff913..842435fcaa5a 100644
--- a/finance/p5-Finance-Bitcoin/Makefile
+++ b/finance/p5-Finance-Bitcoin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-Bitcoin
 PORTVERSION=	0.901
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-Bitcoin/pkg-plist b/finance/p5-Finance-Bitcoin/pkg-plist
index fa81a8e71dff..62dafa1c284e 100644
--- a/finance/p5-Finance-Bitcoin/pkg-plist
+++ b/finance/p5-Finance-Bitcoin/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Finance/Bitcoin/Wallet.pm
 %%SITE_PERL%%/Finance/Bitcoin/Role/HasAPI.pm
 %%SITE_PERL%%/Finance/Bitcoin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Bitcoin/.packlist
 %%PERL5_MAN3%%/Finance::Bitcoin.3.gz
 %%PERL5_MAN3%%/Finance::Bitcoin::API.3.gz
 %%PERL5_MAN3%%/Finance::Bitcoin::Address.3.gz
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
index 622b52f8cf4e..d3c9b479b943 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-Currency-Convert-WebserviceX
 PORTVERSION=	0.07001
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
index faef65b2ac69..18e4d5e1f691 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Finance/Currency/Convert/WebserviceX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX/.packlist
 %%PERL5_MAN3%%/Finance::Currency::Convert::WebserviceX.3.gz
diff --git a/finance/p5-Finance-Currency-Convert-XE/Makefile b/finance/p5-Finance-Currency-Convert-XE/Makefile
index 17184994bc63..90359790612e 100644
--- a/finance/p5-Finance-Currency-Convert-XE/Makefile
+++ b/finance/p5-Finance-Currency-Convert-XE/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-Currency-Convert-XE
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-Currency-Convert-XE/pkg-plist b/finance/p5-Finance-Currency-Convert-XE/pkg-plist
index c12944d9fa1d..ef846b29687a 100644
--- a/finance/p5-Finance-Currency-Convert-XE/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert-XE/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Finance::Currency::Convert::XE.3.gz
 %%SITE_PERL%%/Finance/Currency/Convert/XE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/XE/.packlist
diff --git a/finance/p5-Finance-Currency-Convert/Makefile b/finance/p5-Finance-Currency-Convert/Makefile
index 9e2392377cc6..5894225decb7 100644
--- a/finance/p5-Finance-Currency-Convert/Makefile
+++ b/finance/p5-Finance-Currency-Convert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-Currency-Convert
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-Currency-Convert/pkg-plist b/finance/p5-Finance-Currency-Convert/pkg-plist
index 24afeadad382..abd277c2c158 100644
--- a/finance/p5-Finance-Currency-Convert/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
 %%SITE_PERL%%/Finance/Currency/Convert.pm
 %%SITE_PERL%%/auto/Finance/Currency/Convert/autosplit.ix
 %%PERL5_MAN3%%/Finance::Currency::Convert.3.gz
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index 8f5b39a74186..c4034e5bf2d1 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-Quote
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-Quote/pkg-plist b/finance/p5-Finance-Quote/pkg-plist
index 96a20e75fbdd..369d353f0898 100644
--- a/finance/p5-Finance-Quote/pkg-plist
+++ b/finance/p5-Finance-Quote/pkg-plist
@@ -57,7 +57,6 @@
 %%SITE_PERL%%/Finance/Quote/YahooJSON.pm
 %%SITE_PERL%%/Finance/Quote/ZA.pm
 %%SITE_PERL%%/Finance/Quote/ZA_UnitTrusts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote/.packlist
 %%PERL5_MAN3%%/Finance::Quote.3.gz
 %%PERL5_MAN3%%/Finance::Quote::AEX.3.gz
 %%PERL5_MAN3%%/Finance::Quote::AIAHK.3.gz
diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile
index 773939f56e7a..5e69471065c7 100644
--- a/finance/p5-Finance-QuoteHist/Makefile
+++ b/finance/p5-Finance-QuoteHist/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-QuoteHist
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-QuoteHist/pkg-plist b/finance/p5-Finance-QuoteHist/pkg-plist
index 451e64372786..995e242fdff8 100644
--- a/finance/p5-Finance-QuoteHist/pkg-plist
+++ b/finance/p5-Finance-QuoteHist/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist/.packlist
 %%SITE_PERL%%/Finance/QuoteHist.pm
 %%SITE_PERL%%/Finance/QuoteHist/BusinessWeek.pm
 %%SITE_PERL%%/Finance/QuoteHist/DailyFinance.pm
diff --git a/finance/p5-Finance-QuoteTW/Makefile b/finance/p5-Finance-QuoteTW/Makefile
index 94a7e37ef6d6..75f1e78d6572 100644
--- a/finance/p5-Finance-QuoteTW/Makefile
+++ b/finance/p5-Finance-QuoteTW/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Finance-QuoteTW
 PORTVERSION=	0.09
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-QuoteTW/pkg-plist b/finance/p5-Finance-QuoteTW/pkg-plist
index 90177d26e71f..4f61a727fc9a 100644
--- a/finance/p5-Finance-QuoteTW/pkg-plist
+++ b/finance/p5-Finance-QuoteTW/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/QuoteTW/.packlist
 %%SITE_PERL%%/Finance/QuoteTW.pm
 %%SITE_PERL%%/Finance/QuoteTW/Allianz.pm
 %%SITE_PERL%%/Finance/QuoteTW/Blackrock.pm
diff --git a/finance/p5-Finance-TW-EmergingQuote/Makefile b/finance/p5-Finance-TW-EmergingQuote/Makefile
index a0aadd28c39d..aae38b928e64 100644
--- a/finance/p5-Finance-TW-EmergingQuote/Makefile
+++ b/finance/p5-Finance-TW-EmergingQuote/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-TW-EmergingQuote
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-TW-EmergingQuote/pkg-plist b/finance/p5-Finance-TW-EmergingQuote/pkg-plist
index 347571ad2cbf..ee1b01e3122c 100644
--- a/finance/p5-Finance-TW-EmergingQuote/pkg-plist
+++ b/finance/p5-Finance-TW-EmergingQuote/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Finance/TW/EmergingQuote.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/EmergingQuote/.packlist
 %%PERL5_MAN3%%/Finance::TW::EmergingQuote.3.gz
diff --git a/finance/p5-Finance-TW-TSEQuote/Makefile b/finance/p5-Finance-TW-TSEQuote/Makefile
index 0311921945fe..112eb00aef8a 100644
--- a/finance/p5-Finance-TW-TSEQuote/Makefile
+++ b/finance/p5-Finance-TW-TSEQuote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Finance-TW-TSEQuote
 PORTVERSION=	0.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-TW-TSEQuote/pkg-plist b/finance/p5-Finance-TW-TSEQuote/pkg-plist
index 34c8cef680f7..900a4bdcf64f 100644
--- a/finance/p5-Finance-TW-TSEQuote/pkg-plist
+++ b/finance/p5-Finance-TW-TSEQuote/pkg-plist
@@ -3,5 +3,4 @@ bin/twse-eod-dump
 bin/twse-eod-update
 %%PERL5_MAN3%%/Finance::TW::TSEQuote.3.gz
 %%SITE_PERL%%/Finance/TW/TSEQuote.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/TSEQuote/.packlist
 man/man1/pfq.1.gz
diff --git a/finance/p5-Finance-YahooQuote/Makefile b/finance/p5-Finance-YahooQuote/Makefile
index 09101db5d831..4e0ac2cd0621 100644
--- a/finance/p5-Finance-YahooQuote/Makefile
+++ b/finance/p5-Finance-YahooQuote/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Finance-YahooQuote
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Finance-YahooQuote/pkg-plist b/finance/p5-Finance-YahooQuote/pkg-plist
index a975c3160b62..257a4e2db695 100644
--- a/finance/p5-Finance-YahooQuote/pkg-plist
+++ b/finance/p5-Finance-YahooQuote/pkg-plist
@@ -1,5 +1,4 @@
 bin/yahooquote
 %%SITE_PERL%%/Finance/YahooQuote.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/YahooQuote/.packlist
 %%PERL5_MAN3%%/Finance::YahooQuote.3.gz
 man/man1/yahooquote.1.gz
diff --git a/finance/p5-Locale-Currency-Format/Makefile b/finance/p5-Locale-Currency-Format/Makefile
index c1a16e942ec5..3ab9a84981c8 100644
--- a/finance/p5-Locale-Currency-Format/Makefile
+++ b/finance/p5-Locale-Currency-Format/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-Currency-Format
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Locale-Currency-Format/pkg-plist b/finance/p5-Locale-Currency-Format/pkg-plist
index ccf385622d1e..2a245d47866b 100644
--- a/finance/p5-Locale-Currency-Format/pkg-plist
+++ b/finance/p5-Locale-Currency-Format/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Locale/Currency/Format.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Currency/Format/.packlist
 %%PERL5_MAN3%%/Locale::Currency::Format.3.gz
diff --git a/finance/p5-Math-Financial/Makefile b/finance/p5-Math-Financial/Makefile
index 63f279b20190..4ac25707d640 100644
--- a/finance/p5-Math-Financial/Makefile
+++ b/finance/p5-Math-Financial/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Financial
 PORTVERSION=	0.76
+PORTREVISION=	1
 CATEGORIES=	finance math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/finance/p5-Math-Financial/pkg-plist b/finance/p5-Math-Financial/pkg-plist
index ff4c11510937..b2b57b9661a0 100644
--- a/finance/p5-Math-Financial/pkg-plist
+++ b/finance/p5-Math-Financial/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Math/Financial.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
 %%PERL5_MAN3%%/Math::Financial.3.gz
diff --git a/finance/p5-PayflowPro/Makefile b/finance/p5-PayflowPro/Makefile
index 234d74dab01d..e941b2a71b7b 100644
--- a/finance/p5-PayflowPro/Makefile
+++ b/finance/p5-PayflowPro/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PayflowPro
 PORTVERSION=	3101
+PORTREVISION=	1
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VKHERA
@@ -22,8 +23,6 @@ post-install:
 
 PLIST_FILES=	etc/ca-bundle.crt \
 		%%SITE_PERL%%/PayflowPro.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/PayflowPro/.packlist \
 		%%PERL5_MAN3%%/PayflowPro.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/PayflowPro
 
 .include <bsd.port.mk>
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 1b947c43d3a9..82b95ac62b14 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ftpmirror
 PORTVERSION=	1.96
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.sai.msu.su/pub/unix/FTP/mirror/
 
@@ -30,7 +30,6 @@ post-configure:
 		${WRKSRC}/Fan/Fan.pm
 
 post-install:
-	-@[ -d ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto ] && ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/ftpmirror/pkg-plist b/ftp/ftpmirror/pkg-plist
index 6eb7724ecc41..d7da3cd9ffa0 100644
--- a/ftp/ftpmirror/pkg-plist
+++ b/ftp/ftpmirror/pkg-plist
@@ -1,264 +1,263 @@
 bin/rotate
 bin/ftpmirror
 etc/ftpmirror.cf-sample
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5File.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5String.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Usage/Usage.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/full_setup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/find_archive.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/check.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/subst_directory.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/gen_match.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/gen_subst.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/do_lock.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/cleanup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/net_init.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/last_seq.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/step_synch.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/run_step_mirror.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/run_full_mirror.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/quit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/list.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/put.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/fill_mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/fill_size.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/del.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_del.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_del.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/besame.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/date_check.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/calc_offset.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/adjust_offset.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/mkdirinfo.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_scanner.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_scanner.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/server_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/client_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/changer_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get_uid.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get_gid.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_any.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_remote.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_local.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_encode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_decode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/get_mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/gmt2mdtm.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/cleanup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/validate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/compare.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/copyfrom.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/duplicate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/to_line.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill_checksum.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_path.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_line.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_list.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/parsetime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/update_master.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/append.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/mkdirhier.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/rmdirhier.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_level.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_mask.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plock.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/encode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/decode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/str4time.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/str4date.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/timezone.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/isleap.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofyear.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/days.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofweek.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/daysofmonth.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/nameofmonth.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/lookup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/delete.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/index.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/load.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/fill.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/store.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/update.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/putdata.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/stats.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/passive.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/putreq.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/getres.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/quit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/login.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/do_login.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/port.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/acpt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/pasv.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/cleardataconn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/makedataconn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/list.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/put.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/stat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/chdir.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/cwd.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/pwd.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/type.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/image.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/ascii.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/size.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/unlink.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/mkdir.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/rmdir.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/rename.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/chmod.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/umask.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/group.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/idle.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_begin.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_end.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/generate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/normalize.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/update.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/farm_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/genindex.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/synch.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/getrev.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/parse_url.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/search.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_line.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_option.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_file.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/combine_hash.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/merge_hash.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/dumpall.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/get_value.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/error.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/addkey.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/try_check.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/getval.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/delete.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/setval.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/addval.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/dump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/combine.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/merge.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_ref.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_code.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_hash.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_array.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_boolean.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_decimal.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_octal.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_integer.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_ipv4_addr.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_path.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_file.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_directory.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_timezone.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/findpath.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/where.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/start.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/end.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/down.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/up.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/open.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/close.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/add_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/clr_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/perform_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/unget.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getone.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get_index.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get_misc.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_local.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_ftp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_lslR.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getline_lslR.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/summary.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getcmp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/guess.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/fileglob.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mklist.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mkdiff.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_update.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/attr_cmp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/status_report.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/FATAL.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/stats.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/clearerror.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/error.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/fatal.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/status.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/dump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/putln.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/getln.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/putdata.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/getdata.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/nowait.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/open_socket.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/do_client.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/do_server.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/new_client.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/close.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/handle.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/sockname.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/peername.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Attrib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Cool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/DIR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/FTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Farm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/HTTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Loader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Param.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Scan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Usage.pm
+%%SITE_ARCH%%/auto/Fan/MD5/MD5.so
+%%SITE_ARCH%%/auto/Fan/MD5/MD5File.al
+%%SITE_ARCH%%/auto/Fan/MD5/MD5String.al
+%%SITE_ARCH%%/auto/Fan/MD5/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Usage/Usage.so
+%%SITE_ARCH%%/auto/Fan/full_setup.al
+%%SITE_ARCH%%/auto/Fan/find_archive.al
+%%SITE_ARCH%%/auto/Fan/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/new.al
+%%SITE_ARCH%%/auto/Fan/check.al
+%%SITE_ARCH%%/auto/Fan/subst_directory.al
+%%SITE_ARCH%%/auto/Fan/gen_match.al
+%%SITE_ARCH%%/auto/Fan/gen_subst.al
+%%SITE_ARCH%%/auto/Fan/do_lock.al
+%%SITE_ARCH%%/auto/Fan/cleanup.al
+%%SITE_ARCH%%/auto/Fan/net_init.al
+%%SITE_ARCH%%/auto/Fan/last_seq.al
+%%SITE_ARCH%%/auto/Fan/step_synch.al
+%%SITE_ARCH%%/auto/Fan/run_step_mirror.al
+%%SITE_ARCH%%/auto/Fan/run_full_mirror.al
+%%SITE_ARCH%%/auto/Fan/quit.al
+%%SITE_ARCH%%/auto/Fan/list.al
+%%SITE_ARCH%%/auto/Fan/get.al
+%%SITE_ARCH%%/auto/Fan/put.al
+%%SITE_ARCH%%/auto/Fan/fill_mtime.al
+%%SITE_ARCH%%/auto/Fan/fill_size.al
+%%SITE_ARCH%%/auto/Fan/add.al
+%%SITE_ARCH%%/auto/Fan/del.al
+%%SITE_ARCH%%/auto/Fan/local_add.al
+%%SITE_ARCH%%/auto/Fan/local_del.al
+%%SITE_ARCH%%/auto/Fan/remote_add.al
+%%SITE_ARCH%%/auto/Fan/remote_del.al
+%%SITE_ARCH%%/auto/Fan/besame.al
+%%SITE_ARCH%%/auto/Fan/date_check.al
+%%SITE_ARCH%%/auto/Fan/calc_offset.al
+%%SITE_ARCH%%/auto/Fan/adjust_offset.al
+%%SITE_ARCH%%/auto/Fan/mkdirinfo.al
+%%SITE_ARCH%%/auto/Fan/remote_scanner.al
+%%SITE_ARCH%%/auto/Fan/local_scanner.al
+%%SITE_ARCH%%/auto/Fan/server_filter.al
+%%SITE_ARCH%%/auto/Fan/client_filter.al
+%%SITE_ARCH%%/auto/Fan/changer_filter.al
+%%SITE_ARCH%%/auto/Fan/get_uid.al
+%%SITE_ARCH%%/auto/Fan/get_gid.al
+%%SITE_ARCH%%/auto/Fan/scan_any.al
+%%SITE_ARCH%%/auto/Fan/scan_remote.al
+%%SITE_ARCH%%/auto/Fan/scan_local.al
+%%SITE_ARCH%%/auto/Fan/Attrib/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Attrib/new.al
+%%SITE_ARCH%%/auto/Fan/Attrib/attr_encode.al
+%%SITE_ARCH%%/auto/Fan/Attrib/attr_decode.al
+%%SITE_ARCH%%/auto/Fan/Attrib/mtime.al
+%%SITE_ARCH%%/auto/Fan/Attrib/get_mtime.al
+%%SITE_ARCH%%/auto/Fan/Attrib/gmt2mdtm.al
+%%SITE_ARCH%%/auto/Fan/Attrib/cleanup.al
+%%SITE_ARCH%%/auto/Fan/Attrib/validate.al
+%%SITE_ARCH%%/auto/Fan/Attrib/compare.al
+%%SITE_ARCH%%/auto/Fan/Attrib/copyfrom.al
+%%SITE_ARCH%%/auto/Fan/Attrib/duplicate.al
+%%SITE_ARCH%%/auto/Fan/Attrib/to_line.al
+%%SITE_ARCH%%/auto/Fan/Attrib/fill_checksum.al
+%%SITE_ARCH%%/auto/Fan/Attrib/fill.al
+%%SITE_ARCH%%/auto/Fan/Attrib/from_path.al
+%%SITE_ARCH%%/auto/Fan/Attrib/from_line.al
+%%SITE_ARCH%%/auto/Fan/Attrib/from_list.al
+%%SITE_ARCH%%/auto/Fan/Attrib/parsetime.al
+%%SITE_ARCH%%/auto/Fan/Attrib/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/update_master.al
+%%SITE_ARCH%%/auto/Fan/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Cool/append.al
+%%SITE_ARCH%%/auto/Fan/Cool/mkdirhier.al
+%%SITE_ARCH%%/auto/Fan/Cool/rmdirhier.al
+%%SITE_ARCH%%/auto/Fan/Cool/plog.al
+%%SITE_ARCH%%/auto/Fan/Cool/plog_level.al
+%%SITE_ARCH%%/auto/Fan/Cool/plog_mask.al
+%%SITE_ARCH%%/auto/Fan/Cool/plock.al
+%%SITE_ARCH%%/auto/Fan/Cool/encode.al
+%%SITE_ARCH%%/auto/Fan/Cool/decode.al
+%%SITE_ARCH%%/auto/Fan/Cool/str4time.al
+%%SITE_ARCH%%/auto/Fan/Cool/str4date.al
+%%SITE_ARCH%%/auto/Fan/Cool/timezone.al
+%%SITE_ARCH%%/auto/Fan/Cool/isleap.al
+%%SITE_ARCH%%/auto/Fan/Cool/dayofyear.al
+%%SITE_ARCH%%/auto/Fan/Cool/days.al
+%%SITE_ARCH%%/auto/Fan/Cool/dayofweek.al
+%%SITE_ARCH%%/auto/Fan/Cool/daysofmonth.al
+%%SITE_ARCH%%/auto/Fan/Cool/nameofmonth.al
+%%SITE_ARCH%%/auto/Fan/Cool/lookup.al
+%%SITE_ARCH%%/auto/Fan/Cool/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/DIR/new.al
+%%SITE_ARCH%%/auto/Fan/DIR/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/DIR/get.al
+%%SITE_ARCH%%/auto/Fan/DIR/add.al
+%%SITE_ARCH%%/auto/Fan/DIR/delete.al
+%%SITE_ARCH%%/auto/Fan/DIR/index.al
+%%SITE_ARCH%%/auto/Fan/DIR/load.al
+%%SITE_ARCH%%/auto/Fan/DIR/fill.al
+%%SITE_ARCH%%/auto/Fan/DIR/store.al
+%%SITE_ARCH%%/auto/Fan/DIR/update.al
+%%SITE_ARCH%%/auto/Fan/DIR/putdata.al
+%%SITE_ARCH%%/auto/Fan/DIR/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/FTP/stats.al
+%%SITE_ARCH%%/auto/Fan/FTP/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/FTP/new.al
+%%SITE_ARCH%%/auto/Fan/FTP/passive.al
+%%SITE_ARCH%%/auto/Fan/FTP/putreq.al
+%%SITE_ARCH%%/auto/Fan/FTP/getres.al
+%%SITE_ARCH%%/auto/Fan/FTP/quit.al
+%%SITE_ARCH%%/auto/Fan/FTP/login.al
+%%SITE_ARCH%%/auto/Fan/FTP/do_login.al
+%%SITE_ARCH%%/auto/Fan/FTP/port.al
+%%SITE_ARCH%%/auto/Fan/FTP/acpt.al
+%%SITE_ARCH%%/auto/Fan/FTP/pasv.al
+%%SITE_ARCH%%/auto/Fan/FTP/cleardataconn.al
+%%SITE_ARCH%%/auto/Fan/FTP/makedataconn.al
+%%SITE_ARCH%%/auto/Fan/FTP/list.al
+%%SITE_ARCH%%/auto/Fan/FTP/get.al
+%%SITE_ARCH%%/auto/Fan/FTP/put.al
+%%SITE_ARCH%%/auto/Fan/FTP/stat.al
+%%SITE_ARCH%%/auto/Fan/FTP/chdir.al
+%%SITE_ARCH%%/auto/Fan/FTP/cwd.al
+%%SITE_ARCH%%/auto/Fan/FTP/pwd.al
+%%SITE_ARCH%%/auto/Fan/FTP/type.al
+%%SITE_ARCH%%/auto/Fan/FTP/image.al
+%%SITE_ARCH%%/auto/Fan/FTP/ascii.al
+%%SITE_ARCH%%/auto/Fan/FTP/size.al
+%%SITE_ARCH%%/auto/Fan/FTP/mtime.al
+%%SITE_ARCH%%/auto/Fan/FTP/unlink.al
+%%SITE_ARCH%%/auto/Fan/FTP/mkdir.al
+%%SITE_ARCH%%/auto/Fan/FTP/rmdir.al
+%%SITE_ARCH%%/auto/Fan/FTP/rename.al
+%%SITE_ARCH%%/auto/Fan/FTP/chmod.al
+%%SITE_ARCH%%/auto/Fan/FTP/umask.al
+%%SITE_ARCH%%/auto/Fan/FTP/group.al
+%%SITE_ARCH%%/auto/Fan/FTP/idle.al
+%%SITE_ARCH%%/auto/Fan/FTP/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Farm/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Farm/new.al
+%%SITE_ARCH%%/auto/Fan/Farm/d_begin.al
+%%SITE_ARCH%%/auto/Fan/Farm/d_add.al
+%%SITE_ARCH%%/auto/Fan/Farm/d_end.al
+%%SITE_ARCH%%/auto/Fan/Farm/generate.al
+%%SITE_ARCH%%/auto/Fan/Farm/normalize.al
+%%SITE_ARCH%%/auto/Fan/Farm/update.al
+%%SITE_ARCH%%/auto/Fan/Farm/farm_filter.al
+%%SITE_ARCH%%/auto/Fan/Farm/genindex.al
+%%SITE_ARCH%%/auto/Fan/Farm/synch.al
+%%SITE_ARCH%%/auto/Fan/Farm/getrev.al
+%%SITE_ARCH%%/auto/Fan/Farm/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/HTTP/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/HTTP/new.al
+%%SITE_ARCH%%/auto/Fan/HTTP/get.al
+%%SITE_ARCH%%/auto/Fan/HTTP/parse_url.al
+%%SITE_ARCH%%/auto/Fan/HTTP/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Loader/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Loader/new.al
+%%SITE_ARCH%%/auto/Fan/Loader/search.al
+%%SITE_ARCH%%/auto/Fan/Loader/parse_line.al
+%%SITE_ARCH%%/auto/Fan/Loader/parse_option.al
+%%SITE_ARCH%%/auto/Fan/Loader/parse_file.al
+%%SITE_ARCH%%/auto/Fan/Loader/combine_hash.al
+%%SITE_ARCH%%/auto/Fan/Loader/merge_hash.al
+%%SITE_ARCH%%/auto/Fan/Loader/dumpall.al
+%%SITE_ARCH%%/auto/Fan/Loader/get_value.al
+%%SITE_ARCH%%/auto/Fan/Loader/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Param/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Param/new.al
+%%SITE_ARCH%%/auto/Fan/Param/error.al
+%%SITE_ARCH%%/auto/Fan/Param/addkey.al
+%%SITE_ARCH%%/auto/Fan/Param/try_check.al
+%%SITE_ARCH%%/auto/Fan/Param/getval.al
+%%SITE_ARCH%%/auto/Fan/Param/delete.al
+%%SITE_ARCH%%/auto/Fan/Param/setval.al
+%%SITE_ARCH%%/auto/Fan/Param/addval.al
+%%SITE_ARCH%%/auto/Fan/Param/dump.al
+%%SITE_ARCH%%/auto/Fan/Param/combine.al
+%%SITE_ARCH%%/auto/Fan/Param/merge.al
+%%SITE_ARCH%%/auto/Fan/Param/want_ref.al
+%%SITE_ARCH%%/auto/Fan/Param/want_code.al
+%%SITE_ARCH%%/auto/Fan/Param/want_hash.al
+%%SITE_ARCH%%/auto/Fan/Param/want_array.al
+%%SITE_ARCH%%/auto/Fan/Param/want_boolean.al
+%%SITE_ARCH%%/auto/Fan/Param/want_decimal.al
+%%SITE_ARCH%%/auto/Fan/Param/want_octal.al
+%%SITE_ARCH%%/auto/Fan/Param/want_integer.al
+%%SITE_ARCH%%/auto/Fan/Param/want_ipv4_addr.al
+%%SITE_ARCH%%/auto/Fan/Param/want_path.al
+%%SITE_ARCH%%/auto/Fan/Param/want_file.al
+%%SITE_ARCH%%/auto/Fan/Param/want_directory.al
+%%SITE_ARCH%%/auto/Fan/Param/want_timezone.al
+%%SITE_ARCH%%/auto/Fan/Param/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Scan/findpath.al
+%%SITE_ARCH%%/auto/Fan/Scan/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Scan/new.al
+%%SITE_ARCH%%/auto/Fan/Scan/where.al
+%%SITE_ARCH%%/auto/Fan/Scan/start.al
+%%SITE_ARCH%%/auto/Fan/Scan/end.al
+%%SITE_ARCH%%/auto/Fan/Scan/down.al
+%%SITE_ARCH%%/auto/Fan/Scan/up.al
+%%SITE_ARCH%%/auto/Fan/Scan/open.al
+%%SITE_ARCH%%/auto/Fan/Scan/close.al
+%%SITE_ARCH%%/auto/Fan/Scan/add_filter.al
+%%SITE_ARCH%%/auto/Fan/Scan/clr_filter.al
+%%SITE_ARCH%%/auto/Fan/Scan/perform_filter.al
+%%SITE_ARCH%%/auto/Fan/Scan/unget.al
+%%SITE_ARCH%%/auto/Fan/Scan/get.al
+%%SITE_ARCH%%/auto/Fan/Scan/getone.al
+%%SITE_ARCH%%/auto/Fan/Scan/get_index.al
+%%SITE_ARCH%%/auto/Fan/Scan/get_misc.al
+%%SITE_ARCH%%/auto/Fan/Scan/dir_local.al
+%%SITE_ARCH%%/auto/Fan/Scan/dir_ftp.al
+%%SITE_ARCH%%/auto/Fan/Scan/dir_lslR.al
+%%SITE_ARCH%%/auto/Fan/Scan/getline_lslR.al
+%%SITE_ARCH%%/auto/Fan/Scan/dump.al
+%%SITE_ARCH%%/auto/Fan/Scan/summary.al
+%%SITE_ARCH%%/auto/Fan/Scan/getcmp.al
+%%SITE_ARCH%%/auto/Fan/Scan/guess.al
+%%SITE_ARCH%%/auto/Fan/Scan/fileglob.al
+%%SITE_ARCH%%/auto/Fan/Scan/scan_mklist.al
+%%SITE_ARCH%%/auto/Fan/Scan/scan_mkdiff.al
+%%SITE_ARCH%%/auto/Fan/Scan/scan_update.al
+%%SITE_ARCH%%/auto/Fan/Scan/attr_cmp.al
+%%SITE_ARCH%%/auto/Fan/Scan/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/TCP/status_report.al
+%%SITE_ARCH%%/auto/Fan/TCP/FATAL.al
+%%SITE_ARCH%%/auto/Fan/TCP/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/TCP/new.al
+%%SITE_ARCH%%/auto/Fan/TCP/stats.al
+%%SITE_ARCH%%/auto/Fan/TCP/clearerror.al
+%%SITE_ARCH%%/auto/Fan/TCP/error.al
+%%SITE_ARCH%%/auto/Fan/TCP/fatal.al
+%%SITE_ARCH%%/auto/Fan/TCP/status.al
+%%SITE_ARCH%%/auto/Fan/TCP/dump.al
+%%SITE_ARCH%%/auto/Fan/TCP/putln.al
+%%SITE_ARCH%%/auto/Fan/TCP/getln.al
+%%SITE_ARCH%%/auto/Fan/TCP/putdata.al
+%%SITE_ARCH%%/auto/Fan/TCP/getdata.al
+%%SITE_ARCH%%/auto/Fan/TCP/nowait.al
+%%SITE_ARCH%%/auto/Fan/TCP/open_socket.al
+%%SITE_ARCH%%/auto/Fan/TCP/do_client.al
+%%SITE_ARCH%%/auto/Fan/TCP/do_server.al
+%%SITE_ARCH%%/auto/Fan/TCP/new_client.al
+%%SITE_ARCH%%/auto/Fan/TCP/close.al
+%%SITE_ARCH%%/auto/Fan/TCP/handle.al
+%%SITE_ARCH%%/auto/Fan/TCP/sockname.al
+%%SITE_ARCH%%/auto/Fan/TCP/peername.al
+%%SITE_ARCH%%/auto/Fan/TCP/autosplit.ix
+%%SITE_ARCH%%/Fan.pm
+%%SITE_ARCH%%/Fan/Attrib.pm
+%%SITE_ARCH%%/Fan/Cool.pm
+%%SITE_ARCH%%/Fan/DIR.pm
+%%SITE_ARCH%%/Fan/FTP.pm
+%%SITE_ARCH%%/Fan/Farm.pm
+%%SITE_ARCH%%/Fan/HTTP.pm
+%%SITE_ARCH%%/Fan/Loader.pm
+%%SITE_ARCH%%/Fan/MD5.pm
+%%SITE_ARCH%%/Fan/Param.pm
+%%SITE_ARCH%%/Fan/Scan.pm
+%%SITE_ARCH%%/Fan/TCP.pm
+%%SITE_ARCH%%/Fan/Usage.pm
diff --git a/ftp/p5-File-Fetch/Makefile b/ftp/p5-File-Fetch/Makefile
index f81b05b36704..1773f8d4e4aa 100644
--- a/ftp/p5-File-Fetch/Makefile
+++ b/ftp/p5-File-Fetch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Fetch
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	ftp www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-File-Fetch/pkg-plist b/ftp/p5-File-Fetch/pkg-plist
index 05059ad2bd7e..6792957f29c7 100644
--- a/ftp/p5-File-Fetch/pkg-plist
+++ b/ftp/p5-File-Fetch/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Fetch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Fetch/.packlist
 %%PERL5_MAN3%%/File::Fetch.3.gz
diff --git a/ftp/p5-Net-FTP-Common/Makefile b/ftp/p5-Net-FTP-Common/Makefile
index 039e7ef96a09..691e7cb38437 100644
--- a/ftp/p5-Net-FTP-Common/Makefile
+++ b/ftp/p5-Net-FTP-Common/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-FTP-Common
 PORTVERSION=	7.0.d
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTP-Common/pkg-plist b/ftp/p5-Net-FTP-Common/pkg-plist
index d2964c4a463e..d0f7eaf1a879 100644
--- a/ftp/p5-Net-FTP-Common/pkg-plist
+++ b/ftp/p5-Net-FTP-Common/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Net/FTP/Common.pm
 %%SITE_PERL%%/Net/FTP/Common.pod
 %%PERL5_MAN3%%/Net::FTP::Common.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Common/.packlist
diff --git a/ftp/p5-Net-FTP-Recursive/Makefile b/ftp/p5-Net-FTP-Recursive/Makefile
index 00a65f901472..b01c502ce95c 100644
--- a/ftp/p5-Net-FTP-Recursive/Makefile
+++ b/ftp/p5-Net-FTP-Recursive/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-FTP-Recursive
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTP-Recursive/pkg-plist b/ftp/p5-Net-FTP-Recursive/pkg-plist
index b8491f881747..d589b1c6da97 100644
--- a/ftp/p5-Net-FTP-Recursive/pkg-plist
+++ b/ftp/p5-Net-FTP-Recursive/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/FTP/Recursive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Recursive/.packlist
 %%PERL5_MAN3%%/Net::FTP::Recursive.3.gz
diff --git a/ftp/p5-Net-FTPSSL/Makefile b/ftp/p5-Net-FTPSSL/Makefile
index 30656bb78918..cff47169186f 100644
--- a/ftp/p5-Net-FTPSSL/Makefile
+++ b/ftp/p5-Net-FTPSSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-FTPSSL
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTPSSL/pkg-plist b/ftp/p5-Net-FTPSSL/pkg-plist
index 6a326bb35d6a..563fb59aa0fe 100644
--- a/ftp/p5-Net-FTPSSL/pkg-plist
+++ b/ftp/p5-Net-FTPSSL/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/FTPSSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPSSL/.packlist
 %%PERL5_MAN3%%/Net::FTPSSL.3.gz
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 2818b16805fd..f8a4666366b8 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-FTPServer
 PORTVERSION=	1.125
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index 12e445175760..2ba02c5b9b7b 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -23,7 +23,6 @@ bin/ro-ftpd.pl
 %%SITE_PERL%%/Net/FTPServer/RO/DirHandle.pm
 %%SITE_PERL%%/Net/FTPServer/RO/FileHandle.pm
 %%SITE_PERL%%/Net/FTPServer/RO/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer/.packlist
 %%PERL5_MAN3%%/Net::FTPServer.3.gz
 %%PERL5_MAN3%%/Net::FTPServer::DBeg1::DirHandle.3.gz
 %%PERL5_MAN3%%/Net::FTPServer::DBeg1::FileHandle.3.gz
diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 63db590b17df..5577fa98b460 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-FTP
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-POE-Component-Client-FTP/pkg-plist b/ftp/p5-POE-Component-Client-FTP/pkg-plist
index cd6770e69aeb..9c3925039e64 100644
--- a/ftp/p5-POE-Component-Client-FTP/pkg-plist
+++ b/ftp/p5-POE-Component-Client-FTP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/Client/FTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP/.packlist
 %%PERL5_MAN3%%/POE::Component::Client::FTP.3.gz
diff --git a/ftp/p5-SOAP-Transport-FTP/Makefile b/ftp/p5-SOAP-Transport-FTP/Makefile
index 3d6f7d2e6f95..e2652599b035 100644
--- a/ftp/p5-SOAP-Transport-FTP/Makefile
+++ b/ftp/p5-SOAP-Transport-FTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP-Transport-FTP
 PORTVERSION=	0.711
+PORTREVISION=	1
 CATEGORIES=	ftp net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-SOAP-Transport-FTP/pkg-plist b/ftp/p5-SOAP-Transport-FTP/pkg-plist
index bd2f3a4f30f3..37afb22ac5c0 100644
--- a/ftp/p5-SOAP-Transport-FTP/pkg-plist
+++ b/ftp/p5-SOAP-Transport-FTP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SOAP/Transport/FTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/FTP/.packlist
 %%PERL5_MAN3%%/SOAP::Transport::FTP.3.gz
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index aca28fcbf999..821608cb8c95 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	paraget
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp perl5
 MASTER_SITES=	SF
 
diff --git a/ftp/paraget/pkg-plist b/ftp/paraget/pkg-plist
index 8009bda8d4d2..a0b8fe33e85d 100644
--- a/ftp/paraget/pkg-plist
+++ b/ftp/paraget/pkg-plist
@@ -17,4 +17,3 @@ man/man1/paraget.1.gz
 %%SITE_PERL%%/Net/Paraget/Server.pm
 %%SITE_PERL%%/Net/Paraget/ServerList.pm
 %%SITE_PERL%%/Net/Paraget/ServerQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget/.packlist
diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile
index daa40d47938b..2ab2fa8fdf73 100644
--- a/ftp/profxp/Makefile
+++ b/ftp/profxp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	profxp
 PORTVERSION=	3p2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://duncanthrax.net/profxp/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/p/-pre/}-src
@@ -25,8 +25,8 @@ post-patch1:
 	@${REINPLACE_CMD} -i '' '1s|^\#.*|#!${PERL}|' ${WRKSRC}/profxpv3.pl
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_SCRIPT} ${WRKSRC}/profxpv3.pl ${STAGEDIR}${PREFIX}/bin/profxp
-	${CP} -R ${WRKSRC}/profxp ${STAGEDIR}${SITE_PERL}
+	${CP} -R ${WRKSRC}/profxp ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index ed319fc880c8..d72c84e4c707 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wzdftpd
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}
 
@@ -104,10 +104,6 @@ post-patch:
 		 /gcry_control/d' \
 
 post-install:
-.if ${PORT_OPTIONS:MPERL}
-	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/wzdftpd/.packlist
-.endif
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS ChangeLog NEWS Permissions.ReadMeFirst README \
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 05dc1c3ea31a..868d5e0ab249 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -97,9 +97,8 @@ lib/libwzd_core.a
 lib/libwzd_core.so
 lib/libwzd_core.so.0
 lib/libwzd_core.so.0.801.1
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/wzdftpd/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/wzdftpd/wzdftpd.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/wzdftpd.pm
+%%PERL%%%%SITE_ARCH%%/auto/wzdftpd/wzdftpd.so
+%%PERL%%%%SITE_ARCH%%/wzdftpd.pm
 %%MYSQL%%lib/wzdftpd/backends/libwzdmysql.a
 %%MYSQL%%lib/wzdftpd/backends/libwzdmysql.so
 %%PGSQL%%lib/wzdftpd/backends/libwzdpgsql.a
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index 81133610de17..24b2062a31a0 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	frozen-bubble
 DISTVERSION=	2.2.1-beta1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.frozen-bubble.org/data/
 
diff --git a/games/frozen-bubble/pkg-plist b/games/frozen-bubble/pkg-plist
index b9ec0ab4d831..1e54470ac07c 100644
--- a/games/frozen-bubble/pkg-plist
+++ b/games/frozen-bubble/pkg-plist
@@ -7,3269 +7,3269 @@ bin/frozen-bubble-editor
 %%PERL5_MAN3%%/Games::FrozenBubble::Net.3.gz
 %%PERL5_MAN3%%/Games::FrozenBubble::NetDiscover.3.gz
 %%PERL5_MAN3%%/Games::FrozenBubble::Stuff.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/CStuff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/LevelEditor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/MDKCommon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/NetDiscover.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/Stuff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Games/FrozenBubble/Symbols.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/FrozenBubble/CStuff/CStuff.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo1.bz2
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo2.bz2
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo3.bz2
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo4.bz2
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/data/levels
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/data/plasma.raw
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_hiscores.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_multiplayer.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_netgame.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_one_player.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_paused.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/backgrnd.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-1-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-1.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-2-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-2.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-3-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-3.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-4-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-4.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-5-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-5.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-6-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-6.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-7-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-7.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-8-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-8.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-1-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-1.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-2-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-2.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-3-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-3.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-4-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-4.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-5-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-5.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-6-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-6.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-7-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-7.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-8-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-8.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_lose-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_lose.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_prelight-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_prelight.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_0-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_0.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_1-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_2-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_3-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_4-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_5-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_5.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_6-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_6.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_7.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/banane-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/banane.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/compressor_ext.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/compressor_main.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/dot_green.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/dot_red.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/file_list_background.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-af.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ar.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-az.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-bg.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-br.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-bs.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ca.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-cs.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-cy.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-da.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-de.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-el.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-en.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-eo.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-es.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-eu.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-fi.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-fr.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ga.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-gl.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-hr.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-hu.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-id.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ir.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-is.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-it.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ja.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ko.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-lt.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-lv.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-mk.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ms.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ne.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-nl.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-no.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-pl.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-pt.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-pt_BR.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ro.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ru.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sk.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sl.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sq.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sv.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-tg.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-tr.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-uk.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-uz.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-vi.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-wa.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-zh_CN.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-zh_TW.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/font-hi.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/font.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/font2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/gen
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hiscore-levelset.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hiscore-mptraining.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hiscore_frame.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hover.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_p1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_p2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/intro/back_intro.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/key_shortcuts.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp1-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp2-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp3-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp4-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/level_editor.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_down.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_down_more.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_up.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_up_more.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loading.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loading_step.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loading_step_initial.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loadingpreviews.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/lose_panel.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/1p_panel.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l3_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/back_start.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-left-green.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-left-purple.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-right-green.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-right-purple.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_artwork.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_cpucontrol.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_leveleditor.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_soundtrack.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/blink.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/fblogo-mask.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/fblogo.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/highlight-server.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/ping-high.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/ping-low.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/ping-mid.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/please_wait.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/small_ping.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/stamp.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_1pgame_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_1pgame_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_2pgame_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_2pgame_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_editor_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_editor_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_graphics_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_graphics_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_highscores_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_highscores_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_keys_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_keys_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_langame_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_langame_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_menu_1p_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_menu_1p_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_multiplayer_training_outlined_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_multiplayer_training_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_netgame_off.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_netgame_over.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_pick_start_level_outlined_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_pick_start_level_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_all_levels_outlined_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_all_levels_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_random_levels_outlined_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_random_levels_text.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/void_chat.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/void_chat_small.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/void_panel.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_p1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-insamegame.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-playing.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-5.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-6.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-7.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-8.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-9.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-A.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-B.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-C.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-D.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/on_top_next-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/on_top_next.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_10.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0098.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0099.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0100.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0101.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0102.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0103.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0104.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0105.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0106.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0107.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0108.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0109.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0110.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0111.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0112.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0113.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0114.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0115.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0116.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0117.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0118.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0119.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0120.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0121.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0122.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0123.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0124.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0125.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0126.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0127.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0128.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0129.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0130.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0131.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0132.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0133.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0134.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0135.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0136.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0137.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0138.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0139.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0140.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0141.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0142.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0143.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0144.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0145.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0146.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0147.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0148.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0149.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0150.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0151.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0152.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0153.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0154.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0155.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0156.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0157.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0158.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0098.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0099.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0100.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0101.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0102.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0103.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0104.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0105.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0106.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0107.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0108.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0109.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0110.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0111.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0112.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0113.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0114.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0115.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0116.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0117.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0118.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0119.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0120.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0121.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0122.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0123.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0124.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0125.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0126.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0127.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0128.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0129.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0130.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0131.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0132.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0133.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0134.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0135.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0136.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0137.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0138.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0139.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0140.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0141.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0142.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0143.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0144.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0145.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0146.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0147.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0148.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0149.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0150.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0151.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0152.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0153.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0154.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0155.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0156.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0157.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0158.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0098.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0099.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0100.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0101.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0102.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0103.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0104.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0105.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0106.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0107.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0108.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0109.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0110.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0111.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0112.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0113.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0114.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0115.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0116.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0117.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0118.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0119.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0120.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0121.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0122.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0123.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0124.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0125.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0126.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0127.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0128.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0129.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0130.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0131.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0132.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0133.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0134.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0135.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0136.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0137.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0138.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0139.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0140.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0141.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0142.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0143.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0144.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0145.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0146.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0147.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0148.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0149.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0150.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0151.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0152.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0153.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0154.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0155.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0156.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0157.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0158.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0098.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0099.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0100.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0101.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0102.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0103.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0104.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0105.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0106.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0107.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0108.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0109.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0110.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0111.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0112.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0113.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0114.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0115.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0116.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0117.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0118.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0119.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0120.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0121.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0122.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0123.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0124.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0125.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0126.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0127.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0128.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0129.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0130.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0131.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0132.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0133.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0134.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0135.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0136.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0137.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0138.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0139.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0140.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0141.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0142.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0143.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0144.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0145.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0146.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0147.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0148.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0149.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0150.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0151.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0152.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0153.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0154.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0155.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0156.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0157.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0158.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0098.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0099.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0100.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0101.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0102.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0103.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0104.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0105.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0106.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0107.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0108.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0109.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0110.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0111.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0112.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0113.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0114.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0115.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0116.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0117.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0118.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0119.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0120.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0121.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0122.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0123.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0124.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0125.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0126.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0127.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0128.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0129.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0130.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0131.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0132.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0133.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0134.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0135.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0136.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0137.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0138.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0139.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0140.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0141.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0142.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0143.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0144.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0145.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0146.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0147.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0148.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0149.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0150.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0151.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0152.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0153.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0154.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0155.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0156.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0157.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0158.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0098.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0099.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0100.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0101.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0102.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0103.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0104.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0105.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0106.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0107.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0108.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0109.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0110.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0111.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0112.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0113.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0114.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0115.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0116.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0117.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0118.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0119.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0120.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0121.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0122.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0123.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0124.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0125.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0126.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0127.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0128.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0129.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0130.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0131.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0132.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0133.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0134.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0135.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0136.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0137.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0138.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0139.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0140.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0141.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0142.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0143.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0144.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0145.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0146.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0147.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0148.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0149.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0150.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0151.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0152.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0153.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0154.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0155.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0156.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0157.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0158.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_p1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_p2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0069.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0070.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0071.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0072.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0073.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0074.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0075.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0076.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0077.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0078.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0079.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0080.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0081.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0082.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0083.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0084.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0085.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0086.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0087.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0088.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0089.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0090.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0091.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0092.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0093.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0094.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0095.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0096.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0097.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0001.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0002.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0003.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0004.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0005.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0006.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0007.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0008.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0009.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0010.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0011.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0012.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0013.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0014.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0015.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0016.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0017.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0018.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0019.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0020.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0021.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0022.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0023.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0024.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0025.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0026.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0027.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0028.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0029.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0030.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0031.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0032.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0033.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0034.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0035.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0036.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0037.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0038.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0039.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0040.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0041.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0042.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0043.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0044.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0045.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0046.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0047.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0048.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0049.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0050.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0051.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0052.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0053.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0054.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0055.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0056.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0057.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0058.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0059.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0060.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0061.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0062.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0063.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0064.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0065.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0066.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0067.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0068.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/window_icon_penguin.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/purple_hover.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/scroll_list_background.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/select_level_background.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/shooter-lowgfx.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/shooter-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/shooter.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/tomate-mini.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/tomate.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat_small_p2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat_small_rp1_rp3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat_small_rp2_rp4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_mp_training.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_1player.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_p1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_p1_net.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_p2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp1.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp2.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp3.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp4.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-16x16.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-32x32.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-48x48.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-64x64.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/af.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/bg.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/br.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ca.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/cs.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/da.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/de.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/el.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/eo.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/es.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/fa.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/fi.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/fr.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/frozen-bubble.pot
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/gl.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/it.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ja.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/lt.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/nb.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ne.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/nl.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/nn.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/pl.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/pt.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/pt_BR.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ro.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ru.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/sk.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/sl.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/sv.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/tr.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/zh_CN.po
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/applause.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/cancel.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/chatted.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/destroy_group.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/frozen-mainzik-1p.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/frozen-mainzik-2p.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/hurry.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/introzik.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/launch.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/lose.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/malus.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/menu_change.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/menu_selected.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/newroot.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/newroot_solo.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/noh.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/pause.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/rebound.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/snore.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/stick.ogg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/typewriter.ogg
+%%SITE_ARCH%%/Games/FrozenBubble.pm
+%%SITE_ARCH%%/Games/FrozenBubble/CStuff.pm
+%%SITE_ARCH%%/Games/FrozenBubble/Config.pm
+%%SITE_ARCH%%/Games/FrozenBubble/LevelEditor.pm
+%%SITE_ARCH%%/Games/FrozenBubble/MDKCommon.pm
+%%SITE_ARCH%%/Games/FrozenBubble/Net.pm
+%%SITE_ARCH%%/Games/FrozenBubble/NetDiscover.pm
+%%SITE_ARCH%%/Games/FrozenBubble/Stuff.pm
+%%SITE_ARCH%%/Games/FrozenBubble/Symbols.pm
+%%SITE_ARCH%%/auto/Games/FrozenBubble/CStuff/CStuff.so
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo1.bz2
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo2.bz2
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo3.bz2
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/data/demo4.bz2
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/data/levels
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/data/plasma.raw
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attack_rp4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/attackme_rp4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_hiscores.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_multiplayer.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_netgame.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_one_player.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/back_paused.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/backgrnd.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-1-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-1.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-2-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-2.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-3-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-3.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-4-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-4.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-5-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-5.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-6-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-6.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-7-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-7.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-8-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-8.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-1-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-1.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-2-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-2.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-3-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-3.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-4-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-4.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-5-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-5.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-6-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-6.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-7-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-7.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-8-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble-colourblind-8.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_lose-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_lose.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_prelight-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/bubble_prelight.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_0-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_0.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_1-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_2-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_3-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_4-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_5-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_5.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_6-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_6.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/balls/stick_effect_7.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/banane-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/banane.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/compressor_ext.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/compressor_main.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/dot_green.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/dot_red.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/file_list_background.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-af.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ar.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-az.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-bg.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-br.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-bs.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ca.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-cs.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-cy.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-da.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-de.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-el.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-en.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-eo.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-es.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-eu.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-fi.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-fr.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ga.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-gl.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-hr.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-hu.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-id.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ir.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-is.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-it.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ja.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ko.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-lt.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-lv.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-mk.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ms.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ne.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-nl.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-no.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-pl.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-pt.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-pt_BR.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ro.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-ru.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sk.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sl.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sq.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-sv.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-tg.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-tr.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-uk.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-uz.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-vi.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-wa.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-zh_CN.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/flags/flag-zh_TW.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/font-hi.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/font.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/font2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/gen
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hiscore-levelset.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hiscore-mptraining.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hiscore_frame.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hover.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_p1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_p2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/hurry_rp4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/intro/back_intro.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/key_shortcuts.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp1-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp2-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp3-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/left-rp4-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/level_editor.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_down.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_down_more.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_up.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/list_arrow_up_more.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loading.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loading_step.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loading_step_initial.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/loadingpreviews.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/lose_panel.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/1p_panel.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/1pgame_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/editor_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/gfx-l3_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/highscore_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/keys_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/langame_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/netgame_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/anims/p1p2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/back_start.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-left-green.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-left-purple.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-right-green.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/backgrnd-closedeye-right-purple.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_artwork.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_cpucontrol.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_leveleditor.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/banner_soundtrack.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/blink.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/fblogo-mask.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/fblogo.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/highlight-server.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/ping-high.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/ping-low.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/ping-mid.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/please_wait.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/small_ping.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/stamp.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_1pgame_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_1pgame_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_2pgame_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_2pgame_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_editor_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_editor_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_graphics_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_graphics_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_highscores_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_highscores_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_keys_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_keys_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_langame_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_langame_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_menu_1p_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_menu_1p_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_multiplayer_training_outlined_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_multiplayer_training_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_netgame_off.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_netgame_over.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_pick_start_level_outlined_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_pick_start_level_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_all_levels_outlined_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_all_levels_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_random_levels_outlined_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/txt_play_random_levels_text.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/void_chat.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/void_chat_small.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/menu/void_panel.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_p1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/net_lose_rp4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-insamegame.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-playing.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-5.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-6.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-7.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-8.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-9.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-A.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-B.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-C.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot-self-D.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/netspot.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/on_top_next-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/on_top_next.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pause_10.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p1_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_p2_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp1_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp2_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp3_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/anime-shooter_rp4_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0098.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0099.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0100.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0101.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0102.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0103.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0104.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0105.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0106.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0107.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0108.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0109.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0110.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0111.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0112.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0113.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0114.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0115.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0116.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0117.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0118.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0119.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0120.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0121.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0122.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0123.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0124.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0125.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0126.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0127.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0128.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0129.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0130.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0131.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0132.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0133.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0134.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0135.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0136.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0137.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0138.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0139.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0140.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0141.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0142.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0143.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0144.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0145.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0146.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0147.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0148.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0149.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0150.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0151.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0152.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0153.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0154.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0155.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0156.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0157.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p1_0158.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0098.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0099.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0100.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0101.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0102.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0103.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0104.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0105.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0106.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0107.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0108.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0109.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0110.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0111.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0112.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0113.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0114.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0115.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0116.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0117.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0118.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0119.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0120.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0121.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0122.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0123.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0124.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0125.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0126.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0127.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0128.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0129.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0130.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0131.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0132.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0133.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0134.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0135.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0136.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0137.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0138.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0139.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0140.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0141.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0142.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0143.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0144.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0145.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0146.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0147.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0148.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0149.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0150.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0151.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0152.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0153.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0154.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0155.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0156.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0157.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_p2_0158.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0098.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0099.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0100.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0101.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0102.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0103.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0104.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0105.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0106.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0107.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0108.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0109.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0110.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0111.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0112.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0113.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0114.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0115.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0116.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0117.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0118.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0119.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0120.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0121.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0122.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0123.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0124.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0125.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0126.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0127.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0128.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0129.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0130.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0131.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0132.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0133.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0134.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0135.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0136.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0137.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0138.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0139.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0140.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0141.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0142.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0143.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0144.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0145.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0146.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0147.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0148.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0149.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0150.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0151.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0152.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0153.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0154.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0155.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0156.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0157.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp1_0158.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0098.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0099.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0100.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0101.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0102.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0103.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0104.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0105.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0106.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0107.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0108.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0109.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0110.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0111.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0112.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0113.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0114.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0115.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0116.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0117.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0118.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0119.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0120.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0121.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0122.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0123.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0124.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0125.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0126.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0127.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0128.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0129.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0130.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0131.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0132.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0133.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0134.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0135.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0136.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0137.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0138.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0139.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0140.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0141.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0142.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0143.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0144.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0145.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0146.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0147.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0148.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0149.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0150.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0151.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0152.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0153.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0154.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0155.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0156.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0157.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp2_0158.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0098.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0099.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0100.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0101.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0102.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0103.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0104.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0105.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0106.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0107.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0108.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0109.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0110.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0111.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0112.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0113.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0114.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0115.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0116.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0117.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0118.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0119.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0120.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0121.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0122.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0123.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0124.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0125.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0126.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0127.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0128.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0129.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0130.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0131.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0132.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0133.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0134.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0135.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0136.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0137.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0138.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0139.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0140.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0141.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0142.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0143.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0144.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0145.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0146.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0147.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0148.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0149.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0150.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0151.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0152.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0153.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0154.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0155.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0156.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0157.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp3_0158.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0098.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0099.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0100.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0101.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0102.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0103.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0104.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0105.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0106.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0107.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0108.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0109.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0110.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0111.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0112.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0113.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0114.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0115.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0116.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0117.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0118.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0119.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0120.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0121.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0122.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0123.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0124.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0125.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0126.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0127.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0128.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0129.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0130.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0131.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0132.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0133.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0134.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0135.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0136.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0137.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0138.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0139.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0140.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0141.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0142.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0143.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0144.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0145.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0146.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0147.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0148.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0149.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0150.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0151.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0152.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0153.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0154.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0155.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0156.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0157.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/loose_rp4_0158.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_p1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_p2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/sleep_rp4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p1_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_p2_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp1_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp2_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp3_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0069.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0070.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0071.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0072.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0073.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0074.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0075.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0076.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0077.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0078.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0079.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0080.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0081.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0082.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0083.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0084.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0085.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0086.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0087.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0088.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0089.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0090.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0091.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0092.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0093.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0094.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0095.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0096.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/wait_rp4_0097.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_p2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp1_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp2_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp3_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0001.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0002.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0003.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0004.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0005.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0006.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0007.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0008.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0009.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0010.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0011.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0012.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0013.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0014.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0015.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0016.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0017.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0018.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0019.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0020.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0021.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0022.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0023.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0024.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0025.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0026.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0027.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0028.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0029.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0030.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0031.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0032.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0033.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0034.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0035.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0036.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0037.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0038.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0039.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0040.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0041.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0042.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0043.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0044.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0045.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0046.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0047.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0048.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0049.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0050.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0051.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0052.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0053.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0054.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0055.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0056.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0057.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0058.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0059.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0060.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0061.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0062.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0063.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0064.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0065.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0066.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0067.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0068.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/window_icon_penguin.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/purple_hover.gif
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/scroll_list_background.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/select_level_background.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/shooter-lowgfx.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/shooter-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/shooter.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/tomate-mini.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/tomate.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat_small_p2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat_small_rp1_rp3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_chat_small_rp2_rp4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/void_mp_training.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_1player.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_p1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_p1_net.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_p2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp1.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp2.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp3.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/win_panel_rp4.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-16x16.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-32x32.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-48x48.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-64x64.png
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/af.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/bg.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/br.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ca.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/cs.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/da.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/de.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/el.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/eo.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/es.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/fa.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/fi.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/fr.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/frozen-bubble.pot
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/gl.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/it.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ja.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/lt.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/nb.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ne.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/nl.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/nn.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/pl.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/pt.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/pt_BR.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ro.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/ru.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/sk.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/sl.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/sv.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/tr.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/zh_CN.po
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/applause.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/cancel.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/chatted.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/destroy_group.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/frozen-mainzik-1p.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/frozen-mainzik-2p.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/hurry.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/introzik.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/launch.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/lose.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/malus.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/menu_change.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/menu_selected.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/newroot.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/newroot_solo.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/noh.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/pause.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/rebound.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/snore.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/stick.ogg
+%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/typewriter.ogg
 man/man1/frozen-bubble-editor.1.gz
 man/man1/frozen-bubble.1.gz
 share/pixmaps/frozen-bubble.png
diff --git a/games/lm-solve/Makefile b/games/lm-solve/Makefile
index 6d047fdd8a0b..8162e50e1546 100644
--- a/games/lm-solve/Makefile
+++ b/games/lm-solve/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lm-solve
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	CPAN/Games
 DISTNAME=	Games-LMSolve-${PORTVERSION}
diff --git a/games/lm-solve/pkg-plist b/games/lm-solve/pkg-plist
index 63d7ad17e6d0..f659b9b789e8 100644
--- a/games/lm-solve/pkg-plist
+++ b/games/lm-solve/pkg-plist
@@ -13,7 +13,6 @@ bin/lm-solve
 %%SITE_PERL%%/Games/LMSolve/Tilt/Single.pm
 %%SITE_PERL%%/Games/LMSolve.pm
 %%SITE_PERL%%/Games/get-version.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/LMSolve/.packlist
 man/man1/lm-solve.1.gz
 %%PERL5_MAN3%%/Games::LMSolve.3.gz
 %%PERL5_MAN3%%/Games::LMSolve::Alice.3.gz
diff --git a/games/optimax/Makefile b/games/optimax/Makefile
index 0702710e5846..af927f7637ff 100644
--- a/games/optimax/Makefile
+++ b/games/optimax/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	optimax
 PORTVERSION=	0.63
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.corewar.info/optimax/dload/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}_unix
@@ -39,8 +39,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/remote.pl \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-remote
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/optimars ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}
-	${INSTALL_DATA} ${WRKSRC}/optitools.pm ${STAGEDIR}${SITE_PERL}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_DATA} ${WRKSRC}/optitools.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${CP} -r *.red fsh* templates phase3.lst tables \
 		${STAGEDIR}${DATADIR})
diff --git a/games/p5-Acme-GuessNumber/Makefile b/games/p5-Acme-GuessNumber/Makefile
index fbd1dcf7e294..f34ab8016302 100644
--- a/games/p5-Acme-GuessNumber/Makefile
+++ b/games/p5-Acme-GuessNumber/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Acme-GuessNumber
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Locale/IMACAT
diff --git a/games/p5-Acme-GuessNumber/pkg-plist b/games/p5-Acme-GuessNumber/pkg-plist
index 1a00a516a048..a2b7e5820b1a 100644
--- a/games/p5-Acme-GuessNumber/pkg-plist
+++ b/games/p5-Acme-GuessNumber/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Acme::GuessNumber.3.gz
 %%SITE_PERL%%/Acme/GuessNumber.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme-GuessNumber/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme-GuessNumber
-@dirrmtry %%SITE_PERL%%/Acme
diff --git a/games/p5-Algorithm-Pair-Best2/Makefile b/games/p5-Algorithm-Pair-Best2/Makefile
index ab5eb1cb622c..4f7a59052031 100644
--- a/games/p5-Algorithm-Pair-Best2/Makefile
+++ b/games/p5-Algorithm-Pair-Best2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Pair-Best2
 PORTVERSION=	2.035
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Algorithm-Pair-Best2/pkg-plist b/games/p5-Algorithm-Pair-Best2/pkg-plist
index bc4e1cf80724..162e046aa4d4 100644
--- a/games/p5-Algorithm-Pair-Best2/pkg-plist
+++ b/games/p5-Algorithm-Pair-Best2/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Algorithm/Pair/Best2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Pair/Best2/.packlist
 %%PERL5_MAN3%%/Algorithm::Pair::Best2.3.gz
diff --git a/games/p5-Algorithm-Pair-Swiss/Makefile b/games/p5-Algorithm-Pair-Swiss/Makefile
index 6a27ffa04e56..47a71afbccd8 100644
--- a/games/p5-Algorithm-Pair-Swiss/Makefile
+++ b/games/p5-Algorithm-Pair-Swiss/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Pair-Swiss
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Algorithm-Pair-Swiss/pkg-plist b/games/p5-Algorithm-Pair-Swiss/pkg-plist
index 6a4fa6b6a030..0ce5897211c8 100644
--- a/games/p5-Algorithm-Pair-Swiss/pkg-plist
+++ b/games/p5-Algorithm-Pair-Swiss/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::Pair::Swiss.3.gz
 %%SITE_PERL%%/Algorithm/Pair/Swiss.pm
-@dirrmtry %%SITE_PERL%%/Algorithm/Pair
-@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/games/p5-Baseball-Sabermetrics/Makefile b/games/p5-Baseball-Sabermetrics/Makefile
index 0cf1bce54c20..a3f96a52ade1 100644
--- a/games/p5-Baseball-Sabermetrics/Makefile
+++ b/games/p5-Baseball-Sabermetrics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Baseball-Sabermetrics
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Baseball-Sabermetrics/pkg-plist b/games/p5-Baseball-Sabermetrics/pkg-plist
index ccf9cea25174..0ce90f4dd5fc 100644
--- a/games/p5-Baseball-Sabermetrics/pkg-plist
+++ b/games/p5-Baseball-Sabermetrics/pkg-plist
@@ -5,9 +5,3 @@
 %%SITE_PERL%%/Baseball/Sabermetrics/Player.pm
 %%SITE_PERL%%/Baseball/Sabermetrics/Team.pm
 %%SITE_PERL%%/Baseball/Sabermetrics/abstract.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Baseball/Sabermetrics/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Baseball/Sabermetrics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Baseball
-@dirrmtry %%SITE_PERL%%/Baseball/Sabermetrics/League
-@dirrmtry %%SITE_PERL%%/Baseball/Sabermetrics
-@dirrmtry %%SITE_PERL%%/Baseball
diff --git a/games/p5-Games-Alak/Makefile b/games/p5-Games-Alak/Makefile
index 8a36bc81485a..cebbd5c988b1 100644
--- a/games/p5-Games-Alak/Makefile
+++ b/games/p5-Games-Alak/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-Alak
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-Alak/pkg-plist b/games/p5-Games-Alak/pkg-plist
index f87c7f7e77b7..272376111a1a 100644
--- a/games/p5-Games-Alak/pkg-plist
+++ b/games/p5-Games-Alak/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Games::Alak.3.gz
 %%SITE_PERL%%/Games/Alak.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Alak/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Alak
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-AlphaBeta/Makefile b/games/p5-Games-AlphaBeta/Makefile
index 81dcd9a96c33..d9590aff291e 100644
--- a/games/p5-Games-AlphaBeta/Makefile
+++ b/games/p5-Games-AlphaBeta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-AlphaBeta
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-AlphaBeta/pkg-plist b/games/p5-Games-AlphaBeta/pkg-plist
index 5637c9234ae3..7195b15280ef 100644
--- a/games/p5-Games-AlphaBeta/pkg-plist
+++ b/games/p5-Games-AlphaBeta/pkg-plist
@@ -10,6 +10,3 @@ bin/othello-demo
 %%SITE_PERL%%/Games/Sequential.pm
 %%SITE_PERL%%/Games/Sequential/Position.pm
 man/man1/othello-demo.1.gz
-@dirrmtry %%SITE_PERL%%/Games/Sequential
-@dirrmtry %%SITE_PERL%%/Games/AlphaBeta
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Bingo-Bot/Makefile b/games/p5-Games-Bingo-Bot/Makefile
index 1425997d3f77..fedce6bc827a 100644
--- a/games/p5-Games-Bingo-Bot/Makefile
+++ b/games/p5-Games-Bingo-Bot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-Bingo-Bot
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-Bingo-Bot/pkg-plist b/games/p5-Games-Bingo-Bot/pkg-plist
index c85658f0dd5e..7e0180b25fb8 100644
--- a/games/p5-Games-Bingo-Bot/pkg-plist
+++ b/games/p5-Games-Bingo-Bot/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Games/Bingo/Bot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo/Bot/.packlist
 %%PERL5_MAN3%%/Games::Bingo::Bot.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo/Bot
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
-@dirrmtry %%SITE_PERL%%/Games/Bingo
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Bingo-Print/Makefile b/games/p5-Games-Bingo-Print/Makefile
index af9c0ad3d5ed..69a6142f3ddd 100644
--- a/games/p5-Games-Bingo-Print/Makefile
+++ b/games/p5-Games-Bingo-Print/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Games-Bingo-Print
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-Bingo-Print/pkg-plist b/games/p5-Games-Bingo-Print/pkg-plist
index 4c70818db2de..519e815f84d8 100644
--- a/games/p5-Games-Bingo-Print/pkg-plist
+++ b/games/p5-Games-Bingo-Print/pkg-plist
@@ -1,8 +1,4 @@
 bin/bingo_print.pl
 man/man1/bingo_print.pl.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games-Bingo-Print/.packlist
 %%SITE_PERL%%/Games/Bingo/Print.pm
 %%PERL5_MAN3%%/Games::Bingo::Print.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games-Bingo-Print
-@dirrmtry %%SITE_PERL%%/Games/Bingo
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Bingo/Makefile b/games/p5-Games-Bingo/Makefile
index d8ca8586001c..74182a25a1a7 100644
--- a/games/p5-Games-Bingo/Makefile
+++ b/games/p5-Games-Bingo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-Bingo
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-Bingo/pkg-plist b/games/p5-Games-Bingo/pkg-plist
index 15fabeccdd87..659ed9dcbd99 100644
--- a/games/p5-Games-Bingo/pkg-plist
+++ b/games/p5-Games-Bingo/pkg-plist
@@ -10,5 +10,3 @@ man/man1/bingo.pl.1.gz
 %%PERL5_MAN3%%/Games::Bingo::Column.3.gz
 %%PERL5_MAN3%%/Games::Bingo::ColumnCollection.3.gz
 %%PERL5_MAN3%%/Games::Bingo::Constants.3.gz
-@dirrm %%SITE_PERL%%/Games/Bingo
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Dice/Makefile b/games/p5-Games-Dice/Makefile
index d572987e04b5..53717ae345d2 100644
--- a/games/p5-Games-Dice/Makefile
+++ b/games/p5-Games-Dice/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-Dice
 PORTVERSION=	0.044
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-Dice/pkg-plist b/games/p5-Games-Dice/pkg-plist
index ca130ebaf509..71d648c4405e 100644
--- a/games/p5-Games-Dice/pkg-plist
+++ b/games/p5-Games-Dice/pkg-plist
@@ -1,8 +1,4 @@
 bin/roll
 %%SITE_PERL%%/Games/Dice.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Dice/.packlist
 man/man1/roll.1.gz
 %%PERL5_MAN3%%/Games::Dice.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Dice
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-GuessWord/Makefile b/games/p5-Games-GuessWord/Makefile
index da984ac1eedb..53e528be8017 100644
--- a/games/p5-Games-GuessWord/Makefile
+++ b/games/p5-Games-GuessWord/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-GuessWord
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-GuessWord/pkg-plist b/games/p5-Games-GuessWord/pkg-plist
index 4d6fe36e8258..2e09a792ecd6 100644
--- a/games/p5-Games-GuessWord/pkg-plist
+++ b/games/p5-Games-GuessWord/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Games::GuessWord.3.gz
 %%SITE_PERL%%/Games/GuessWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/GuessWord/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/GuessWord
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Tournament-RoundRobin/Makefile b/games/p5-Games-Tournament-RoundRobin/Makefile
index 7d5ea757d12e..38f8e88639fb 100644
--- a/games/p5-Games-Tournament-RoundRobin/Makefile
+++ b/games/p5-Games-Tournament-RoundRobin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-Tournament-RoundRobin
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	games perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/games/p5-Games-Tournament-RoundRobin/pkg-plist b/games/p5-Games-Tournament-RoundRobin/pkg-plist
index 560e3f85094f..a4ce36c92d36 100644
--- a/games/p5-Games-Tournament-RoundRobin/pkg-plist
+++ b/games/p5-Games-Tournament-RoundRobin/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Games::Tournament::RoundRobin.3.gz
 %%SITE_PERL%%/Games/League/Member.pm
 %%SITE_PERL%%/Games/Tournament/RoundRobin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Tournament/RoundRobin/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Tournament/RoundRobin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Tournament
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
-@dirrmtry %%SITE_PERL%%/Games/Tournament
-@dirrmtry %%SITE_PERL%%/Games/League
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/graphics/IPA/Makefile b/graphics/IPA/Makefile
index 2e191ec80f89..a1f62ce1647c 100644
--- a/graphics/IPA/Makefile
+++ b/graphics/IPA/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IPA
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.prima.eu.org/IPA/ CPAN/Prima/KARASIK
 
diff --git a/graphics/IPA/pkg-plist b/graphics/IPA/pkg-plist
index 4960d32578ab..826f4b56e0c1 100644
--- a/graphics/IPA/pkg-plist
+++ b/graphics/IPA/pkg-plist
@@ -8,29 +8,28 @@ man/man1/iterm.1.gz
 %%PERL5_MAN3%%/IPA::Morphology.3.gz
 %%PERL5_MAN3%%/IPA::Point.3.gz
 %%PERL5_MAN3%%/IPA::Region.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/IPAsupp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Geometry.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Global.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Local.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Misc.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Morphology.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Point.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Geometry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Geometry/GeometrySupp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Global.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Global/GlobalSupp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Global/gsclose.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Local.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Local/LocalSupp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Misc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Misc/MiscSupp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Morphology.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Morphology/MorphologySupp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Morphology/thin.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Morphology/thin1.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Point.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Point/PointSupp.h
-%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Region.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/IPA.so
+%%SITE_ARCH%%/IPA.pm
+%%SITE_ARCH%%/IPA/CORE/IPAsupp.h
+%%SITE_ARCH%%/IPA/CORE/generic/Geometry.h
+%%SITE_ARCH%%/IPA/CORE/generic/Global.h
+%%SITE_ARCH%%/IPA/CORE/generic/Local.h
+%%SITE_ARCH%%/IPA/CORE/generic/Misc.h
+%%SITE_ARCH%%/IPA/CORE/generic/Morphology.h
+%%SITE_ARCH%%/IPA/CORE/generic/Point.h
+%%SITE_ARCH%%/IPA/Geometry.pm
+%%SITE_ARCH%%/IPA/Geometry/GeometrySupp.h
+%%SITE_ARCH%%/IPA/Global.pm
+%%SITE_ARCH%%/IPA/Global/GlobalSupp.h
+%%SITE_ARCH%%/IPA/Global/gsclose.h
+%%SITE_ARCH%%/IPA/Local.pm
+%%SITE_ARCH%%/IPA/Local/LocalSupp.h
+%%SITE_ARCH%%/IPA/Misc.pm
+%%SITE_ARCH%%/IPA/Misc/MiscSupp.h
+%%SITE_ARCH%%/IPA/Morphology.pm
+%%SITE_ARCH%%/IPA/Morphology/MorphologySupp.h
+%%SITE_ARCH%%/IPA/Morphology/thin.h
+%%SITE_ARCH%%/IPA/Morphology/thin1.h
+%%SITE_ARCH%%/IPA/Point.pm
+%%SITE_ARCH%%/IPA/Point/PointSupp.h
+%%SITE_ARCH%%/IPA/Region.pm
+%%SITE_ARCH%%/auto/IPA/IPA.so
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 74d9cce4f920..90ca5301495a 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.9.0-0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -395,10 +396,6 @@ pre-configure:
 .endif
 
 post-install: test
-.if ${PORT_OPTIONS:MPERL}
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod*
-	@${RM} -f ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Image/Magick/.packlist
-.endif
 .if ${PORT_OPTIONS:MMODULES}
 	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/coders/.keep
 	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/filters/.keep
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 211843b434dc..348e4875e27e 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -439,12 +439,12 @@ libdata/pkgconfig/Magick++-6.%%QBIT%%%%HDRI%%.pc
 libdata/pkgconfig/MagickCore-6.%%QBIT%%%%HDRI%%.pc
 libdata/pkgconfig/MagickWand-6.%%QBIT%%%%HDRI%%.pc
 libdata/pkgconfig/Wand-6.%%QBIT%%%%HDRI%%.pc
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
+%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/Magick.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/autosplit.ix
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick::%%QBIT%%%%HDRI%%.3.gz
 man/man1/ImageMagick.1.gz
@@ -1472,4 +1472,3 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/subversion.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/t-shirt.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/wand.png
-%%WITH_PERL%%@dir lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
diff --git a/graphics/asciio/Makefile b/graphics/asciio/Makefile
index e8605393c869..0842823217d5 100644
--- a/graphics/asciio/Makefile
+++ b/graphics/asciio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	asciio
 PORTVERSION=	1.02.71
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.switch.ch/ftp/mirror/CPAN/authors/id/N/NK/NKH/ \
 		CRITICAL
diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile
index 1e31b6eb047c..4f82fb4991e8 100644
--- a/graphics/eps2png/Makefile
+++ b/graphics/eps2png/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eps2png
 PORTVERSION=	2.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JV
diff --git a/graphics/eps2png/pkg-plist b/graphics/eps2png/pkg-plist
index 9a24e498df47..c48543c6d487 100644
--- a/graphics/eps2png/pkg-plist
+++ b/graphics/eps2png/pkg-plist
@@ -1,3 +1,2 @@
 bin/eps2png
 man/man1/eps2png.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/eps2png/.packlist
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index a5832fdee587..88725b8b3404 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exact-image
 PORTVERSION=	0.8.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5 python
 MASTER_SITES=	http://dl.exactcode.de/oss/${PORTNAME}/ LOCAL/bf
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 6ac60cdacaf7..0e87c8b45658 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.38.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 4d04429f7266..3e8ed82315dc 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -176,8 +176,8 @@ lib/graphviz/libgvpr.so.2
 %%PERL%%lib/graphviz/perl/gv.pm
 %%PERL%%lib/graphviz/perl/libgv_perl.la
 %%PERL%%lib/graphviz/perl/libgv_perl.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.so
+%%PERL%%%%SITE_ARCH%%/gv.pm
+%%PERL%%%%SITE_ARCH%%/gv.so
 %%PYTHON%%lib/graphviz/python/_gv.so
 %%PYTHON%%lib/graphviz/python/gv.py
 %%PYTHON%%lib/graphviz/python/libgv_python.la
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index 655460ed95c1..0afecb128657 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gscan2pdf
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/gscan2pdf/pkg-plist b/graphics/gscan2pdf/pkg-plist
index e952dd3f8fc9..99676c2ad33b 100644
--- a/graphics/gscan2pdf/pkg-plist
+++ b/graphics/gscan2pdf/pkg-plist
@@ -17,7 +17,6 @@ bin/scanimage-perl
 %%SITE_PERL%%/Gscan2pdf/Scanner/Options.pm
 %%SITE_PERL%%/Gscan2pdf/Tesseract.pm
 %%SITE_PERL%%/Gscan2pdf/Unpaper.pm
-%%SITE_ARCH%%/auto/gscan2pdf/.packlist
 man/man1/gscan2pdf.1.gz
 man/man1/scanadf-perl.1.gz
 man/man1/scanimage-perl.1.gz
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 9ef53b089692..f92e6c8be939 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.4.5
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Releases/
 
@@ -71,7 +71,7 @@ post-install:
 .if defined(SLAVEPORT) && ${SLAVEPORT} == "p5"
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${INSTALL_WRKSRC}/examples/ && ${INSTALL_DATA} *.cgi ${STAGEDIR}${EXAMPLESDIR}/
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/SWF/SWF.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SWF/SWF.so
 .endif
 .if defined(SLAVEPORT) && ${SLAVEPORT} == "py"
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_mingc.so
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index 81ff8d06a3bf..80f8703339e7 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Acme-Steganography-Image-Png
 PORTVERSION=	0.06
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Acme-Steganography-Image-Png/pkg-plist b/graphics/p5-Acme-Steganography-Image-Png/pkg-plist
index 260ee00aa915..8faf49af3b62 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/pkg-plist
+++ b/graphics/p5-Acme-Steganography-Image-Png/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Acme/Steganography/Image/Png.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Steganography/Image/Png/.packlist
 %%PERL5_MAN3%%/Acme::Steganography::Image::Png.3.gz
diff --git a/graphics/p5-CAD-Drawing-Template/Makefile b/graphics/p5-CAD-Drawing-Template/Makefile
index f67dc6ea8ffd..2d6963b737d2 100644
--- a/graphics/p5-CAD-Drawing-Template/Makefile
+++ b/graphics/p5-CAD-Drawing-Template/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CAD-Drawing-Template
 PORTVERSION=	0.01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile
index ea53dbc23049..471a8616553c 100644
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CAD-Drawing
 PORTVERSION=	0.26
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index 498863ec48d2..450b96700d0c 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cairo
 PORTVERSION=	1.104
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN \
 		SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/p5-Cairo/pkg-plist b/graphics/p5-Cairo/pkg-plist
index 7b073398f3e5..195e623c1d0f 100644
--- a/graphics/p5-Cairo/pkg-plist
+++ b/graphics/p5-Cairo/pkg-plist
@@ -1,10 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/Install/cairo-perl-auto.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/Install/cairo-perl-auto.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/Install/cairo-perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/Install/cairo-perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Cairo/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cairo/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cairo/Cairo.so
+%%SITE_ARCH%%/Cairo.pm
+%%SITE_ARCH%%/Cairo/Install/Files.pm
+%%SITE_ARCH%%/Cairo/Install/cairo-perl-auto.h
+%%SITE_ARCH%%/Cairo/Install/cairo-perl-auto.typemap
+%%SITE_ARCH%%/Cairo/Install/cairo-perl.h
+%%SITE_ARCH%%/Cairo/Install/cairo-perl.typemap
+%%SITE_ARCH%%/Cairo/Install/doctypes
+%%SITE_ARCH%%/auto/Cairo/Cairo.so
 %%PERL5_MAN3%%/Cairo.3.gz
diff --git a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
index 1854d615cf6a..b5663878a00b 100644
--- a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Captcha-reCAPTCHA-Mailhide
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ANDYA
diff --git a/graphics/p5-Captcha-reCAPTCHA-Mailhide/pkg-plist b/graphics/p5-Captcha-reCAPTCHA-Mailhide/pkg-plist
index a4f35b7822b2..1003f0dd1498 100644
--- a/graphics/p5-Captcha-reCAPTCHA-Mailhide/pkg-plist
+++ b/graphics/p5-Captcha-reCAPTCHA-Mailhide/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Captcha/reCAPTCHA/Mailhide.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Captcha/reCAPTCHA/Mailhide/.packlist
 %%PERL5_MAN3%%/Captcha::reCAPTCHA::Mailhide.3.gz
diff --git a/graphics/p5-Captcha-reCAPTCHA/Makefile b/graphics/p5-Captcha-reCAPTCHA/Makefile
index a8a5977add68..2bd99959debb 100644
--- a/graphics/p5-Captcha-reCAPTCHA/Makefile
+++ b/graphics/p5-Captcha-reCAPTCHA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Captcha-reCAPTCHA
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PHRED
diff --git a/graphics/p5-Captcha-reCAPTCHA/pkg-plist b/graphics/p5-Captcha-reCAPTCHA/pkg-plist
index a652bd8301cb..8309082f582f 100644
--- a/graphics/p5-Captcha-reCAPTCHA/pkg-plist
+++ b/graphics/p5-Captcha-reCAPTCHA/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Captcha::reCAPTCHA.3.gz
 %%SITE_PERL%%/Captcha/reCAPTCHA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Captcha/reCAPTCHA/.packlist
diff --git a/graphics/p5-Chart-Clicker/Makefile b/graphics/p5-Chart-Clicker/Makefile
index e1b00b623b66..fb5341b6cebd 100644
--- a/graphics/p5-Chart-Clicker/Makefile
+++ b/graphics/p5-Chart-Clicker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chart-Clicker
 PORTVERSION=	2.87
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Chart-Clicker/pkg-plist b/graphics/p5-Chart-Clicker/pkg-plist
index f5e47520938e..0cf85e665921 100644
--- a/graphics/p5-Chart-Clicker/pkg-plist
+++ b/graphics/p5-Chart-Clicker/pkg-plist
@@ -74,4 +74,3 @@
 %%SITE_PERL%%/Chart/Clicker/Renderer/StackedArea.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/StackedBar.pm
 %%SITE_PERL%%/Chart/Clicker/Tutorial.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Clicker/.packlist
diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile
index 01508eb89d0e..4200b150612c 100644
--- a/graphics/p5-Chart-Graph/Makefile
+++ b/graphics/p5-Chart-Graph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Chart-Graph
 PORTVERSION=	3.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Chart-Graph/pkg-plist b/graphics/p5-Chart-Graph/pkg-plist
index 57f86cf46553..b02f06c824fd 100644
--- a/graphics/p5-Chart-Graph/pkg-plist
+++ b/graphics/p5-Chart-Graph/pkg-plist
@@ -22,4 +22,3 @@
 %%PERL5_MAN3%%/Chart::Graph::Xmgrace.3.gz
 %%PERL5_MAN3%%/Chart::Graph::Xrt2d.3.gz
 %%PERL5_MAN3%%/Chart::Graph::Xrt3d.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Graph/.packlist
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index 6bb3f8669c8e..227784edeb30 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Chart-PNGgraph
 PORTVERSION=	1.21
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Chart-PNGgraph/pkg-plist b/graphics/p5-Chart-PNGgraph/pkg-plist
index a0e645b69a68..dc3da0ae1b71 100644
--- a/graphics/p5-Chart-PNGgraph/pkg-plist
+++ b/graphics/p5-Chart-PNGgraph/pkg-plist
@@ -9,4 +9,3 @@
 %%SITE_PERL%%/Chart/PNGgraph/mixed.pm
 %%SITE_PERL%%/Chart/PNGgraph/pie.pm
 %%SITE_PERL%%/Chart/PNGgraph/points.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/PNGgraph/.packlist
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index ab45d77f5c67..655219a50b3a 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Chart
 PORTVERSION=	2.4.6
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHARTGRP
diff --git a/graphics/p5-Chart/pkg-plist b/graphics/p5-Chart/pkg-plist
index 0f7af9e7a548..7e3201e0539a 100644
--- a/graphics/p5-Chart/pkg-plist
+++ b/graphics/p5-Chart/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/Chart/Points.pm
 %%SITE_PERL%%/Chart/Split.pm
 %%SITE_PERL%%/Chart/StackedBars.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/.packlist
diff --git a/graphics/p5-Color-Calc/Makefile b/graphics/p5-Color-Calc/Makefile
index 84d27d4f47d3..929cb5083ef7 100644
--- a/graphics/p5-Color-Calc/Makefile
+++ b/graphics/p5-Color-Calc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Color-Calc
 PORTVERSION=	1.074
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Color
diff --git a/graphics/p5-Color-Calc/pkg-plist b/graphics/p5-Color-Calc/pkg-plist
index 0d8f67eab27d..fba1a5a4e5f9 100644
--- a/graphics/p5-Color-Calc/pkg-plist
+++ b/graphics/p5-Color-Calc/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Color::Calc::WWW.3.gz
 %%SITE_PERL%%/Color/Calc.pm
 %%SITE_PERL%%/Color/Calc/WWW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Color/Calc/.packlist
diff --git a/graphics/p5-Color-Library/Makefile b/graphics/p5-Color-Library/Makefile
index 4ef572ccb33a..90e181a1ffac 100644
--- a/graphics/p5-Color-Library/Makefile
+++ b/graphics/p5-Color-Library/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Color-Library
 PORTVERSION=	0.02.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROKR
diff --git a/graphics/p5-Color-Library/pkg-plist b/graphics/p5-Color-Library/pkg-plist
index 9ab064e17338..667be0f77ce1 100644
--- a/graphics/p5-Color-Library/pkg-plist
+++ b/graphics/p5-Color-Library/pkg-plist
@@ -48,4 +48,3 @@
 %%SITE_PERL%%/Color/Library/Dictionary/WWW.pm
 %%SITE_PERL%%/Color/Library/Dictionary/Windows.pm
 %%SITE_PERL%%/Color/Library/Dictionary/X11.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Color/Library/.packlist
diff --git a/graphics/p5-Color-Palette/Makefile b/graphics/p5-Color-Palette/Makefile
index a51dcbfcde14..8c7c2b99066f 100644
--- a/graphics/p5-Color-Palette/Makefile
+++ b/graphics/p5-Color-Palette/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Color-Palette
 PORTVERSION=	0.100002
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Color
diff --git a/graphics/p5-Color-Palette/pkg-plist b/graphics/p5-Color-Palette/pkg-plist
index 3a277619ad1c..dc9066ff1a5e 100644
--- a/graphics/p5-Color-Palette/pkg-plist
+++ b/graphics/p5-Color-Palette/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Color/Palette.pm
 %%SITE_PERL%%/Color/Palette/Schema.pm
 %%SITE_PERL%%/Color/Palette/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Color/Palette/.packlist
 %%PERL5_MAN3%%/Color::Palette.3.gz
 %%PERL5_MAN3%%/Color::Palette::Schema.3.gz
 %%PERL5_MAN3%%/Color::Palette::Types.3.gz
diff --git a/graphics/p5-Color-Rgb/Makefile b/graphics/p5-Color-Rgb/Makefile
index 69d4934f3e8b..58c93afeafea 100644
--- a/graphics/p5-Color-Rgb/Makefile
+++ b/graphics/p5-Color-Rgb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Color-Rgb
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Color-Rgb/pkg-plist b/graphics/p5-Color-Rgb/pkg-plist
index 3b7207ad5b8b..b1d93305a67e 100644
--- a/graphics/p5-Color-Rgb/pkg-plist
+++ b/graphics/p5-Color-Rgb/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Color/Rgb/.packlist
 %%SITE_PERL%%/Color/Rgb.pm
 %%PERL5_MAN3%%/Color::Rgb.3.gz
diff --git a/graphics/p5-Color-Scheme/Makefile b/graphics/p5-Color-Scheme/Makefile
index 12c2feb220dd..23ee20ab091c 100644
--- a/graphics/p5-Color-Scheme/Makefile
+++ b/graphics/p5-Color-Scheme/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Color-Scheme
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Color
diff --git a/graphics/p5-Color-Scheme/pkg-plist b/graphics/p5-Color-Scheme/pkg-plist
index 8bf5f74b596a..600330de831b 100644
--- a/graphics/p5-Color-Scheme/pkg-plist
+++ b/graphics/p5-Color-Scheme/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Color/Scheme.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Color/Scheme/.packlist
 %%PERL5_MAN3%%/Color::Scheme.3.gz
diff --git a/graphics/p5-Convert-Color/Makefile b/graphics/p5-Convert-Color/Makefile
index 9108d62a4467..15f8b8429ae9 100644
--- a/graphics/p5-Convert-Color/Makefile
+++ b/graphics/p5-Convert-Color/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Convert-Color
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Convert-Color/pkg-plist b/graphics/p5-Convert-Color/pkg-plist
index 40f96db1ae1f..de23f6ec9c00 100644
--- a/graphics/p5-Convert-Color/pkg-plist
+++ b/graphics/p5-Convert-Color/pkg-plist
@@ -8,7 +8,6 @@
 %%PERL5_MAN3%%/Convert::Color::RGB8.3.gz
 %%PERL5_MAN3%%/Convert::Color::VGA.3.gz
 %%PERL5_MAN3%%/Convert::Color::X11.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Color/.packlist
 %%SITE_PERL%%/Convert/Color.pm
 %%SITE_PERL%%/Convert/Color/CMY.pm
 %%SITE_PERL%%/Convert/Color/CMYK.pm
diff --git a/graphics/p5-GD-Arrow/Makefile b/graphics/p5-GD-Arrow/Makefile
index bc9b131c91c6..1aea97f54cfa 100644
--- a/graphics/p5-GD-Arrow/Makefile
+++ b/graphics/p5-GD-Arrow/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GD-Arrow
 PORTVERSION=	0.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD-Arrow/pkg-plist b/graphics/p5-GD-Arrow/pkg-plist
index 4f1c26a5cbee..8bb40fe355a6 100644
--- a/graphics/p5-GD-Arrow/pkg-plist
+++ b/graphics/p5-GD-Arrow/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GD::Arrow.3.gz
 %%SITE_PERL%%/GD/Arrow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Arrow/.packlist
diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile
index 949b80439e86..8da16fe09f0b 100644
--- a/graphics/p5-GD-Barcode/Makefile
+++ b/graphics/p5-GD-Barcode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GD-Barcode
 PORTVERSION=	1.15
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD-Barcode/pkg-plist b/graphics/p5-GD-Barcode/pkg-plist
index 77b8988ec191..720d55ce9e27 100644
--- a/graphics/p5-GD-Barcode/pkg-plist
+++ b/graphics/p5-GD-Barcode/pkg-plist
@@ -197,4 +197,3 @@
 %%SITE_PERL%%/GD/Barcode/QRcode/rsc30.dat
 %%SITE_PERL%%/GD/Barcode/UPCA.pm
 %%SITE_PERL%%/GD/Barcode/UPCE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Barcode/.packlist
diff --git a/graphics/p5-GD-Graph-histogram/Makefile b/graphics/p5-GD-Graph-histogram/Makefile
index 466e2794559b..ba928e1de6c4 100644
--- a/graphics/p5-GD-Graph-histogram/Makefile
+++ b/graphics/p5-GD-Graph-histogram/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GD-Graph-histogram
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WHIZDOG
diff --git a/graphics/p5-GD-Graph-histogram/pkg-plist b/graphics/p5-GD-Graph-histogram/pkg-plist
index 899115f41751..aaa9cecaa46a 100644
--- a/graphics/p5-GD-Graph-histogram/pkg-plist
+++ b/graphics/p5-GD-Graph-histogram/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GD::Graph::histogram.3.gz
 %%SITE_PERL%%/GD/Graph/histogram.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph/histogram/.packlist
diff --git a/graphics/p5-GD-Graph-ohlc/Makefile b/graphics/p5-GD-Graph-ohlc/Makefile
index b5ae42a39639..028932e6341d 100644
--- a/graphics/p5-GD-Graph-ohlc/Makefile
+++ b/graphics/p5-GD-Graph-ohlc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GD-Graph-ohlc
 PORTVERSION=	0.9703
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JETTERO
diff --git a/graphics/p5-GD-Graph-ohlc/pkg-plist b/graphics/p5-GD-Graph-ohlc/pkg-plist
index 33825e7bdf7d..90402a108637 100644
--- a/graphics/p5-GD-Graph-ohlc/pkg-plist
+++ b/graphics/p5-GD-Graph-ohlc/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/GD/Graph/candlesticks.pod
 %%SITE_PERL%%/GD/Graph/ohlc.pod
 %%SITE_PERL%%/GD/Graph/candlesticks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph/ohlc/.packlist
 %%PERL5_MAN3%%/GD::Graph::candlesticks.3.gz
 %%PERL5_MAN3%%/GD::Graph::ohlc.3.gz
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index 115795a36ceb..e842ba1cd198 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GD-Graph
 PORTVERSION=	1.48
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD-Graph/pkg-plist b/graphics/p5-GD-Graph/pkg-plist
index eff0f71fc43b..4e1a66d7a9e2 100644
--- a/graphics/p5-GD-Graph/pkg-plist
+++ b/graphics/p5-GD-Graph/pkg-plist
@@ -19,4 +19,3 @@
 %%SITE_PERL%%/GD/Graph/pie.pm
 %%SITE_PERL%%/GD/Graph/points.pm
 %%SITE_PERL%%/GD/Graph/utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph/.packlist
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index 3cb18a2f3688..9fc0ed83b720 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GD-Graph3d
 PORTVERSION=	0.63
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD-Graph3d/pkg-plist b/graphics/p5-GD-Graph3d/pkg-plist
index 7e8277940035..958526a07a40 100644
--- a/graphics/p5-GD-Graph3d/pkg-plist
+++ b/graphics/p5-GD-Graph3d/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/GD/Graph/lines3d.pm
 %%SITE_PERL%%/GD/Graph/pie3d.pm
 %%SITE_PERL%%/GD/Graph3d.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph3d/.packlist
diff --git a/graphics/p5-GD-SVG/Makefile b/graphics/p5-GD-SVG/Makefile
index fe7a597cc2a2..08ec0cb63c7b 100644
--- a/graphics/p5-GD-SVG/Makefile
+++ b/graphics/p5-GD-SVG/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GD-SVG
 PORTVERSION=	0.33
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD-SVG/pkg-plist b/graphics/p5-GD-SVG/pkg-plist
index ee48a6f197f4..bae64c14472f 100644
--- a/graphics/p5-GD-SVG/pkg-plist
+++ b/graphics/p5-GD-SVG/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GD::SVG.3.gz
 %%SITE_PERL%%/GD/SVG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/SVG/.packlist
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index 8645dc740528..04ac6c0e1401 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GD-TextUtil
 PORTVERSION=	0.86
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD-TextUtil/pkg-plist b/graphics/p5-GD-TextUtil/pkg-plist
index 0955a48010cf..1d9262b0596e 100644
--- a/graphics/p5-GD-TextUtil/pkg-plist
+++ b/graphics/p5-GD-TextUtil/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/GD/Text.pm
 %%SITE_PERL%%/GD/Text/Align.pm
 %%SITE_PERL%%/GD/Text/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Text/.packlist
diff --git a/graphics/p5-GD-Thumbnail/Makefile b/graphics/p5-GD-Thumbnail/Makefile
index 083c1827cc02..665ba99bf46b 100644
--- a/graphics/p5-GD-Thumbnail/Makefile
+++ b/graphics/p5-GD-Thumbnail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GD-Thumbnail
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD-Thumbnail/pkg-plist b/graphics/p5-GD-Thumbnail/pkg-plist
index bc9b4a7e7cab..adf560dfbc12 100644
--- a/graphics/p5-GD-Thumbnail/pkg-plist
+++ b/graphics/p5-GD-Thumbnail/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GD::Thumbnail.3.gz
 %%SITE_PERL%%/GD/Thumbnail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Thumbnail/.packlist
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index b3e5f1f720bd..a01ab6f34c87 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	GD
 PORTVERSION=	2.53
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GD/pkg-plist b/graphics/p5-GD/pkg-plist
index 705f5ac2acec..bead24064c67 100644
--- a/graphics/p5-GD/pkg-plist
+++ b/graphics/p5-GD/pkg-plist
@@ -4,14 +4,13 @@ bin/bdf2gdfont.pl
 %%PERL5_MAN3%%/GD::Polygon.3.gz
 %%PERL5_MAN3%%/GD::Polyline.3.gz
 %%PERL5_MAN3%%/GD::Simple.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GD/Group.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GD/Image.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polygon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polyline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GD/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
+%%SITE_ARCH%%/GD.pm
+%%SITE_ARCH%%/GD/Group.pm
+%%SITE_ARCH%%/GD/Image.pm
+%%SITE_ARCH%%/GD/Polygon.pm
+%%SITE_ARCH%%/GD/Polyline.pm
+%%SITE_ARCH%%/GD/Simple.pm
+%%SITE_ARCH%%/auto/GD/GD.so
+%%SITE_ARCH%%/auto/GD/autosplit.ix
+%%SITE_ARCH%%/qd.pl
 man/man1/bdf2gdfont.pl.1.gz
diff --git a/graphics/p5-Geo-EOP/Makefile b/graphics/p5-Geo-EOP/Makefile
index 8ddb64b31be6..7b8f372c71e2 100644
--- a/graphics/p5-Geo-EOP/Makefile
+++ b/graphics/p5-Geo-EOP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Geo-EOP
 PORTVERSION=	0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Geo-EOP/pkg-plist b/graphics/p5-Geo-EOP/pkg-plist
index 3f6ce6d01173..826027357331 100644
--- a/graphics/p5-Geo-EOP/pkg-plist
+++ b/graphics/p5-Geo-EOP/pkg-plist
@@ -25,4 +25,3 @@
 %%SITE_PERL%%/Geo/EOP/xsd/hma1.0/hma.xsd
 %%SITE_PERL%%/Geo/EOP/xsd/hma1.0/ohr.xsd
 %%SITE_PERL%%/Geo/EOP/xsd/hma1.0/sar.xsd
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/EOP/.packlist
diff --git a/graphics/p5-Geo-GDAL/Makefile b/graphics/p5-Geo-GDAL/Makefile
index f3a5b2d0fe9d..f7f54504d8d7 100644
--- a/graphics/p5-Geo-GDAL/Makefile
+++ b/graphics/p5-Geo-GDAL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-GDAL
 PORTVERSION=	1.11.1
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://download.osgeo.org/gdal/ \
 		ftp://ftp.remotesensing.org/pub/gdal/ \
@@ -17,7 +18,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
 
-USE_PERL5=	build fixpacklist run
+USE_PERL5=	build run
 USES=		perl5 tar:xz
 WRKSRC=		${WRKDIR}/${DISTNAME}/swig/perl
 
@@ -26,7 +27,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|(const char \*)""|(char \*)""|' ${WRKSRC}/gdal_wrap.cpp ${WRKSRC}/ogr_wrap.cpp
 
 post-install:
-	${CHMOD} u+w ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Geo/GDAL/Const/Const.so ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Geo/*/*.so
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Geo/GDAL/Const/Const.so ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Geo/*/*.so
+	${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/GDAL/Const/Const.so ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/*/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/GDAL/Const/Const.so ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/*/*.so
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Geo-GDAL/pkg-plist b/graphics/p5-Geo-GDAL/pkg-plist
index 2c1324c6fe8b..01c9ed984d68 100644
--- a/graphics/p5-Geo-GDAL/pkg-plist
+++ b/graphics/p5-Geo-GDAL/pkg-plist
@@ -1,12 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/GDAL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/GDAL/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/OGR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/OSR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/GDAL/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/GDAL/Const/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/GDAL/Const/Const.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/GDAL/GDAL.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/OGR/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/OGR/OGR.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/OSR/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/OSR/OSR.so
+%%SITE_ARCH%%/Geo/GDAL.pm
+%%SITE_ARCH%%/Geo/GDAL/Const.pm
+%%SITE_ARCH%%/Geo/OGR.pm
+%%SITE_ARCH%%/Geo/OSR.pm
+%%SITE_ARCH%%/auto/Geo/GDAL/Const/Const.so
+%%SITE_ARCH%%/auto/Geo/GDAL/GDAL.so
+%%SITE_ARCH%%/auto/Geo/OGR/OGR.so
+%%SITE_ARCH%%/auto/Geo/OSR/OSR.so
diff --git a/graphics/p5-Geo-GML/Makefile b/graphics/p5-Geo-GML/Makefile
index 91b6a35e086d..3a1558ef5806 100644
--- a/graphics/p5-Geo-GML/Makefile
+++ b/graphics/p5-Geo-GML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-GML
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Geo-GML/pkg-plist b/graphics/p5-Geo-GML/pkg-plist
index eda289563d42..d736344f7803 100644
--- a/graphics/p5-Geo-GML/pkg-plist
+++ b/graphics/p5-Geo-GML/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/GML/.packlist
 %%SITE_PERL%%/Geo/GML.pm
 %%SITE_PERL%%/Geo/GML.pod
 %%SITE_PERL%%/Geo/GML/GeoPoint.pod
diff --git a/graphics/p5-Geo-Gpx/Makefile b/graphics/p5-Geo-Gpx/Makefile
index 97bb8a321a73..90f23e1362bd 100644
--- a/graphics/p5-Geo-Gpx/Makefile
+++ b/graphics/p5-Geo-Gpx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Geo-Gpx
 PORTVERSION=	0.26
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Geo-Gpx/pkg-plist b/graphics/p5-Geo-Gpx/pkg-plist
index 2afc535eb195..39a5af80d8a3 100644
--- a/graphics/p5-Geo-Gpx/pkg-plist
+++ b/graphics/p5-Geo-Gpx/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Gpx/.packlist
 %%SITE_PERL%%/Geo/Gpx.pm
 %%PERL5_MAN3%%/Geo::Gpx.3.gz
diff --git a/graphics/p5-Geo-KML/Makefile b/graphics/p5-Geo-KML/Makefile
index 918b9170a774..29d57d8686f2 100644
--- a/graphics/p5-Geo-KML/Makefile
+++ b/graphics/p5-Geo-KML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-KML
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	graphics perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Geo-KML/pkg-plist b/graphics/p5-Geo-KML/pkg-plist
index a3accb26556f..03db5da0a4c6 100644
--- a/graphics/p5-Geo-KML/pkg-plist
+++ b/graphics/p5-Geo-KML/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/Geo/KML/xsd/kml-2.2.0/kml22gx.xsd
 %%SITE_PERL%%/Geo/KML/xsd/kml-2.2.0/ogckml22.xsd
 %%SITE_PERL%%/Geo/KML/xsd/xal-2.0/xAL.xsd
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/KML/.packlist
diff --git a/graphics/p5-Geo-Point/Makefile b/graphics/p5-Geo-Point/Makefile
index 77d935c0b9d8..0bb0491c1f16 100644
--- a/graphics/p5-Geo-Point/Makefile
+++ b/graphics/p5-Geo-Point/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Point
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	graphics devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Geo-Point/pkg-plist b/graphics/p5-Geo-Point/pkg-plist
index b2f334e959bc..c999846d674a 100644
--- a/graphics/p5-Geo-Point/pkg-plist
+++ b/graphics/p5-Geo-Point/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/Geo/Space.pod
 %%SITE_PERL%%/Geo/Surface.pm
 %%SITE_PERL%%/Geo/Surface.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Point/.packlist
diff --git a/graphics/p5-Geo-Proj4/Makefile b/graphics/p5-Geo-Proj4/Makefile
index 200f525daf9f..d70aab835571 100644
--- a/graphics/p5-Geo-Proj4/Makefile
+++ b/graphics/p5-Geo-Proj4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Proj4
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	graphics devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Geo-Proj4/pkg-plist b/graphics/p5-Geo-Proj4/pkg-plist
index 48118432099f..db4be01510b6 100644
--- a/graphics/p5-Geo-Proj4/pkg-plist
+++ b/graphics/p5-Geo-Proj4/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/Proj4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/Proj4.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Proj4/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Proj4/Proj4.so
+%%SITE_ARCH%%/Geo/Proj4.pm
+%%SITE_ARCH%%/Geo/Proj4.pod
+%%SITE_ARCH%%/auto/Geo/Proj4/Proj4.so
 %%PERL5_MAN3%%/Geo::Proj4.3.gz
diff --git a/graphics/p5-Geometry-Primitive/Makefile b/graphics/p5-Geometry-Primitive/Makefile
index b7b1f009e9e0..d62e86281075 100644
--- a/graphics/p5-Geometry-Primitive/Makefile
+++ b/graphics/p5-Geometry-Primitive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geometry-Primitive
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GPHAT
diff --git a/graphics/p5-Geometry-Primitive/pkg-plist b/graphics/p5-Geometry-Primitive/pkg-plist
index a41e3c6467e8..96e84dc33e41 100644
--- a/graphics/p5-Geometry-Primitive/pkg-plist
+++ b/graphics/p5-Geometry-Primitive/pkg-plist
@@ -22,4 +22,3 @@
 %%SITE_PERL%%/Geometry/Primitive/Polygon.pm
 %%SITE_PERL%%/Geometry/Primitive/Rectangle.pm
 %%SITE_PERL%%/Geometry/Primitive/Shape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geometry/Primitive/.packlist
diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile
index 68800a43b195..384317b56a88 100644
--- a/graphics/p5-Gimp/Makefile
+++ b/graphics/p5-Gimp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gimp
 PORTVERSION=	2.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Gimp/pkg-plist b/graphics/p5-Gimp/pkg-plist
index aa4ce9935a27..f6574de77ddf 100644
--- a/graphics/p5-Gimp/pkg-plist
+++ b/graphics/p5-Gimp/pkg-plist
@@ -12,27 +12,26 @@ bin/xcftopnm
 %%PERL5_MAN3%%/Gimp::Pod.3.gz
 %%PERL5_MAN3%%/Gimp::UI.3.gz
 %%PERL5_MAN3%%/Gimp::Util.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/ColorDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Constant.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Data.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Extension.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Fu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Lib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Lib/Install/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Lib/Install/typemap.pdl
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Pod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/UI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/UI/Install/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gimp/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gimp/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gimp/Gimp.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gimp/Lib/Lib.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gimp/Net/Net.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gimp/UI/UI.so
+%%SITE_ARCH%%/Gimp.pm
+%%SITE_ARCH%%/Gimp/ColorDB.pm
+%%SITE_ARCH%%/Gimp/Config.pm
+%%SITE_ARCH%%/Gimp/Constant.pm
+%%SITE_ARCH%%/Gimp/Data.pm
+%%SITE_ARCH%%/Gimp/Extension.pm
+%%SITE_ARCH%%/Gimp/Fu.pm
+%%SITE_ARCH%%/Gimp/Install/Files.pm
+%%SITE_ARCH%%/Gimp/Lib.pm
+%%SITE_ARCH%%/Gimp/Lib/Install/typemap
+%%SITE_ARCH%%/Gimp/Lib/Install/typemap.pdl
+%%SITE_ARCH%%/Gimp/Net.pm
+%%SITE_ARCH%%/Gimp/Pod.pm
+%%SITE_ARCH%%/Gimp/UI.pm
+%%SITE_ARCH%%/Gimp/UI/Install/typemap
+%%SITE_ARCH%%/Gimp/Util.pm
+%%SITE_ARCH%%/auto/Gimp/Gimp.so
+%%SITE_ARCH%%/auto/Gimp/Lib/Lib.so
+%%SITE_ARCH%%/auto/Gimp/Net/Net.so
+%%SITE_ARCH%%/auto/Gimp/UI/UI.so
 libexec/gimp/2.2/plug-ins/Perl-Console
 libexec/gimp/2.2/plug-ins/Perl-Server
 libexec/gimp/2.2/plug-ins/animate_cells
diff --git a/graphics/p5-Google-Chart/Makefile b/graphics/p5-Google-Chart/Makefile
index fa545edab3f2..7ddb7ef60c96 100644
--- a/graphics/p5-Google-Chart/Makefile
+++ b/graphics/p5-Google-Chart/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Google-Chart
 PORTVERSION=	0.05014
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Google-Chart/pkg-plist b/graphics/p5-Google-Chart/pkg-plist
index 42613da8abe7..e5788e812fa3 100644
--- a/graphics/p5-Google-Chart/pkg-plist
+++ b/graphics/p5-Google-Chart/pkg-plist
@@ -64,4 +64,3 @@
 %%PERL5_MAN3%%/Google::Chart::Type::XY.3.gz
 %%PERL5_MAN3%%/Google::Chart::Margin.3.gz
 %%PERL5_MAN3%%/Google::Chart::Types.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Chart/.packlist
diff --git a/graphics/p5-Graph-Easy/Makefile b/graphics/p5-Graph-Easy/Makefile
index 0bef61c4264c..333b719457fa 100644
--- a/graphics/p5-Graph-Easy/Makefile
+++ b/graphics/p5-Graph-Easy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graph-Easy
 PORTVERSION=	0.73
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graph-Easy/pkg-plist b/graphics/p5-Graph-Easy/pkg-plist
index ac0f8a34e146..a637b44cb8e3 100644
--- a/graphics/p5-Graph-Easy/pkg-plist
+++ b/graphics/p5-Graph-Easy/pkg-plist
@@ -1,5 +1,4 @@
 bin/graph-easy
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/Easy/.packlist
 %%SITE_PERL%%/Graph/Easy.pm
 %%SITE_PERL%%/Graph/Easy/As_ascii.pm
 %%SITE_PERL%%/Graph/Easy/As_graphml.pm
diff --git a/graphics/p5-Graph-ReadWrite/Makefile b/graphics/p5-Graph-ReadWrite/Makefile
index e0eb13875db7..6bbb556fe05f 100644
--- a/graphics/p5-Graph-ReadWrite/Makefile
+++ b/graphics/p5-Graph-ReadWrite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graph-ReadWrite
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graph-ReadWrite/pkg-plist b/graphics/p5-Graph-ReadWrite/pkg-plist
index c43a35ca58da..8cf6dca358d8 100644
--- a/graphics/p5-Graph-ReadWrite/pkg-plist
+++ b/graphics/p5-Graph-ReadWrite/pkg-plist
@@ -18,4 +18,3 @@
 %%SITE_PERL%%/Graph/Writer/VCG.pm
 %%SITE_PERL%%/Graph/Writer/XML.pm
 %%SITE_PERL%%/Graph/Writer/daVinci.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/ReadWrite/.packlist
diff --git a/graphics/p5-Graph-SocialMap/Makefile b/graphics/p5-Graph-SocialMap/Makefile
index 164f55df0b00..afea12077d12 100644
--- a/graphics/p5-Graph-SocialMap/Makefile
+++ b/graphics/p5-Graph-SocialMap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Graph-SocialMap
 PORTVERSION=	0.12
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graph-SocialMap/pkg-plist b/graphics/p5-Graph-SocialMap/pkg-plist
index 43c8b7cb26d9..a66769e13ee1 100644
--- a/graphics/p5-Graph-SocialMap/pkg-plist
+++ b/graphics/p5-Graph-SocialMap/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Graph::SocialMap.3.gz
 %%SITE_PERL%%/Graph/SocialMap.pm
 %%SITE_PERL%%/Graph/SocialMap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/SocialMap/.packlist
diff --git a/graphics/p5-Graph-Writer-GraphViz/Makefile b/graphics/p5-Graph-Writer-GraphViz/Makefile
index 0465f06916be..5572c6f58f10 100644
--- a/graphics/p5-Graph-Writer-GraphViz/Makefile
+++ b/graphics/p5-Graph-Writer-GraphViz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Graph-Writer-GraphViz
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graph-Writer-GraphViz/pkg-plist b/graphics/p5-Graph-Writer-GraphViz/pkg-plist
index 5458748fa2d6..21d2dab252be 100644
--- a/graphics/p5-Graph-Writer-GraphViz/pkg-plist
+++ b/graphics/p5-Graph-Writer-GraphViz/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Graph/Writer/GraphViz.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/Writer/GraphViz/.packlist
 %%PERL5_MAN3%%/Graph::Writer::GraphViz.3.gz
diff --git a/graphics/p5-GraphViz-Data-Structure/Makefile b/graphics/p5-GraphViz-Data-Structure/Makefile
index 7686ff1be0d5..838e04d029c7 100644
--- a/graphics/p5-GraphViz-Data-Structure/Makefile
+++ b/graphics/p5-GraphViz-Data-Structure/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GraphViz-Data-Structure
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GraphViz-Data-Structure/pkg-plist b/graphics/p5-GraphViz-Data-Structure/pkg-plist
index d0e977b6dc69..5fbf3ea3985b 100644
--- a/graphics/p5-GraphViz-Data-Structure/pkg-plist
+++ b/graphics/p5-GraphViz-Data-Structure/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/GraphViz::Data::Structure.3.gz
 %%SITE_PERL%%/GraphViz/Data/Structure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data/Structure/.packlist
diff --git a/graphics/p5-GraphViz-Traverse/Makefile b/graphics/p5-GraphViz-Traverse/Makefile
index 1d0a384aab37..5018728b6717 100644
--- a/graphics/p5-GraphViz-Traverse/Makefile
+++ b/graphics/p5-GraphViz-Traverse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GraphViz-Traverse
 PORTVERSION=	0.02
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GraphViz-Traverse/pkg-plist b/graphics/p5-GraphViz-Traverse/pkg-plist
index 6105c7bc383e..5af964f618cb 100644
--- a/graphics/p5-GraphViz-Traverse/pkg-plist
+++ b/graphics/p5-GraphViz-Traverse/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/GraphViz::Traverse::Filesystem.3.gz
 %%SITE_PERL%%/GraphViz/Traverse.pm
 %%SITE_PERL%%/GraphViz/Traverse/Filesystem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Traverse/.packlist
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index 5872fcebf8b2..dd10742d9277 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GraphViz
 PORTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-GraphViz/pkg-plist b/graphics/p5-GraphViz/pkg-plist
index 63248aa38fb8..bb10e6440c28 100644
--- a/graphics/p5-GraphViz/pkg-plist
+++ b/graphics/p5-GraphViz/pkg-plist
@@ -18,4 +18,3 @@
 %%SITE_PERL%%/GraphViz/Regex.pm
 %%SITE_PERL%%/GraphViz/Small.pm
 %%SITE_PERL%%/GraphViz/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/.packlist
diff --git a/graphics/p5-GraphViz2/Makefile b/graphics/p5-GraphViz2/Makefile
index 2daabca1d904..a5f960e6bb7b 100644
--- a/graphics/p5-GraphViz2/Makefile
+++ b/graphics/p5-GraphViz2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GraphViz2
 PORTVERSION=	2.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSAVAGE
diff --git a/graphics/p5-GraphViz2/pkg-plist b/graphics/p5-GraphViz2/pkg-plist
index 7ed72c3cd897..5434fcd847f8 100644
--- a/graphics/p5-GraphViz2/pkg-plist
+++ b/graphics/p5-GraphViz2/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/GraphViz2/Parse/Yacc.pm
 %%SITE_PERL%%/GraphViz2/Parse/Yapp.pm
 %%SITE_PERL%%/GraphViz2/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz2/.packlist
 %%PERL5_MAN3%%/GraphViz2.3.gz
 %%PERL5_MAN3%%/GraphViz2::Config.3.gz
 %%PERL5_MAN3%%/GraphViz2::DBI.3.gz
diff --git a/graphics/p5-Graphics-Color/Makefile b/graphics/p5-Graphics-Color/Makefile
index 4e2e515ad2cd..5ca1483217a3 100644
--- a/graphics/p5-Graphics-Color/Makefile
+++ b/graphics/p5-Graphics-Color/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graphics-Color
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graphics-Color/pkg-plist b/graphics/p5-Graphics-Color/pkg-plist
index ae213b0b35f2..2b1cee1cfe66 100644
--- a/graphics/p5-Graphics-Color/pkg-plist
+++ b/graphics/p5-Graphics-Color/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/Graphics/Color/Types.pm
 %%SITE_PERL%%/Graphics/Color/YIQ.pm
 %%SITE_PERL%%/Graphics/Color/YUV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Color/.packlist
diff --git a/graphics/p5-Graphics-ColorNames-WWW/Makefile b/graphics/p5-Graphics-ColorNames-WWW/Makefile
index 7d7789a71457..b12bc035e0b7 100644
--- a/graphics/p5-Graphics-ColorNames-WWW/Makefile
+++ b/graphics/p5-Graphics-ColorNames-WWW/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graphics-ColorNames-WWW
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graphics-ColorNames/Makefile b/graphics/p5-Graphics-ColorNames/Makefile
index 671c61a7ef8b..488cd71c0bee 100644
--- a/graphics/p5-Graphics-ColorNames/Makefile
+++ b/graphics/p5-Graphics-ColorNames/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graphics-ColorNames
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graphics-GnuplotIF/Makefile b/graphics/p5-Graphics-GnuplotIF/Makefile
index 922840682887..41cc9ff364ce 100644
--- a/graphics/p5-Graphics-GnuplotIF/Makefile
+++ b/graphics/p5-Graphics-GnuplotIF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graphics-GnuplotIF
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
index 51b89b734b0b..957382a65339 100644
--- a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
+++ b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graphics-Primitive-Driver-Cairo
 PORTVERSION=	0.45
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Graphics-Primitive-Driver-Cairo/pkg-plist b/graphics/p5-Graphics-Primitive-Driver-Cairo/pkg-plist
index e1a27f7e80d4..c84a6e24b05d 100644
--- a/graphics/p5-Graphics-Primitive-Driver-Cairo/pkg-plist
+++ b/graphics/p5-Graphics-Primitive-Driver-Cairo/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Graphics::Primitive::Driver::Cairo::TextLayout.3.gz
 %%SITE_PERL%%/Graphics/Primitive/Driver/Cairo.pm
 %%SITE_PERL%%/Graphics/Primitive/Driver/Cairo/TextLayout.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Primitive/Driver/Cairo/.packlist
diff --git a/graphics/p5-Graphics-Primitive/Makefile b/graphics/p5-Graphics-Primitive/Makefile
index 482696a2e788..b05c0519e450 100644
--- a/graphics/p5-Graphics-Primitive/Makefile
+++ b/graphics/p5-Graphics-Primitive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graphics-Primitive
 PORTVERSION=	0.62
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GPHAT
diff --git a/graphics/p5-Graphics-Primitive/pkg-plist b/graphics/p5-Graphics-Primitive/pkg-plist
index acc79b870d82..3f8d3757b4cc 100644
--- a/graphics/p5-Graphics-Primitive/pkg-plist
+++ b/graphics/p5-Graphics-Primitive/pkg-plist
@@ -46,4 +46,3 @@
 %%SITE_PERL%%/Graphics/Primitive/Paint/Solid.pm
 %%SITE_PERL%%/Graphics/Primitive/Path.pm
 %%SITE_PERL%%/Graphics/Primitive/TextBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Primitive/.packlist
diff --git a/graphics/p5-Image-Base-SVG/Makefile b/graphics/p5-Image-Base-SVG/Makefile
index a98034057992..d0c9abc03888 100644
--- a/graphics/p5-Image-Base-SVG/Makefile
+++ b/graphics/p5-Image-Base-SVG/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Base-SVG
 PORTVERSION=	4
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Base-SVG/pkg-plist b/graphics/p5-Image-Base-SVG/pkg-plist
index d28b34431afd..92b3c61e19f6 100644
--- a/graphics/p5-Image-Base-SVG/pkg-plist
+++ b/graphics/p5-Image-Base-SVG/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Image/Base/SVG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Base/SVG/.packlist
 %%PERL5_MAN3%%/Image::Base::SVG.3.gz
diff --git a/graphics/p5-Image-Base/Makefile b/graphics/p5-Image-Base/Makefile
index 7a0b6f28bdb9..bdd13603f1dd 100644
--- a/graphics/p5-Image-Base/Makefile
+++ b/graphics/p5-Image-Base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Base
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Base/pkg-plist b/graphics/p5-Image-Base/pkg-plist
index 76a5f4700b00..bfd678f08393 100644
--- a/graphics/p5-Image-Base/pkg-plist
+++ b/graphics/p5-Image-Base/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Image/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Base/.packlist
 %%PERL5_MAN3%%/Image::Base.3.gz
diff --git a/graphics/p5-Image-Caa/Makefile b/graphics/p5-Image-Caa/Makefile
index fd7de75a4c52..e084d66c109d 100644
--- a/graphics/p5-Image-Caa/Makefile
+++ b/graphics/p5-Image-Caa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Caa
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Caa/pkg-plist b/graphics/p5-Image-Caa/pkg-plist
index 98855dda66d4..6f0b9ec65aee 100644
--- a/graphics/p5-Image-Caa/pkg-plist
+++ b/graphics/p5-Image-Caa/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/Image/Caa/DriverANSI.pm
 %%SITE_PERL%%/Image/Caa/DriverCurses.pm
 %%SITE_PERL%%/Image/Caa/DriverTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Caa/.packlist
 %%EXAMPLESDIR%%/curses.pl
 %%EXAMPLESDIR%%/kitten.jpg
 %%EXAMPLESDIR%%/kitten.pl
diff --git a/graphics/p5-Image-Compare/Makefile b/graphics/p5-Image-Compare/Makefile
index 60aeac54f767..07d6d7f16cb5 100644
--- a/graphics/p5-Image-Compare/Makefile
+++ b/graphics/p5-Image-Compare/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Compare
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Compare/pkg-plist b/graphics/p5-Image-Compare/pkg-plist
index 7ce99fccdd33..491ea6dac8c1 100644
--- a/graphics/p5-Image-Compare/pkg-plist
+++ b/graphics/p5-Image-Compare/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/Image/Compare/IMAGE.pm
 %%SITE_PERL%%/Image/Compare/THRESHOLD.pm
 %%SITE_PERL%%/Image/Compare/THRESHOLD_COUNT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Compare/.packlist
diff --git a/graphics/p5-Image-ExifTool-devel/Makefile b/graphics/p5-Image-ExifTool-devel/Makefile
index 98bcde704e10..1786acf2807d 100644
--- a/graphics/p5-Image-ExifTool-devel/Makefile
+++ b/graphics/p5-Image-ExifTool-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-ExifTool
 PORTVERSION=	9.69
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.sno.phy.queensu.ca/~phil/exiftool/
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-ExifTool-devel/pkg-plist b/graphics/p5-Image-ExifTool-devel/pkg-plist
index d33762ee079e..9d4a1c96c768 100644
--- a/graphics/p5-Image-ExifTool-devel/pkg-plist
+++ b/graphics/p5-Image-ExifTool-devel/pkg-plist
@@ -352,5 +352,4 @@ bin/exiftool
 %%SITE_PERL%%/Image/ExifTool/XMPStruct.pl
 %%SITE_PERL%%/Image/ExifTool/ZIP.pm
 %%SITE_PERL%%/Image/ExifTool/iWork.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/ExifTool/.packlist
 man/man1/exiftool.1.gz
diff --git a/graphics/p5-Image-ExifTool/Makefile b/graphics/p5-Image-ExifTool/Makefile
index 2e538e2a7817..de4f3c9e0e32 100644
--- a/graphics/p5-Image-ExifTool/Makefile
+++ b/graphics/p5-Image-ExifTool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-ExifTool
 PORTVERSION=	9.60
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.sno.phy.queensu.ca/~phil/exiftool/ \
 		CPAN
diff --git a/graphics/p5-Image-ExifTool/pkg-plist b/graphics/p5-Image-ExifTool/pkg-plist
index 3b424dbe788d..ab394aeb8eea 100644
--- a/graphics/p5-Image-ExifTool/pkg-plist
+++ b/graphics/p5-Image-ExifTool/pkg-plist
@@ -348,5 +348,4 @@ bin/exiftool
 %%SITE_PERL%%/Image/ExifTool/XMPStruct.pl
 %%SITE_PERL%%/Image/ExifTool/ZIP.pm
 %%SITE_PERL%%/Image/ExifTool/iWork.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/ExifTool/.packlist
 man/man1/exiftool.1.gz
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index 744339fe0802..6305c4d10c5e 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Grab
 PORTVERSION=	1.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Grab/pkg-plist b/graphics/p5-Image-Grab/pkg-plist
index e6addd20cbb9..aa5099d580fd 100644
--- a/graphics/p5-Image-Grab/pkg-plist
+++ b/graphics/p5-Image-Grab/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Image/Grab.pod
 %%SITE_PERL%%/Image/Grab/RequestAgent.pm
 %%SITE_PERL%%/Image/Grab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Grab/.packlist
 %%PERL5_MAN3%%/Image::Grab.3.gz
diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile
index ecc3aefc1b8f..c603685d76cf 100644
--- a/graphics/p5-Image-Heatmap/Makefile
+++ b/graphics/p5-Image-Heatmap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Heatmap
 PORTVERSION=	0.565
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Heatmap/pkg-plist b/graphics/p5-Image-Heatmap/pkg-plist
index fc9a9eea8a25..8a01ec4e488d 100644
--- a/graphics/p5-Image-Heatmap/pkg-plist
+++ b/graphics/p5-Image-Heatmap/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Image/Heatmap.pm
 %%SITE_PERL%%/Image/Heatmap/bolilla.png
 %%SITE_PERL%%/Image/Heatmap/colors.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Heatmap/.packlist
 %%PERL5_MAN3%%/Image::Heatmap.3.gz
diff --git a/graphics/p5-Image-IPTCInfo/Makefile b/graphics/p5-Image-IPTCInfo/Makefile
index e79a82e3208a..1535433446fd 100644
--- a/graphics/p5-Image-IPTCInfo/Makefile
+++ b/graphics/p5-Image-IPTCInfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-IPTCInfo
 PORTVERSION=	1.95
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-IPTCInfo/pkg-plist b/graphics/p5-Image-IPTCInfo/pkg-plist
index a725c83e0fcd..08e1058dcf21 100644
--- a/graphics/p5-Image-IPTCInfo/pkg-plist
+++ b/graphics/p5-Image-IPTCInfo/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Image::IPTCInfo.3.gz
 %%SITE_PERL%%/Image/IPTCInfo.pm
 %%SITE_PERL%%/Image/demo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/IPTCInfo/.packlist
 %%PORTDOCS%%%%EXAMPLESDIR%%/burger_van.jpg
 %%PORTDOCS%%%%EXAMPLESDIR%%/dog.jpg
diff --git a/graphics/p5-Image-Imgur/Makefile b/graphics/p5-Image-Imgur/Makefile
index 65b2ab1fd84d..a27f62ad3088 100644
--- a/graphics/p5-Image-Imgur/Makefile
+++ b/graphics/p5-Image-Imgur/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Imgur
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Imgur/pkg-plist b/graphics/p5-Image-Imgur/pkg-plist
index d7e1d2467450..8ec8c227d359 100644
--- a/graphics/p5-Image-Imgur/pkg-plist
+++ b/graphics/p5-Image-Imgur/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Image/Imgur.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Imgur/.packlist
 %%PERL5_MAN3%%/Image::Imgur.3.gz
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 70a26c0c2dde..fa6c6c8ed7fc 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Imlib2
 PORTVERSION=	2.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Imlib2/pkg-plist b/graphics/p5-Image-Imlib2/pkg-plist
index f2900929e03b..7f1b0cb6f023 100644
--- a/graphics/p5-Image-Imlib2/pkg-plist
+++ b/graphics/p5-Image-Imlib2/pkg-plist
@@ -1,6 +1,6 @@
 %%PERL5_MAN3%%/Image::Imlib2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Image/Imlib2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Imlib2/Imlib2.so
+%%SITE_ARCH%%/Image/Imlib2.pm
+%%SITE_ARCH%%/auto/Image/Imlib2/Imlib2.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/benchmark.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/benchmark.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/maeda.pl
diff --git a/graphics/p5-Image-Info/Makefile b/graphics/p5-Image-Info/Makefile
index 2e3ef87228a4..2fd06a9450e5 100644
--- a/graphics/p5-Image-Info/Makefile
+++ b/graphics/p5-Image-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Info
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Info/pkg-plist b/graphics/p5-Image-Info/pkg-plist
index b1742d0d596d..161cf9093099 100644
--- a/graphics/p5-Image-Info/pkg-plist
+++ b/graphics/p5-Image-Info/pkg-plist
@@ -32,4 +32,3 @@
 %%SITE_PERL%%/Image/Info/XBM.pm
 %%SITE_PERL%%/Image/Info/XPM.pm
 %%SITE_PERL%%/Image/TIFF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Info/.packlist
diff --git a/graphics/p5-Image-LibExif/Makefile b/graphics/p5-Image-LibExif/Makefile
index 358df6443e57..f81f86ca79ea 100644
--- a/graphics/p5-Image-LibExif/Makefile
+++ b/graphics/p5-Image-LibExif/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-LibExif
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-LibExif/pkg-plist b/graphics/p5-Image-LibExif/pkg-plist
index 0640fee228a0..9209e286396a 100644
--- a/graphics/p5-Image-LibExif/pkg-plist
+++ b/graphics/p5-Image-LibExif/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Image/LibExif.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/LibExif/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/LibExif/LibExif.so
+%%SITE_ARCH%%/Image/LibExif.pm
+%%SITE_ARCH%%/auto/Image/LibExif/LibExif.so
 %%PERL5_MAN3%%/Image::LibExif.3.gz
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index 9ab05cb3511e..41fc8cf58662 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Magick-Iterator
 PORTVERSION=	0.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Magick-Iterator/pkg-plist b/graphics/p5-Image-Magick-Iterator/pkg-plist
index b76f4c97d099..805e54a7fc8b 100644
--- a/graphics/p5-Image-Magick-Iterator/pkg-plist
+++ b/graphics/p5-Image-Magick-Iterator/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Image/Magick/Iterator.pm
 %%SITE_PERL%%/Image/Magick/Iterator/PPM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Iterator/.packlist
 %%PERL5_MAN3%%/Image::Magick::Iterator.3.gz
 %%PERL5_MAN3%%/Image::Magick::Iterator::PPM.3.gz
diff --git a/graphics/p5-Image-Math-Constrain/Makefile b/graphics/p5-Image-Math-Constrain/Makefile
index 4b3d226cf2cb..2ad65908838c 100644
--- a/graphics/p5-Image-Math-Constrain/Makefile
+++ b/graphics/p5-Image-Math-Constrain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Math-Constrain
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Math-Constrain/pkg-plist b/graphics/p5-Image-Math-Constrain/pkg-plist
index 9cab30ffd301..a5447a0b515a 100644
--- a/graphics/p5-Image-Math-Constrain/pkg-plist
+++ b/graphics/p5-Image-Math-Constrain/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Image/Math/Constrain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Math/Constrain/.packlist
 %%PERL5_MAN3%%/Image::Math::Constrain.3.gz
diff --git a/graphics/p5-Image-MetaData-GQview/Makefile b/graphics/p5-Image-MetaData-GQview/Makefile
index a44b9b51d450..574a92827b6c 100644
--- a/graphics/p5-Image-MetaData-GQview/Makefile
+++ b/graphics/p5-Image-MetaData-GQview/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-MetaData-GQview
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-MetaData-GQview/pkg-plist b/graphics/p5-Image-MetaData-GQview/pkg-plist
index 4f6ed6854240..29793ce78e83 100644
--- a/graphics/p5-Image-MetaData-GQview/pkg-plist
+++ b/graphics/p5-Image-MetaData-GQview/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Image/MetaData/.perltidyrc
 %%SITE_PERL%%/Image/MetaData/GQview.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/MetaData/GQview/.packlist
 %%PERL5_MAN3%%/Image::MetaData::GQview.3.gz
diff --git a/graphics/p5-Image-MetaData-JPEG/Makefile b/graphics/p5-Image-MetaData-JPEG/Makefile
index 1e30dbe028f6..675b0be8b649 100644
--- a/graphics/p5-Image-MetaData-JPEG/Makefile
+++ b/graphics/p5-Image-MetaData-JPEG/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-MetaData-JPEG
 PORTVERSION=	0.153
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-MetaData-JPEG/pkg-plist b/graphics/p5-Image-MetaData-JPEG/pkg-plist
index cefa165286fb..b2f64761d6e2 100644
--- a/graphics/p5-Image-MetaData-JPEG/pkg-plist
+++ b/graphics/p5-Image-MetaData-JPEG/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/MetaData/JPEG/.packlist
 %%SITE_PERL%%/Image/MetaData/JPEG.pm
 %%SITE_PERL%%/Image/MetaData/JPEG.pod
 %%SITE_PERL%%/Image/MetaData/JPEG/Backtrace.pm
diff --git a/graphics/p5-Image-ObjectDetect/Makefile b/graphics/p5-Image-ObjectDetect/Makefile
index 48d51ae2855a..d4264f63b197 100644
--- a/graphics/p5-Image-ObjectDetect/Makefile
+++ b/graphics/p5-Image-ObjectDetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-ObjectDetect
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-ObjectDetect/pkg-plist b/graphics/p5-Image-ObjectDetect/pkg-plist
index a3c9f3022cf3..1e9796fd4a39 100644
--- a/graphics/p5-Image-ObjectDetect/pkg-plist
+++ b/graphics/p5-Image-ObjectDetect/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Image/ObjectDetect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Image/ObjectDetect.xs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/ObjectDetect/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/ObjectDetect/ObjectDetect.so
+%%SITE_ARCH%%/Image/ObjectDetect.pm
+%%SITE_ARCH%%/Image/ObjectDetect.xs
+%%SITE_ARCH%%/auto/Image/ObjectDetect/ObjectDetect.so
 %%PERL5_MAN3%%/Image::ObjectDetect.3.gz
diff --git a/graphics/p5-Image-PBMlib/Makefile b/graphics/p5-Image-PBMlib/Makefile
index 93579dd373e7..874482d1ecef 100644
--- a/graphics/p5-Image-PBMlib/Makefile
+++ b/graphics/p5-Image-PBMlib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-PBMlib
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Image
diff --git a/graphics/p5-Image-PBMlib/pkg-plist b/graphics/p5-Image-PBMlib/pkg-plist
index 15c2a42a9226..5e873beee21e 100644
--- a/graphics/p5-Image-PBMlib/pkg-plist
+++ b/graphics/p5-Image-PBMlib/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Image::PBMlib.3.gz
 %%SITE_PERL%%/Image/PBMlib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/PBMlib/.packlist
diff --git a/graphics/p5-Image-Pngslimmer/Makefile b/graphics/p5-Image-Pngslimmer/Makefile
index 975ea1e0d9d5..8154c6820d1c 100644
--- a/graphics/p5-Image-Pngslimmer/Makefile
+++ b/graphics/p5-Image-Pngslimmer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Pngslimmer
 PORTVERSION=	0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Pngslimmer/pkg-plist b/graphics/p5-Image-Pngslimmer/pkg-plist
index 78f848473be2..65fa1bf461a1 100644
--- a/graphics/p5-Image-Pngslimmer/pkg-plist
+++ b/graphics/p5-Image-Pngslimmer/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Image::Pngslimmer.3.gz
 %%SITE_PERL%%/Image/Pngslimmer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Pngslimmer/.packlist
diff --git a/graphics/p5-Image-Scale/Makefile b/graphics/p5-Image-Scale/Makefile
index 3201ffaf07be..c59735d45084 100644
--- a/graphics/p5-Image-Scale/Makefile
+++ b/graphics/p5-Image-Scale/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Scale
 PORTVERSION=	0.08
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Scale/pkg-plist b/graphics/p5-Image-Scale/pkg-plist
index 7990e689525d..f262d6a24bc9 100644
--- a/graphics/p5-Image-Scale/pkg-plist
+++ b/graphics/p5-Image-Scale/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Image/Scale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Scale/Scale.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Scale/.packlist
+%%SITE_ARCH%%/Image/Scale.pm
+%%SITE_ARCH%%/auto/Image/Scale/Scale.so
 %%PERL5_MAN3%%/Image::Scale.3.gz
diff --git a/graphics/p5-Image-Size-FillFullSelect/Makefile b/graphics/p5-Image-Size-FillFullSelect/Makefile
index 3f253bcf92f9..077bf1282a23 100644
--- a/graphics/p5-Image-Size-FillFullSelect/Makefile
+++ b/graphics/p5-Image-Size-FillFullSelect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Size-FillFullSelect
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/graphics/p5-Image-Size-FillFullSelect/pkg-plist b/graphics/p5-Image-Size-FillFullSelect/pkg-plist
index b1cb7e9ae9a5..5df14b7e93ff 100644
--- a/graphics/p5-Image-Size-FillFullSelect/pkg-plist
+++ b/graphics/p5-Image-Size-FillFullSelect/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Image/Size/FillFullSelect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Size/FillFullSelect/.packlist
 %%PERL5_MAN3%%/Image::Size::FillFullSelect.3.gz
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 2fa4f3fb6fa5..c9e695af3ed2 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Image-Size
 PORTVERSION=	3.232
+PORTREVISION=	1
 CATEGORIES=	graphics www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Image-Size/pkg-plist b/graphics/p5-Image-Size/pkg-plist
index 5c9710f8d04a..4fca9185c0b1 100644
--- a/graphics/p5-Image-Size/pkg-plist
+++ b/graphics/p5-Image-Size/pkg-plist
@@ -1,5 +1,4 @@
 bin/imgsize
 %%PERL5_MAN3%%/Image::Size.3.gz
 man/man1/imgsize.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Size/.packlist
 %%SITE_PERL%%/Image/Size.pm
diff --git a/graphics/p5-Imager-AverageGray/Makefile b/graphics/p5-Imager-AverageGray/Makefile
index 0614d2dda530..21dff4bd2a38 100644
--- a/graphics/p5-Imager-AverageGray/Makefile
+++ b/graphics/p5-Imager-AverageGray/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Imager-AverageGray
 PORTVERSION=	0.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Imager-AverageGray/pkg-plist b/graphics/p5-Imager-AverageGray/pkg-plist
index d4629c7e1e10..e820ddf8755f 100644
--- a/graphics/p5-Imager-AverageGray/pkg-plist
+++ b/graphics/p5-Imager-AverageGray/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Imager/AverageGray.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/AverageGray/.packlist
 %%PERL5_MAN3%%/Imager::AverageGray.3.gz
diff --git a/graphics/p5-Imager-Graph/Makefile b/graphics/p5-Imager-Graph/Makefile
index 9163a2b818fc..b256110dc906 100644
--- a/graphics/p5-Imager-Graph/Makefile
+++ b/graphics/p5-Imager-Graph/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Imager-Graph
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Imager-Graph/pkg-plist b/graphics/p5-Imager-Graph/pkg-plist
index 480f9cbc7b98..e918f68bf2ca 100644
--- a/graphics/p5-Imager-Graph/pkg-plist
+++ b/graphics/p5-Imager-Graph/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/Imager/Graph/StackedColumn.pm
 %%SITE_PERL%%/Imager/Graph/Util.pm
 %%SITE_PERL%%/Imager/Graph/Vertical.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Graph/.packlist
 %%PERL5_MAN3%%/Imager::Graph.3.gz
 %%PERL5_MAN3%%/Imager::Graph::Area.3.gz
 %%PERL5_MAN3%%/Imager::Graph::Bar.3.gz
diff --git a/graphics/p5-Imager-Plot/Makefile b/graphics/p5-Imager-Plot/Makefile
index 423b34b73777..57f50002d957 100644
--- a/graphics/p5-Imager-Plot/Makefile
+++ b/graphics/p5-Imager-Plot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Imager-Plot
 PORTVERSION=	0.09
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Imager-Plot/pkg-plist b/graphics/p5-Imager-Plot/pkg-plist
index 203aafc2d150..0e5e62515734 100644
--- a/graphics/p5-Imager-Plot/pkg-plist
+++ b/graphics/p5-Imager-Plot/pkg-plist
@@ -7,4 +7,3 @@
 %%SITE_PERL%%/Imager/Plot/Util.pm
 %%SITE_PERL%%/Imager/plot.pl
 %%SITE_PERL%%/auto/Imager/Plot/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Plot/.packlist
diff --git a/graphics/p5-Imager-QRCode/Makefile b/graphics/p5-Imager-QRCode/Makefile
index 9dc19107b4cc..1f5fb2bce263 100644
--- a/graphics/p5-Imager-QRCode/Makefile
+++ b/graphics/p5-Imager-QRCode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Imager-QRCode
 PORTVERSION=	0.03.4
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Imager-QRCode/pkg-plist b/graphics/p5-Imager-QRCode/pkg-plist
index e298689b9895..e1ff2b9f43a5 100644
--- a/graphics/p5-Imager-QRCode/pkg-plist
+++ b/graphics/p5-Imager-QRCode/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Imager::QRCode.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/QRCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/QRCode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/QRCode/QRCode.so
+%%SITE_ARCH%%/Imager/QRCode.pm
+%%SITE_ARCH%%/auto/Imager/QRCode/QRCode.so
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index a895f5def7a1..91cb3316dd68 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Imager
 PORTVERSION=	1.000
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -30,7 +31,7 @@ CONFIGURE_ENV=	IM_CFLAGS="${CFLAGS}" \
 		IM_LIBPATH=${LOCALBASE}/lib
 
 post-install:
-	@${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Imager \
+	@${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Imager \
 		-name "*.so" -exec ${STRIP_CMD} {} \;
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Imager/pkg-plist b/graphics/p5-Imager/pkg-plist
index 7b3a290aed4d..186853491566 100644
--- a/graphics/p5-Imager/pkg-plist
+++ b/graphics/p5-Imager/pkg-plist
@@ -49,101 +49,100 @@
 %%PERL5_MAN3%%/Imager::Transformations.3.gz
 %%PERL5_MAN3%%/Imager::Tutorial.3.gz
 %%PERL5_MAN3%%/Imager::interface.3.gz
-%%PERL5_MAN3%%/Imager::reg%%PERL_ARCH%%.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/API.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/APIRef.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Color.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Color/Float.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Color/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/CountColor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Draw.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Engines.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Expr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Expr/Assem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/ExtUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/File/CUR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/File/GIF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/File/ICO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/File/JPEG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/File/PNG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/File/SGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/File/TIFF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Files.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Fill.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Filter/DynTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Filter/Flines.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Filter/Mandelbrot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Filters.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/BBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/FT2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/FreeType2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Image.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/T1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Truetype.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Type1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Fountain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Handy.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/IO.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/ImageTypes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Inline.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Install.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/LargeSamples.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Matrix2d.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Preprocess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Probe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Regops.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Security.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Threads.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Transform.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Transformations.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/draw.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/dynaload.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/ext.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/feat.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imager.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imageri.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imconfig.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imdatatypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imerror.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imext.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imextdef.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imextpl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imextpltypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imexttypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imio.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/immacros.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imperlio.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/imrender.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/iolayer.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/iolayert.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/log.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/plug.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/ppport.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/regmach.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/rendert.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/include/stackmach.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/interface.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/regmach.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Imager/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/CountColor/CountColor.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/File/GIF/GIF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/File/ICO/ICO.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/File/JPEG/JPEG.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/File/PNG/PNG.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/File/SGI/SGI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/File/TIFF/TIFF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Filter/DynTest/DynTest.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Filter/Flines/Flines.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Filter/Mandelbrot/Mandelbrot.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Font/FT2/FT2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Font/T1/T1.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Imager.so
+%%PERL5_MAN3%%/Imager::regmach.3.gz
+%%SITE_ARCH%%/Imager.pm
+%%SITE_ARCH%%/Imager/API.pod
+%%SITE_ARCH%%/Imager/APIRef.pod
+%%SITE_ARCH%%/Imager/Color.pm
+%%SITE_ARCH%%/Imager/Color/Float.pm
+%%SITE_ARCH%%/Imager/Color/Table.pm
+%%SITE_ARCH%%/Imager/Cookbook.pod
+%%SITE_ARCH%%/Imager/CountColor.pm
+%%SITE_ARCH%%/Imager/Draw.pod
+%%SITE_ARCH%%/Imager/Engines.pod
+%%SITE_ARCH%%/Imager/Expr.pm
+%%SITE_ARCH%%/Imager/Expr/Assem.pm
+%%SITE_ARCH%%/Imager/ExtUtils.pm
+%%SITE_ARCH%%/Imager/File/CUR.pm
+%%SITE_ARCH%%/Imager/File/GIF.pm
+%%SITE_ARCH%%/Imager/File/ICO.pm
+%%SITE_ARCH%%/Imager/File/JPEG.pm
+%%SITE_ARCH%%/Imager/File/PNG.pm
+%%SITE_ARCH%%/Imager/File/SGI.pm
+%%SITE_ARCH%%/Imager/File/TIFF.pm
+%%SITE_ARCH%%/Imager/Files.pod
+%%SITE_ARCH%%/Imager/Fill.pm
+%%SITE_ARCH%%/Imager/Filter/DynTest.pm
+%%SITE_ARCH%%/Imager/Filter/Flines.pm
+%%SITE_ARCH%%/Imager/Filter/Mandelbrot.pm
+%%SITE_ARCH%%/Imager/Filters.pod
+%%SITE_ARCH%%/Imager/Font.pm
+%%SITE_ARCH%%/Imager/Font/BBox.pm
+%%SITE_ARCH%%/Imager/Font/FT2.pm
+%%SITE_ARCH%%/Imager/Font/FreeType2.pm
+%%SITE_ARCH%%/Imager/Font/Image.pm
+%%SITE_ARCH%%/Imager/Font/T1.pm
+%%SITE_ARCH%%/Imager/Font/Test.pm
+%%SITE_ARCH%%/Imager/Font/Truetype.pm
+%%SITE_ARCH%%/Imager/Font/Type1.pm
+%%SITE_ARCH%%/Imager/Font/Wrap.pm
+%%SITE_ARCH%%/Imager/Fountain.pm
+%%SITE_ARCH%%/Imager/Handy.pod
+%%SITE_ARCH%%/Imager/IO.pod
+%%SITE_ARCH%%/Imager/ImageTypes.pod
+%%SITE_ARCH%%/Imager/Inline.pod
+%%SITE_ARCH%%/Imager/Install.pod
+%%SITE_ARCH%%/Imager/LargeSamples.pod
+%%SITE_ARCH%%/Imager/Matrix2d.pm
+%%SITE_ARCH%%/Imager/Preprocess.pm
+%%SITE_ARCH%%/Imager/Probe.pm
+%%SITE_ARCH%%/Imager/Regops.pm
+%%SITE_ARCH%%/Imager/Security.pod
+%%SITE_ARCH%%/Imager/Test.pm
+%%SITE_ARCH%%/Imager/Threads.pod
+%%SITE_ARCH%%/Imager/Transform.pm
+%%SITE_ARCH%%/Imager/Transformations.pod
+%%SITE_ARCH%%/Imager/Tutorial.pod
+%%SITE_ARCH%%/Imager/include/draw.h
+%%SITE_ARCH%%/Imager/include/dynaload.h
+%%SITE_ARCH%%/Imager/include/ext.h
+%%SITE_ARCH%%/Imager/include/feat.h
+%%SITE_ARCH%%/Imager/include/imager.h
+%%SITE_ARCH%%/Imager/include/imageri.h
+%%SITE_ARCH%%/Imager/include/imconfig.h
+%%SITE_ARCH%%/Imager/include/imdatatypes.h
+%%SITE_ARCH%%/Imager/include/imerror.h
+%%SITE_ARCH%%/Imager/include/imext.h
+%%SITE_ARCH%%/Imager/include/imextdef.h
+%%SITE_ARCH%%/Imager/include/imextpl.h
+%%SITE_ARCH%%/Imager/include/imextpltypes.h
+%%SITE_ARCH%%/Imager/include/imexttypes.h
+%%SITE_ARCH%%/Imager/include/imio.h
+%%SITE_ARCH%%/Imager/include/immacros.h
+%%SITE_ARCH%%/Imager/include/imperl.h
+%%SITE_ARCH%%/Imager/include/imperlio.h
+%%SITE_ARCH%%/Imager/include/imrender.h
+%%SITE_ARCH%%/Imager/include/iolayer.h
+%%SITE_ARCH%%/Imager/include/iolayert.h
+%%SITE_ARCH%%/Imager/include/log.h
+%%SITE_ARCH%%/Imager/include/plug.h
+%%SITE_ARCH%%/Imager/include/ppport.h
+%%SITE_ARCH%%/Imager/include/regmach.h
+%%SITE_ARCH%%/Imager/include/rendert.h
+%%SITE_ARCH%%/Imager/include/stackmach.h
+%%SITE_ARCH%%/Imager/interface.pod
+%%SITE_ARCH%%/Imager/regmach.pod
+%%SITE_ARCH%%/Imager/typemap
+%%SITE_ARCH%%/auto/Imager/CountColor/CountColor.so
+%%SITE_ARCH%%/auto/Imager/File/GIF/GIF.so
+%%SITE_ARCH%%/auto/Imager/File/ICO/ICO.so
+%%SITE_ARCH%%/auto/Imager/File/JPEG/JPEG.so
+%%SITE_ARCH%%/auto/Imager/File/PNG/PNG.so
+%%SITE_ARCH%%/auto/Imager/File/SGI/SGI.so
+%%SITE_ARCH%%/auto/Imager/File/TIFF/TIFF.so
+%%SITE_ARCH%%/auto/Imager/Filter/DynTest/DynTest.so
+%%SITE_ARCH%%/auto/Imager/Filter/Flines/Flines.so
+%%SITE_ARCH%%/auto/Imager/Filter/Mandelbrot/Mandelbrot.so
+%%SITE_ARCH%%/auto/Imager/Font/FT2/FT2.so
+%%SITE_ARCH%%/auto/Imager/Font/T1/T1.so
+%%SITE_ARCH%%/auto/Imager/Imager.so
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index c36512bdd8ba..b99afbfe1d60 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Imlib2
 PORTVERSION=	1.0.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.muhri.net/
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Imlib2/pkg-plist b/graphics/p5-Imlib2/pkg-plist
index ab163eb2c37c..415c4245672b 100644
--- a/graphics/p5-Imlib2/pkg-plist
+++ b/graphics/p5-Imlib2/pkg-plist
@@ -1,7 +1,6 @@
 %%PERL5_MAN3%%/Imlib2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Imlib2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imlib2/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Imlib2/ooimlib.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2/Imlib2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2/autosplit.ix
+%%SITE_ARCH%%/Imlib2.pm
+%%SITE_ARCH%%/Imlib2/Object.pm
+%%SITE_ARCH%%/Imlib2/ooimlib.pl
+%%SITE_ARCH%%/auto/Imlib2/Imlib2.so
+%%SITE_ARCH%%/auto/Imlib2/autosplit.ix
diff --git a/graphics/p5-Layout-Manager/Makefile b/graphics/p5-Layout-Manager/Makefile
index 617a232e3292..83377679cda4 100644
--- a/graphics/p5-Layout-Manager/Makefile
+++ b/graphics/p5-Layout-Manager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Layout-Manager
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GPHAT
diff --git a/graphics/p5-Layout-Manager/pkg-plist b/graphics/p5-Layout-Manager/pkg-plist
index f16e50970f8f..5959f78c9643 100644
--- a/graphics/p5-Layout-Manager/pkg-plist
+++ b/graphics/p5-Layout-Manager/pkg-plist
@@ -12,4 +12,3 @@
 %%SITE_PERL%%/Layout/Manager/Flow.pm
 %%SITE_PERL%%/Layout/Manager/Grid.pm
 %%SITE_PERL%%/Layout/Manager/Single.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Layout/Manager/.packlist
diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile
index 0cbfaab72217..e16bc22862cd 100644
--- a/graphics/p5-OpenGL/Makefile
+++ b/graphics/p5-OpenGL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	OpenGL
 PORTVERSION=	0.66
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHM
diff --git a/graphics/p5-OpenGL/pkg-plist b/graphics/p5-OpenGL/pkg-plist
index 48fe136a09ec..ff0f1e50ef04 100644
--- a/graphics/p5-OpenGL/pkg-plist
+++ b/graphics/p5-OpenGL/pkg-plist
@@ -1,11 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenGL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenGL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenGL/Array.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenGL/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenGL/Tessellation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenGL/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenGL/OpenGL.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenGL/autosplit.ix
+%%SITE_ARCH%%/OpenGL.pm
+%%SITE_ARCH%%/OpenGL.pod
+%%SITE_ARCH%%/OpenGL/Array.pod
+%%SITE_ARCH%%/OpenGL/Config.pm
+%%SITE_ARCH%%/OpenGL/Tessellation.pod
+%%SITE_ARCH%%/auto/OpenGL/OpenGL.so
+%%SITE_ARCH%%/auto/OpenGL/autosplit.ix
 %%PERL5_MAN3%%/Array.3.gz
 %%PERL5_MAN3%%/OpenGL.3.gz
 %%PERL5_MAN3%%/Tessellation.3.gz
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index d8ef9b460f14..8b7e73444c87 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PGPLOT
 PORTVERSION=	2.21
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KGB
diff --git a/graphics/p5-PGPLOT/pkg-plist b/graphics/p5-PGPLOT/pkg-plist
index f2a25141540d..e1d4f07df7cf 100644
--- a/graphics/p5-PGPLOT/pkg-plist
+++ b/graphics/p5-PGPLOT/pkg-plist
@@ -1,7 +1,6 @@
 %%PERL5_MAN3%%/PGPLOT.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/PGPLOT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.so
+%%SITE_ARCH%%/PGPLOT.pm
+%%SITE_ARCH%%/auto/PGPLOT/PGPLOT.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/LICENSE
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.img
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pl
diff --git a/graphics/p5-SVG-DOM2/Makefile b/graphics/p5-SVG-DOM2/Makefile
index 7e1c5a0095d1..0ab655a53968 100644
--- a/graphics/p5-SVG-DOM2/Makefile
+++ b/graphics/p5-SVG-DOM2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SVG-DOM2
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-SVG-DOM2/pkg-plist b/graphics/p5-SVG-DOM2/pkg-plist
index 697c26da5794..c101cf1dd16a 100644
--- a/graphics/p5-SVG-DOM2/pkg-plist
+++ b/graphics/p5-SVG-DOM2/pkg-plist
@@ -21,7 +21,6 @@
 %%SITE_PERL%%/SVG/DOM2/Element/Shape/Font.pm
 %%SITE_PERL%%/SVG/DOM2/Element/Shape/Stroke.pm
 %%SITE_PERL%%/SVG/DOM2/Element/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG/DOM2/.packlist
 %%PERL5_MAN3%%/SVG::DOM2.3.gz
 %%PERL5_MAN3%%/SVG::DOM2::Attribute::Transform.3.gz
 %%PERL5_MAN3%%/SVG::DOM2::Element::Document.3.gz
diff --git a/graphics/p5-SVG-Graph/Makefile b/graphics/p5-SVG-Graph/Makefile
index b83a72d834b3..ab3d6b231ed8 100644
--- a/graphics/p5-SVG-Graph/Makefile
+++ b/graphics/p5-SVG-Graph/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVG-Graph
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CJFIELDS
diff --git a/graphics/p5-SVG-Metadata/Makefile b/graphics/p5-SVG-Metadata/Makefile
index 6d0bacd2e991..74aeb6cbc62e 100644
--- a/graphics/p5-SVG-Metadata/Makefile
+++ b/graphics/p5-SVG-Metadata/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVG-Metadata
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-SVG-Metadata/pkg-plist b/graphics/p5-SVG-Metadata/pkg-plist
index a4a2811d57f8..06cdec239b7f 100644
--- a/graphics/p5-SVG-Metadata/pkg-plist
+++ b/graphics/p5-SVG-Metadata/pkg-plist
@@ -2,6 +2,5 @@ bin/svg_annotate
 bin/svg_validate
 %%PERL5_MAN3%%/SVG::Metadata.3.gz
 %%SITE_PERL%%/SVG/Metadata.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG/Metadata/.packlist
 man/man1/svg_annotate.1.gz
 man/man1/svg_validate.1.gz
diff --git a/graphics/p5-SWF-Builder/Makefile b/graphics/p5-SWF-Builder/Makefile
index a20a076e6e6d..f8e2dd488384 100644
--- a/graphics/p5-SWF-Builder/Makefile
+++ b/graphics/p5-SWF-Builder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SWF-Builder
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	graphics www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-SWF-Builder/pkg-plist b/graphics/p5-SWF-Builder/pkg-plist
index 9bfb41335497..132ffafecf38 100644
--- a/graphics/p5-SWF-Builder/pkg-plist
+++ b/graphics/p5-SWF-Builder/pkg-plist
@@ -30,5 +30,4 @@ bin/asc.plx
 %%SITE_PERL%%/SWF/Builder/ExElement.pm
 %%SITE_PERL%%/SWF/Builder/Gradient.pm
 %%SITE_PERL%%/SWF/Builder/Shape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/Builder/.packlist
 man/man1/asc.plx.1.gz
diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile
index 0b6c5022961a..b751a79a034b 100644
--- a/graphics/p5-SWF-File/Makefile
+++ b/graphics/p5-SWF-File/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SWF-File
 PORTVERSION=	0.42
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics www perl5
 MASTER_SITES=	CPAN
diff --git a/graphics/p5-SWF-File/pkg-plist b/graphics/p5-SWF-File/pkg-plist
index 1d9f7b853af4..2b7bc343bfae 100644
--- a/graphics/p5-SWF-File/pkg-plist
+++ b/graphics/p5-SWF-File/pkg-plist
@@ -14,4 +14,3 @@ bin/dumpswf.plx
 %%SITE_PERL%%/SWF/Element.pod
 %%SITE_PERL%%/SWF/File.pm
 %%SITE_PERL%%/SWF/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/File/.packlist
diff --git a/graphics/p5-Sane/Makefile b/graphics/p5-Sane/Makefile
index db0ece1a486f..fa823e0d731c 100644
--- a/graphics/p5-Sane/Makefile
+++ b/graphics/p5-Sane/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sane
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Sane/pkg-plist b/graphics/p5-Sane/pkg-plist
index d476b33e4558..8724e2ebc55f 100644
--- a/graphics/p5-Sane/pkg-plist
+++ b/graphics/p5-Sane/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Sane.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sane.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sane/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sane/Sane.so
+%%SITE_ARCH%%/Sane.pm
+%%SITE_ARCH%%/auto/Sane/Sane.so
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index 290ddeff02d8..6beb640d4ae9 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SpringGraph
 PORTVERSION=	0.05
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	GraphViz/TEEJAY
diff --git a/graphics/p5-SpringGraph/pkg-plist b/graphics/p5-SpringGraph/pkg-plist
index 08a1911be0dc..9eae82a16ac4 100644
--- a/graphics/p5-SpringGraph/pkg-plist
+++ b/graphics/p5-SpringGraph/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/SpringGraph.3.gz
 %%SITE_PERL%%/SpringGraph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SpringGraph/.packlist
diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile
index 4c1f6754c021..872473578557 100644
--- a/graphics/p5-Tk-JPEG-Lite/Makefile
+++ b/graphics/p5-Tk-JPEG-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tk-JPEG-Lite
 PORTVERSION=	2.01500
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Tk-JPEG-Lite/pkg-plist b/graphics/p5-Tk-JPEG-Lite/pkg-plist
index e9fa9b01aeef..c2af65bcb542 100644
--- a/graphics/p5-Tk-JPEG-Lite/pkg-plist
+++ b/graphics/p5-Tk-JPEG-Lite/pkg-plist
@@ -1,6 +1,5 @@
 bin/tkjpeg-lite
 %%PERL5_MAN3%%/Tk::JPEG::Lite.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/JPEG/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG/Lite/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG/Lite/Lite.so
+%%SITE_ARCH%%/Tk/JPEG/Lite.pm
+%%SITE_ARCH%%/auto/Tk/JPEG/Lite/Lite.so
 man/man1/tkjpeg-lite.1.gz
diff --git a/graphics/p5-URI-GoogleChart/Makefile b/graphics/p5-URI-GoogleChart/Makefile
index ce749e7bf4e0..8f0024ee297c 100644
--- a/graphics/p5-URI-GoogleChart/Makefile
+++ b/graphics/p5-URI-GoogleChart/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-GoogleChart
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	graphics www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	URI
diff --git a/graphics/p5-URI-GoogleChart/pkg-plist b/graphics/p5-URI-GoogleChart/pkg-plist
index e2692536ef54..bf84a4e74e7d 100644
--- a/graphics/p5-URI-GoogleChart/pkg-plist
+++ b/graphics/p5-URI-GoogleChart/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/URI/GoogleChart.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/GoogleChart/.packlist
 %%PERL5_MAN3%%/URI::GoogleChart.3.gz
diff --git a/graphics/p5-VCG/Makefile b/graphics/p5-VCG/Makefile
index b46e447e5c38..dba57d1eb16e 100644
--- a/graphics/p5-VCG/Makefile
+++ b/graphics/p5-VCG/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	VCG
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEEJAY
diff --git a/graphics/p5-VCG/pkg-plist b/graphics/p5-VCG/pkg-plist
index 1228e3309586..b07e2217891f 100644
--- a/graphics/p5-VCG/pkg-plist
+++ b/graphics/p5-VCG/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/VCG.3.gz
 %%SITE_PERL%%/VCG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCG/.packlist
diff --git a/graphics/p5-Visio/Makefile b/graphics/p5-Visio/Makefile
index 8d7f0eaaee31..137a0eaac953 100644
--- a/graphics/p5-Visio/Makefile
+++ b/graphics/p5-Visio/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Visio
 PORTVERSION=	1.010
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-Visio/pkg-plist b/graphics/p5-Visio/pkg-plist
index 3baf62938f44..ba2f8a80bd39 100644
--- a/graphics/p5-Visio/pkg-plist
+++ b/graphics/p5-Visio/pkg-plist
@@ -16,4 +16,3 @@
 %%SITE_PERL%%/Visio/PageProps.pm
 %%SITE_PERL%%/Visio/PageSheet.pm
 %%SITE_PERL%%/Visio/Shape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Visio/.packlist
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index 69fe0ef8faaa..cc199da91935 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ming
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 PKGNAMEPREFIX=	p5-
 
diff --git a/graphics/p5-ming/pkg-plist b/graphics/p5-ming/pkg-plist
index 4f027932057e..c49ac44c89c7 100644
--- a/graphics/p5-ming/pkg-plist
+++ b/graphics/p5-ming/pkg-plist
@@ -1,39 +1,38 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Action.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/BinaryData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Bitmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Blur.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/BrowserFont.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Button.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/ButtonRecord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/CXform.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Character.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/DisplayItem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Fill.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/FilterMatrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Font.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/FontCharacter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/FontCollection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Gradient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/InitAction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Matrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Morph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Movie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/MovieClip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/PrebuiltClip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Shadow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Shape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Sound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/SoundInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/SoundStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Sprite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/TextField.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SWF/VideoStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/SWF.so
+%%SITE_ARCH%%/SWF.pm
+%%SITE_ARCH%%/SWF/Action.pm
+%%SITE_ARCH%%/SWF/BinaryData.pm
+%%SITE_ARCH%%/SWF/Bitmap.pm
+%%SITE_ARCH%%/SWF/Blur.pm
+%%SITE_ARCH%%/SWF/BrowserFont.pm
+%%SITE_ARCH%%/SWF/Button.pm
+%%SITE_ARCH%%/SWF/ButtonRecord.pm
+%%SITE_ARCH%%/SWF/CXform.pm
+%%SITE_ARCH%%/SWF/Character.pm
+%%SITE_ARCH%%/SWF/Constants.pm
+%%SITE_ARCH%%/SWF/DisplayItem.pm
+%%SITE_ARCH%%/SWF/Fill.pm
+%%SITE_ARCH%%/SWF/Filter.pm
+%%SITE_ARCH%%/SWF/FilterMatrix.pm
+%%SITE_ARCH%%/SWF/Font.pm
+%%SITE_ARCH%%/SWF/FontCharacter.pm
+%%SITE_ARCH%%/SWF/FontCollection.pm
+%%SITE_ARCH%%/SWF/Gradient.pm
+%%SITE_ARCH%%/SWF/InitAction.pm
+%%SITE_ARCH%%/SWF/Matrix.pm
+%%SITE_ARCH%%/SWF/Morph.pm
+%%SITE_ARCH%%/SWF/Movie.pm
+%%SITE_ARCH%%/SWF/MovieClip.pm
+%%SITE_ARCH%%/SWF/PrebuiltClip.pm
+%%SITE_ARCH%%/SWF/Shadow.pm
+%%SITE_ARCH%%/SWF/Shape.pm
+%%SITE_ARCH%%/SWF/Sound.pm
+%%SITE_ARCH%%/SWF/SoundInstance.pm
+%%SITE_ARCH%%/SWF/SoundStream.pm
+%%SITE_ARCH%%/SWF/Sprite.pm
+%%SITE_ARCH%%/SWF/Text.pm
+%%SITE_ARCH%%/SWF/TextField.pm
+%%SITE_ARCH%%/SWF/VideoStream.pm
+%%SITE_ARCH%%/auto/SWF/SWF.so
 %%PERL5_MAN3%%/SWF.3.gz
 %%PERL5_MAN3%%/SWF::Action.3.gz
 %%PERL5_MAN3%%/SWF::BinaryData.3.gz
diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile
index 8e02a0b37018..48346cd49adf 100644
--- a/graphics/renrot/Makefile
+++ b/graphics/renrot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	renrot
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://download.gnu.org.ua/pub/release/${PORTNAME}/
 
diff --git a/graphics/renrot/pkg-plist b/graphics/renrot/pkg-plist
index 74600c8d66fe..ed1365db0480 100644
--- a/graphics/renrot/pkg-plist
+++ b/graphics/renrot/pkg-plist
@@ -4,7 +4,6 @@ bin/renrot
 @sample etc/renrot/renrot.conf.sample
 @sample etc/renrot/tags.conf.sample
 man/man1/renrot.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/renrot/.packlist
 %%SITE_PERL%%/Image/RenRot/Config.pm
 %%SITE_PERL%%/Image/RenRot/FileUtil.pm
 %%SITE_PERL%%/Image/RenRot/Logging.pm
diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index 2f09aa79075b..debb8ca2d760 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	epic4
 PORTVERSION=	2.10.5
+PORTREVISION=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \
 		http://tehran.lain.pl/epic-mirror/EPIC4-PRODUCTION/ \
@@ -51,7 +52,7 @@ CONFIGURE_ARGS+=	--without-tcl
 #
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
-CONFIGURE_ARGS+=	--with-perl=${SITE_PERL}/../../${PERL_VERSION}/${PERL_ARCH}/CORE
+CONFIGURE_ARGS+=	--with-perl=${LOCALBASE}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/CORE
 .else
 CONFIGURE_ARGS+=	--without-perl
 .endif
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 8c29c4cc0cac..6b92f579b09a 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	irssi
 PORTVERSION=	20140530
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://mirror.irssi.org/snapshots/
 PKGNAMESUFFIX=	-devel
@@ -82,8 +82,5 @@ post-configure:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
-.if ${PORT_OPTIONS:MPERL}
-	@${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
-.endif
 
 .include <bsd.port.mk>
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index cbfe06dab047..93dd72600871 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -115,18 +115,14 @@ include/irssi/src/lib-config/iconfig.h
 include/irssi/src/lib-config/module.h
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi.pm
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi/UI.pm
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
 man/man1/irssi.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/design.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 9c0d0aec5697..a7d4ccb0d900 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	irssi
 PORTVERSION=	0.8.17
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	irc
 MASTER_SITES=	http://mirror.irssi.org/
 
@@ -82,8 +82,5 @@ post-configure:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
-.if ${PORT_OPTIONS:MPERL}
-	@${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
-.endif
 
 .include <bsd.port.mk>
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 20680b64795b..8d0e3b86404e 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -115,18 +115,14 @@ include/irssi/src/lib-config/iconfig.h
 include/irssi/src/lib-config/module.h
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi.pm
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
+%%WITH_PERL%%%%SITE_ARCH%%/Irssi/UI.pm
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
 man/man1/irssi.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/design.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
diff --git a/irc/nethirc/Makefile b/irc/nethirc/Makefile
index 3f24b0853db6..f21349c8d79a 100644
--- a/irc/nethirc/Makefile
+++ b/irc/nethirc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NetHirc
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.nog.net/pub/tony/nethirc/
 
diff --git a/irc/nethirc/pkg-plist b/irc/nethirc/pkg-plist
index bcbb0fae4753..04044b781e55 100644
--- a/irc/nethirc/pkg-plist
+++ b/irc/nethirc/pkg-plist
@@ -18,6 +18,5 @@ bin/nethirc.pl
 %%SITE_PERL%%/NetHirc/Totalitarian.pm
 %%SITE_PERL%%/NetHirc/Util.pm
 %%SITE_PERL%%/NetHirc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetHirc/.packlist
 %%PERL5_MAN3%%/NetHirc.3.gz
 man/man1/nethirc.pl.1.gz
diff --git a/irc/p5-AnyEvent-IRC/Makefile b/irc/p5-AnyEvent-IRC/Makefile
index 6ada7836a4e5..aa887df4bd13 100644
--- a/irc/p5-AnyEvent-IRC/Makefile
+++ b/irc/p5-AnyEvent-IRC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-IRC
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	irc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-AnyEvent-IRC/pkg-plist b/irc/p5-AnyEvent-IRC/pkg-plist
index 24db5969323b..56be995e76f0 100644
--- a/irc/p5-AnyEvent-IRC/pkg-plist
+++ b/irc/p5-AnyEvent-IRC/pkg-plist
@@ -6,4 +6,3 @@
 %%SITE_PERL%%/AnyEvent/IRC/Client.pm
 %%SITE_PERL%%/AnyEvent/IRC/Connection.pm
 %%SITE_PERL%%/AnyEvent/IRC/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/IRC/.packlist
diff --git a/irc/p5-Bot-BasicBot/Makefile b/irc/p5-Bot-BasicBot/Makefile
index e4da64d7f046..da6cc6c5437e 100644
--- a/irc/p5-Bot-BasicBot/Makefile
+++ b/irc/p5-Bot-BasicBot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bot-BasicBot
 PORTVERSION=	0.89
+PORTREVISION=	1
 CATEGORIES=	irc perl5
 MASTER_SITES=	CPAN/Bot
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-Bot-BasicBot/pkg-plist b/irc/p5-Bot-BasicBot/pkg-plist
index d814b5ca7085..44050d673c6a 100644
--- a/irc/p5-Bot-BasicBot/pkg-plist
+++ b/irc/p5-Bot-BasicBot/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Bot/BasicBot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/BasicBot/.packlist
 %%PERL5_MAN3%%/Bot::BasicBot.3.gz
diff --git a/irc/p5-IRC-Bot-Hangman/Makefile b/irc/p5-IRC-Bot-Hangman/Makefile
index f5f426d792db..e149b952d41f 100644
--- a/irc/p5-IRC-Bot-Hangman/Makefile
+++ b/irc/p5-IRC-Bot-Hangman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IRC-Bot-Hangman
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	irc games perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PDENIS
diff --git a/irc/p5-IRC-Utils/Makefile b/irc/p5-IRC-Utils/Makefile
index efb90e40ebf4..089b999db190 100644
--- a/irc/p5-IRC-Utils/Makefile
+++ b/irc/p5-IRC-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IRC-Utils
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	irc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HINRIK
diff --git a/irc/p5-IRC-Utils/pkg-plist b/irc/p5-IRC-Utils/pkg-plist
index ade4a31aa1ae..5d04e9d52ff2 100644
--- a/irc/p5-IRC-Utils/pkg-plist
+++ b/irc/p5-IRC-Utils/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/IRC::Utils.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IRC/Utils/.packlist
 %%SITE_PERL%%/IRC/Utils.pm
diff --git a/irc/p5-POE-Component-IRC-Object/Makefile b/irc/p5-POE-Component-IRC-Object/Makefile
index 2775cced589f..435656ea0700 100644
--- a/irc/p5-POE-Component-IRC-Object/Makefile
+++ b/irc/p5-POE-Component-IRC-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Object
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Component-IRC-Object/pkg-plist b/irc/p5-POE-Component-IRC-Object/pkg-plist
index 829f5930e1ca..7820a6f16b79 100644
--- a/irc/p5-POE-Component-IRC-Object/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Object/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/POE::Component::IRC::Object.3.gz
 %%SITE_PERL%%/POE/Component/IRC/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/elizabot.pl
diff --git a/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile b/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
index 17b3ad8daca4..d446f8ff6755 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-Blowfish
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PLU
diff --git a/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist
index 3ff2445e94b9..42ffb854edca 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Blowfish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Blowfish/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Blowfish.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile b/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
index f356b2df3aef..295c09ed6064 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-Bollocks
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist
index 7054642f6976..0a5ce0231a32 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Bollocks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Bollocks/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Bollocks.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile b/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
index 5ff2e5398680..d26b0fa67d4b 100644
--- a/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-CoreList
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist
index 49f32758a649..24b5a5509849 100644
--- a/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/CoreList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/CoreList/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::CoreList.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile b/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
index 5142a231a6ca..2b7c541d8589 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-Hailo
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	irc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HINRIK
diff --git a/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
index 51c716dda596..6c18f99fc7f7 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
@@ -1,5 +1,4 @@
 bin/irchailo-seed
 man/man1/irchailo-seed.1.gz
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Hailo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Hailo/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Hailo.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile b/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
index 1f55b17bb188..8ce544ab30d5 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-Karma
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	irc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:APOCAL
diff --git a/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist
index 89433ef707d5..af76354bf18d 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Karma.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Karma/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Karma.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
index c22de2bc1f3b..71ccf8a136e2 100644
--- a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-POE-Knee
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist
index 013417db2b97..bbf41d948f56 100644
--- a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/POE/Knee.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/POE/Knee/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::POE::Knee.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
index 552efa8521d8..a84c5ec0c831 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-QueryDNS
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist
index 342d04b1e9de..f484756843e5 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/QueryDNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/QueryDNS/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::QueryDNS.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile
index 4db773ef776a..c73bbc112805 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-QueryDNSBL
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist
index 29a81a6ea1da..52dbf6e4d4cd 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/QueryDNSBL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/QueryDNSBL/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::QueryDNSBL.3.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
index 499b4f11b25c..c3881d349a54 100644
--- a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-IRC-Plugin-RSS-Headlines
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist
index 8611de4d0183..0b0c58f86f58 100644
--- a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/RSS/Headlines.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/RSS/Headlines/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::RSS::Headlines.3.gz
diff --git a/irc/p5-POE-Component-IRC/Makefile b/irc/p5-POE-Component-IRC/Makefile
index 1bb629229201..acd1c0571ba0 100644
--- a/irc/p5-POE-Component-IRC/Makefile
+++ b/irc/p5-POE-Component-IRC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-IRC
 PORTVERSION=	6.83
+PORTREVISION=	1
 CATEGORIES=	irc devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/irc/p5-POE-Component-IRC/pkg-plist b/irc/p5-POE-Component-IRC/pkg-plist
index 877778d019eb..7dbd761a13b0 100644
--- a/irc/p5-POE-Component-IRC/pkg-plist
+++ b/irc/p5-POE-Component-IRC/pkg-plist
@@ -34,7 +34,6 @@
 %%SITE_PERL%%/POE/Component/IRC/State.pm
 %%SITE_PERL%%/POE/Filter/IRC.pm
 %%SITE_PERL%%/POE/Filter/IRC/Compat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC.3.gz
 %%PERL5_MAN3%%/POE::Component::IRC::Common.3.gz
 %%PERL5_MAN3%%/POE::Component::IRC::Constants.3.gz
diff --git a/irc/p5-POE-Component-Server-IRC/Makefile b/irc/p5-POE-Component-Server-IRC/Makefile
index f1d64cbef896..3d189700226f 100644
--- a/irc/p5-POE-Component-Server-IRC/Makefile
+++ b/irc/p5-POE-Component-Server-IRC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Server-IRC
 PORTVERSION=	1.54
+PORTREVISION=	1
 CATEGORIES=	irc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HINRIK
diff --git a/irc/p5-POE-Component-Server-IRC/pkg-plist b/irc/p5-POE-Component-Server-IRC/pkg-plist
index efe2d740f647..90fcc8ff9354 100644
--- a/irc/p5-POE-Component-Server-IRC/pkg-plist
+++ b/irc/p5-POE-Component-Server-IRC/pkg-plist
@@ -1,6 +1,5 @@
 bin/pmkpasswd
 man/man1/pmkpasswd.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/IRC/.packlist
 %%SITE_PERL%%/POE/Component/Server/IRC.pm
 %%SITE_PERL%%/POE/Component/Server/IRC/Common.pm
 %%SITE_PERL%%/POE/Component/Server/IRC/Plugin.pm
diff --git a/irc/p5-POE-Filter-IRCD/Makefile b/irc/p5-POE-Filter-IRCD/Makefile
index 13a4fe947806..b8ee2134e2bc 100644
--- a/irc/p5-POE-Filter-IRCD/Makefile
+++ b/irc/p5-POE-Filter-IRCD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-IRCD
 PORTVERSION=	2.44
+PORTREVISION=	1
 CATEGORIES=	irc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-POE-Filter-IRCD/pkg-plist b/irc/p5-POE-Filter-IRCD/pkg-plist
index 00f5e3601b9e..365868577410 100644
--- a/irc/p5-POE-Filter-IRCD/pkg-plist
+++ b/irc/p5-POE-Filter-IRCD/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/IRCD/.packlist
 %%SITE_PERL%%/POE/Filter/IRCD.pm
 %%PERL5_MAN3%%/POE::Filter::IRCD.3.gz
diff --git a/irc/p5-POE-Session-Irssi/Makefile b/irc/p5-POE-Session-Irssi/Makefile
index c213fb34434b..2aa6cfba5109 100644
--- a/irc/p5-POE-Session-Irssi/Makefile
+++ b/irc/p5-POE-Session-Irssi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Session-Irssi
 PORTVERSION=	0.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc perl5 devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARTIJN
diff --git a/irc/p5-POE-Session-Irssi/pkg-plist b/irc/p5-POE-Session-Irssi/pkg-plist
index 53fc25da9aa8..aa50c7e1f817 100644
--- a/irc/p5-POE-Session-Irssi/pkg-plist
+++ b/irc/p5-POE-Session-Irssi/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/POE::Session::Irssi.3.gz
 %%SITE_PERL%%/POE/Session/Irssi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/Irssi/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clean-backlog.pl
diff --git a/irc/p5-Parse-IRC/Makefile b/irc/p5-Parse-IRC/Makefile
index 4bf5656fdda3..1a98e96788d7 100644
--- a/irc/p5-Parse-IRC/Makefile
+++ b/irc/p5-Parse-IRC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-IRC
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	irc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/irc/p5-Parse-IRC/pkg-plist b/irc/p5-Parse-IRC/pkg-plist
index 9fee7db9526b..cdb0fa12a002 100644
--- a/irc/p5-Parse-IRC/pkg-plist
+++ b/irc/p5-Parse-IRC/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Parse/IRC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/IRC/.packlist
 %%PERL5_MAN3%%/Parse::IRC.3.gz
diff --git a/irc/pisg/Makefile b/irc/pisg/Makefile
index f06a30ac7f33..f62412f395b0 100644
--- a/irc/pisg/Makefile
+++ b/irc/pisg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pisg
 PORTVERSION=	0.73
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	SF
 
@@ -33,15 +34,15 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pisg
 	${MKDIR} ${STAGEDIR}${DATADIR}/layout
 	${MKDIR} ${STAGEDIR}${DATADIR}/gfx
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/Pisg/Parser/Format
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Pisg/Parser/Format
 	${INSTALL_DATA} ${WRKSRC}/pisg.cfg ${STAGEDIR}${PREFIX}/etc/pisg/pisg.cfg.sample
 	${INSTALL_DATA} ${WRKSRC}/gfx/* ${STAGEDIR}${DATADIR}/gfx
 	${INSTALL_DATA} ${WRKSRC}/layout/* ${STAGEDIR}${DATADIR}/layout
 	${INSTALL_DATA} ${WRKSRC}/lang.txt ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/modules/Pisg.pm ${STAGEDIR}${SITE_PERL}
-	${INSTALL_DATA} ${WRKSRC}/modules/Pisg/*.pm ${STAGEDIR}${SITE_PERL}/Pisg
-	${INSTALL_DATA} ${WRKSRC}/modules/Pisg/Parser/*.pm ${STAGEDIR}${SITE_PERL}/Pisg/Parser
-	${INSTALL_DATA} ${WRKSRC}/modules/Pisg/Parser/Format/*.pm ${STAGEDIR}${SITE_PERL}/Pisg/Parser/Format
+	${INSTALL_DATA} ${WRKSRC}/modules/Pisg.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_DATA} ${WRKSRC}/modules/Pisg/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Pisg
+	${INSTALL_DATA} ${WRKSRC}/modules/Pisg/Parser/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Pisg/Parser
+	${INSTALL_DATA} ${WRKSRC}/modules/Pisg/Parser/Format/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Pisg/Parser/Format
 	${INSTALL_SCRIPT} ${WRKSRC}/pisg ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/pisg-doc.txt ${STAGEDIR}${DOCSDIR}/pisg-doc.txt
diff --git a/japanese/freepwing/Makefile b/japanese/freepwing/Makefile
index e84bd607ff8b..e82b5b6e9c7e 100644
--- a/japanese/freepwing/Makefile
+++ b/japanese/freepwing/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freepwing
 PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/freepwing/old/1.4/
 
diff --git a/japanese/freepwing/pkg-plist b/japanese/freepwing/pkg-plist
index 31def243eac1..9fbf88a73ac6 100644
--- a/japanese/freepwing/pkg-plist
+++ b/japanese/freepwing/pkg-plist
@@ -1,35 +1,35 @@
 bin/fpwmake
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/CharConv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/ColorGraphic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Control.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/EndWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/ColorGraphic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Copyright.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Heading.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/KeyWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Menu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Sound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Word2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FullUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/HalfUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Heading.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Index.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/KeyWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Link.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/RefUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Reference.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Sound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Tag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Word.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Word2.pm
+%%SITE_ARCH%%/FreePWING/BaseText.pm
+%%SITE_ARCH%%/FreePWING/BaseUserChar.pm
+%%SITE_ARCH%%/FreePWING/BaseWord.pm
+%%SITE_ARCH%%/FreePWING/CharConv.pm
+%%SITE_ARCH%%/FreePWING/ColorGraphic.pm
+%%SITE_ARCH%%/FreePWING/Control.pm
+%%SITE_ARCH%%/FreePWING/EndWord.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/ColorGraphic.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Copyright.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/FPWParser.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/FPWUtils.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Heading.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/KeyWord.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Menu.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Sound.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Text.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Word2.pm
+%%SITE_ARCH%%/FreePWING/FullUserChar.pm
+%%SITE_ARCH%%/FreePWING/HalfUserChar.pm
+%%SITE_ARCH%%/FreePWING/Heading.pm
+%%SITE_ARCH%%/FreePWING/Index.pm
+%%SITE_ARCH%%/FreePWING/KeyWord.pm
+%%SITE_ARCH%%/FreePWING/Link.pm
+%%SITE_ARCH%%/FreePWING/RefUserChar.pm
+%%SITE_ARCH%%/FreePWING/Reference.pm
+%%SITE_ARCH%%/FreePWING/Sort.pm
+%%SITE_ARCH%%/FreePWING/Sound.pm
+%%SITE_ARCH%%/FreePWING/Tag.pm
+%%SITE_ARCH%%/FreePWING/Text.pm
+%%SITE_ARCH%%/FreePWING/Word.pm
+%%SITE_ARCH%%/FreePWING/Word2.pm
 libexec/freepwing/catdump
 libexec/freepwing/cphier
 libexec/freepwing/fpwcgraph
diff --git a/japanese/jacode.pl/Makefile b/japanese/jacode.pl/Makefile
index 73ded8fbc713..1579fd154aab 100644
--- a/japanese/jacode.pl/Makefile
+++ b/japanese/jacode.pl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jacode.pl
 PORTVERSION=	2.13.4.11
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INA/${PORTNAME:S|.pl||}
diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile
index e86c74b5ed88..ca84da635c38 100644
--- a/japanese/jcode.pl/Makefile
+++ b/japanese/jcode.pl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jcode.pl
 PORTVERSION=	2.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese perl5
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
 		ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
diff --git a/japanese/mime_pls/Makefile b/japanese/mime_pls/Makefile
index b41708b2b60b..89e55aa6bdfc 100644
--- a/japanese/mime_pls/Makefile
+++ b/japanese/mime_pls/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mime_pls
 PORTVERSION=	2.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese perl5 mail
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nork
@@ -24,7 +24,7 @@ PLIST_FILES=	${BINS:C,^,bin/,} ${LIBS:C,^,${SITE_PERL_REL}/,}
 
 do-install:
 	${INSTALL_SCRIPT} ${BINS:C,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}
-	${INSTALL_DATA}   ${LIBS:C,^,${WRKSRC}/,} ${STAGEDIR}${SITE_PERL}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_DATA}   ${LIBS:C,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>
diff --git a/japanese/p5-Acme-Lou/Makefile b/japanese/p5-Acme-Lou/Makefile
index 5cfb56982727..778b2cd7ac98 100644
--- a/japanese/p5-Acme-Lou/Makefile
+++ b/japanese/p5-Acme-Lou/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Acme-Lou
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	ja-p5-
diff --git a/japanese/p5-Acme-Lou/pkg-plist b/japanese/p5-Acme-Lou/pkg-plist
index 8ebeaee04b19..76dd41ae46bb 100644
--- a/japanese/p5-Acme-Lou/pkg-plist
+++ b/japanese/p5-Acme-Lou/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Lou/.packlist
 %%SITE_PERL%%/Acme/Lou.pm
 %%SITE_PERL%%/Acme/Lou/Effect.pm
 %%SITE_PERL%%/Acme/Lou/lou-ja2kana.db
diff --git a/japanese/p5-Date-Japanese-Era/Makefile b/japanese/p5-Date-Japanese-Era/Makefile
index 28cddb46a844..820f5a159340 100644
--- a/japanese/p5-Date-Japanese-Era/Makefile
+++ b/japanese/p5-Date-Japanese-Era/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Japanese-Era
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Date-Japanese-Era/pkg-plist b/japanese/p5-Date-Japanese-Era/pkg-plist
index 5d237b6c8c85..e4fd315e88d1 100644
--- a/japanese/p5-Date-Japanese-Era/pkg-plist
+++ b/japanese/p5-Date-Japanese-Era/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Date/Japanese/Era.pm
 %%SITE_PERL%%/Date/Japanese/Era/Table.pm
 %%SITE_PERL%%/Date/Japanese/Era/Table/JIS_X0301.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era/.packlist
diff --git a/japanese/p5-Date-Japanese-Holiday/Makefile b/japanese/p5-Date-Japanese-Holiday/Makefile
index 20aa1474fa4c..06539cb1d78e 100644
--- a/japanese/p5-Date-Japanese-Holiday/Makefile
+++ b/japanese/p5-Date-Japanese-Holiday/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Date-Japanese-Holiday
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Date-Japanese-Holiday/pkg-plist b/japanese/p5-Date-Japanese-Holiday/pkg-plist
index 4ab1a3d7819f..de944cce6eae 100644
--- a/japanese/p5-Date-Japanese-Holiday/pkg-plist
+++ b/japanese/p5-Date-Japanese-Holiday/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Date/Japanese/Holiday.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Holiday/.packlist
 %%PERL5_MAN3%%/Date::Japanese::Holiday.3.gz
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
index 1077c04fe4ae..01da096af455 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Japanese-Era
 PORTVERSION=	0.08001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese devel perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist b/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist
index d42a2024cf0e..de7b221a5941 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Japanese/Era/.packlist
 %%SITE_PERL%%/auto/share/module/DateTime-Calendar-Japanese-Era/eras.yaml
 %%SITE_PERL%%/auto/share/module/DateTime-Calendar-Japanese-Era/south-eras.yaml
 %%SITE_PERL%%/DateTime/Calendar/Japanese/Era.pm
diff --git a/japanese/p5-DateTime-Format-Japanese/Makefile b/japanese/p5-DateTime-Format-Japanese/Makefile
index 191436c3b180..b74676abc656 100644
--- a/japanese/p5-DateTime-Format-Japanese/Makefile
+++ b/japanese/p5-DateTime-Format-Japanese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Japanese
 PORTVERSION=	0.04000
+PORTREVISION=	1
 CATEGORIES=	japanese devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/japanese/p5-DateTime-Format-Japanese/pkg-plist b/japanese/p5-DateTime-Format-Japanese/pkg-plist
index 3f2a6b801c6d..ac07c46a2d0a 100644
--- a/japanese/p5-DateTime-Format-Japanese/pkg-plist
+++ b/japanese/p5-DateTime-Format-Japanese/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Japanese/.packlist
 %%SITE_PERL%%/DateTime/Format/Japanese.pm
 %%SITE_PERL%%/DateTime/Format/Japanese/Common.pm
 %%SITE_PERL%%/DateTime/Format/Japanese/Traditional.pm
diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile
index 79da5f1854cd..1f3d4b292299 100644
--- a/japanese/p5-Encode-EUCJPMS/Makefile
+++ b/japanese/p5-Encode-EUCJPMS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Encode-EUCJPMS
 PORTVERSION=	0.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese converters perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Encode-EUCJPMS/pkg-plist b/japanese/p5-Encode-EUCJPMS/pkg-plist
index fe5e40197729..fb7a55d122bc 100644
--- a/japanese/p5-Encode-EUCJPMS/pkg-plist
+++ b/japanese/p5-Encode-EUCJPMS/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/EUCJPMS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EUCJPMS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EUCJPMS/EUCJPMS.so
+%%SITE_ARCH%%/Encode/EUCJPMS.pm
+%%SITE_ARCH%%/auto/Encode/EUCJPMS/EUCJPMS.so
diff --git a/japanese/p5-Encode-JP-Emoji/Makefile b/japanese/p5-Encode-JP-Emoji/Makefile
index 090cb6e0e42b..f4e36bc7b27b 100644
--- a/japanese/p5-Encode-JP-Emoji/Makefile
+++ b/japanese/p5-Encode-JP-Emoji/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Encode-JP-Emoji
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Encode-JP-Emoji/pkg-plist b/japanese/p5-Encode-JP-Emoji/pkg-plist
index 562403a71eb4..e8d015b1ec93 100644
--- a/japanese/p5-Encode-JP-Emoji/pkg-plist
+++ b/japanese/p5-Encode-JP-Emoji/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Emoji/.packlist
 %%SITE_PERL%%/Encode/JP/Emoji.pm
 %%SITE_PERL%%/Encode/JP/Emoji/Encoding.pm
 %%SITE_PERL%%/Encode/JP/Emoji/FB_EMOJI_TEXT.pm
diff --git a/japanese/p5-Encode-JP-Mobile/Makefile b/japanese/p5-Encode-JP-Mobile/Makefile
index 63d2362f2fbe..de6731b2aeed 100644
--- a/japanese/p5-Encode-JP-Mobile/Makefile
+++ b/japanese/p5-Encode-JP-Mobile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Encode-JP-Mobile
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
@@ -19,7 +20,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Encode/JP/Mobile/Mobile.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Encode/JP/Mobile/Mobile.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/p5-Encode-JP-Mobile/pkg-plist b/japanese/p5-Encode-JP-Mobile/pkg-plist
index cfb5057ae41a..a8f1c19706c8 100644
--- a/japanese/p5-Encode-JP-Mobile/pkg-plist
+++ b/japanese/p5-Encode-JP-Mobile/pkg-plist
@@ -1,25 +1,24 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/AirHJIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Character.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Charnames.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/ConvertPictogramSJIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Fallback.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/KDDIJIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/AirH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/DoCoMo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/KDDI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/SoftBank.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Vodafone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/Mobile.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/docomo-table.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/docomo-table.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/kddi-table.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/kddi-table.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/softbank-table.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/softbank-table.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/softbank-unicode2sjis_auto.yaml
+%%SITE_ARCH%%/Encode/JP/Mobile.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/AirHJIS.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Character.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Charnames.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/ConvertPictogramSJIS.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Cookbook.pod
+%%SITE_ARCH%%/Encode/JP/Mobile/Fallback.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/KDDIJIS.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/AirH.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/DoCoMo.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/KDDI.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/SoftBank.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Vodafone.pm
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/Mobile.so
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/docomo-table.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/docomo-table.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/kddi-table.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/kddi-table.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/softbank-table.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/softbank-table.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/softbank-unicode2sjis_auto.yaml
diff --git a/japanese/p5-HTML-MobileJp/Makefile b/japanese/p5-HTML-MobileJp/Makefile
index 5ab878a7dec2..084e839fc7f5 100644
--- a/japanese/p5-HTML-MobileJp/Makefile
+++ b/japanese/p5-HTML-MobileJp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-MobileJp
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-HTML-MobileJp/pkg-plist b/japanese/p5-HTML-MobileJp/pkg-plist
index c48235750963..e643c4a82ab2 100644
--- a/japanese/p5-HTML-MobileJp/pkg-plist
+++ b/japanese/p5-HTML-MobileJp/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/MobileJp/.packlist
 %%SITE_PERL%%/HTML/MobileJp/Plugin/EZweb/Object.pm
 %%SITE_PERL%%/HTML/MobileJp/Plugin/GPS.pm
 %%SITE_PERL%%/HTML/MobileJp.pm
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index a4ec86c9de9a..f9744e247b78 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Jcode
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Jcode/pkg-plist b/japanese/p5-Jcode/pkg-plist
index 5bdcb4d1df20..c0f10e7a58e8 100644
--- a/japanese/p5-Jcode/pkg-plist
+++ b/japanese/p5-Jcode/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Jcode::Nihongo.3.gz
 %%SITE_PERL%%/Jcode.pm
 %%SITE_PERL%%/Jcode/Nihongo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/.packlist
diff --git a/japanese/p5-Lingua-JA-Kana/Makefile b/japanese/p5-Lingua-JA-Kana/Makefile
index 421524da86a8..fef151308938 100644
--- a/japanese/p5-Lingua-JA-Kana/Makefile
+++ b/japanese/p5-Lingua-JA-Kana/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-JA-Kana
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Lingua-JA-Kana/pkg-plist b/japanese/p5-Lingua-JA-Kana/pkg-plist
index c1595b634686..2eb1f82b506b 100644
--- a/japanese/p5-Lingua-JA-Kana/pkg-plist
+++ b/japanese/p5-Lingua-JA-Kana/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/JA/Kana.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Kana/.packlist
 %%PERL5_MAN3%%/Lingua::JA::Kana.3.gz
diff --git a/japanese/p5-Lingua-JA-Numbers/Makefile b/japanese/p5-Lingua-JA-Numbers/Makefile
index df528da1fe4c..c338345951c4 100644
--- a/japanese/p5-Lingua-JA-Numbers/Makefile
+++ b/japanese/p5-Lingua-JA-Numbers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-JA-Numbers
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/japanese/p5-Lingua-JA-Numbers/pkg-plist b/japanese/p5-Lingua-JA-Numbers/pkg-plist
index 08bfab35ccea..e9230952597c 100644
--- a/japanese/p5-Lingua-JA-Numbers/pkg-plist
+++ b/japanese/p5-Lingua-JA-Numbers/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::JA::Numbers.3.gz
 %%SITE_PERL%%/Lingua/JA/Numbers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Numbers/.packlist
diff --git a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
index 7872b8bc9850..448cd537e3c1 100644
--- a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
+++ b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Lingua-JA-Regular-Unicode
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
index 4c7aac6831de..386b06a76625 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-JA-Summarize-Extract
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist b/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist
index 5ab74adafbbb..75c62168bcde 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist
@@ -3,7 +3,6 @@
 %%PERL5_MAN3%%/Lingua::JA::Summarize::Extract::Plugin::Parser::NgramSimple.3.gz
 %%PERL5_MAN3%%/Lingua::JA::Summarize::Extract::Plugin::Parser::Trim.3.gz
 %%PERL5_MAN3%%/Lingua::JA::Summarize::Extract::Plugin::Sentence::Base.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Summarize/Extract/.packlist
 %%SITE_PERL%%/Lingua/JA/Summarize/Extract.pm
 %%SITE_PERL%%/Lingua/JA/Summarize/Extract/Plugin.pm
 %%SITE_PERL%%/Lingua/JA/Summarize/Extract/ResultSet.pm
diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile
index 844c0384340f..a2c15dbc3cdf 100644
--- a/japanese/p5-MeCab/Makefile
+++ b/japanese/p5-MeCab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MeCab
 PORTVERSION=	0.996
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	${PORTNAME:tl}
diff --git a/japanese/p5-MeCab/pkg-plist b/japanese/p5-MeCab/pkg-plist
index 2d3b6ba00141..7c1d655a2a3e 100644
--- a/japanese/p5-MeCab/pkg-plist
+++ b/japanese/p5-MeCab/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/MeCab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab/MeCab.so
+%%SITE_ARCH%%/MeCab.pm
+%%SITE_ARCH%%/auto/MeCab/MeCab.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pl
diff --git a/japanese/p5-Number-Phone-JP/Makefile b/japanese/p5-Number-Phone-JP/Makefile
index 1524e9c38662..1ad2c55a28b8 100644
--- a/japanese/p5-Number-Phone-JP/Makefile
+++ b/japanese/p5-Number-Phone-JP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Phone-JP
 PORTVERSION=	0.20141105
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TANIGUCHI
diff --git a/japanese/p5-Number-Phone-JP/pkg-plist b/japanese/p5-Number-Phone-JP/pkg-plist
index 0e2aae19d76d..6d11e7593a45 100644
--- a/japanese/p5-Number-Phone-JP/pkg-plist
+++ b/japanese/p5-Number-Phone-JP/pkg-plist
@@ -13,6 +13,5 @@
 %%SITE_PERL%%/Number/Phone/JP/Table/United.pm
 %%SITE_PERL%%/Number/Phone/JP/Table/Upt.pm
 %%SITE_PERL%%/Number/Phone/regexp-table-maker.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Phone/JP/.packlist
 %%PERL5_MAN3%%/Number::Phone::JP.3.gz
 %%PERL5_MAN3%%/Number::Phone::JP::Table.3.gz
diff --git a/japanese/p5-PDFJ/Makefile b/japanese/p5-PDFJ/Makefile
index f3caee354cd0..b94fc0039eab 100644
--- a/japanese/p5-PDFJ/Makefile
+++ b/japanese/p5-PDFJ/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	PDFJ
 PORTVERSION=	0.90
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://hp1.jonex.ne.jp/%7Enakajima.yasushi/archives/
 
diff --git a/japanese/p5-PDFJ/pkg-plist b/japanese/p5-PDFJ/pkg-plist
index 6249b6cc37c0..f9f5fbee0407 100644
--- a/japanese/p5-PDFJ/pkg-plist
+++ b/japanese/p5-PDFJ/pkg-plist
@@ -36,7 +36,6 @@ bin/xpdfj.pl
 %%EXAMPLESDIR%%/qrcode.pl
 %%EXAMPLESDIR%%/stdmacro.xp
 %%EXAMPLESDIR%%/stdmacro.xp.pdf
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFJ/.packlist
 %%SITE_PERL%%/PDFJ.pm
 %%SITE_PERL%%/PDFJ/CFF.pm
 %%SITE_PERL%%/PDFJ/E2U.pm
diff --git a/japanese/p5-Text-ChaSen/Makefile b/japanese/p5-Text-ChaSen/Makefile
index aef6d2791be6..a7736af81b23 100644
--- a/japanese/p5-Text-ChaSen/Makefile
+++ b/japanese/p5-Text-ChaSen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-ChaSen
 PORTVERSION=	1.03
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	SFJP
 MASTER_SITE_SUBDIR=	chasen-legacy/32224
diff --git a/japanese/p5-Text-ChaSen/pkg-plist b/japanese/p5-Text-ChaSen/pkg-plist
index aa379935feef..596fe247d7b6 100644
--- a/japanese/p5-Text-ChaSen/pkg-plist
+++ b/japanese/p5-Text-ChaSen/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Text::ChaSen.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ChaSen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so
+%%SITE_ARCH%%/Text/ChaSen.pm
+%%SITE_ARCH%%/auto/Text/ChaSen/ChaSen.so
 %%PORTDOCS%%%%DOCSDIR%%/README.perl
diff --git a/japanese/p5-Text-Kakasi/Makefile b/japanese/p5-Text-Kakasi/Makefile
index 551e9907bdf2..70fd069fcf90 100644
--- a/japanese/p5-Text-Kakasi/Makefile
+++ b/japanese/p5-Text-Kakasi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Kakasi
 PORTVERSION=	2.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Text-Kakasi/pkg-plist b/japanese/p5-Text-Kakasi/pkg-plist
index a4c5f729362e..5f11afd45d41 100644
--- a/japanese/p5-Text-Kakasi/pkg-plist
+++ b/japanese/p5-Text-Kakasi/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Text::Kakasi.3.gz
 %%PERL5_MAN3%%/Text::Kakasi::JP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Kakasi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Kakasi/JP.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.so
+%%SITE_ARCH%%/Text/Kakasi.pm
+%%SITE_ARCH%%/Text/Kakasi/JP.pod
+%%SITE_ARCH%%/auto/Text/Kakasi/Kakasi.so
diff --git a/japanese/p5-Text-MeCab/Makefile b/japanese/p5-Text-MeCab/Makefile
index 9b75c710b3ba..d200e25e80f0 100644
--- a/japanese/p5-Text-MeCab/Makefile
+++ b/japanese/p5-Text-MeCab/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Text-MeCab
 PORTVERSION=		0.20009
+PORTREVISION=	1
 CATEGORIES=		japanese textproc perl5
 MASTER_SITES=		CPAN
 
diff --git a/japanese/p5-Text-MeCab/pkg-plist b/japanese/p5-Text-MeCab/pkg-plist
index 3e580bbb18ee..bcce3fbd9e0d 100644
--- a/japanese/p5-Text-MeCab/pkg-plist
+++ b/japanese/p5-Text-MeCab/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/Text::MeCab.3.gz
 %%PERL5_MAN3%%/Text::MeCab::Dict.3.gz
 %%PERL5_MAN3%%/Text::MeCab::Node.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab/Dict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab/Node.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MeCab/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MeCab/MeCab.so
+%%SITE_ARCH%%/Text/MeCab.pm
+%%SITE_ARCH%%/Text/MeCab/Dict.pm
+%%SITE_ARCH%%/Text/MeCab/Node.pod
+%%SITE_ARCH%%/auto/Text/MeCab/MeCab.so
diff --git a/japanese/p5-Unicode-Japanese/Makefile b/japanese/p5-Unicode-Japanese/Makefile
index cefca68d7a79..946e4611ec36 100644
--- a/japanese/p5-Unicode-Japanese/Makefile
+++ b/japanese/p5-Unicode-Japanese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Japanese
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	japanese converters perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Unicode-Japanese/pkg-plist b/japanese/p5-Unicode-Japanese/pkg-plist
index 7928510dcc05..ae495f66dc88 100644
--- a/japanese/p5-Unicode-Japanese/pkg-plist
+++ b/japanese/p5-Unicode-Japanese/pkg-plist
@@ -1,10 +1,9 @@
 bin/ujconv
 bin/ujguess
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Japanese.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Japanese.mlpod
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Japanese/JA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Japanese/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Japanese/Japanese.so
+%%SITE_ARCH%%/Unicode/Japanese.pm
+%%SITE_ARCH%%/Unicode/Japanese.mlpod
+%%SITE_ARCH%%/Unicode/Japanese/JA.pod
+%%SITE_ARCH%%/auto/Unicode/Japanese/Japanese.so
 %%PERL5_MAN3%%/Unicode::Japanese.3.gz
 %%PERL5_MAN3%%/Unicode::Japanese::JA.3.gz
 man/man1/ujconv.1.gz
diff --git a/japanese/p5-WWW-2ch/Makefile b/japanese/p5-WWW-2ch/Makefile
index c1e13625fa6c..7ca6cce0565c 100644
--- a/japanese/p5-WWW-2ch/Makefile
+++ b/japanese/p5-WWW-2ch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-2ch
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/japanese/p5-WWW-2ch/pkg-plist b/japanese/p5-WWW-2ch/pkg-plist
index 874a137f2080..0b401dc023d5 100644
--- a/japanese/p5-WWW-2ch/pkg-plist
+++ b/japanese/p5-WWW-2ch/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/2ch/.packlist
 %%SITE_PERL%%/WWW/2ch.pm
 %%SITE_PERL%%/WWW/2ch/Cache.pm
 %%SITE_PERL%%/WWW/2ch/Cache/File.pm
diff --git a/japanese/p5-WWW-MobileCarrierJP/Makefile b/japanese/p5-WWW-MobileCarrierJP/Makefile
index b933390c47cc..bed5739736ed 100644
--- a/japanese/p5-WWW-MobileCarrierJP/Makefile
+++ b/japanese/p5-WWW-MobileCarrierJP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-MobileCarrierJP
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-WWW-MobileCarrierJP/pkg-plist b/japanese/p5-WWW-MobileCarrierJP/pkg-plist
index c26b3626c087..204a4a7d42fe 100644
--- a/japanese/p5-WWW-MobileCarrierJP/pkg-plist
+++ b/japanese/p5-WWW-MobileCarrierJP/pkg-plist
@@ -1,5 +1,4 @@
 bin/www-mobilecarrierjp-dump_all.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/MobileCarrierJP/.packlist
 %%SITE_PERL%%/WWW/MobileCarrierJP/AirHPhone/CIDR.pm
 %%SITE_PERL%%/WWW/MobileCarrierJP/DoCoMo/Display.pm
 %%SITE_PERL%%/WWW/MobileCarrierJP/DoCoMo/Flash.pm
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index 1147948bf199..377ea3d3465f 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nkf
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	SFJP/${PORTNAME}/53171
diff --git a/japanese/p5-nkf/pkg-plist b/japanese/p5-nkf/pkg-plist
index 90a6ee0820f2..6ee3cc6e3977 100644
--- a/japanese/p5-nkf/pkg-plist
+++ b/japanese/p5-nkf/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/NKF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF/NKF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF/.packlist
+%%SITE_ARCH%%/NKF.pm
+%%SITE_ARCH%%/auto/NKF/NKF.so
 %%PERL5_MAN3%%/NKF.3.gz
diff --git a/japanese/spamassassin/Makefile b/japanese/spamassassin/Makefile
index 20d7ca7b9aed..9626598a4df6 100644
--- a/japanese/spamassassin/Makefile
+++ b/japanese/spamassassin/Makefile
@@ -1,7 +1,7 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	japanese mail perl5
 PKGNAMEPREFIX=	ja-
 
diff --git a/japanese/spamassassin/files/spamassassin-ja.plist b/japanese/spamassassin/files/spamassassin-ja.plist
index 91d905205633..acfde3df93a1 100644
--- a/japanese/spamassassin/files/spamassassin-ja.plist
+++ b/japanese/spamassassin/files/spamassassin-ja.plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/Charset.pm
 %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer.3.gz
diff --git a/lang/clang-cheri/Makefile b/lang/clang-cheri/Makefile
index 50ac3e67e829..b4885223675a 100644
--- a/lang/clang-cheri/Makefile
+++ b/lang/clang-cheri/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clang-cheri
 PORTVERSION=	3.5.d20140815
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -127,7 +127,6 @@ post-install:
 build-plist:
 	${RM} -f ${PLIST}
 	${MAKE} makeplist | \
-	    ${GREP} -v /you/have/to/check/what/makeplist/gives/you | \
-	    ${SED} -e 's/%%PERL_ARCH%%/${PERL_ARCH}/' >> ${PLIST}
+	    ${GREP} -v /you/have/to/check/what/makeplist/gives/you >> ${PLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/p5-Data-JavaScript/Makefile b/lang/p5-Data-JavaScript/Makefile
index eac45f873d8c..e5615b952148 100644
--- a/lang/p5-Data-JavaScript/Makefile
+++ b/lang/p5-Data-JavaScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-JavaScript
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	lang www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-Data-JavaScript/pkg-plist b/lang/p5-Data-JavaScript/pkg-plist
index fb7d49b7b6d4..92ad53fc784f 100644
--- a/lang/p5-Data-JavaScript/pkg-plist
+++ b/lang/p5-Data-JavaScript/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/Data/JavaScript.pm
 %%SITE_PERL%%/Data/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/JavaScript/.packlist
 %%PERL5_MAN3%%/Data::JavaScript.3.gz
diff --git a/lang/p5-Error/Makefile b/lang/p5-Error/Makefile
index 30247c232e60..509f96eb2a85 100644
--- a/lang/p5-Error/Makefile
+++ b/lang/p5-Error/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Error
 PORTVERSION=	0.17022
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-Error/pkg-plist b/lang/p5-Error/pkg-plist
index 15f0dc959130..e6634b719082 100644
--- a/lang/p5-Error/pkg-plist
+++ b/lang/p5-Error/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Error::Simple.3.gz
 %%SITE_PERL%%/Error.pm
 %%SITE_PERL%%/Error/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error/.packlist
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index ad09248bb600..446febae419d 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Expect
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-Expect/pkg-plist b/lang/p5-Expect/pkg-plist
index ed2d1bea847a..abebca8726ce 100644
--- a/lang/p5-Expect/pkg-plist
+++ b/lang/p5-Expect/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Expect.3.gz
 %%SITE_PERL%%/Expect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect/.packlist
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index 783abe594fc8..d992a7d44c9c 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ExtUtils-F77
 PORTVERSION=	1.17
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-ExtUtils-F77/pkg-plist b/lang/p5-ExtUtils-F77/pkg-plist
index 82580b994c9c..df7216f402bd 100644
--- a/lang/p5-ExtUtils-F77/pkg-plist
+++ b/lang/p5-ExtUtils-F77/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/ExtUtils::F77.3.gz
 %%SITE_PERL%%/ExtUtils/F77.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
diff --git a/lang/p5-Interpolation/Makefile b/lang/p5-Interpolation/Makefile
index c392668002f2..d5db242d8667 100644
--- a/lang/p5-Interpolation/Makefile
+++ b/lang/p5-Interpolation/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Interpolation
 PORTVERSION=	0.74
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JENDA
diff --git a/lang/p5-Interpolation/pkg-plist b/lang/p5-Interpolation/pkg-plist
index 4c789abccdf5..0841d06c3b32 100644
--- a/lang/p5-Interpolation/pkg-plist
+++ b/lang/p5-Interpolation/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Interpolation.3.gz
 %%SITE_PERL%%/Interpolation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation/.packlist
diff --git a/lang/p5-JSAN/Makefile b/lang/p5-JSAN/Makefile
index 610348fe0be3..672bc1501afa 100644
--- a/lang/p5-JSAN/Makefile
+++ b/lang/p5-JSAN/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	JSAN
 PORTVERSION=	0.07
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CWEST
diff --git a/lang/p5-JSAN/pkg-plist b/lang/p5-JSAN/pkg-plist
index b31d9ff12ce6..a0edbcdb2eee 100644
--- a/lang/p5-JSAN/pkg-plist
+++ b/lang/p5-JSAN/pkg-plist
@@ -7,4 +7,3 @@ bin/jsan
 %%SITE_PERL%%/JSAN/Indexer.pm
 %%SITE_PERL%%/JSAN/Indexer/Creator.pm
 %%SITE_PERL%%/JSAN/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSAN/.packlist
diff --git a/lang/p5-JavaScript-SpiderMonkey/Makefile b/lang/p5-JavaScript-SpiderMonkey/Makefile
index ae65362c9de4..e8a559a5d250 100644
--- a/lang/p5-JavaScript-SpiderMonkey/Makefile
+++ b/lang/p5-JavaScript-SpiderMonkey/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	JavaScript-SpiderMonkey
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-JavaScript-SpiderMonkey/pkg-plist b/lang/p5-JavaScript-SpiderMonkey/pkg-plist
index 4c2798a308c8..fcc3f958ecd5 100644
--- a/lang/p5-JavaScript-SpiderMonkey/pkg-plist
+++ b/lang/p5-JavaScript-SpiderMonkey/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/SpiderMonkey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.so
+%%SITE_ARCH%%/JavaScript/SpiderMonkey.pm
+%%SITE_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.so
 %%PERL5_MAN3%%/JavaScript::SpiderMonkey.3.gz
diff --git a/lang/p5-JavaScript-Squish/Makefile b/lang/p5-JavaScript-Squish/Makefile
index ce4cdcc5cfbd..2920e5850046 100644
--- a/lang/p5-JavaScript-Squish/Makefile
+++ b/lang/p5-JavaScript-Squish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JavaScript-Squish
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-JavaScript-Squish/pkg-plist b/lang/p5-JavaScript-Squish/pkg-plist
index e36e115b84b9..eab3bb4f2f98 100644
--- a/lang/p5-JavaScript-Squish/pkg-plist
+++ b/lang/p5-JavaScript-Squish/pkg-plist
@@ -1,5 +1,4 @@
 bin/js_compactor
 %%PERL5_MAN3%%/JavaScript::Squish.3.gz
 %%SITE_PERL%%/JavaScript/Squish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish/.packlist
 man/man1/js_compactor.1.gz
diff --git a/lang/p5-JavaScript-Value-Escape/Makefile b/lang/p5-JavaScript-Value-Escape/Makefile
index 695b75e24b50..bcc68d2576af 100644
--- a/lang/p5-JavaScript-Value-Escape/Makefile
+++ b/lang/p5-JavaScript-Value-Escape/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	JavaScript-Value-Escape
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-JavaScript-Value-Escape/pkg-plist b/lang/p5-JavaScript-Value-Escape/pkg-plist
index 4c202042d7ff..6c62b9dec9cd 100644
--- a/lang/p5-JavaScript-Value-Escape/pkg-plist
+++ b/lang/p5-JavaScript-Value-Escape/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Value/Escape/.packlist
 %%SITE_PERL%%/JavaScript/Value/Escape.pm
 %%PERL5_MAN3%%/JavaScript::Value::Escape.3.gz
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index c1fdfa9cdc58..d494800d0964 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-MoreUtils
 DISTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/lang/p5-List-MoreUtils/pkg-plist b/lang/p5-List-MoreUtils/pkg-plist
index 633fc86dc551..4efe2ce0090f 100644
--- a/lang/p5-List-MoreUtils/pkg-plist
+++ b/lang/p5-List-MoreUtils/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/List/MoreUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/MoreUtils.so
+%%SITE_ARCH%%/List/MoreUtils.pm
+%%SITE_ARCH%%/auto/List/MoreUtils/MoreUtils.so
 %%PERL5_MAN3%%/List::MoreUtils.3.gz
diff --git a/lang/p5-Marpa-PP/Makefile b/lang/p5-Marpa-PP/Makefile
index f1218f8e99bb..84370b54e397 100644
--- a/lang/p5-Marpa-PP/Makefile
+++ b/lang/p5-Marpa-PP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Marpa-PP
 PORTVERSION=	0.014
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEGL
diff --git a/lang/p5-Marpa-XS/Makefile b/lang/p5-Marpa-XS/Makefile
index bef4997061de..81c5062003c7 100644
--- a/lang/p5-Marpa-XS/Makefile
+++ b/lang/p5-Marpa-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Marpa-XS
 PORTVERSION=	1.008000
+PORTREVISION=	1
 CATEGORIES=	lang textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEGL
diff --git a/lang/p5-Marpa-XS/pkg-plist b/lang/p5-Marpa-XS/pkg-plist
index 6da48ccd94d9..7752f9563894 100644
--- a/lang/p5-Marpa-XS/pkg-plist
+++ b/lang/p5-Marpa-XS/pkg-plist
@@ -1,26 +1,25 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Advanced/Bibliography.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Advanced/Models.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Debug.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Grammar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Grammar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Installed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Internal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Recognizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Recognizer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Rewrite.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Infinite.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Null.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Order.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Support.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Tracing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Vocabulary.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS/XS.so
+%%SITE_ARCH%%/Marpa/XS.pm
+%%SITE_ARCH%%/Marpa/XS.pod
+%%SITE_ARCH%%/Marpa/XS/Advanced/Bibliography.pod
+%%SITE_ARCH%%/Marpa/XS/Advanced/Models.pod
+%%SITE_ARCH%%/Marpa/XS/Debug.pod
+%%SITE_ARCH%%/Marpa/XS/Grammar.pm
+%%SITE_ARCH%%/Marpa/XS/Grammar.pod
+%%SITE_ARCH%%/Marpa/XS/Installed.pm
+%%SITE_ARCH%%/Marpa/XS/Internal.pm
+%%SITE_ARCH%%/Marpa/XS/Recognizer.pm
+%%SITE_ARCH%%/Marpa/XS/Recognizer.pod
+%%SITE_ARCH%%/Marpa/XS/Rewrite.pod
+%%SITE_ARCH%%/Marpa/XS/Semantics.pod
+%%SITE_ARCH%%/Marpa/XS/Semantics/Infinite.pod
+%%SITE_ARCH%%/Marpa/XS/Semantics/Null.pod
+%%SITE_ARCH%%/Marpa/XS/Semantics/Order.pod
+%%SITE_ARCH%%/Marpa/XS/Support.pod
+%%SITE_ARCH%%/Marpa/XS/Tracing.pod
+%%SITE_ARCH%%/Marpa/XS/Value.pm
+%%SITE_ARCH%%/Marpa/XS/Version.pm
+%%SITE_ARCH%%/Marpa/XS/Vocabulary.pod
+%%SITE_ARCH%%/auto/Marpa/XS/XS.so
 %%PERL5_MAN3%%/Marpa::XS.3.gz
 %%PERL5_MAN3%%/Marpa::XS::Advanced::Bibliography.3.gz
 %%PERL5_MAN3%%/Marpa::XS::Advanced::Models.3.gz
diff --git a/lang/p5-Marpa/Makefile b/lang/p5-Marpa/Makefile
index 975bbc5df63e..1b569ec3617d 100644
--- a/lang/p5-Marpa/Makefile
+++ b/lang/p5-Marpa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Marpa
 PORTVERSION=	0.208
+PORTREVISION=	1
 CATEGORIES=	lang textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEGL
diff --git a/lang/p5-Marpa/pkg-plist b/lang/p5-Marpa/pkg-plist
index 73addcb97e35..0f5935ccf9a1 100644
--- a/lang/p5-Marpa/pkg-plist
+++ b/lang/p5-Marpa/pkg-plist
@@ -32,7 +32,6 @@
 %%SITE_PERL%%/Marpa/Test.pm
 %%SITE_PERL%%/Marpa/Test/Util.pm
 %%SITE_PERL%%/Marpa/Tracing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/.packlist
 %%PERL5_MAN3%%/Marpa::Advanced::Algorithm.3.gz
 %%PERL5_MAN3%%/Marpa::Advanced::Bibliography.3.gz
 %%PERL5_MAN3%%/Marpa::Advanced::Implementation.3.gz
diff --git a/lang/p5-Modern-Perl/Makefile b/lang/p5-Modern-Perl/Makefile
index 71ce83547b1d..7192e04dcd02 100644
--- a/lang/p5-Modern-Perl/Makefile
+++ b/lang/p5-Modern-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Modern-Perl
 PORTVERSION=	1.20140107
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHROMATIC
diff --git a/lang/p5-Parse-Perl/Makefile b/lang/p5-Parse-Perl/Makefile
index a084541caa6a..8efd7f873179 100644
--- a/lang/p5-Parse-Perl/Makefile
+++ b/lang/p5-Parse-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Perl
 PORTVERSION=	0.007
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-Parse-Perl/pkg-plist b/lang/p5-Parse-Perl/pkg-plist
index eba1d1057d8a..caf0a5b2c048 100644
--- a/lang/p5-Parse-Perl/pkg-plist
+++ b/lang/p5-Parse-Perl/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/Parse::Perl.3.gz
 %%PERL5_MAN3%%/Parse::Perl::CopHintsHash.3.gz
 %%PERL5_MAN3%%/Parse::Perl::Environment.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Parse/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Parse/Perl/CopHintsHash.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Parse/Perl/Environment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Perl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Perl/Perl.so
+%%SITE_ARCH%%/Parse/Perl.pm
+%%SITE_ARCH%%/Parse/Perl/CopHintsHash.pod
+%%SITE_ARCH%%/Parse/Perl/Environment.pod
+%%SITE_ARCH%%/auto/Parse/Perl/Perl.so
diff --git a/lang/p5-Perl6-Subs/Makefile b/lang/p5-Perl6-Subs/Makefile
index bd5a947558a6..30df0225078e 100644
--- a/lang/p5-Perl6-Subs/Makefile
+++ b/lang/p5-Perl6-Subs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Perl6-Subs
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-Perl6-Subs/pkg-plist b/lang/p5-Perl6-Subs/pkg-plist
index d8c4ce63b34a..0ca6784a76ac 100644
--- a/lang/p5-Perl6-Subs/pkg-plist
+++ b/lang/p5-Perl6-Subs/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Perl6/Subs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs/.packlist
 %%PERL5_MAN3%%/Perl6::Subs.3.gz
diff --git a/lang/p5-Pugs-Compiler-Rule/Makefile b/lang/p5-Pugs-Compiler-Rule/Makefile
index 33e40ed462c5..fa177e775a10 100644
--- a/lang/p5-Pugs-Compiler-Rule/Makefile
+++ b/lang/p5-Pugs-Compiler-Rule/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pugs-Compiler-Rule
 PORTVERSION=	0.37
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FGLOCK
diff --git a/lang/p5-Pugs-Compiler-Rule/pkg-plist b/lang/p5-Pugs-Compiler-Rule/pkg-plist
index 1f770ee0709f..69077589cc55 100644
--- a/lang/p5-Pugs-Compiler-Rule/pkg-plist
+++ b/lang/p5-Pugs-Compiler-Rule/pkg-plist
@@ -36,5 +36,4 @@ bin/compile_p6grammar.pl
 %%SITE_PERL%%/Pugs/Runtime/Rule.pm
 %%SITE_PERL%%/Pugs/Runtime/StrPos.pm
 %%SITE_PERL%%/Pugs/Runtime/Tracer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pugs/Compiler/Rule/.packlist
 man/man1/compile_p6grammar.pl.1.gz
diff --git a/lang/p5-Quantum-Superpositions/Makefile b/lang/p5-Quantum-Superpositions/Makefile
index e81a109fdea4..c5d927d6901f 100644
--- a/lang/p5-Quantum-Superpositions/Makefile
+++ b/lang/p5-Quantum-Superpositions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Quantum-Superpositions
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	lang science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-Quantum-Superpositions/pkg-plist b/lang/p5-Quantum-Superpositions/pkg-plist
index dd1d63badc4c..2cf20b02a1c1 100644
--- a/lang/p5-Quantum-Superpositions/pkg-plist
+++ b/lang/p5-Quantum-Superpositions/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Quantum::Superpositions.3.gz
 %%SITE_PERL%%/Quantum/Superpositions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Quantum/Superpositions/.packlist
diff --git a/lang/p5-Scalar-List-Utils/Makefile b/lang/p5-Scalar-List-Utils/Makefile
index e334a5976899..55e0ef0b6823 100644
--- a/lang/p5-Scalar-List-Utils/Makefile
+++ b/lang/p5-Scalar-List-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Scalar-List-Utils
 PORTVERSION=	1.35
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
diff --git a/lang/p5-Scalar-List-Utils/pkg-plist b/lang/p5-Scalar-List-Utils/pkg-plist
index c51f184d6e34..0c7d13b1aafa 100644
--- a/lang/p5-Scalar-List-Utils/pkg-plist
+++ b/lang/p5-Scalar-List-Utils/pkg-plist
@@ -1,8 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/Util.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Scalar/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/List/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/List/Util/XS.pm
+%%SITE_ARCH%%/auto/List/Util/Util.so
+%%SITE_ARCH%%/Scalar/Util.pm
+%%SITE_ARCH%%/List/Util.pm
+%%SITE_ARCH%%/List/Util/XS.pm
 %%PERL5_MAN3%%/List::Util.3.gz
 %%PERL5_MAN3%%/List::Util::XS.3.gz
 %%PERL5_MAN3%%/Scalar::Util.3.gz
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index 1a99efaf75f0..0afb407a18d7 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Switch
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHORNY
diff --git a/lang/p5-Switch/pkg-plist b/lang/p5-Switch/pkg-plist
index 3a9a6b4ea2de..5e977173a115 100644
--- a/lang/p5-Switch/pkg-plist
+++ b/lang/p5-Switch/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch/.packlist
 %%SITE_PERL%%/Switch.pm
 %%PERL5_MAN3%%/Switch.3.gz
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index b1fd65eebd7a..cef135504d66 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tcl
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VKON
diff --git a/lang/p5-Tcl/pkg-plist b/lang/p5-Tcl/pkg-plist
index b6bf1ae3ecde..af055588cc98 100644
--- a/lang/p5-Tcl/pkg-plist
+++ b/lang/p5-Tcl/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Tcl.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Tcl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tcl.so
+%%SITE_ARCH%%/Tcl.pm
+%%SITE_ARCH%%/auto/Tcl/Tcl.so
diff --git a/lang/p5-Test-XPath/Makefile b/lang/p5-Test-XPath/Makefile
index 7b848ca9c5c2..a9c44f931830 100644
--- a/lang/p5-Test-XPath/Makefile
+++ b/lang/p5-Test-XPath/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Test-XPath
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DWHEELER
diff --git a/lang/p5-Try-Tiny-Retry/Makefile b/lang/p5-Try-Tiny-Retry/Makefile
index 91083080eb43..c2b9fd02cbae 100644
--- a/lang/p5-Try-Tiny-Retry/Makefile
+++ b/lang/p5-Try-Tiny-Retry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Try-Tiny-Retry
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/lang/p5-Try-Tiny-Retry/pkg-plist b/lang/p5-Try-Tiny-Retry/pkg-plist
index 28cc28a8878b..227914e01e19 100644
--- a/lang/p5-Try-Tiny-Retry/pkg-plist
+++ b/lang/p5-Try-Tiny-Retry/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Try::Tiny::Retry.3.gz
 %%SITE_PERL%%/Try/Tiny/Retry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Try/Tiny/Retry/.packlist
diff --git a/lang/p5-Try-Tiny/Makefile b/lang/p5-Try-Tiny/Makefile
index 09e94a8c9758..a68b894851b9 100644
--- a/lang/p5-Try-Tiny/Makefile
+++ b/lang/p5-Try-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Try-Tiny
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
diff --git a/lang/p5-Try-Tiny/pkg-plist b/lang/p5-Try-Tiny/pkg-plist
index 016a5c57b7e8..4522cfe32f64 100644
--- a/lang/p5-Try-Tiny/pkg-plist
+++ b/lang/p5-Try-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Try/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Try/Tiny/.packlist
 %%PERL5_MAN3%%/Try::Tiny.3.gz
diff --git a/lang/p5-TryCatch/Makefile b/lang/p5-TryCatch/Makefile
index 4a5a59994acb..8db970b3e3b3 100644
--- a/lang/p5-TryCatch/Makefile
+++ b/lang/p5-TryCatch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	TryCatch
 PORTVERSION=	1.003002
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ASH
diff --git a/lang/p5-TryCatch/pkg-plist b/lang/p5-TryCatch/pkg-plist
index ece44f19de51..677ba9e02d77 100644
--- a/lang/p5-TryCatch/pkg-plist
+++ b/lang/p5-TryCatch/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/TryCatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TryCatch/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TryCatch/TryCatch.so
+%%SITE_ARCH%%/TryCatch.pm
+%%SITE_ARCH%%/auto/TryCatch/TryCatch.so
 %%PERL5_MAN3%%/TryCatch.3.gz
diff --git a/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile
index 32bc807a8c1f..e973761cf930 100644
--- a/lang/p5-ePerl/Makefile
+++ b/lang/p5-ePerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	eperl
 PORTVERSION=	2.2.14
+PORTREVISION=	1
 CATEGORIES=	lang www perl5
 MASTER_SITES=	OSSP/tool/${PORTNAME}
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-ePerl/pkg-plist b/lang/p5-ePerl/pkg-plist
index ff1858fe7d1d..6f41dfe2a187 100644
--- a/lang/p5-ePerl/pkg-plist
+++ b/lang/p5-ePerl/pkg-plist
@@ -1,7 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/ePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Parse/ePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/.packlist
+%%SITE_ARCH%%/Apache/ePerl.pm
+%%SITE_ARCH%%/Parse/ePerl.pm
+%%SITE_ARCH%%/auto/Parse/ePerl/autosplit.ix
+%%SITE_ARCH%%/auto/Parse/ePerl/ePerl.so
 %%PERL5_MAN3%%/Parse::ePerl.3.gz
 %%PERL5_MAN3%%/Apache::ePerl.3.gz
diff --git a/lang/p5-signatures/Makefile b/lang/p5-signatures/Makefile
index c4ca89571093..79a75e9dbd25 100644
--- a/lang/p5-signatures/Makefile
+++ b/lang/p5-signatures/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	signatures
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAPPA
diff --git a/lang/p5-signatures/pkg-plist b/lang/p5-signatures/pkg-plist
index 1b93c1330121..1964b9a413cb 100644
--- a/lang/p5-signatures/pkg-plist
+++ b/lang/p5-signatures/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/signatures/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/signatures/signatures.so
-%%SITE_PERL%%/%%PERL_ARCH%%/signatures.pm
+%%SITE_ARCH%%/auto/signatures/signatures.so
+%%SITE_ARCH%%/signatures.pm
 %%PERL5_MAN3%%/signatures.3.gz
diff --git a/lang/p5-v6/Makefile b/lang/p5-v6/Makefile
index 31266e3a5d18..d72fea90c90b 100644
--- a/lang/p5-v6/Makefile
+++ b/lang/p5-v6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	v6
 PORTVERSION=	0.017
+PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/F/FG/FGLOCK
diff --git a/lang/p5-v6/pkg-plist b/lang/p5-v6/pkg-plist
index 8e2c3f0f297f..cede9e896fe0 100644
--- a/lang/p5-v6/pkg-plist
+++ b/lang/p5-v6/pkg-plist
@@ -27,6 +27,5 @@
 %%SITE_PERL%%/Pugs/Runtime/Perl6AST.pmc
 %%SITE_PERL%%/Pugs/Runtime/Perl6Prelude.pm
 %%SITE_PERL%%/Pugs/Runtime/Perl6Prelude.pmc
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/v6/alpha/.packlist
 %%SITE_PERL%%/v6.pm
 %%SITE_PERL%%/v6/hello_world.pl
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index a712cc9e8ee3..fd5aefac443d 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -43,8 +43,12 @@ PORTSCOUT=	limit:^${PERL_VER}.
 PERL_VERSION=	5.14.4
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl
 SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
+SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
+SITE_ARCH?=	${PREFIX}/${SITE_ARCH_REL}
+SITE_MAN3_REL?=	${SITE_PERL_REL}/man/man3
+SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 USES=	tar:bzip2 cpe
 HAS_CONFIGURE=	yes
@@ -52,12 +56,13 @@ CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsitearch=${SITE_ARCH} \
+	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
+	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
@@ -75,6 +80,7 @@ SUB_FILES=	perl5_version use.perl perl-man.conf
 
 PKGINSTALL=	${WRKDIR}/use.perl
 PKGDEINSTALL=	${WRKDIR}/use.perl
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
@@ -107,14 +113,16 @@ CONFIGURE_ARGS+=	\
     -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
-MANDIRS+=	${MAN3PREFIX}
+MAN3PREFIX_REL=	lib/perl5/${PERL_VER}
+MAN3PREFIX=	${PREFIX}/${MAN3PREFIX_REL}
+MANDIRS+=	${MAN3PREFIX}/man
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
-		MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \
-		SITE_PERL=${SITE_PERL:S|^${PREFIX}/||}
+		MAN3=${MAN3PREFIX_REL}/man/man3 \
+		SITE_PERL=${SITE_PERL_REL} \
+		SITE_ARCH=${SITE_ARCH_REL}
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	-Doptimize="-g" -DDEBUGGING
@@ -200,15 +208,22 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys
+	${MKDIR} ${STAGEDIR}${SITE_MAN3}
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
+	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist
 	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
 	${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
+	# h2ph needs perl, but perl is not installed, it's only
+	# staged, so, use the one in WRKDIR 
+	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
+	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index 00c052af3cd0..7a0457717878 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -678,7 +678,6 @@ lib/perl5/%%PERL_VER%%/integer.pm
 lib/perl5/%%PERL_VER%%/less.pm
 lib/perl5/%%PERL_VER%%/locale.pm
 lib/perl5/%%PERL_VER%%/look.pl
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm
@@ -2999,14 +2998,10 @@ man/man1/s2p.1.gz
 man/man1/shasum.1.gz
 man/man1/splain.1.gz
 man/man1/xsubpp.1.gz
-@dir lib/perl5/%%PERL_VER%%/man/man3
+@dir %%SITE_PERL%%/man/man3
 @dir %%SITE_PERL%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null
+@dir %%SITE_ARCH%%/auto
+@exec makewhatis %D/%%SITE_PERL%%/man
 @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man
-@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man
 @rmtry lib/perl5/%%PERL_VER%%/man/whatis
-@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis
-@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@rmtry %%SITE_PERL%%/man/whatis
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index ec794bc21111..aab1fbe61ee7 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -43,8 +43,12 @@ PORTSCOUT=	limit:^${PERL_VER}.
 PERL_VERSION=	5.16.3
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl
 SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
+SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
+SITE_ARCH?=	${PREFIX}/${SITE_ARCH_REL}
+SITE_MAN3_REL?=	${SITE_PERL_REL}/man/man3
+SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 USES=	tar:bzip2 cpe
 HAS_CONFIGURE=	yes
@@ -52,12 +56,13 @@ CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsitearch=${SITE_ARCH} \
+	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
+	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
@@ -75,6 +80,7 @@ SUB_FILES=	perl5_version use.perl perl-man.conf
 
 PKGINSTALL=	${WRKDIR}/use.perl
 PKGDEINSTALL=	${WRKDIR}/use.perl
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
@@ -107,14 +113,16 @@ CONFIGURE_ARGS+=	\
     -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
-MANDIRS+=	${MAN3PREFIX}
+MAN3PREFIX_REL=	lib/perl5/${PERL_VER}
+MAN3PREFIX=	${PREFIX}/${MAN3PREFIX_REL}
+MANDIRS+=	${MAN3PREFIX}/man
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
-		MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \
-		SITE_PERL=${SITE_PERL:S|^${PREFIX}/||}
+		MAN3=${MAN3PREFIX_REL}/man/man3 \
+		SITE_PERL=${SITE_PERL_REL} \
+		SITE_ARCH=${SITE_ARCH_REL}
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	-Doptimize="-g" -DDEBUGGING
@@ -200,15 +208,22 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys
+	${MKDIR} ${STAGEDIR}${SITE_MAN3}
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
+	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist
 	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
 	${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
+	# h2ph needs perl, but perl is not installed, it's only
+	# staged, so, use the one in WRKDIR 
+	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
+	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index 8d08549efa41..f5ec466da3e9 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -723,7 +723,6 @@ lib/perl5/%%PERL_VER%%/inc/latest/private.pm
 lib/perl5/%%PERL_VER%%/integer.pm
 lib/perl5/%%PERL_VER%%/less.pm
 lib/perl5/%%PERL_VER%%/locale.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm
@@ -2854,14 +2853,10 @@ man/man1/shasum.1.gz
 man/man1/splain.1.gz
 man/man1/xsubpp.1.gz
 man/man1/zipdetails.1.gz
-@dir lib/perl5/%%PERL_VER%%/man/man3
+@dir %%SITE_PERL%%/man/man3
 @dir %%SITE_PERL%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null
+@dir %%SITE_ARCH%%/auto
+@exec makewhatis %D/%%SITE_PERL%%/man
 @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man
-@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man
 @rmtry lib/perl5/%%PERL_VER%%/man/whatis
-@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis
-@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@rmtry %%SITE_PERL%%/man/whatis
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index 6d60e90b8ed1..6139d0b96efb 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -62,8 +62,12 @@ PORTSCOUT=	limit:^${PERL_VER}.
 PERL_VERSION=	5.18.4
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl
 SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
+SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
+SITE_ARCH?=	${PREFIX}/${SITE_ARCH_REL}
+SITE_MAN3_REL?=	${SITE_PERL_REL}/man/man3
+SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 USES=	tar:bzip2 cpe
 HAS_CONFIGURE=	yes
@@ -71,12 +75,13 @@ CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsitearch=${SITE_ARCH} \
+	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
+	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
@@ -94,6 +99,7 @@ SUB_FILES=	perl5_version use.perl perl-man.conf
 
 PKGINSTALL=	${WRKDIR}/use.perl
 PKGDEINSTALL=	${WRKDIR}/use.perl
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
@@ -126,14 +132,16 @@ CONFIGURE_ARGS+=	\
     -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
-MANDIRS+=	${MAN3PREFIX}
+MAN3PREFIX_REL=	lib/perl5/${PERL_VER}
+MAN3PREFIX=	${PREFIX}/${MAN3PREFIX_REL}
+MANDIRS+=	${MAN3PREFIX}/man
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
-		MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \
-		SITE_PERL=${SITE_PERL:S|^${PREFIX}/||}
+		MAN3=${MAN3PREFIX_REL}/man/man3 \
+		SITE_PERL=${SITE_PERL_REL} \
+		SITE_ARCH=${SITE_ARCH_REL}
 
 .if ${PORT_OPTIONS:MDEBUG}
 STRIP=
@@ -182,15 +190,22 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys
+	${MKDIR} ${STAGEDIR}${SITE_MAN3}
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
+	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist
 	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
 	${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
+	# h2ph needs perl, but perl is not installed, it's only
+	# staged, so, use the one in WRKDIR 
+	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
+	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
diff --git a/lang/perl5.18/pkg-plist b/lang/perl5.18/pkg-plist
index 0d8c6e284282..e3bf3f0e3d6a 100644
--- a/lang/perl5.18/pkg-plist
+++ b/lang/perl5.18/pkg-plist
@@ -727,7 +727,6 @@ lib/perl5/%%PERL_VER%%/inc/latest/private.pm
 lib/perl5/%%PERL_VER%%/integer.pm
 lib/perl5/%%PERL_VER%%/less.pm
 lib/perl5/%%PERL_VER%%/locale.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm
@@ -2882,14 +2881,10 @@ man/man1/shasum.1.gz
 man/man1/splain.1.gz
 man/man1/xsubpp.1.gz
 man/man1/zipdetails.1.gz
-@dir lib/perl5/%%PERL_VER%%/man/man3
+@dir %%SITE_PERL%%/man/man3
 @dir %%SITE_PERL%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null
+@dir %%SITE_ARCH%%/auto
+@exec makewhatis %D/%%SITE_PERL%%/man
 @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man
-@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man
 @rmtry lib/perl5/%%PERL_VER%%/man/whatis
-@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis
-@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@rmtry %%SITE_PERL%%/man/whatis
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index 4b76b165178b..388351e07485 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -63,8 +63,12 @@ PORTSCOUT=	limitw:1,even
 PERL_VERSION=	5.20.1
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl
 SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
+SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
+SITE_ARCH?=	${PREFIX}/${SITE_ARCH_REL}
+SITE_MAN3_REL?=	${SITE_PERL_REL}/man/man3
+SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 USES=	tar:bzip2 cpe
 HAS_CONFIGURE=	yes
@@ -72,12 +76,13 @@ CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsitearch=${SITE_ARCH} \
+	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
+	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
@@ -95,6 +100,7 @@ SUB_FILES=	perl5_version use.perl perl-man.conf
 
 PKGINSTALL=	${WRKDIR}/use.perl
 PKGDEINSTALL=	${WRKDIR}/use.perl
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
@@ -127,14 +133,16 @@ CONFIGURE_ARGS+=	\
     -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
-MANDIRS+=	${MAN3PREFIX}
+MAN3PREFIX_REL=	lib/perl5/${PERL_VER}
+MAN3PREFIX=	${PREFIX}/${MAN3PREFIX_REL}
+MANDIRS+=	${MAN3PREFIX}/man
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
-		MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \
-		SITE_PERL=${SITE_PERL:S|^${PREFIX}/||}
+		MAN3=${MAN3PREFIX_REL}/man/man3 \
+		SITE_PERL=${SITE_PERL_REL} \
+		SITE_ARCH=${SITE_ARCH_REL}
 
 .if ${PORT_OPTIONS:MDEBUG}
 STRIP=
@@ -176,14 +184,21 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys
+	${MKDIR} ${STAGEDIR}${SITE_MAN3}
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
+	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist
 	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
+	# h2ph needs perl, but perl is not installed, it's only
+	# staged, so, use the one in WRKDIR 
+	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
+	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
diff --git a/lang/perl5.20/pkg-plist b/lang/perl5.20/pkg-plist
index cb4bfbbfc3da..8c3675154d66 100644
--- a/lang/perl5.20/pkg-plist
+++ b/lang/perl5.20/pkg-plist
@@ -664,7 +664,6 @@ lib/perl5/%%PERL_VER%%/inc/latest/private.pm
 lib/perl5/%%PERL_VER%%/integer.pm
 lib/perl5/%%PERL_VER%%/less.pm
 lib/perl5/%%PERL_VER%%/locale.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm
@@ -2251,14 +2250,10 @@ man/man1/shasum.1.gz
 man/man1/splain.1.gz
 man/man1/xsubpp.1.gz
 man/man1/zipdetails.1.gz
-@dir lib/perl5/%%PERL_VER%%/man/man3
+@dir %%SITE_PERL%%/man/man3
 @dir %%SITE_PERL%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null
+@dir %%SITE_ARCH%%/auto
+@exec makewhatis %D/%%SITE_PERL%%/man
 @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man
-@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man
 @rmtry lib/perl5/%%PERL_VER%%/man/whatis
-@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis
-@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@rmtry %%SITE_PERL%%/man/whatis
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index adee6898c8f1..25cb76afacae 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	anomy-sanitizer
 PORTVERSION=	1.76
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail security
 MASTER_SITES=	http://mailtools.anomy.net/dist/
 
@@ -18,15 +18,15 @@ DOCS=		CHANGELOG.sanitizer CREDITS README.sanitizer sanitizer.html
 OPTIONS_DEFINE= DOCS
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/HTMLCleaner.pm ${STAGEDIR}${SITE_PERL}/Anomy
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Log.pm ${STAGEDIR}${SITE_PERL}/Anomy
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/MIMEStream.pm ${STAGEDIR}${SITE_PERL}/Anomy
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer.pm ${STAGEDIR}${SITE_PERL}/Anomy
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FProt.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FileTypes.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/MacroScanner.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
-	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/Scoring.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/HTMLCleaner.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Log.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/MIMEStream.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FProt.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FileTypes.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/MacroScanner.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+	${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/Scoring.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/sanitizer.pl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/simplify.pl ${STAGEDIR}${PREFIX}/bin
 
diff --git a/mail/anomy-sanitizer/pkg-plist b/mail/anomy-sanitizer/pkg-plist
index 2646f5e9276a..6c55cef61bdc 100644
--- a/mail/anomy-sanitizer/pkg-plist
+++ b/mail/anomy-sanitizer/pkg-plist
@@ -14,5 +14,3 @@ bin/simplify.pl
 %%PORTDOCS%%%%DOCSDIR%%/README.sanitizer
 %%PORTDOCS%%%%DOCSDIR%%/sanitizer.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/Anomy/Sanitizer/
-@dirrm %%SITE_PERL%%/Anomy/
diff --git a/mail/bayespam/Makefile b/mail/bayespam/Makefile
index 8eb56c11b6b2..0de057333e83 100644
--- a/mail/bayespam/Makefile
+++ b/mail/bayespam/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bayespam
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.garyarnold.com/sites/default/files/
 EXTRACT_SUFX=	.tar_.gz
diff --git a/mail/bayespam/pkg-plist b/mail/bayespam/pkg-plist
index ee78e836b847..aa19e3cbbb0b 100644
--- a/mail/bayespam/pkg-plist
+++ b/mail/bayespam/pkg-plist
@@ -10,4 +10,3 @@ bin/bayestest.pl
 %%PORTDOCS%%share/doc/bayespam/TODO
 %%PORTDOCS%%share/doc/bayespam/qmail.sample
 %%PORTDOCS%%@dirrm share/doc/bayespam
-@dirrm %%SITE_PERL%%/Bayespam
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index fa24ee0d6763..883989a3434b 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.18
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
 PKGNAMESUFFIX=	23
@@ -24,7 +24,6 @@ PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
 USE_RC_SUBR=	imapd
 
 USES=		perl5
-USE_PERL5=	run build fixpacklist
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index cec25a2ca8a8..f734f5600cfe 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -96,15 +96,13 @@ include/cyrus/xstrlcat.h
 include/cyrus/xstrlcpy.h
 lib/libcyrus.a
 lib/libcyrus_min.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_ARCH%%/Cyrus/IMAP.pm
+%%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
 man/man1/cyradm.1.gz
 man/man1/imtest.1.gz
 man/man1/installsieve.1.gz
@@ -120,12 +118,5 @@ man/man5/cyrus.conf.5.gz
 man/man5/imapd.conf.5.gz
 man/man5/krb.equiv.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
 @dirrm include/cyrus
 @dirrm cyrus/bin
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index efdf05464296..a73bc9893960 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.4.17
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
@@ -24,7 +24,6 @@ PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
 USE_RC_SUBR=	imapd
 
 USES=		perl5
-USE_PERL5=	run build fixpacklist
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 4c89c0be9c9c..53bc21bc63f7 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -97,15 +97,13 @@ include/cyrus/xstrlcat.h
 include/cyrus/xstrlcpy.h
 lib/libcyrus.a
 lib/libcyrus_min.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_ARCH%%/Cyrus/IMAP.pm
+%%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
 man/man1/cyradm.1.gz
 man/man1/imtest.1.gz
 man/man1/installsieve.1.gz
@@ -121,12 +119,5 @@ man/man5/cyrus.conf.5.gz
 man/man5/imapd.conf.5.gz
 man/man5/krb.equiv.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
 @dirrm include/cyrus
 @dirrm cyrus/bin
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index dd3aa841e78a..2ce727379e23 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	grepmail
 PORTVERSION=	5.3033
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/grepmail/pkg-plist b/mail/grepmail/pkg-plist
index 6c5ccd7ab1f1..d4c0acf15137 100644
--- a/mail/grepmail/pkg-plist
+++ b/mail/grepmail/pkg-plist
@@ -1,4 +1,2 @@
 bin/grepmail
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail/.packlist
 man/man1/grepmail.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail
diff --git a/mail/imaputils/Makefile b/mail/imaputils/Makefile
index d23d68cf21a6..22d014d8f6ee 100644
--- a/mail/imaputils/Makefile
+++ b/mail/imaputils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	imaputils
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://tsatsenko.ru/ports/distfiles/
 
diff --git a/mail/imaputils/pkg-plist b/mail/imaputils/pkg-plist
index cbd4619b0cee..94a6c0789529 100644
--- a/mail/imaputils/pkg-plist
+++ b/mail/imaputils/pkg-plist
@@ -20,5 +20,3 @@ bin/iu-purge
 bin/iu-restore
 bin/iu-sync
 bin/iu-trash
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/imaputils/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/imaputils
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index ee1907a6c6b3..989d20a95566 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mbx2mbox
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/mbx2mbox/pkg-plist b/mail/mbx2mbox/pkg-plist
index df8473ab921c..550d228fa606 100644
--- a/mail/mbx2mbox/pkg-plist
+++ b/mail/mbx2mbox/pkg-plist
@@ -1,4 +1,2 @@
 bin/mbx2mbox
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox/.packlist
 man/man1/mbx2mbox.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox
diff --git a/mail/mime-construct/Makefile b/mail/mime-construct/Makefile
index a81327e6d0f7..be70644298d2 100644
--- a/mail/mime-construct/Makefile
+++ b/mail/mime-construct/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mime-construct
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.argon.org/~roderick/ \
 		ftp://renatasystems.org/pub/FreeBSD/ports/distfiles/
diff --git a/mail/mime-construct/pkg-plist b/mail/mime-construct/pkg-plist
index e6308c09b8b2..baa8f8f7de87 100644
--- a/mail/mime-construct/pkg-plist
+++ b/mail/mime-construct/pkg-plist
@@ -1,4 +1,2 @@
 bin/mime-construct
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mime-construct/.packlist
 man/man1/mime-construct.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mime-construct
diff --git a/mail/p5-CGP-CLI/Makefile b/mail/p5-CGP-CLI/Makefile
index aedb24d091e2..0eb1da1b3bf4 100644
--- a/mail/p5-CGP-CLI/Makefile
+++ b/mail/p5-CGP-CLI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGP-CLI
 PORTVERSION=	2.7.5
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JBUHACOFF
diff --git a/mail/p5-CGP-CLI/pkg-plist b/mail/p5-CGP-CLI/pkg-plist
index 0e18750ac2a4..2803bcc70777 100644
--- a/mail/p5-CGP-CLI/pkg-plist
+++ b/mail/p5-CGP-CLI/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP/CLI/.packlist
 %%SITE_PERL%%/CGP/CLI.pm
 %%PERL5_MAN3%%/CGP::CLI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP/CLI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP
-@dirrmtry %%SITE_PERL%%/CGP
diff --git a/mail/p5-Clamd/Makefile b/mail/p5-Clamd/Makefile
index eff68662cb5e..43e8359eeaed 100644
--- a/mail/p5-Clamd/Makefile
+++ b/mail/p5-Clamd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Clamd
 PORTVERSION=	1.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
diff --git a/mail/p5-Clamd/pkg-plist b/mail/p5-Clamd/pkg-plist
index 820dd583c4f5..1c046f383d74 100644
--- a/mail/p5-Clamd/pkg-plist
+++ b/mail/p5-Clamd/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Clamd.3.gz
 %%SITE_PERL%%/Clamd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clamd/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clamd
diff --git a/mail/p5-Dancer-Plugin-Email/Makefile b/mail/p5-Dancer-Plugin-Email/Makefile
index 80595da360d5..a562ea45085c 100644
--- a/mail/p5-Dancer-Plugin-Email/Makefile
+++ b/mail/p5-Dancer-Plugin-Email/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Dancer-Plugin-Email
 PORTVERSION=	1.0201
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:IRONCAMEL
diff --git a/mail/p5-Dancer-Plugin-Email/pkg-plist b/mail/p5-Dancer-Plugin-Email/pkg-plist
index c336d71e3426..b08611949d46 100644
--- a/mail/p5-Dancer-Plugin-Email/pkg-plist
+++ b/mail/p5-Dancer-Plugin-Email/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Email/.packlist
 %%SITE_PERL%%/Dancer/Plugin/Email.pm
 %%PERL5_MAN3%%/Dancer::Plugin::Email.3.gz
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/Dancer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
diff --git a/mail/p5-Data-Validate-Email/Makefile b/mail/p5-Data-Validate-Email/Makefile
index 0a3037ab4515..0a3f54547adc 100644
--- a/mail/p5-Data-Validate-Email/Makefile
+++ b/mail/p5-Data-Validate-Email/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Validate-Email
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Data-Validate-Email/pkg-plist b/mail/p5-Data-Validate-Email/pkg-plist
index 2e4b85ada8a1..0acdb8fbbad7 100644
--- a/mail/p5-Data-Validate-Email/pkg-plist
+++ b/mail/p5-Data-Validate-Email/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/Email/.packlist
 %%SITE_PERL%%/Data/Validate/Email.pm
 %%SITE_PERL%%/auto/Data/Validate/Email/new.al
 %%SITE_PERL%%/auto/Data/Validate/Email/is_email.al
@@ -7,11 +6,3 @@
 %%SITE_PERL%%/auto/Data/Validate/Email/is_username.al
 %%SITE_PERL%%/auto/Data/Validate/Email/autosplit.ix
 %%PERL5_MAN3%%/Data::Validate::Email.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrm %%SITE_PERL%%/auto/Data/Validate/Email
-@dirrmtry %%SITE_PERL%%/auto/Data/Validate
-@dirrmtry %%SITE_PERL%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data/Validate
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
index 2345c7858529..eef68918f235 100644
--- a/mail/p5-Email-Abstract/Makefile
+++ b/mail/p5-Email-Abstract/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Email-Abstract
 PORTVERSION=	3.007
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Email
diff --git a/mail/p5-Email-Abstract/pkg-plist b/mail/p5-Email-Abstract/pkg-plist
index c4ef8bb5ae5b..79cf6e35abdc 100644
--- a/mail/p5-Email-Abstract/pkg-plist
+++ b/mail/p5-Email-Abstract/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Email/Abstract/MailInternet.pm
 %%SITE_PERL%%/Email/Abstract/MailMessage.pm
 %%SITE_PERL%%/Email/Abstract/Plugin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract/.packlist
 %%PERL5_MAN3%%/Email::Abstract.3.gz
 %%PERL5_MAN3%%/Email::Abstract::EmailMIME.3.gz
 %%PERL5_MAN3%%/Email::Abstract::EmailSimple.3.gz
@@ -13,6 +12,3 @@
 %%PERL5_MAN3%%/Email::Abstract::MailInternet.3.gz
 %%PERL5_MAN3%%/Email::Abstract::MailMessage.3.gz
 %%PERL5_MAN3%%/Email::Abstract::Plugin.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract
-@dirrmtry %%SITE_PERL%%/Email/Abstract
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Address-List/Makefile b/mail/p5-Email-Address-List/Makefile
index 7887b2270cd5..49093dfb1bf6 100644
--- a/mail/p5-Email-Address-List/Makefile
+++ b/mail/p5-Email-Address-List/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Address-List
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://download.bestpractical.com/mirror/ \
 		CPAN
diff --git a/mail/p5-Email-Address-List/pkg-plist b/mail/p5-Email-Address-List/pkg-plist
index 7101bbd67aa0..133361c1ed82 100644
--- a/mail/p5-Email-Address-List/pkg-plist
+++ b/mail/p5-Email-Address-List/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Email::Address::List.3.gz
 %%SITE_PERL%%/Email/Address/List.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/List/.packlist
 
 
diff --git a/mail/p5-Email-Address-Loose/Makefile b/mail/p5-Email-Address-Loose/Makefile
index 97c424e9bd39..3879ceb85efe 100644
--- a/mail/p5-Email-Address-Loose/Makefile
+++ b/mail/p5-Email-Address-Loose/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Email-Address-Loose
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Address-Loose/pkg-plist b/mail/p5-Email-Address-Loose/pkg-plist
index 54351e9d2f7c..0105eb3b8dc2 100644
--- a/mail/p5-Email-Address-Loose/pkg-plist
+++ b/mail/p5-Email-Address-Loose/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/Loose/.packlist
 %%SITE_PERL%%/Email/Address/Loose.pm
 %%SITE_PERL%%/Email/Address/Loose/EmailAddress.pm
 %%SITE_PERL%%/Email/Address/Loose/EmailValidLoose.pm
 %%PERL5_MAN3%%/Email::Address::Loose.3.gz
-@dirrm %%SITE_PERL%%/Email/Address/Loose
-@dirrmtry %%SITE_PERL%%/Email/Address
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/Loose
diff --git a/mail/p5-Email-Address/Makefile b/mail/p5-Email-Address/Makefile
index 6dbc68d311f9..65c46033689f 100644
--- a/mail/p5-Email-Address/Makefile
+++ b/mail/p5-Email-Address/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Address
 PORTVERSION=	1.90.5
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Address/pkg-plist b/mail/p5-Email-Address/pkg-plist
index 2debdbae848f..a8d620398dc0 100644
--- a/mail/p5-Email-Address/pkg-plist
+++ b/mail/p5-Email-Address/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Email::Address.3.gz
 %%SITE_PERL%%/Email/Address.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-AddressParser/Makefile b/mail/p5-Email-AddressParser/Makefile
index 01089afa25ed..c5bf4956f182 100644
--- a/mail/p5-Email-AddressParser/Makefile
+++ b/mail/p5-Email-AddressParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-AddressParser
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-AddressParser/pkg-plist b/mail/p5-Email-AddressParser/pkg-plist
index cf76cd90f229..9bab30ae1cfb 100644
--- a/mail/p5-Email-AddressParser/pkg-plist
+++ b/mail/p5-Email-AddressParser/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser/AddressParser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Email/AddressParser.pm
+%%SITE_ARCH%%/auto/Email/AddressParser/AddressParser.so
+%%SITE_ARCH%%/Email/AddressParser.pm
 %%PERL5_MAN3%%/Email::AddressParser.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email
diff --git a/mail/p5-Email-Date-Format/Makefile b/mail/p5-Email-Date-Format/Makefile
index 374616a55ead..0e6869b3cd2a 100644
--- a/mail/p5-Email-Date-Format/Makefile
+++ b/mail/p5-Email-Date-Format/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Date-Format
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Email
diff --git a/mail/p5-Email-Date-Format/pkg-plist b/mail/p5-Email-Date-Format/pkg-plist
index 674ab05f213c..333e925beaba 100644
--- a/mail/p5-Email-Date-Format/pkg-plist
+++ b/mail/p5-Email-Date-Format/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/Format/.packlist
 %%SITE_PERL%%/Email/Date/Format.pm
 %%PERL5_MAN3%%/Email::Date::Format.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/Format
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Date
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Date/Makefile b/mail/p5-Email-Date/Makefile
index 92ed7787af46..131b17efcae9 100644
--- a/mail/p5-Email-Date/Makefile
+++ b/mail/p5-Email-Date/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Date
 PORTVERSION=	1.10.4
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Date/pkg-plist b/mail/p5-Email-Date/pkg-plist
index 4e06a70650de..a0d6395cc645 100644
--- a/mail/p5-Email-Date/pkg-plist
+++ b/mail/p5-Email-Date/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Email::Date.3.gz
 %%SITE_PERL%%/Email/Date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index 1171fc3a762c..aa7db19825ef 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Delete
 PORTVERSION=	2.00.1
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Email
diff --git a/mail/p5-Email-Delete/pkg-plist b/mail/p5-Email-Delete/pkg-plist
index 7116ef9263ab..3254b64cd729 100644
--- a/mail/p5-Email-Delete/pkg-plist
+++ b/mail/p5-Email-Delete/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/Email/Delete.pm
 %%SITE_PERL%%/Email/Delete/Maildir.pm
 %%SITE_PERL%%/Email/Delete/Mbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete/.packlist
 %%PERL5_MAN3%%/Email::Delete.3.gz
 %%PERL5_MAN3%%/Email::Delete::Maildir.3.gz
 %%PERL5_MAN3%%/Email::Delete::Mbox.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Delete
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index 29a077cff81a..5b0963f180bb 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Filter
 PORTVERSION=	1.03.3
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Filter/pkg-plist b/mail/p5-Email-Filter/pkg-plist
index de5a92d84d95..48abd2e1880c 100644
--- a/mail/p5-Email-Filter/pkg-plist
+++ b/mail/p5-Email-Filter/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Email::Filter.3.gz
 %%SITE_PERL%%/Email/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 78ca637389d7..0a4d5d758902 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Find
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Find/pkg-plist b/mail/p5-Email-Find/pkg-plist
index eb4fed1c376d..12f5a38549ed 100644
--- a/mail/p5-Email-Find/pkg-plist
+++ b/mail/p5-Email-Find/pkg-plist
@@ -1,7 +1,4 @@
 %%SITE_PERL%%/Email/Find.pm
 %%SITE_PERL%%/Email/Find/addrspec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find/.packlist
 %%PERL5_MAN3%%/Email::Find.3.gz
 %%PERL5_MAN3%%/Email::Find::addrspec.3.gz
-@dirrm %%SITE_PERL%%/Email/Find
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find
diff --git a/mail/p5-Email-Folder-IMAP/Makefile b/mail/p5-Email-Folder-IMAP/Makefile
index 8a712eda9032..d6ed353b2b05 100644
--- a/mail/p5-Email-Folder-IMAP/Makefile
+++ b/mail/p5-Email-Folder-IMAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Folder-IMAP
 PORTVERSION=	1.10.2
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Folder-IMAP/pkg-plist b/mail/p5-Email-Folder-IMAP/pkg-plist
index 8fc1f8d73d66..ceafa34311c9 100644
--- a/mail/p5-Email-Folder-IMAP/pkg-plist
+++ b/mail/p5-Email-Folder-IMAP/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Email/Folder/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP/.packlist
 %%PERL5_MAN3%%/Email::Folder::IMAP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder-IMAPS/Makefile b/mail/p5-Email-Folder-IMAPS/Makefile
index f171f0292efe..b4274937cab9 100644
--- a/mail/p5-Email-Folder-IMAPS/Makefile
+++ b/mail/p5-Email-Folder-IMAPS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Folder-IMAPS
 PORTVERSION=	1.10.2
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Folder-IMAPS/pkg-plist b/mail/p5-Email-Folder-IMAPS/pkg-plist
index 8d55ffb72e28..b25ffe05f967 100644
--- a/mail/p5-Email-Folder-IMAPS/pkg-plist
+++ b/mail/p5-Email-Folder-IMAPS/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Email/Folder/IMAPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS/.packlist
 %%PERL5_MAN3%%/Email::Folder::IMAPS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder-POP3/Makefile b/mail/p5-Email-Folder-POP3/Makefile
index 78899c7e8e32..f149290ab394 100644
--- a/mail/p5-Email-Folder-POP3/Makefile
+++ b/mail/p5-Email-Folder-POP3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Folder-POP3
 PORTVERSION=	1.01.3
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Folder-POP3/pkg-plist b/mail/p5-Email-Folder-POP3/pkg-plist
index 6264fa52618b..95bf0874011a 100644
--- a/mail/p5-Email-Folder-POP3/pkg-plist
+++ b/mail/p5-Email-Folder-POP3/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Email/Folder/POP3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3/.packlist
 %%PERL5_MAN3%%/Email::Folder::POP3.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index dcf9b8b99734..e0ac92cd4ca8 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Folder
 PORTVERSION=	0.85.5
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Folder/pkg-plist b/mail/p5-Email-Folder/pkg-plist
index a39461f67200..8fac282875ca 100644
--- a/mail/p5-Email-Folder/pkg-plist
+++ b/mail/p5-Email-Folder/pkg-plist
@@ -4,13 +4,8 @@
 %%SITE_PERL%%/Email/Folder/Maildir.pm
 %%SITE_PERL%%/Email/Folder/Mbox.pm
 %%SITE_PERL%%/Email/Folder/Reader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/.packlist
 %%PERL5_MAN3%%/Email::Folder.3.gz
 %%PERL5_MAN3%%/Email::Folder::MH.3.gz
 %%PERL5_MAN3%%/Email::Folder::Maildir.3.gz
 %%PERL5_MAN3%%/Email::Folder::Mbox.3.gz
 %%PERL5_MAN3%%/Email::Folder::Reader.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index f1d24d978d09..35c1002ca800 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-FolderType-Net
 PORTVERSION=	1.04.1
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Email
diff --git a/mail/p5-Email-FolderType-Net/pkg-plist b/mail/p5-Email-FolderType-Net/pkg-plist
index 79c83d0b996d..a05b412b2289 100644
--- a/mail/p5-Email-FolderType-Net/pkg-plist
+++ b/mail/p5-Email-FolderType-Net/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Email/FolderType/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net/.packlist
 %%PERL5_MAN3%%/Email::FolderType::Net.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/FolderType
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile
index 661eaed96955..fe06e12df574 100644
--- a/mail/p5-Email-FolderType/Makefile
+++ b/mail/p5-Email-FolderType/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Email-FolderType
 PORTVERSION=	0.8.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-FolderType/pkg-plist b/mail/p5-Email-FolderType/pkg-plist
index 9aafc1c97ab1..06cd4f07588f 100644
--- a/mail/p5-Email-FolderType/pkg-plist
+++ b/mail/p5-Email-FolderType/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/Email/FolderType/MH.pm
 %%SITE_PERL%%/Email/FolderType/Maildir.pm
 %%SITE_PERL%%/Email/FolderType/Mbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/.packlist
 %%PERL5_MAN3%%/Email::FolderType.3.gz
 %%PERL5_MAN3%%/Email::FolderType::Ezmlm.3.gz
 %%PERL5_MAN3%%/Email::FolderType::MH.3.gz
 %%PERL5_MAN3%%/Email::FolderType::Maildir.3.gz
 %%PERL5_MAN3%%/Email::FolderType::Mbox.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/FolderType
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index 718cea24192e..abed0fdcb5a6 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-LocalDelivery-Ezmlm
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
index aadab7433141..f0ee8312c724 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Email/LocalDelivery/Ezmlm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm/.packlist
 %%PERL5_MAN3%%/Email::LocalDelivery::Ezmlm.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-LocalDelivery/Makefile b/mail/p5-Email-LocalDelivery/Makefile
index 8865cf5d0aa6..1314d20feac5 100644
--- a/mail/p5-Email-LocalDelivery/Makefile
+++ b/mail/p5-Email-LocalDelivery/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-LocalDelivery
 PORTVERSION=	1.200
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-LocalDelivery/pkg-plist b/mail/p5-Email-LocalDelivery/pkg-plist
index bdf011fd5841..a5dfa34b4f1d 100644
--- a/mail/p5-Email-LocalDelivery/pkg-plist
+++ b/mail/p5-Email-LocalDelivery/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Email/LocalDelivery.pm
 %%SITE_PERL%%/Email/LocalDelivery/Maildir.pm
 %%SITE_PERL%%/Email/LocalDelivery/Mbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index fc0e1d89252b..986b772a8430 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Email-MIME-Attachment-Stripper
 PORTVERSION=	1.31.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
index 10f619a35aa0..6cbe77e1df12 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
+++ b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Email/MIME/Attachment/Stripper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper/.packlist
 %%PERL5_MAN3%%/Email::MIME::Attachment::Stripper.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME/Attachment
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-ContentType/Makefile b/mail/p5-Email-MIME-ContentType/Makefile
index 0998799c840b..ddc25472af58 100644
--- a/mail/p5-Email-MIME-ContentType/Makefile
+++ b/mail/p5-Email-MIME-ContentType/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Email-MIME-ContentType
 PORTVERSION=	1.01.7
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Email
diff --git a/mail/p5-Email-MIME-ContentType/pkg-plist b/mail/p5-Email-MIME-ContentType/pkg-plist
index 8b81d3cae57b..e12b0ed500a8 100644
--- a/mail/p5-Email-MIME-ContentType/pkg-plist
+++ b/mail/p5-Email-MIME-ContentType/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Email/MIME/ContentType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType/.packlist
 %%PERL5_MAN3%%/Email::MIME::ContentType.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-CreateHTML/Makefile b/mail/p5-Email-MIME-CreateHTML/Makefile
index 6a7f47bc6515..10d153b2f242 100644
--- a/mail/p5-Email-MIME-CreateHTML/Makefile
+++ b/mail/p5-Email-MIME-CreateHTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-MIME-CreateHTML
 PORTVERSION=	1.040
+PORTREVISION=	1
 CATEGORIES=	mail www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-MIME-CreateHTML/pkg-plist b/mail/p5-Email-MIME-CreateHTML/pkg-plist
index a3d0d8144b6f..357b9e776128 100644
--- a/mail/p5-Email-MIME-CreateHTML/pkg-plist
+++ b/mail/p5-Email-MIME-CreateHTML/pkg-plist
@@ -8,11 +8,3 @@
 %%SITE_PERL%%/Email/MIME/CreateHTML/Resolver/Cached.pm
 %%SITE_PERL%%/Email/MIME/CreateHTML/Resolver/Filesystem.pm
 %%SITE_PERL%%/Email/MIME/CreateHTML/Resolver/LWP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/CreateHTML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/CreateHTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME/CreateHTML/Resolver
-@dirrmtry %%SITE_PERL%%/Email/MIME/CreateHTML
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
index a44fa44f75dc..4ffcc8338f88 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Email-MIME-Creator-ISO_2022_JP
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist b/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
index 21a9cbec7310..27107298ee5e 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
@@ -1,11 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/ISO_2022_JP/.packlist
 %%SITE_PERL%%/Email/MIME/Creator/ISO_2022_JP.pm
 %%PERL5_MAN3%%/Email::MIME::Creator::ISO_2022_JP.3.gz
-@dirrmtry %%SITE_PERL%%/Email/MIME/Creator
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/ISO_2022_JP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/ISO_2022_JP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-MIME-Encodings/Makefile b/mail/p5-Email-MIME-Encodings/Makefile
index 1a3a30631d00..75aaae917b0b 100644
--- a/mail/p5-Email-MIME-Encodings/Makefile
+++ b/mail/p5-Email-MIME-Encodings/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Email-MIME-Encodings
 PORTVERSION=	1.315
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-MIME-Encodings/pkg-plist b/mail/p5-Email-MIME-Encodings/pkg-plist
index dd82cc26942e..05d706c19aa0 100644
--- a/mail/p5-Email-MIME-Encodings/pkg-plist
+++ b/mail/p5-Email-MIME-Encodings/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Email/MIME/Encodings.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings/.packlist
 %%PERL5_MAN3%%/Email::MIME::Encodings.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile
index 281d863af7fc..80db42a34be1 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Email-MIME
 PORTVERSION=	1.926
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-MIME/pkg-plist b/mail/p5-Email-MIME/pkg-plist
index 82dfbc4921a0..9e4924c69e7d 100644
--- a/mail/p5-Email-MIME/pkg-plist
+++ b/mail/p5-Email-MIME/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/Email/MIME/Encode.pm
 %%SITE_PERL%%/Email/MIME/Header.pm
 %%SITE_PERL%%/Email/MIME/Modifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/.packlist
 %%PERL5_MAN3%%/Email::MIME.3.gz
 %%PERL5_MAN3%%/Email::MIME::Creator.3.gz
 %%PERL5_MAN3%%/Email::MIME::Encode.3.gz
 %%PERL5_MAN3%%/Email::MIME::Header.3.gz
 %%PERL5_MAN3%%/Email::MIME::Modifier.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MessageID/Makefile b/mail/p5-Email-MessageID/Makefile
index e3a7dd8b28b1..2f038cd787e7 100644
--- a/mail/p5-Email-MessageID/Makefile
+++ b/mail/p5-Email-MessageID/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-MessageID
 PORTVERSION=	1.405
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-MessageID/pkg-plist b/mail/p5-Email-MessageID/pkg-plist
index 8180dfd7eab5..df987616026b 100644
--- a/mail/p5-Email-MessageID/pkg-plist
+++ b/mail/p5-Email-MessageID/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Email::MessageID.3.gz
 %%SITE_PERL%%/Email/MessageID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index 08fcbe5f5937..805685dd1082 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Reply
 PORTVERSION=	1.203
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Reply/pkg-plist b/mail/p5-Email-Reply/pkg-plist
index 28cc0e85f9e6..ec27b83e0088 100644
--- a/mail/p5-Email-Reply/pkg-plist
+++ b/mail/p5-Email-Reply/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Email/Reply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Reply/.packlist
 %%PERL5_MAN3%%/Email::Reply.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Reply
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index 2fefcd5e0d4d..f25b35631dcd 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Send
 PORTVERSION=	2.199
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Send/pkg-plist b/mail/p5-Email-Send/pkg-plist
index f8578751e59e..d3d001071403 100644
--- a/mail/p5-Email-Send/pkg-plist
+++ b/mail/p5-Email-Send/pkg-plist
@@ -4,14 +4,9 @@
 %%SITE_PERL%%/Email/Send/SMTP.pm
 %%SITE_PERL%%/Email/Send/Sendmail.pm
 %%SITE_PERL%%/Email/Send/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send/.packlist
 %%PERL5_MAN3%%/Email::Send.3.gz
 %%PERL5_MAN3%%/Email::Send::NNTP.3.gz
 %%PERL5_MAN3%%/Email::Send::Qmail.3.gz
 %%PERL5_MAN3%%/Email::Send::SMTP.3.gz
 %%PERL5_MAN3%%/Email::Send::Sendmail.3.gz
 %%PERL5_MAN3%%/Email::Send::Test.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Send
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
index 76cb7cecc9f4..99b9321f64b1 100644
--- a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Sender-Transport-SMTP-TLS
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist b/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
index 015169648fdd..31687cb136cc 100644
--- a/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
@@ -1,11 +1,2 @@
 %%SITE_PERL%%/Email/Sender/Transport/SMTP/TLS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP/TLS/.packlist
 %%PERL5_MAN3%%/Email::Sender::Transport::SMTP::TLS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/Email/Sender
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Sender-Transport-SMTPS/Makefile b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
index dec5a7ea72e9..b7bbfd928a7a 100644
--- a/mail/p5-Email-Sender-Transport-SMTPS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Email-Sender-Transport-SMTPS
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist b/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist
index 1fe96164363b..260865366c4f 100644
--- a/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Email::Sender::Transport::SMTPS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTPS/.packlist
 %%SITE_PERL%%/Email/Sender/Transport/SMTPS.pm
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
diff --git a/mail/p5-Email-Sender-Transport-SQLite/Makefile b/mail/p5-Email-Sender-Transport-SQLite/Makefile
index 98c9cf80a2e5..43dbe90f98af 100644
--- a/mail/p5-Email-Sender-Transport-SQLite/Makefile
+++ b/mail/p5-Email-Sender-Transport-SQLite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Sender-Transport-SQLite
 PORTVERSION=	0.092002
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Sender-Transport-SQLite/pkg-plist b/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
index 6c203ab100c5..240a9c1bba8c 100644
--- a/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Email/Sender/Transport/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SQLite/.packlist
 %%PERL5_MAN3%%/Email::Sender::Transport::SQLite.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SQLite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/Email/Sender
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Sender/Makefile b/mail/p5-Email-Sender/Makefile
index 125dc6b64388..dd6003c65c14 100644
--- a/mail/p5-Email-Sender/Makefile
+++ b/mail/p5-Email-Sender/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Sender
 PORTVERSION=	1.300011
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/mail/p5-Email-Sender/pkg-plist b/mail/p5-Email-Sender/pkg-plist
index 37219d7e65de..790107e315bb 100644
--- a/mail/p5-Email-Sender/pkg-plist
+++ b/mail/p5-Email-Sender/pkg-plist
@@ -22,7 +22,6 @@
 %%SITE_PERL%%/Email/Sender/Transport/Test.pm
 %%SITE_PERL%%/Email/Sender/Transport/Wrapper.pm
 %%SITE_PERL%%/Email/Sender/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/.packlist
 %%PERL5_MAN3%%/Email::Sender.3.gz
 %%PERL5_MAN3%%/Email::Sender::Failure.3.gz
 %%PERL5_MAN3%%/Email::Sender::Failure::Multi.3.gz
@@ -47,13 +46,3 @@
 %%PERL5_MAN3%%/Email::Sender::Transport::Test.3.gz
 %%PERL5_MAN3%%/Email::Sender::Transport::Wrapper.3.gz
 %%PERL5_MAN3%%/Email::Sender::Util.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport/SMTP
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/Email/Sender/Success
-@dirrmtry %%SITE_PERL%%/Email/Sender/Role
-@dirrmtry %%SITE_PERL%%/Email/Sender/Manual
-@dirrmtry %%SITE_PERL%%/Email/Sender/Failure
-@dirrmtry %%SITE_PERL%%/Email/Sender
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Simple-FromHandle/Makefile b/mail/p5-Email-Simple-FromHandle/Makefile
index 984bd443c816..2f874e5d288a 100644
--- a/mail/p5-Email-Simple-FromHandle/Makefile
+++ b/mail/p5-Email-Simple-FromHandle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Simple-FromHandle
 PORTVERSION=	0.054
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Simple-FromHandle/pkg-plist b/mail/p5-Email-Simple-FromHandle/pkg-plist
index 5672e2809fdb..db6dd57f2f09 100644
--- a/mail/p5-Email-Simple-FromHandle/pkg-plist
+++ b/mail/p5-Email-Simple-FromHandle/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/mach/auto/Email/Simple/FromHandle/.packlist
 %%SITE_PERL%%/Email/Simple/FromHandle.pm
 %%PERL5_MAN3%%/Email::Simple::FromHandle.3.gz
-@dirrmtry %%SITE_PERL%%/Email/Simple
-@dirrmtry %%SITE_PERL%%/mach/auto/Email/Simple/FromHandle
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 82e00133ae62..20cf2691b0a3 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Simple
 PORTVERSION=	2.203
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/mail/p5-Email-Simple/pkg-plist b/mail/p5-Email-Simple/pkg-plist
index 92ae840b4f88..0054552e6e2c 100644
--- a/mail/p5-Email-Simple/pkg-plist
+++ b/mail/p5-Email-Simple/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Email/Simple.pm
 %%SITE_PERL%%/Email/Simple/Creator.pm
 %%SITE_PERL%%/Email/Simple/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Simple
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Stuffer/Makefile b/mail/p5-Email-Stuffer/Makefile
index d40bdfbf56bf..d2f33ca6a1bb 100644
--- a/mail/p5-Email-Stuffer/Makefile
+++ b/mail/p5-Email-Stuffer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Stuffer
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Stuffer/pkg-plist b/mail/p5-Email-Stuffer/pkg-plist
index 9beb7071674b..8d1b6822a634 100644
--- a/mail/p5-Email-Stuffer/pkg-plist
+++ b/mail/p5-Email-Stuffer/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Email/Stuffer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuffer/.packlist
 %%PERL5_MAN3%%/Email::Stuffer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuffer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index d89d69ad7c96..9186f2e65165 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Valid-Loose
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Valid-Loose/pkg-plist b/mail/p5-Email-Valid-Loose/pkg-plist
index 25628901a574..d58e9f8ce635 100644
--- a/mail/p5-Email-Valid-Loose/pkg-plist
+++ b/mail/p5-Email-Valid-Loose/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid/Loose/.packlist
 %%SITE_PERL%%/Email/Valid/Loose.pm
 %%PERL5_MAN3%%/Email::Valid::Loose.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid/Loose
-@dirrm %%SITE_PERL%%/Email/Valid
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index e8e6f79a7fab..9d3864d727ee 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Email-Valid
 PORTVERSION=	1.192
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/mail/p5-Email-Valid/pkg-plist b/mail/p5-Email-Valid/pkg-plist
index 1060781de992..af1573800c26 100644
--- a/mail/p5-Email-Valid/pkg-plist
+++ b/mail/p5-Email-Valid/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid/.packlist
 %%SITE_PERL%%/Email/Valid.pm
 %%PERL5_MAN3%%/Email::Valid.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 42d93bb86dca..36a5902d7538 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	FuzzyOcr
 DISTVERSION=	3.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:tl}/
 PKGNAMEPREFIX=	p5-
@@ -73,9 +73,9 @@ post-patch:
 	                  ${WRKSRC}/FuzzyOcr.pm
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr
-	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.pm ${STAGEDIR}${SITE_PERL}/${SA_PLUGINDIR}
-	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr/*.pm ${STAGEDIR}${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${SA_PLUGINDIR}/FuzzyOcr
+	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${SA_PLUGINDIR}
+	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${SA_PLUGINDIR}/FuzzyOcr
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.cf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.words ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.words
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.scansets ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.scansets
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index 056a1e02bc88..4e33e47173c1 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GMail-IMAPD
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-GMail-IMAPD/pkg-plist b/mail/p5-GMail-IMAPD/pkg-plist
index 158589efb383..5017734167bd 100644
--- a/mail/p5-GMail-IMAPD/pkg-plist
+++ b/mail/p5-GMail-IMAPD/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/GMail/IMAPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail/IMAPD/.packlist
 %%PERL5_MAN3%%/GMail::IMAPD.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail/IMAPD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail
-@dirrm %%SITE_PERL%%/GMail
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index 66b83e76f469..3489ee3dfa5b 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IMAP-Admin
 PORTVERSION=	1.6.7
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-IMAP-Admin/pkg-plist b/mail/p5-IMAP-Admin/pkg-plist
index 17ee383e6465..defaef1a73d5 100644
--- a/mail/p5-IMAP-Admin/pkg-plist
+++ b/mail/p5-IMAP-Admin/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin/.packlist
 %%PERL5_MAN3%%/IMAP::Admin.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
-@dirrm %%SITE_PERL%%/IMAP
diff --git a/mail/p5-IMAP-Client/Makefile b/mail/p5-IMAP-Client/Makefile
index d17cb41a9569..ee11092db66b 100644
--- a/mail/p5-IMAP-Client/Makefile
+++ b/mail/p5-IMAP-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IMAP-Client
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-IMAP-Client/pkg-plist b/mail/p5-IMAP-Client/pkg-plist
index b31f38bab8ee..f1c6f754dc6f 100644
--- a/mail/p5-IMAP-Client/pkg-plist
+++ b/mail/p5-IMAP-Client/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/IMAP::Client.3.gz
 %%SITE_PERL%%/IMAP/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Client/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
-@dirrmtry %%SITE_PERL%%/IMAP
diff --git a/mail/p5-IMAP-Sieve/Makefile b/mail/p5-IMAP-Sieve/Makefile
index 60b1e0c47ec0..6fb276e9d8df 100644
--- a/mail/p5-IMAP-Sieve/Makefile
+++ b/mail/p5-IMAP-Sieve/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IMAP-Sieve
 PORTVERSION=	0.4.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail perl5
 MASTER_SITES=	SF/websieve/websieve/063a
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-IMAP-Sieve/pkg-plist b/mail/p5-IMAP-Sieve/pkg-plist
index 8b4ee3a0d4ba..a67d62a0955a 100644
--- a/mail/p5-IMAP-Sieve/pkg-plist
+++ b/mail/p5-IMAP-Sieve/pkg-plist
@@ -1,5 +1 @@
 %%SITE_PERL%%/IMAP/Sieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
-@dirrmtry %%SITE_PERL%%/IMAP
diff --git a/mail/p5-LMAP-CID2SPF/Makefile b/mail/p5-LMAP-CID2SPF/Makefile
index 61652d99f4dd..9f9048b1cfb4 100644
--- a/mail/p5-LMAP-CID2SPF/Makefile
+++ b/mail/p5-LMAP-CID2SPF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	LMAP-CID2SPF
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://www.baschny.de/spf/
 PKGNAMEPREFIX=	p5-
@@ -23,8 +23,8 @@ USE_PERL5=	configure
 SHEBANG_FILES=	cid2spf
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/LMAP
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/LMAP
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} cid2spf ${STAGEDIR}${PREFIX}/bin
-	cd ${WRKSRC} && ${INSTALL_DATA} CID2SPF.pm ${STAGEDIR}${SITE_PERL}/LMAP
+	cd ${WRKSRC} && ${INSTALL_DATA} CID2SPF.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/LMAP
 
 .include <bsd.port.mk>
diff --git a/mail/p5-LMAP-CID2SPF/pkg-plist b/mail/p5-LMAP-CID2SPF/pkg-plist
index ce9adbaed876..98e3ab4d55ba 100644
--- a/mail/p5-LMAP-CID2SPF/pkg-plist
+++ b/mail/p5-LMAP-CID2SPF/pkg-plist
@@ -1,3 +1,2 @@
 bin/cid2spf
 %%SITE_PERL%%/LMAP/CID2SPF.pm
-@dirrmtry %%SITE_PERL%%/LMAP
diff --git a/mail/p5-Log-Procmail/Makefile b/mail/p5-Log-Procmail/Makefile
index 05bc0cebfefc..2b5e257ec1c3 100644
--- a/mail/p5-Log-Procmail/Makefile
+++ b/mail/p5-Log-Procmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Log-Procmail
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	mail devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Log-Procmail/pkg-plist b/mail/p5-Log-Procmail/pkg-plist
index 9abf3db55d35..06b2beb5c038 100644
--- a/mail/p5-Log-Procmail/pkg-plist
+++ b/mail/p5-Log-Procmail/pkg-plist
@@ -1,8 +1,4 @@
 bin/mailstat.pl
 %%PERL5_MAN3%%/Log::Procmail.3.gz
 %%SITE_PERL%%/Log/Procmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail/.packlist
 man/man1/mailstat.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
-@dirrmtry %%SITE_PERL%%/Log
diff --git a/mail/p5-MIME-AltWords/Makefile b/mail/p5-MIME-AltWords/Makefile
index 49c7f6f18cde..24084156a4ba 100644
--- a/mail/p5-MIME-AltWords/Makefile
+++ b/mail/p5-MIME-AltWords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-AltWords
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-AltWords/pkg-plist b/mail/p5-MIME-AltWords/pkg-plist
index 497d30d01d96..aa6ac19917a1 100644
--- a/mail/p5-MIME-AltWords/pkg-plist
+++ b/mail/p5-MIME-AltWords/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/MIME/AltWords.pm
 %%SITE_PERL%%/MIME/AltWords0.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/AltWords/.packlist
 %%PERL5_MAN3%%/MIME::AltWords.3.gz
 %%PERL5_MAN3%%/MIME::AltWords0.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/AltWords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Charset/Makefile b/mail/p5-MIME-Charset/Makefile
index e07d05adacc8..df69aa791d42 100644
--- a/mail/p5-MIME-Charset/Makefile
+++ b/mail/p5-MIME-Charset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Charset
 PORTVERSION=	1.011.1
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-Charset/pkg-plist b/mail/p5-MIME-Charset/pkg-plist
index 40a4158f613b..1525e08c69a3 100644
--- a/mail/p5-MIME-Charset/pkg-plist
+++ b/mail/p5-MIME-Charset/pkg-plist
@@ -3,13 +3,5 @@
 %%SITE_PERL%%/MIME/Charset/UTF.pm
 %%SITE_PERL%%/MIME/Charset/_Compat.pm
 %%SITE_PERL%%/POD2/JA/MIME/Charset.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Charset/.packlist
 %%PERL5_MAN3%%/MIME::Charset.3.gz
 %%PERL5_MAN3%%/POD2::JA::MIME::Charset.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Charset
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/Charset
-@dirrmtry %%SITE_PERL%%/MIME
-@dirrmtry %%SITE_PERL%%/POD2/JA/MIME
-@dirrmtry %%SITE_PERL%%/POD2/JA
-@dirrmtry %%SITE_PERL%%/POD2
diff --git a/mail/p5-MIME-EcoEncode/Makefile b/mail/p5-MIME-EcoEncode/Makefile
index 005a4c13ebb6..a38f4f99a0c3 100644
--- a/mail/p5-MIME-EcoEncode/Makefile
+++ b/mail/p5-MIME-EcoEncode/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MIME-EcoEncode
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-EcoEncode/pkg-plist b/mail/p5-MIME-EcoEncode/pkg-plist
index 4ada70a4df34..d293b3019164 100644
--- a/mail/p5-MIME-EcoEncode/pkg-plist
+++ b/mail/p5-MIME-EcoEncode/pkg-plist
@@ -1,7 +1,6 @@
 %%PERL5_MAN3%%/MIME::EcoEncode.3.gz
 %%PERL5_MAN3%%/MIME::EcoEncode::Fold.3.gz
 %%PERL5_MAN3%%/MIME::EcoEncode::Param.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EcoEncode/.packlist
 %%SITE_PERL%%/MIME/EcoEncode.pm
 %%SITE_PERL%%/MIME/EcoEncode.pod
 %%SITE_PERL%%/MIME/EcoEncode/Fold.pm
@@ -10,7 +9,3 @@
 %%SITE_PERL%%/MIME/EcoEncode/JP_Q.pm
 %%SITE_PERL%%/MIME/EcoEncode/Param.pm
 %%SITE_PERL%%/MIME/EcoEncode/Param.pod
-@dirrm %%SITE_PERL%%/MIME/EcoEncode
-@dirrmtry %%SITE_PERL%%/MIME
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EcoEncode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index 0b0939eef425..6e03490c1690 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-EncWords
 PORTVERSION=	1.011.1
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-EncWords/pkg-plist b/mail/p5-MIME-EncWords/pkg-plist
index 3f2389de8860..1ef6770c3dde 100644
--- a/mail/p5-MIME-EncWords/pkg-plist
+++ b/mail/p5-MIME-EncWords/pkg-plist
@@ -1,10 +1,5 @@
 %%SITE_PERL%%/MIME/EncWords.pm
 %%SITE_PERL%%/MIME/EncWords/Defaults.pm.sample
 %%SITE_PERL%%/MIME/EncWords/JA_JP.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EncWords/.packlist
 %%PERL5_MAN3%%/MIME::EncWords.3.gz
 %%PERL5_MAN3%%/MIME::EncWords::JA_JP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EncWords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/EncWords
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Explode/Makefile b/mail/p5-MIME-Explode/Makefile
index c6b265b6332c..0992d4fc6dc6 100644
--- a/mail/p5-MIME-Explode/Makefile
+++ b/mail/p5-MIME-Explode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Explode
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-Explode/pkg-plist b/mail/p5-MIME-Explode/pkg-plist
index 112c0ace4cd7..108303daadfa 100644
--- a/mail/p5-MIME-Explode/pkg-plist
+++ b/mail/p5-MIME-Explode/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/MIME::Explode.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Explode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode/Explode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
+%%SITE_ARCH%%/MIME/Explode.pm
+%%SITE_ARCH%%/auto/MIME/Explode/Explode.so
+%%SITE_ARCH%%/auto/MIME/Explode/autosplit.ix
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index 5eae7e572508..ae625532996e 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MIME-Fast
 PORTVERSION=	1.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-Fast/pkg-plist b/mail/p5-MIME-Fast/pkg-plist
index d95dc13f23f4..01f8b60db063 100644
--- a/mail/p5-MIME-Fast/pkg-plist
+++ b/mail/p5-MIME-Fast/pkg-plist
@@ -1,9 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Fast.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/Fast.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/autosplit.ix
+%%SITE_ARCH%%/MIME/Fast.pm
+%%SITE_ARCH%%/MIME/Fast.pod
+%%SITE_ARCH%%/auto/MIME/Fast/Fast.so
+%%SITE_ARCH%%/auto/MIME/Fast/autosplit.ix
 %%PERL5_MAN3%%/MIME::Fast.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
diff --git a/mail/p5-MIME-Lite-HTML/Makefile b/mail/p5-MIME-Lite-HTML/Makefile
index 9e6ab0d19754..5c59f50061c5 100644
--- a/mail/p5-MIME-Lite-HTML/Makefile
+++ b/mail/p5-MIME-Lite-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Lite-HTML
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-Lite-HTML/pkg-plist b/mail/p5-MIME-Lite-HTML/pkg-plist
index 330242735982..a65c41b977ab 100644
--- a/mail/p5-MIME-Lite-HTML/pkg-plist
+++ b/mail/p5-MIME-Lite-HTML/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/MIME/Lite/HTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML/.packlist
 %%PERL5_MAN3%%/MIME::Lite::HTML.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/Lite
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite-TT-HTML/Makefile b/mail/p5-MIME-Lite-TT-HTML/Makefile
index e7a265071ef8..3a1cdac920fd 100644
--- a/mail/p5-MIME-Lite-TT-HTML/Makefile
+++ b/mail/p5-MIME-Lite-TT-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Lite-TT-HTML
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-Lite-TT-HTML/pkg-plist b/mail/p5-MIME-Lite-TT-HTML/pkg-plist
index f5cbf702b892..b7ae1d37e5a0 100644
--- a/mail/p5-MIME-Lite-TT-HTML/pkg-plist
+++ b/mail/p5-MIME-Lite-TT-HTML/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/MIME/Lite/TT/HTML.pm
 %%PERL5_MAN3%%/MIME::Lite::TT::HTML.3.gz
-@dirrmtry %%SITE_PERL%%/MIME/Lite/TT
-@dirrmtry %%SITE_PERL%%/MIME/Lite
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite-TT/Makefile b/mail/p5-MIME-Lite-TT/Makefile
index 83678cae3b89..c18f619a3116 100644
--- a/mail/p5-MIME-Lite-TT/Makefile
+++ b/mail/p5-MIME-Lite-TT/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MIME-Lite-TT
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-Lite-TT/pkg-plist b/mail/p5-MIME-Lite-TT/pkg-plist
index e0528d4b3d77..6a6c8106b3cb 100644
--- a/mail/p5-MIME-Lite-TT/pkg-plist
+++ b/mail/p5-MIME-Lite-TT/pkg-plist
@@ -1,9 +1,2 @@
 %%SITE_PERL%%/MIME/Lite/TT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/TT/.packlist
 %%PERL5_MAN3%%/MIME::Lite::TT.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/TT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/MIME/Lite
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index f73da155383e..a3213adb9a8c 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Lite
 PORTVERSION=	3.03.0
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-MIME-Lite/pkg-plist b/mail/p5-MIME-Lite/pkg-plist
index 64d15f6193b5..b7640d87f907 100644
--- a/mail/p5-MIME-Lite/pkg-plist
+++ b/mail/p5-MIME-Lite/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/MIME/Lite.pm
 %%SITE_PERL%%/MIME/changes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/.packlist
 %%PERL5_MAN3%%/MIME::Lite.3.gz
 %%PERL5_MAN3%%/MIME::changes.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 8bc3f41f3b46..03d9e1e424fd 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MIME-Tools
 PORTVERSION=	5.505
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
diff --git a/mail/p5-MIME-Tools/pkg-plist b/mail/p5-MIME-Tools/pkg-plist
index daa52f36c42c..7feb44b10e6b 100644
--- a/mail/p5-MIME-Tools/pkg-plist
+++ b/mail/p5-MIME-Tools/pkg-plist
@@ -42,10 +42,3 @@
 %%SITE_PERL%%/MIME/Tools.pm
 %%SITE_PERL%%/MIME/WordDecoder.pm
 %%SITE_PERL%%/MIME/Words.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Tools/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Tools
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/Parser
-@dirrmtry %%SITE_PERL%%/MIME/Field
-@dirrmtry %%SITE_PERL%%/MIME/Decoder
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Types/Makefile b/mail/p5-MIME-Types/Makefile
index 7c8c7e8e2ed8..afe602d4c699 100644
--- a/mail/p5-MIME-Types/Makefile
+++ b/mail/p5-MIME-Types/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	MIME-Types
 PORTVERSION=	2.09
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARKOV
diff --git a/mail/p5-MIME-Types/pkg-plist b/mail/p5-MIME-Types/pkg-plist
index e41848c0bdee..5d2b8e26337c 100644
--- a/mail/p5-MIME-Types/pkg-plist
+++ b/mail/p5-MIME-Types/pkg-plist
@@ -8,9 +8,3 @@
 %%SITE_PERL%%/MIME/types.db
 %%SITE_PERL%%/MojoX/MIME/Types.pm
 %%SITE_PERL%%/MojoX/MIME/Types.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME
-@dirrmtry %%SITE_PERL%%/MojoX/MIME
-@dirrmtry %%SITE_PERL%%/MojoX
diff --git a/mail/p5-Mail-Address-MobileJp/Makefile b/mail/p5-Mail-Address-MobileJp/Makefile
index a467929c5b28..43f1b0b578eb 100644
--- a/mail/p5-Mail-Address-MobileJp/Makefile
+++ b/mail/p5-Mail-Address-MobileJp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Address-MobileJp
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Address-MobileJp/pkg-plist b/mail/p5-Mail-Address-MobileJp/pkg-plist
index b9aaed64fd0e..3d6e05226a1d 100644
--- a/mail/p5-Mail-Address-MobileJp/pkg-plist
+++ b/mail/p5-Mail-Address-MobileJp/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Mail::Address::MobileJp.3.gz
 %%SITE_PERL%%/Mail/Address/MobileJp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Address
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Alias/Makefile b/mail/p5-Mail-Alias/Makefile
index 830fdaa3c130..3a65c92bccf2 100644
--- a/mail/p5-Mail-Alias/Makefile
+++ b/mail/p5-Mail-Alias/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Alias
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Alias/pkg-plist b/mail/p5-Mail-Alias/pkg-plist
index e36a99f7e505..beee3127cc7c 100644
--- a/mail/p5-Mail-Alias/pkg-plist
+++ b/mail/p5-Mail-Alias/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Mail/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias/.packlist
 %%PERL5_MAN3%%/Mail::Alias.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Audit-Attach/Makefile b/mail/p5-Mail-Audit-Attach/Makefile
index b0c63a4231c2..a8e403b97515 100644
--- a/mail/p5-Mail-Audit-Attach/Makefile
+++ b/mail/p5-Mail-Audit-Attach/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Audit-Attach
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Audit-Attach/pkg-plist b/mail/p5-Mail-Audit-Attach/pkg-plist
index 94c93d104029..e6d180c9307a 100644
--- a/mail/p5-Mail-Audit-Attach/pkg-plist
+++ b/mail/p5-Mail-Audit-Attach/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Mail::Audit::Attach.3.gz
 %%SITE_PERL%%/Mail/Audit/Attach.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/Attach/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/Attach
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Audit
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index ece8eaabe401..c1b506d35fb3 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Audit
 PORTVERSION=	2.2.27
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Audit/pkg-plist b/mail/p5-Mail-Audit/pkg-plist
index 7e989aa6b591..6e5944db4643 100644
--- a/mail/p5-Mail-Audit/pkg-plist
+++ b/mail/p5-Mail-Audit/pkg-plist
@@ -12,9 +12,3 @@
 %%SITE_PERL%%/Mail/Audit/MimeEntity.pm
 %%SITE_PERL%%/Mail/Audit/Util/Tempdir.pm
 %%SITE_PERL%%/Mail/Audit/Vacation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Audit/Util
-@dirrmtry %%SITE_PERL%%/Mail/Audit
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Box-Parser-C/Makefile b/mail/p5-Mail-Box-Parser-C/Makefile
index f193b3f82940..1125afdb3807 100644
--- a/mail/p5-Mail-Box-Parser-C/Makefile
+++ b/mail/p5-Mail-Box-Parser-C/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Box-Parser-C
 PORTVERSION=	3.007
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Box-Parser-C/pkg-plist b/mail/p5-Mail-Box-Parser-C/pkg-plist
index ef42309c4845..79d3709a4b30 100644
--- a/mail/p5-Mail-Box-Parser-C/pkg-plist
+++ b/mail/p5-Mail-Box-Parser-C/pkg-plist
@@ -1,12 +1,4 @@
 %%PERL5_MAN3%%/Mail::Box::Parser::C.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser/C.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser/C.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
+%%SITE_ARCH%%/Mail/Box/Parser/C.pm
+%%SITE_ARCH%%/Mail/Box/Parser/C.pod
+%%SITE_ARCH%%/auto/Mail/Box/Parser/C/C.so
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 7e06430ced06..7a2439c4882f 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-Box
 PORTVERSION=	2.109
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARKOV
diff --git a/mail/p5-Mail-Box/pkg-plist b/mail/p5-Mail-Box/pkg-plist
index 5f58d0049a01..755405b3d4b1 100644
--- a/mail/p5-Mail-Box/pkg-plist
+++ b/mail/p5-Mail-Box/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
 %%SITE_PERL%%/Mail/Box-Cookbook.pod
 %%SITE_PERL%%/Mail/Box-Index.pod
 %%SITE_PERL%%/Mail/Box-Overview.pod
@@ -371,35 +370,3 @@
 %%PERL5_MAN3%%/Mail::Transport::SMTP.3.gz
 %%PERL5_MAN3%%/Mail::Transport::Send.3.gz
 %%PERL5_MAN3%%/Mail::Transport::Sendmail.3.gz
-@dirrmtry %%SITE_PERL%%/Mail/Transport
-@dirrmtry %%SITE_PERL%%/Mail/Server/IMAP4
-@dirrmtry %%SITE_PERL%%/Mail/Server
-@dirrmtry %%SITE_PERL%%/Mail/Message/Wrapper
-@dirrmtry %%SITE_PERL%%/Mail/Message/TransferEnc
-@dirrmtry %%SITE_PERL%%/Mail/Message/Replace
-@dirrmtry %%SITE_PERL%%/Mail/Message/Head
-@dirrmtry %%SITE_PERL%%/Mail/Message/Field
-@dirrmtry %%SITE_PERL%%/Mail/Message/Convert
-@dirrmtry %%SITE_PERL%%/Mail/Message/Construct
-@dirrmtry %%SITE_PERL%%/Mail/Message/Body
-@dirrmtry %%SITE_PERL%%/Mail/Message
-@dirrmtry %%SITE_PERL%%/Mail/Box/Tie
-@dirrmtry %%SITE_PERL%%/Mail/Box/Thread
-@dirrmtry %%SITE_PERL%%/Mail/Box/Search
-@dirrmtry %%SITE_PERL%%/Mail/Box/Parser
-@dirrmtry %%SITE_PERL%%/Mail/Box/POP3
-@dirrmtry %%SITE_PERL%%/Mail/Box/Net
-@dirrmtry %%SITE_PERL%%/Mail/Box/Message
-@dirrmtry %%SITE_PERL%%/Mail/Box/Mbox
-@dirrmtry %%SITE_PERL%%/Mail/Box/Manage
-@dirrmtry %%SITE_PERL%%/Mail/Box/Maildir
-@dirrmtry %%SITE_PERL%%/Mail/Box/MH
-@dirrmtry %%SITE_PERL%%/Mail/Box/Locker
-@dirrmtry %%SITE_PERL%%/Mail/Box/IMAP4
-@dirrmtry %%SITE_PERL%%/Mail/Box/File
-@dirrmtry %%SITE_PERL%%/Mail/Box/Dir
-@dirrmtry %%SITE_PERL%%/Mail/Box/Dbx
-@dirrmtry %%SITE_PERL%%/Mail/Box
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Bulkmail/Makefile b/mail/p5-Mail-Bulkmail/Makefile
index b8988a6d4e34..9544903e11e1 100644
--- a/mail/p5-Mail-Bulkmail/Makefile
+++ b/mail/p5-Mail-Bulkmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Bulkmail
 PORTVERSION=	3.12
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Bulkmail/pkg-plist b/mail/p5-Mail-Bulkmail/pkg-plist
index bcbc5589a9ed..3d4d5c7449ad 100644
--- a/mail/p5-Mail-Bulkmail/pkg-plist
+++ b/mail/p5-Mail-Bulkmail/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/Mail/Bulkmail/Object.pm
 %%SITE_PERL%%/Mail/Bulkmail/Server.pm
 %%SITE_PERL%%/Mail/Bulkmail/DummyServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail/.packlist
 %%PERL5_MAN3%%/Mail::Bulkmail.3.gz
 %%PERL5_MAN3%%/Mail::Bulkmail::DummyServer.3.gz
 %%PERL5_MAN3%%/Mail::Bulkmail::Dynamic.3.gz
 %%PERL5_MAN3%%/Mail::Bulkmail::Object.3.gz
 %%PERL5_MAN3%%/Mail::Bulkmail::Server.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/Bulkmail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Cache/Makefile b/mail/p5-Mail-Cache/Makefile
index 455a6577260a..370a919a1de1 100644
--- a/mail/p5-Mail-Cache/Makefile
+++ b/mail/p5-Mail-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Cache
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/mail/p5-Mail-Cache/pkg-plist b/mail/p5-Mail-Cache/pkg-plist
index 6eb9a05cebc3..66fe5e4bd65d 100644
--- a/mail/p5-Mail-Cache/pkg-plist
+++ b/mail/p5-Mail-Cache/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Mail/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cache/.packlist
 %%PERL5_MAN3%%/Mail::Cache.3.gz
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index db31ae61f339..00220121ac44 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-CheckUser
 PORTVERSION=	1.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-CheckUser/pkg-plist b/mail/p5-Mail-CheckUser/pkg-plist
index 497cea77f5ca..5e9dfc4814c0 100644
--- a/mail/p5-Mail-CheckUser/pkg-plist
+++ b/mail/p5-Mail-CheckUser/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/Mail/CheckUser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser/.packlist
 bin/cufilter
 %%PERL5_MAN3%%/Mail::CheckUser.3.gz
 man/man1/cufilter.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index c2a4026eb96c..e04a666de419 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-ClamAV
 PORTVERSION=	0.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-ClamAV/pkg-plist b/mail/p5-Mail-ClamAV/pkg-plist
index d381790e0642..fca4e126b388 100644
--- a/mail/p5-Mail-ClamAV/pkg-plist
+++ b/mail/p5-Mail-ClamAV/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Mail::ClamAV.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/ClamAV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/ClamAV.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
+%%SITE_ARCH%%/Mail/ClamAV.pm
+%%SITE_ARCH%%/auto/Mail/ClamAV/ClamAV.so
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index 22f7b418424c..b2453282c27e 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-DKIM
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-DKIM/pkg-plist b/mail/p5-Mail-DKIM/pkg-plist
index 044b0b2ed13d..e2344097ed6e 100644
--- a/mail/p5-Mail-DKIM/pkg-plist
+++ b/mail/p5-Mail-DKIM/pkg-plist
@@ -48,10 +48,3 @@ bin/dkimverify.pl
 %%SITE_PERL%%/Mail/DKIM/TextWrap.pm
 %%SITE_PERL%%/Mail/DKIM/Verifier.pm
 %%SITE_PERL%%/Mail/sample_mime_lite.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DKIM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DKIM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/DKIM/Canonicalization
-@dirrmtry %%SITE_PERL%%/Mail/DKIM/Algorithm
-@dirrmtry %%SITE_PERL%%/Mail/DKIM
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
index ec50bea279f3..eef62fd20f6a 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-DeliveryStatus-BounceParser
 PORTVERSION=	1.5.34
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
index c641e811191e..ffe3e2693dc9 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Mail/DeliveryStatus/BounceParser.pm
 %%SITE_PERL%%/Mail/DeliveryStatus/Report.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser/.packlist
 %%PERL5_MAN3%%/Mail::DeliveryStatus::BounceParser.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/DeliveryStatus
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-DomainKeys/Makefile b/mail/p5-Mail-DomainKeys/Makefile
index 772349ddf8d5..e4bec9eb7185 100644
--- a/mail/p5-Mail-DomainKeys/Makefile
+++ b/mail/p5-Mail-DomainKeys/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-DomainKeys
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-DomainKeys/pkg-plist b/mail/p5-Mail-DomainKeys/pkg-plist
index 2214f0c244e5..0a9017777df5 100644
--- a/mail/p5-Mail-DomainKeys/pkg-plist
+++ b/mail/p5-Mail-DomainKeys/pkg-plist
@@ -7,9 +7,3 @@
 %%SITE_PERL%%/Mail/DomainKeys/Message.pm
 %%SITE_PERL%%/Mail/DomainKeys/Policy.pm
 %%SITE_PERL%%/Mail/DomainKeys/Signature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DomainKeys/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DomainKeys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/DomainKeys/Key
-@dirrmtry %%SITE_PERL%%/Mail/DomainKeys
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 9221349239bf..b52c70fb3117 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-Ezmlm
 PORTVERSION=	0.08.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Ezmlm/pkg-plist b/mail/p5-Mail-Ezmlm/pkg-plist
index 8dc087741c75..edff8a23f653 100644
--- a/mail/p5-Mail-Ezmlm/pkg-plist
+++ b/mail/p5-Mail-Ezmlm/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/Mail/Ezmlm.pm
 %%SITE_PERL%%/Mail/Ezmlm/GpgEzmlm.pm
 %%SITE_PERL%%/Mail/Ezmlm/GpgKeyRing.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm/.packlist
 %%PERL5_MAN3%%/Mail::Ezmlm.3.gz
 %%PERL5_MAN3%%/Mail::Ezmlm::GpgKeyRing.3.gz
 %%PERL5_MAN3%%/Mail::Ezmlm::GpgEzmlm.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Ezmlm
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Field-Received/Makefile b/mail/p5-Mail-Field-Received/Makefile
index a0892ba316f0..f5b6ebee0795 100644
--- a/mail/p5-Mail-Field-Received/Makefile
+++ b/mail/p5-Mail-Field-Received/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Field-Received
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Field-Received/pkg-plist b/mail/p5-Mail-Field-Received/pkg-plist
index 6c273c3ccc67..dbc51c8fa869 100644
--- a/mail/p5-Mail-Field-Received/pkg-plist
+++ b/mail/p5-Mail-Field-Received/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Mail/Field/Received.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received/.packlist
 %%PERL5_MAN3%%/Mail::Field::Received.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Field
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 1c0608744e22..5d224f850872 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-FilterXML
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-FilterXML/pkg-plist b/mail/p5-Mail-FilterXML/pkg-plist
index 5c6578c75c26..fa04b4a5cbfe 100644
--- a/mail/p5-Mail-FilterXML/pkg-plist
+++ b/mail/p5-Mail-FilterXML/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Mail::FilterXML.3.gz
 %%SITE_PERL%%/Mail/FilterXML.pm
 %%SITE_PERL%%/Mail/mailfilter.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index be6ad8a0ec9a..0632a08c6e14 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Folder
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Folder/pkg-plist b/mail/p5-Mail-Folder/pkg-plist
index ecd54ace2644..d805210a9a71 100644
--- a/mail/p5-Mail-Folder/pkg-plist
+++ b/mail/p5-Mail-Folder/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/Mail/Folder/Maildir.pm
 %%SITE_PERL%%/Mail/Folder/Mbox.pm
 %%SITE_PERL%%/Mail/Folder/NNTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder/.packlist
 %%PERL5_MAN3%%/Mail::Folder.3.gz
 %%PERL5_MAN3%%/Mail::Folder::Emaul.3.gz
 %%PERL5_MAN3%%/Mail::Folder::Mbox.3.gz
 %%PERL5_MAN3%%/Mail::Folder::NNTP.3.gz
 %%PERL5_MAN3%%/Mail::Folder::Maildir.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/Folder
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 90f388517143..59e57b64aa5a 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Freshmeat
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FOX
diff --git a/mail/p5-Mail-Freshmeat/pkg-plist b/mail/p5-Mail-Freshmeat/pkg-plist
index e27132bcf89a..bbc5011f8bb3 100644
--- a/mail/p5-Mail-Freshmeat/pkg-plist
+++ b/mail/p5-Mail-Freshmeat/pkg-plist
@@ -3,8 +3,3 @@
 %%SITE_PERL%%/Mail/Freshmeat/Article.pm
 %%SITE_PERL%%/Mail/Freshmeat/Entry.pm
 %%SITE_PERL%%/Mail/Freshmeat/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Freshmeat
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-GnuPG/Makefile b/mail/p5-Mail-GnuPG/Makefile
index 47f0310490cb..0e8aef778d22 100644
--- a/mail/p5-Mail-GnuPG/Makefile
+++ b/mail/p5-Mail-GnuPG/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-GnuPG
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	mail security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-GnuPG/pkg-plist b/mail/p5-Mail-GnuPG/pkg-plist
index b4b3acedb5ff..5b5467160484 100644
--- a/mail/p5-Mail-GnuPG/pkg-plist
+++ b/mail/p5-Mail-GnuPG/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Mail::GnuPG.3.gz
 %%SITE_PERL%%/Mail/GnuPG.pm
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Graph/Makefile b/mail/p5-Mail-Graph/Makefile
index 90df67adaf8d..ddb8dadb668a 100644
--- a/mail/p5-Mail-Graph/Makefile
+++ b/mail/p5-Mail-Graph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-Graph
 PORTVERSION=	0.14
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Graph/pkg-plist b/mail/p5-Mail-Graph/pkg-plist
index 55d782037205..9d3d36aaf0ac 100644
--- a/mail/p5-Mail-Graph/pkg-plist
+++ b/mail/p5-Mail-Graph/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Mail/Graph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail-Graph/.packlist
 %%EXAMPLESDIR%%/sample.pl
 %%EXAMPLESDIR%%/convert.pl
 %%EXAMPLESDIR%%/index/dummy.txt
@@ -13,5 +12,3 @@
 @dirrm %%EXAMPLESDIR%%/index
 @dirrm %%EXAMPLESDIR%%/output
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail-Graph
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index 56747f5207f7..5c2f6b26c7f4 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-IMAPClient
 PORTVERSION=	3.35
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PLOBBES
diff --git a/mail/p5-Mail-IMAPClient/pkg-plist b/mail/p5-Mail-IMAPClient/pkg-plist
index b6ba6ac02d82..b4e178ba4c27 100644
--- a/mail/p5-Mail-IMAPClient/pkg-plist
+++ b/mail/p5-Mail-IMAPClient/pkg-plist
@@ -8,14 +8,8 @@
 %%SITE_PERL%%/Mail/IMAPClient/Thread.grammar
 %%SITE_PERL%%/Mail/IMAPClient/Thread.pm
 %%SITE_PERL%%/Mail/IMAPClient/Thread.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPClient/.packlist
 %%PERL5_MAN3%%/Mail::IMAPClient.3.gz
 %%PERL5_MAN3%%/Mail::IMAPClient::BodyStructure.3.gz
 %%PERL5_MAN3%%/Mail::IMAPClient::BodyStructure::Parse.3.gz
 %%PERL5_MAN3%%/Mail::IMAPClient::MessageSet.3.gz
 %%PERL5_MAN3%%/Mail::IMAPClient::Thread.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPClient
-@dirrm %%SITE_PERL%%/Mail/IMAPClient/BodyStructure
-@dirrm %%SITE_PERL%%/Mail/IMAPClient
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/Makefile b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
index 28799d50d569..695f0bd94ac2 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/Makefile
+++ b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-IMAPTalk-MailCache
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist b/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
index edad6cac19fe..1c1fa57285aa 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
+++ b/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Mail/IMAPTalk/MailCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/MailCache/.packlist
 %%PERL5_MAN3%%/Mail::IMAPTalk::MailCache.3.gz
-@dirrmtry %%SITE_PERL%%/Mail/IMAPTalk
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/MailCache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-IMAPTalk/Makefile b/mail/p5-Mail-IMAPTalk/Makefile
index 17368232cb51..3defb829405f 100644
--- a/mail/p5-Mail-IMAPTalk/Makefile
+++ b/mail/p5-Mail-IMAPTalk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-IMAPTalk
 PORTVERSION=	3.01
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-IMAPTalk/pkg-plist b/mail/p5-Mail-IMAPTalk/pkg-plist
index b28499cf9ae3..656aa10a13f5 100644
--- a/mail/p5-Mail-IMAPTalk/pkg-plist
+++ b/mail/p5-Mail-IMAPTalk/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Mail::IMAPTalk.3.gz
 %%SITE_PERL%%/Mail/IMAPTalk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-LMLM/Makefile b/mail/p5-Mail-LMLM/Makefile
index c8e9062303a7..966c5ff89958 100644
--- a/mail/p5-Mail-LMLM/Makefile
+++ b/mail/p5-Mail-LMLM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-LMLM
 PORTVERSION=	0.6803
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Mail
diff --git a/mail/p5-Mail-LMLM/pkg-plist b/mail/p5-Mail-LMLM/pkg-plist
index 27c1614451ae..0c23a906747f 100644
--- a/mail/p5-Mail-LMLM/pkg-plist
+++ b/mail/p5-Mail-LMLM/pkg-plist
@@ -23,7 +23,6 @@
 %%SITE_PERL%%/Mail/LMLM/Types/Mailman.pm
 %%SITE_PERL%%/Mail/LMLM/Types/Majordomo.pm
 %%SITE_PERL%%/Mail/get-version.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/LMLM/.packlist
 %%DATADIR%%/COPYING
 %%EXAMPLESDIR%%/Iglu/Iglu/LMLM/Types/Hamakor.pm
 %%EXAMPLESDIR%%/Iglu/Iglu/LMLM/Types/Iglu.pm
@@ -39,9 +38,3 @@
 @dirrmtry %%EXAMPLESDIR%%/Iglu
 @dirrmtry %%EXAMPLESDIR%%
 @dirrmtry %%DATADIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/LMLM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/LMLM/Types
-@dirrmtry %%SITE_PERL%%/Mail/LMLM/Render
-@dirrmtry %%SITE_PERL%%/Mail/LMLM
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index d1af3e545a22..964290b3604e 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-ListDetector
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSTEVENS
diff --git a/mail/p5-Mail-ListDetector/pkg-plist b/mail/p5-Mail-ListDetector/pkg-plist
index 68cf68a9bec7..859f9982136c 100644
--- a/mail/p5-Mail-ListDetector/pkg-plist
+++ b/mail/p5-Mail-ListDetector/pkg-plist
@@ -45,13 +45,5 @@
 %%SITE_PERL%%/Mail/ListDetector/Detector/Yahoogroups.pm
 %%SITE_PERL%%/Mail/ListDetector/List.pm
 %%SITE_PERL%%/auto/Mail/ListDetector/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ListDetector/.packlist
 %%EXAMPLESDIR%%/sample.pl
 @dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ListDetector
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/auto/Mail/ListDetector
-@dirrmtry %%SITE_PERL%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/ListDetector/Detector
-@dirrmtry %%SITE_PERL%%/Mail/ListDetector
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index aec841cdf77c..d1f8b0f5e018 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MailStats
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 07420862e9c1..baaa41120ced 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -3,10 +3,5 @@ bin/countmail
 %%SITE_PERL%%/Mail/Stats/Config.pm
 %%SITE_PERL%%/Mail/Stats/Parser.pm
 %%SITE_PERL%%/Mail/Stats/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
 %%PERL5_MAN3%%/Mail::Stats::Record.3.gz
 %%PERL5_MAN3%%/Mail::Stats.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats
-@dirrm %%SITE_PERL%%/Mail/Stats
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index cd1c820fb674..c9ffdc8e2434 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-Mbox-MessageParser
 PORTVERSION=	1.5002
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Mbox-MessageParser/pkg-plist b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
index 07876e546d33..01690ce4fe3b 100644
--- a/mail/p5-Mail-Mbox-MessageParser/pkg-plist
+++ b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
@@ -9,10 +9,3 @@
 %%SITE_PERL%%/Mail/Mbox/MessageParser/Grep.pm
 %%SITE_PERL%%/Mail/Mbox/MessageParser/MetaInfo.pm
 %%SITE_PERL%%/Mail/Mbox/MessageParser/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Mbox/MessageParser
-@dirrmtry %%SITE_PERL%%/Mail/Mbox
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index d42f69b585dc..75a06f9c5dd7 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-MboxParser
 PORTVERSION=	0.55
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-MboxParser/pkg-plist b/mail/p5-Mail-MboxParser/pkg-plist
index c470f92b3949..0f4b4fcadc05 100644
--- a/mail/p5-Mail-MboxParser/pkg-plist
+++ b/mail/p5-Mail-MboxParser/pkg-plist
@@ -3,12 +3,8 @@
 %%SITE_PERL%%/Mail/MboxParser/Mail.pm
 %%SITE_PERL%%/Mail/MboxParser/Mail/Convertable.pm
 %%SITE_PERL%%/Mail/MboxParser/Mail/Body.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/MboxParser/.packlist
 %%PERL5_MAN3%%/Mail::MboxParser.3.gz
 %%PERL5_MAN3%%/Mail::MboxParser::Base.3.gz
 %%PERL5_MAN3%%/Mail::MboxParser::Mail.3.gz
 %%PERL5_MAN3%%/Mail::MboxParser::Mail::Body.3.gz
 %%PERL5_MAN3%%/Mail::MboxParser::Mail::Convertable.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/MboxParser
-@dirrm %%SITE_PERL%%/Mail/MboxParser/Mail
-@dirrm %%SITE_PERL%%/Mail/MboxParser
diff --git a/mail/p5-Mail-OpenDKIM/Makefile b/mail/p5-Mail-OpenDKIM/Makefile
index 01c15477e345..bad821ea2d0e 100644
--- a/mail/p5-Mail-OpenDKIM/Makefile
+++ b/mail/p5-Mail-OpenDKIM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-OpenDKIM
 PORTVERSION=	4201
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -21,21 +22,16 @@ RUN_DEPENDS=	opendkim>=2.5.0:${PORTSDIR}/mail/opendkim \
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/DKIM.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/PrivateKey.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/Signature.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/Signer.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/.packlist \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so \
+PLIST_FILES=	%%SITE_ARCH%%/Mail/OpenDKIM.pm \
+		%%SITE_ARCH%%/Mail/OpenDKIM/DKIM.pm \
+		%%SITE_ARCH%%/Mail/OpenDKIM/PrivateKey.pm \
+		%%SITE_ARCH%%/Mail/OpenDKIM/Signature.pm \
+		%%SITE_ARCH%%/Mail/OpenDKIM/Signer.pm \
+		%%SITE_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so \
 		%%PERL5_MAN3%%/Mail::OpenDKIM.3.gz \
 		%%PERL5_MAN3%%/Mail::OpenDKIM::DKIM.3.gz \
 		%%PERL5_MAN3%%/Mail::OpenDKIM::PrivateKey.3.gz \
 		%%PERL5_MAN3%%/Mail::OpenDKIM::Signature.3.gz \
 		%%PERL5_MAN3%%/Mail::OpenDKIM::Signer.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM
-PLIST_DIRSTRY=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Mail
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index bde7679733f4..88fe2d722929 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-OpenRelay-Simple
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-OpenRelay-Simple/pkg-plist b/mail/p5-Mail-OpenRelay-Simple/pkg-plist
index fcac331db677..311211d873d7 100644
--- a/mail/p5-Mail-OpenRelay-Simple/pkg-plist
+++ b/mail/p5-Mail-OpenRelay-Simple/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Mail/OpenRelay/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay/Simple/.packlist
 %%PERL5_MAN3%%/Mail::OpenRelay::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/OpenRelay
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index a6f3e2d84d30..9d3549de1e1a 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-POP3Client
 PORTVERSION=	2.19
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-POP3Client/pkg-plist b/mail/p5-Mail-POP3Client/pkg-plist
index a89dcb3c84c1..9e84d44c756d 100644
--- a/mail/p5-Mail-POP3Client/pkg-plist
+++ b/mail/p5-Mail-POP3Client/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Mail/POP3Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client/.packlist
 %%PERL5_MAN3%%/Mail::POP3Client.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Procmail/Makefile b/mail/p5-Mail-Procmail/Makefile
index c7bea8cfd610..8f7c13683574 100644
--- a/mail/p5-Mail-Procmail/Makefile
+++ b/mail/p5-Mail-Procmail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-Procmail
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Procmail/pkg-plist b/mail/p5-Mail-Procmail/pkg-plist
index 130744b68795..1836d07e822c 100644
--- a/mail/p5-Mail-Procmail/pkg-plist
+++ b/mail/p5-Mail-Procmail/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Mail::Procmail.3.gz
 %%SITE_PERL%%/Mail/Procmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Procmailrc/Makefile b/mail/p5-Mail-Procmailrc/Makefile
index 027aa5ce552b..6dce68f5dec0 100644
--- a/mail/p5-Mail-Procmailrc/Makefile
+++ b/mail/p5-Mail-Procmailrc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Procmailrc
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN \
 		http://scott.wiersdorf.org/perl/
diff --git a/mail/p5-Mail-Procmailrc/pkg-plist b/mail/p5-Mail-Procmailrc/pkg-plist
index 0ee7e42804e6..f834e1eaf107 100644
--- a/mail/p5-Mail-Procmailrc/pkg-plist
+++ b/mail/p5-Mail-Procmailrc/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Mail::Procmailrc.3.gz
 %%SITE_PERL%%/Mail/Procmailrc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index a94a1d69004b..ba5e30f5f1ef 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-RBL
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-RBL/pkg-plist b/mail/p5-Mail-RBL/pkg-plist
index b390e3c1fd7f..86a7efbba58e 100644
--- a/mail/p5-Mail-RBL/pkg-plist
+++ b/mail/p5-Mail-RBL/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Mail::RBL.3.gz
 %%SITE_PERL%%/Mail/RBL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-RFC822-Address/Makefile b/mail/p5-Mail-RFC822-Address/Makefile
index 3b47c78bfe71..4a7aa9bd3dbf 100644
--- a/mail/p5-Mail-RFC822-Address/Makefile
+++ b/mail/p5-Mail-RFC822-Address/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-RFC822-Address
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-RFC822-Address/pkg-plist b/mail/p5-Mail-RFC822-Address/pkg-plist
index 76c085b13cd2..04ddda905c63 100644
--- a/mail/p5-Mail-RFC822-Address/pkg-plist
+++ b/mail/p5-Mail-RFC822-Address/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Mail::RFC822::Address.3.gz
 %%SITE_PERL%%/Mail/RFC822/Address.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/RFC822
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index d0a743d415e0..524297f42510 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-SPF
 PORTVERSION=	2.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-SPF/pkg-plist b/mail/p5-Mail-SPF/pkg-plist
index d66867ee2617..1fdfebf5049a 100644
--- a/mail/p5-Mail-SPF/pkg-plist
+++ b/mail/p5-Mail-SPF/pkg-plist
@@ -50,9 +50,3 @@ sbin/spfd.pl
 %%PERL5_MAN3%%/Mail::SPF::v1::Record.3.gz
 %%PERL5_MAN3%%/Mail::SPF::v2::Record.3.gz
 man/man1/spfquery.pl.1.gz
-@dirrmtry %%SITE_PERL%%/Mail/SPF/v2
-@dirrmtry %%SITE_PERL%%/Mail/SPF/v1
-@dirrmtry %%SITE_PERL%%/Mail/SPF/Mod
-@dirrmtry %%SITE_PERL%%/Mail/SPF/Mech
-@dirrmtry %%SITE_PERL%%/Mail/SPF
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index 9b0ff96a9014..0999063423ea 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-SRS
 PORTVERSION=	0.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-SRS/pkg-plist b/mail/p5-Mail-SRS/pkg-plist
index a9962d1c156d..aca33d46aa68 100644
--- a/mail/p5-Mail-SRS/pkg-plist
+++ b/mail/p5-Mail-SRS/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Mail/SRS/Reversible.pm
 %%SITE_PERL%%/Mail/SRS/Shortcut.pm
 %%SITE_PERL%%/Mail/SRS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SRS/.packlist
 bin/srs
 bin/srsd
 %%PERL5_MAN3%%/Mail::SRS.3.gz
@@ -16,7 +15,3 @@ bin/srsd
 %%PERL5_MAN3%%/Mail::SRS::Shortcut.3.gz
 man/man1/srs.1.gz
 man/man1/srsd.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SRS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/SRS
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SendEasy/Makefile b/mail/p5-Mail-SendEasy/Makefile
index 6a2f5210833f..f80fcf2a3fe3 100644
--- a/mail/p5-Mail-SendEasy/Makefile
+++ b/mail/p5-Mail-SendEasy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-SendEasy
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-SendEasy/pkg-plist b/mail/p5-Mail-SendEasy/pkg-plist
index 41687dfaa3a1..b43bde1ba940 100644
--- a/mail/p5-Mail-SendEasy/pkg-plist
+++ b/mail/p5-Mail-SendEasy/pkg-plist
@@ -3,11 +3,6 @@
 %%SITE_PERL%%/Mail/SendEasy/Base64.pm
 %%SITE_PERL%%/Mail/SendEasy/IOScalar.pm
 %%SITE_PERL%%/Mail/SendEasy/SMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SendEasy/.packlist
 %%PERL5_MAN3%%/Mail::SendEasy.3.gz
 %%PERL5_MAN3%%/Mail::SendEasy::AUTH.3.gz
 %%PERL5_MAN3%%/Mail::SendEasy::SMTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SendEasy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/SendEasy
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
index f4a3c1a89107..0ab44c0d2d09 100644
--- a/mail/p5-Mail-Sender/Makefile
+++ b/mail/p5-Mail-Sender/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Sender
 PORTVERSION=	0.8.22
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Sender/pkg-plist b/mail/p5-Mail-Sender/pkg-plist
index 91370e50d5c8..03cc6c9cce55 100644
--- a/mail/p5-Mail-Sender/pkg-plist
+++ b/mail/p5-Mail-Sender/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Mail/Sender.pm
 %%SITE_PERL%%/Mail/Sender/CType/Ext.pm
 %%SITE_PERL%%/Mail/Sender/CType/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender/.packlist
 %%PERL5_MAN3%%/Mail::Sender.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/Sender/CType
-@dirrm %%SITE_PERL%%/Mail/Sender
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index 115d0f3482e5..c8a3682894c3 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Sendmail
 PORTVERSION=	0.79
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Sendmail/pkg-plist b/mail/p5-Mail-Sendmail/pkg-plist
index 4dde6af80b64..0c8f2695996d 100644
--- a/mail/p5-Mail-Sendmail/pkg-plist
+++ b/mail/p5-Mail-Sendmail/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Mail::Sendmail.3.gz
 %%SITE_PERL%%/Mail/Sendmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 1a2581a04c7b..dd140a7d3751 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Spool
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Spool/pkg-plist b/mail/p5-Mail-Spool/pkg-plist
index 61644117af09..1b15c860eeaa 100644
--- a/mail/p5-Mail-Spool/pkg-plist
+++ b/mail/p5-Mail-Spool/pkg-plist
@@ -1,9 +1,6 @@
 %%SITE_PERL%%/Mail/Spool.pm
 %%SITE_PERL%%/Mail/Spool/Handle.pm
 %%SITE_PERL%%/Mail/Spool/Node.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool/.packlist
 %%PERL5_MAN3%%/Mail::Spool.3.gz
 %%PERL5_MAN3%%/Mail::Spool::Handle.3.gz
 %%PERL5_MAN3%%/Mail::Spool::Node.3.gz
-@dirrm %%SITE_PERL%%/Mail/Spool
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index e8bf28a963e4..47d613dfacd2 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Tools
 PORTVERSION=	2.13
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index 3372e155a594..55777c2df5bf 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
 %%SITE_PERL%%/Mail/Address.pm
 %%SITE_PERL%%/Mail/Address.pod
 %%SITE_PERL%%/Mail/Cap.pm
@@ -41,7 +40,3 @@
 %%PERL5_MAN3%%/Mail::Mailer.3.gz
 %%PERL5_MAN3%%/Mail::Send.3.gz
 %%PERL5_MAN3%%/Mail::Util.3.gz
-@dirrmtry %%SITE_PERL%%/Mail/Mailer
-@dirrmtry %%SITE_PERL%%/Mail/Field
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index f8cb2bdfbe70..47f0d2047f3d 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Transport-Dbx
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Transport-Dbx/pkg-plist b/mail/p5-Mail-Transport-Dbx/pkg-plist
index b078dd68302d..ccc00fc43e0d 100644
--- a/mail/p5-Mail-Transport-Dbx/pkg-plist
+++ b/mail/p5-Mail-Transport-Dbx/pkg-plist
@@ -1,10 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Transport/Dbx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/Dbx.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/autosplit.ix
+%%SITE_ARCH%%/Mail/Transport/Dbx.pm
+%%SITE_ARCH%%/auto/Mail/Transport/Dbx/Dbx.so
+%%SITE_ARCH%%/auto/Mail/Transport/Dbx/autosplit.ix
 %%PERL5_MAN3%%/Mail::Transport::Dbx.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index d44abd4a4672..5004dd2c7090 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Verify
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Verify/pkg-plist b/mail/p5-Mail-Verify/pkg-plist
index f7420ca4f4de..1b3842319839 100644
--- a/mail/p5-Mail-Verify/pkg-plist
+++ b/mail/p5-Mail-Verify/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Mail/Verify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
 %%PERL5_MAN3%%/Mail::Verify.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Verp/Makefile b/mail/p5-Mail-Verp/Makefile
index eb6fc9b1b842..9299cbccd65a 100644
--- a/mail/p5-Mail-Verp/Makefile
+++ b/mail/p5-Mail-Verp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Verp
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Verp/pkg-plist b/mail/p5-Mail-Verp/pkg-plist
index d38b598a61a4..5db06834144b 100644
--- a/mail/p5-Mail-Verp/pkg-plist
+++ b/mail/p5-Mail-Verp/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Mail/Verp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verp/.packlist
 %%PERL5_MAN3%%/Mail::Verp.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index 23a30cd2dd73..0a6475bbdd18 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mail-Webmail-Gmail
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-Webmail-Gmail/pkg-plist b/mail/p5-Mail-Webmail-Gmail/pkg-plist
index 9c12be6c9df9..5b7c46ad409d 100644
--- a/mail/p5-Mail-Webmail-Gmail/pkg-plist
+++ b/mail/p5-Mail-Webmail-Gmail/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Mail::Webmail::Gmail.3.gz
 %%SITE_PERL%%/Mail/Webmail/Gmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Webmail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Net-IMAP-Client/Makefile b/mail/p5-Net-IMAP-Client/Makefile
index 3bbe2390b846..0b72b2a90af5 100644
--- a/mail/p5-Net-IMAP-Client/Makefile
+++ b/mail/p5-Net-IMAP-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IMAP-Client
 PORTVERSION=	0.9505
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-IMAP-Client/pkg-plist b/mail/p5-Net-IMAP-Client/pkg-plist
index 53700efc14b5..564a7e770564 100644
--- a/mail/p5-Net-IMAP-Client/pkg-plist
+++ b/mail/p5-Net-IMAP-Client/pkg-plist
@@ -4,10 +4,3 @@
 %%SITE_PERL%%/Net/IMAP/Client.pm
 %%SITE_PERL%%/Net/IMAP/Client/MsgAddress.pm
 %%SITE_PERL%%/Net/IMAP/Client/MsgSummary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Client/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Client
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-IMAP-Server/Makefile b/mail/p5-Net-IMAP-Server/Makefile
index 8c4c9ea6d5f1..53a8cc6ff80b 100644
--- a/mail/p5-Net-IMAP-Server/Makefile
+++ b/mail/p5-Net-IMAP-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IMAP-Server
 PORTVERSION=	1.38
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-IMAP-Server/pkg-plist b/mail/p5-Net-IMAP-Server/pkg-plist
index 9be021da830b..1d1bc0d0f895 100644
--- a/mail/p5-Net-IMAP-Server/pkg-plist
+++ b/mail/p5-Net-IMAP-Server/pkg-plist
@@ -33,7 +33,6 @@
 %%SITE_PERL%%/Net/IMAP/Server/DefaultModel.pm
 %%SITE_PERL%%/Net/IMAP/Server/DefaultAuth.pm
 %%SITE_PERL%%/Net/IMAP/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Server/.packlist
 %%PERL5_MAN3%%/Net::IMAP::Server.3.gz
 %%PERL5_MAN3%%/Net::IMAP::Server::Command.3.gz
 %%PERL5_MAN3%%/Net::IMAP::Server::Connection.3.gz
@@ -42,10 +41,3 @@
 %%PERL5_MAN3%%/Net::IMAP::Server::Error.3.gz
 %%PERL5_MAN3%%/Net::IMAP::Server::Mailbox.3.gz
 %%PERL5_MAN3%%/Net::IMAP::Server::Message.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Server/Command
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Server
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index 0a686df88b93..94f29a3726b7 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IMAP-Simple-SSL
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
index c4f1c1e3343c..aaab28babd16 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
+++ b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Net/IMAP/Simple/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL/.packlist
 %%PERL5_MAN3%%/Net::IMAP::Simple::SSL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index 684ce6f5b2a1..98667c6f01fa 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IMAP-Simple
 PORTVERSION=	1.2205
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JETTERO
diff --git a/mail/p5-Net-IMAP-Simple/pkg-plist b/mail/p5-Net-IMAP-Simple/pkg-plist
index 25297ddac221..38affd0e5429 100644
--- a/mail/p5-Net-IMAP-Simple/pkg-plist
+++ b/mail/p5-Net-IMAP-Simple/pkg-plist
@@ -3,13 +3,6 @@
 %%SITE_PERL%%/Net/IMAP/Simple/PipeSocket.pm
 %%SX%%%%SITE_PERL%%/Net/IMAP/SimpleX.pm
 %%SX%%%%SITE_PERL%%/Net/IMAP/SimpleX.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/.packlist
 %%PERL5_MAN3%%/Net::IMAP::Simple.3.gz
 %%PERL5_MAN3%%/Net::IMAP::Simple::PipeSocket.3.gz
 %%SX%%%%PERL5_MAN3%%/Net::IMAP::SimpleX.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-ManageSieve/Makefile b/mail/p5-Net-ManageSieve/Makefile
index 9db0ff4d8480..30f90fe14dd0 100644
--- a/mail/p5-Net-ManageSieve/Makefile
+++ b/mail/p5-Net-ManageSieve/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-ManageSieve
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-ManageSieve/pkg-plist b/mail/p5-Net-ManageSieve/pkg-plist
index 01facbf5218a..0999af98dcaa 100644
--- a/mail/p5-Net-ManageSieve/pkg-plist
+++ b/mail/p5-Net-ManageSieve/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::ManageSieve.3.gz
 %%SITE_PERL%%/Net/ManageSieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ManageSieve/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ManageSieve
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-POP3-SSLWrapper/Makefile b/mail/p5-Net-POP3-SSLWrapper/Makefile
index dfdfe185dbf6..844fd3d06ac6 100644
--- a/mail/p5-Net-POP3-SSLWrapper/Makefile
+++ b/mail/p5-Net-POP3-SSLWrapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-POP3-SSLWrapper
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-POP3-SSLWrapper/pkg-plist b/mail/p5-Net-POP3-SSLWrapper/pkg-plist
index 61dfe2e3f578..db6cd4d914eb 100644
--- a/mail/p5-Net-POP3-SSLWrapper/pkg-plist
+++ b/mail/p5-Net-POP3-SSLWrapper/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/POP3/SSLWrapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3/SSLWrapper/.packlist
 %%PERL5_MAN3%%/Net::POP3::SSLWrapper.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3/SSLWrapper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/POP3
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-QMTP/Makefile b/mail/p5-Net-QMTP/Makefile
index f9576c882116..42782eca7718 100644
--- a/mail/p5-Net-QMTP/Makefile
+++ b/mail/p5-Net-QMTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-QMTP
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-QMTP/pkg-plist b/mail/p5-Net-QMTP/pkg-plist
index 24b1ef3513b7..a3d21aeb47fd 100644
--- a/mail/p5-Net-QMTP/pkg-plist
+++ b/mail/p5-Net-QMTP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/QMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/QMTP/.packlist
 %%PERL5_MAN3%%/Net::QMTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/QMTP
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-Net-SMTP-SSL/Makefile b/mail/p5-Net-SMTP-SSL/Makefile
index 616447ef1c34..bcfea1bb0f76 100644
--- a/mail/p5-Net-SMTP-SSL/Makefile
+++ b/mail/p5-Net-SMTP-SSL/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Net-SMTP-SSL
 PORTVERSION=	1.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-SMTP-SSL/pkg-plist b/mail/p5-Net-SMTP-SSL/pkg-plist
index cdcc80bb590e..c414bf92cb56 100644
--- a/mail/p5-Net-SMTP-SSL/pkg-plist
+++ b/mail/p5-Net-SMTP-SSL/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/SMTP/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/SSL/.packlist
 %%PERL5_MAN3%%/Net::SMTP::SSL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index 9441b0db728e..ccd3f6e42392 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SMTP-Server
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-SMTP-Server/pkg-plist b/mail/p5-Net-SMTP-Server/pkg-plist
index f13343b0a53c..ecc432e7bf5b 100644
--- a/mail/p5-Net-SMTP-Server/pkg-plist
+++ b/mail/p5-Net-SMTP-Server/pkg-plist
@@ -7,15 +7,3 @@
 %%SITE_PERL%%/auto/Net/SMTP/Server/Client/autosplit.ix
 %%SITE_PERL%%/auto/Net/SMTP/Server/Relay/autosplit.ix
 %%SITE_PERL%%/auto/Net/SMTP/Server/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP/Server/Relay
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP/Server/Client
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP/Server
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP/Server
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile b/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
index 7b54ff5b769a..116b2eb7ec0a 100644
--- a/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
+++ b/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SMTP-TLS-ButMaintained
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist b/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist
index 57a945e24557..2898d46ada6e 100644
--- a/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist
+++ b/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Net::SMTP::TLS::ButMaintained.3.gz
 %%SITE_PERL%%/Net/SMTP/TLS/ButMaintained.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS/ButMaintained/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS/ButMaintained
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index c0afbcf37bb1..eedff1c172b9 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SMTP-TLS
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-SMTP-TLS/pkg-plist b/mail/p5-Net-SMTP-TLS/pkg-plist
index fa52e4cc7479..cdfddf6551e0 100644
--- a/mail/p5-Net-SMTP-TLS/pkg-plist
+++ b/mail/p5-Net-SMTP-TLS/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/SMTP/TLS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS/.packlist
 %%PERL5_MAN3%%/Net::SMTP::TLS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTPS/Makefile b/mail/p5-Net-SMTPS/Makefile
index 1bd83ccf139f..0a0c3f825f41 100644
--- a/mail/p5-Net-SMTPS/Makefile
+++ b/mail/p5-Net-SMTPS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SMTPS
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-SMTPS/pkg-plist b/mail/p5-Net-SMTPS/pkg-plist
index 24891bd80552..c0cbc2a94d8c 100644
--- a/mail/p5-Net-SMTPS/pkg-plist
+++ b/mail/p5-Net-SMTPS/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/SMTPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTPS/.packlist
 %%PERL5_MAN3%%/Net::SMTPS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile
index 857ddd258c3e..053fb9e7039a 100644
--- a/mail/p5-Net-SMTP_auth/Makefile
+++ b/mail/p5-Net-SMTP_auth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SMTP_auth
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Net-SMTP_auth/pkg-plist b/mail/p5-Net-SMTP_auth/pkg-plist
index 1bfe2cf7e8ad..21a0d6f3a857 100644
--- a/mail/p5-Net-SMTP_auth/pkg-plist
+++ b/mail/p5-Net-SMTP_auth/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::SMTP_auth.3.gz
 %%SITE_PERL%%/Net/SMTP_auth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP_auth/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP_auth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SenderBase/Makefile b/mail/p5-Net-SenderBase/Makefile
index 34310120dfae..ba6712f2c033 100644
--- a/mail/p5-Net-SenderBase/Makefile
+++ b/mail/p5-Net-SenderBase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SenderBase
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR= CPAN:JOENIO
diff --git a/mail/p5-Net-SenderBase/pkg-plist b/mail/p5-Net-SenderBase/pkg-plist
index c3a6617f00ea..96be43268925 100644
--- a/mail/p5-Net-SenderBase/pkg-plist
+++ b/mail/p5-Net-SenderBase/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SenderBase/.packlist
 %%SITE_PERL%%/Net/SenderBase.pm
 %%SITE_PERL%%/Net/SenderBase/Query.pm
 %%SITE_PERL%%/Net/SenderBase/Results.pm
@@ -6,8 +5,3 @@
 %%PERL5_MAN3%%/Net::SenderBase.3.gz
 %%PERL5_MAN3%%/Net::SenderBase::Query.3.gz
 %%PERL5_MAN3%%/Net::SenderBase::Results.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SenderBase
-@dirrm %%SITE_PERL%%/Net/SenderBase/Query
-@dirrm %%SITE_PERL%%/Net/SenderBase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-Server-Mail/Makefile b/mail/p5-Net-Server-Mail/Makefile
index 8eac8e590f32..23b71a74f192 100644
--- a/mail/p5-Net-Server-Mail/Makefile
+++ b/mail/p5-Net-Server-Mail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Server-Mail
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GUIMARD
diff --git a/mail/p5-Net-Server-Mail/pkg-plist b/mail/p5-Net-Server-Mail/pkg-plist
index a894dc0d68de..88b7d7a92c08 100644
--- a/mail/p5-Net-Server-Mail/pkg-plist
+++ b/mail/p5-Net-Server-Mail/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail/.packlist
 %%SITE_PERL%%/Net/Server/Mail.pm
 %%SITE_PERL%%/Net/Server/Mail/ESMTP.pm
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/Extension.pm
@@ -13,10 +12,3 @@
 %%PERL5_MAN3%%/Net::Server::Mail::ESMTP::XFORWARD.3.gz
 %%PERL5_MAN3%%/Net::Server::Mail::LMTP.3.gz
 %%PERL5_MAN3%%/Net::Server::Mail::SMTP.3.gz
-@dirrm %%SITE_PERL%%/Net/Server/Mail/ESMTP
-@dirrm %%SITE_PERL%%/Net/Server/Mail
-@dirrmtry %%SITE_PERL%%/Net/Server
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index de765f16ebaa..482519bbdc7e 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-POP3
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-plist b/mail/p5-POE-Component-Client-POP3/pkg-plist
index bcdb092b9088..31910002b937 100644
--- a/mail/p5-POE-Component-Client-POP3/pkg-plist
+++ b/mail/p5-POE-Component-Client-POP3/pkg-plist
@@ -1,13 +1,5 @@
 %%PERL5_MAN3%%/POE::Component::Client::POP3.3.gz
 %%SITE_PERL%%/POE/Component/Client/POP3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/term.perl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.perl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-POE-Component-Client-SMTP/Makefile b/mail/p5-POE-Component-Client-SMTP/Makefile
index 572e3eec4a7f..86ef8f4299f0 100644
--- a/mail/p5-POE-Component-Client-SMTP/Makefile
+++ b/mail/p5-POE-Component-Client-SMTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-SMTP
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-POE-Component-Client-SMTP/pkg-plist b/mail/p5-POE-Component-Client-SMTP/pkg-plist
index d1ac33b2ae4d..3b9b78e05f1a 100644
--- a/mail/p5-POE-Component-Client-SMTP/pkg-plist
+++ b/mail/p5-POE-Component-Client-SMTP/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Client::SMTP.3.gz
 %%SITE_PERL%%/POE/Component/Client/SMTP.pm
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-POE-Component-SMTP/Makefile b/mail/p5-POE-Component-SMTP/Makefile
index 022506483327..fee8f355eaf7 100644
--- a/mail/p5-POE-Component-SMTP/Makefile
+++ b/mail/p5-POE-Component-SMTP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-SMTP
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-POE-Component-SMTP/pkg-plist b/mail/p5-POE-Component-SMTP/pkg-plist
index a4987863e9ff..f76625adc16e 100644
--- a/mail/p5-POE-Component-SMTP/pkg-plist
+++ b/mail/p5-POE-Component-SMTP/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/POE::Filter::SMTP.3.gz
 %%SITE_PERL%%/POE/Component/Server/SMTP.pm
 %%SITE_PERL%%/POE/Filter/SMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-POE-Filter-Transparent-SMTP/Makefile b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
index 6a198867da3a..7bda65ffbf60 100644
--- a/mail/p5-POE-Filter-Transparent-SMTP/Makefile
+++ b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-Transparent-SMTP
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist b/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist
index a5e3c06a8dd2..7b9cd286af49 100644
--- a/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist
+++ b/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/POE::Filter::Transparent::SMTP.3.gz
 %%SITE_PERL%%/POE/Filter/Transparent/SMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Transparent/SMTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Transparent/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Transparent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter/Transparent
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index bd4629ee403d..0fa02fa1508c 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Syslog-Mail
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Parse-Syslog-Mail/pkg-plist b/mail/p5-Parse-Syslog-Mail/pkg-plist
index 3eb9d20509ef..f1b3f1262427 100644
--- a/mail/p5-Parse-Syslog-Mail/pkg-plist
+++ b/mail/p5-Parse-Syslog-Mail/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Parse/Syslog/Mail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/Mail/.packlist
 %%PERL5_MAN3%%/Parse::Syslog::Mail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrmtry %%SITE_PERL%%/Parse/Syslog
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/mail/p5-Qmail-Envelope/Makefile b/mail/p5-Qmail-Envelope/Makefile
index 33a4f2878719..0c0ab332fe45 100644
--- a/mail/p5-Qmail-Envelope/Makefile
+++ b/mail/p5-Qmail-Envelope/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Qmail-Envelope
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MJA
diff --git a/mail/p5-Qmail-Envelope/pkg-plist b/mail/p5-Qmail-Envelope/pkg-plist
index ddf7cb00e6b5..6bee09835e52 100644
--- a/mail/p5-Qmail-Envelope/pkg-plist
+++ b/mail/p5-Qmail-Envelope/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Qmail::Envelope.3.gz
 %%SITE_PERL%%/Qmail/Envelope.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail
-@dirrmtry %%SITE_PERL%%/Qmail
diff --git a/mail/p5-SES/Makefile b/mail/p5-SES/Makefile
index 90897ecdbee3..fd69d6040ed5 100644
--- a/mail/p5-SES/Makefile
+++ b/mail/p5-SES/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SES
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://d36cz9buwru1tt.cloudfront.net/catalog/attachments/
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index 15f320b6908c..303e37bcf98c 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sendmail-AccessDB
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Sendmail-AccessDB/pkg-plist b/mail/p5-Sendmail-AccessDB/pkg-plist
index 8d162e64faca..1393672f513e 100644
--- a/mail/p5-Sendmail-AccessDB/pkg-plist
+++ b/mail/p5-Sendmail-AccessDB/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sendmail/AccessDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/AccessDB/.packlist
 %%PERL5_MAN3%%/Sendmail::AccessDB.3.gz
diff --git a/mail/p5-Sendmail-Milter/Makefile b/mail/p5-Sendmail-Milter/Makefile
index 68b66012562d..4154d0b007e3 100644
--- a/mail/p5-Sendmail-Milter/Makefile
+++ b/mail/p5-Sendmail-Milter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sendmail-Milter
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Sendmail-Milter/pkg-plist b/mail/p5-Sendmail-Milter/pkg-plist
index 1f524c09b760..e6fa1efbfaba 100644
--- a/mail/p5-Sendmail-Milter/pkg-plist
+++ b/mail/p5-Sendmail-Milter/pkg-plist
@@ -1,9 +1,5 @@
 %%PERL5_MAN3%%/Sendmail::Milter.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/Milter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/sample.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Sendmail
+%%SITE_ARCH%%/Sendmail/Milter.pm
+%%SITE_ARCH%%/Sendmail/sample.pl
+%%SITE_ARCH%%/auto/Sendmail/Milter/Milter.so
+%%SITE_ARCH%%/auto/Sendmail/Milter/autosplit.ix
diff --git a/mail/p5-Test-Email/Makefile b/mail/p5-Test-Email/Makefile
index b8e1bf16aa1b..ec3df05dc11d 100644
--- a/mail/p5-Test-Email/Makefile
+++ b/mail/p5-Test-Email/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Email
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JAMES
diff --git a/mail/p5-Test-Email/pkg-plist b/mail/p5-Test-Email/pkg-plist
index 99c9e5a57bcc..1869e1d68229 100644
--- a/mail/p5-Test-Email/pkg-plist
+++ b/mail/p5-Test-Email/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Test::POP3.3.gz
 %%SITE_PERL%%/Test/Email.pm
 %%SITE_PERL%%/Test/POP3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Email/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 0c0805355de4..159a79a6f5d3 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-imap
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-URI-imap/pkg-plist b/mail/p5-URI-imap/pkg-plist
index dcff72a25334..cc0b65f1a940 100644
--- a/mail/p5-URI-imap/pkg-plist
+++ b/mail/p5-URI-imap/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/URI/imap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap/.packlist
 %%PERL5_MAN3%%/URI::imap.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index b67dc798d73e..aeffae6a96d2 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-imaps
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ALEXM
diff --git a/mail/p5-URI-imaps/pkg-plist b/mail/p5-URI-imaps/pkg-plist
index 39861afea06f..c6542f28e75d 100644
--- a/mail/p5-URI-imaps/pkg-plist
+++ b/mail/p5-URI-imaps/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/URI/imaps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps/.packlist
 %%PERL5_MAN3%%/URI::imaps.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index 9b1656e78a54..b3d159e81a20 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-GMail
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-WWW-GMail/pkg-plist b/mail/p5-WWW-GMail/pkg-plist
index edfdab1890dc..46305fa9dfd1 100644
--- a/mail/p5-WWW-GMail/pkg-plist
+++ b/mail/p5-WWW-GMail/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/WWW/GMail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GMail/.packlist
 %%PERL5_MAN3%%/WWW::GMail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GMail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index 5ca031d37cf0..3dd017840427 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Hotmail
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-WWW-Hotmail/pkg-plist b/mail/p5-WWW-Hotmail/pkg-plist
index cd590db8071c..3ad82dca3641 100644
--- a/mail/p5-WWW-Hotmail/pkg-plist
+++ b/mail/p5-WWW-Hotmail/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/WWW/Hotmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Hotmail/.packlist
 %%PERL5_MAN3%%/WWW::Hotmail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Hotmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/mail/p5-ZConf-Mail/Makefile b/mail/p5-ZConf-Mail/Makefile
index a403fecfacda..80a3bf341cb3 100644
--- a/mail/p5-ZConf-Mail/Makefile
+++ b/mail/p5-ZConf-Mail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ZConf-Mail
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/mail/p5-ZConf-Mail/pkg-plist b/mail/p5-ZConf-Mail/pkg-plist
index d161505d6355..46e8d50052e1 100644
--- a/mail/p5-ZConf-Mail/pkg-plist
+++ b/mail/p5-ZConf-Mail/pkg-plist
@@ -1,9 +1,4 @@
 bin/zcgetmail
 bin/zcmailaccount
 %%SITE_PERL%%/ZConf/Mail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Mail/.packlist
 %%PERL5_MAN3%%/ZConf::Mail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/ZConf
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index 9376e6a835a7..783bf909c958 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qpsmtpd
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	https://github.com/smtpd/qpsmtpd/archive/
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-qpsmtpd/pkg-plist b/mail/p5-qpsmtpd/pkg-plist
index 472735cf6962..858c01bc3330 100644
--- a/mail/p5-qpsmtpd/pkg-plist
+++ b/mail/p5-qpsmtpd/pkg-plist
@@ -124,7 +124,6 @@ man/man1/qpsmtpd-async.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls_ciphers
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/dkim
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd/.packlist
 %%SITE_PERL%%/Apache/Qpsmtpd.pm
 %%SITE_PERL%%/Danga/Client.pm
 %%SITE_PERL%%/Danga/TimeoutSocket.pm
@@ -158,12 +157,3 @@ man/man1/qpsmtpd-async.1.gz
 @dirrmtry %%DATADIR%%/plugins/logging
 @dirrmtry %%DATADIR%%/plugins/queue
 @dirrmtry %%DATADIR%%/plugins/virus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd
-@dirrmtry %%SITE_PERL%%/Apache
-@dirrmtry %%SITE_PERL%%/Danga
-@dirrmtry %%SITE_PERL%%/Qpsmtpd
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/Plugin
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/Plugin/Async
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/Postfix
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/SMTP
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/TcpServer
diff --git a/mail/pflogstats/Makefile b/mail/pflogstats/Makefile
index b6cd1a4ae752..87a66157dfd0 100644
--- a/mail/pflogstats/Makefile
+++ b/mail/pflogstats/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pflogstats
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.aerasec.de/pub/linux/postfix/pflogsumm/${PORTNAME}/
diff --git a/mail/pflogstats/pkg-plist b/mail/pflogstats/pkg-plist
index 3a5b8b54aa9b..89a2049f2b94 100644
--- a/mail/pflogstats/pkg-plist
+++ b/mail/pflogstats/pkg-plist
@@ -20,4 +20,3 @@ bin/pflogstats
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/Pflogstats
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index 40bede30eb5a..7d1e01e3684f 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	policyd2
 PORTVERSION=	2.0.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://devlabs.linuxassist.net/attachments/download/${DOWNLOAD_FOLDER}/
 DISTNAME=	cluebringer-${PORTVERSION}
@@ -58,7 +58,7 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR} \
-		${STAGEDIR}${SITE_PERL}/cbp \
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp \
 		${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/cbpadmin ${STAGEDIR}${PREFIX}/bin
@@ -66,7 +66,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cluebringer.conf \
 		${STAGEDIR}${PREFIX}/etc/cluebringer.conf.sample
 	(cd ${WRKSRC}/webui && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR})
-	(cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${STAGEDIR}${SITE_PERL}/cbp)
+	(cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} database ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index f6970cfad526..a6dfe2e99006 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	razor-agents
 PORTVERSION=	2.84
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/razor/${PORTNAME}/${PORTVERSION}
 
diff --git a/mail/razor-agents/pkg-plist b/mail/razor-agents/pkg-plist
index b17ef499fab8..9fb953204757 100644
--- a/mail/razor-agents/pkg-plist
+++ b/mail/razor-agents/pkg-plist
@@ -13,37 +13,26 @@ man/man1/razor-revoke.1.gz
 man/man5/razor-agent.conf.5.gz
 man/man5/razor-agents.5.gz
 man/man5/razor-whitelist.5.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Agent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Engine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Engine/VR8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Errorhandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Logger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/Manager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deBase64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTML_comment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTMLxs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deNewline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deQP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/enBase64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature/Ephemeral.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature/Whiplash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Syslog/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/razor-agents/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Engine
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Syslog
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/razor-agents
+%%SITE_ARCH%%/Razor2/Client/Agent.pm
+%%SITE_ARCH%%/Razor2/Client/Config.pm
+%%SITE_ARCH%%/Razor2/Client/Core.pm
+%%SITE_ARCH%%/Razor2/Client/Engine.pm
+%%SITE_ARCH%%/Razor2/Client/Version.pm
+%%SITE_ARCH%%/Razor2/Engine/VR8.pm
+%%SITE_ARCH%%/Razor2/Errorhandler.pm
+%%SITE_ARCH%%/Razor2/Logger.pm
+%%SITE_ARCH%%/Razor2/Preproc/Manager.pm
+%%SITE_ARCH%%/Razor2/Preproc/deBase64.pm
+%%SITE_ARCH%%/Razor2/Preproc/deHTML.pm
+%%SITE_ARCH%%/Razor2/Preproc/deHTML_comment.pm
+%%SITE_ARCH%%/Razor2/Preproc/deHTMLxs.pm
+%%SITE_ARCH%%/Razor2/Preproc/deNewline.pm
+%%SITE_ARCH%%/Razor2/Preproc/deQP.pm
+%%SITE_ARCH%%/Razor2/Preproc/enBase64.pm
+%%SITE_ARCH%%/Razor2/Signature/Ephemeral.pm
+%%SITE_ARCH%%/Razor2/Signature/Whiplash.pm
+%%SITE_ARCH%%/Razor2/String.pm
+%%SITE_ARCH%%/Razor2/Syslog.pm
+%%SITE_ARCH%%/auto/Razor2/Preproc/deHTMLxs/autosplit.ix
+%%SITE_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so
+%%SITE_ARCH%%/auto/Razor2/Syslog/autosplit.ix
diff --git a/mail/slapd-cyrus/Makefile b/mail/slapd-cyrus/Makefile
index 6c63346950d1..fdf24ba525fc 100644
--- a/mail/slapd-cyrus/Makefile
+++ b/mail/slapd-cyrus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	slapd-cyrus
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	Slapd-Backend-Cyrus-${PORTVERSION}
@@ -29,9 +29,9 @@ PLIST_SUB=	SITE_PERL_REL=${SITE_PERL_REL} \
 PORTDOCS=	slapd-cyrus.conf.sample
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${SITE_PERL}
+	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_DATA} -m 0444 ${WRKSRC}/t/etc/slapd.conf.dist \
 		${STAGEDIR}${DOCSDIR}/slapd-cyrus.conf.sample
-	cd ${WRKSRC}/lib && ${PAX} -r -w . ${STAGEDIR}${SITE_PERL}
+	cd ${WRKSRC}/lib && ${PAX} -r -w . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>
diff --git a/mail/slapd-cyrus/pkg-plist b/mail/slapd-cyrus/pkg-plist
index 150d3a94c322..f73baf7db9e7 100644
--- a/mail/slapd-cyrus/pkg-plist
+++ b/mail/slapd-cyrus/pkg-plist
@@ -7,9 +7,3 @@
 %%SITE_PERL_REL%%/Slapd/Backend/Proxy.pm
 %%SITE_PERL_REL%%/Slapd/Backend/Proxy/Store.pm
 %%SITE_PERL_REL%%/Slapd/Backend/Proxy/Store/BerkeleyDB.pm
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend/Proxy/Store
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend/Proxy
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend/Cyrus
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend
-@dirrmtry %%SITE_PERL_REL%%/Slapd
-@dirrmtry %%SITE_PERL_REL%%
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 946a125887d7..4ee4ff5eb029 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamassassin
 PORTVERSION=	3.4.0
-PORTREVISION?=	13	# also bump japanese/spamassassin
+PORTREVISION?=	14	# also bump japanese/spamassassin
 CATEGORIES?=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist
index 065dc27c0f04..5f70c0ad445a 100644
--- a/mail/spamassassin/pkg-plist
+++ b/mail/spamassassin/pkg-plist
@@ -196,25 +196,11 @@ man/man1/spamd.1.gz
 %%SITE_PERL%%/Mail/SpamAssassin/Util/ScopedTimer.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/TinyRedis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
 %%SITE_PERL%%/spamassassin-run.pod
 %%DATADIR%%/languages
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template
 @dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Util
-@dirrmtry %%SITE_PERL%%/Mail/SpamAssassin/Plugin
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Logger
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Locker
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Conf
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/BayesStore
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Bayes
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin
-@dirrmtry %%SITE_PERL%%/Mail
 @dirrmtry %%ETCDIR%%
 @dirrmtry etc/mail
 
diff --git a/mail/spamcup/Makefile b/mail/spamcup/Makefile
index 9bd12a2ffeee..c17834a8a5a5 100644
--- a/mail/spamcup/Makefile
+++ b/mail/spamcup/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamcup
 PORTVERSION=	1.09
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -19,9 +19,6 @@ RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	bin/spamcup.pl ${SITE_PERL_REL}/spamcup.pl \
-		${SITE_PERL_REL}/${PERL_ARCH}/auto/Spamcup/.packlist
-
-PLIST_DIRS=	${SITE_PERL_REL}/${PERL_ARCH}/auto/Spamcup
+PLIST_FILES=	bin/spamcup.pl ${SITE_PERL_REL}/spamcup.pl
 
 .include <bsd.port.mk>
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index c0bfe35dd2e0..8652d4524c94 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PDL
 PORTVERSION=	2.007
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN/${PORTNAME} SF/pdl/PDL_2013/PDL-${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -21,10 +21,9 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		gmake perl5
 USE_PERL5=	configure
 MAKE_ENV=	PERL5LIB=${WRKSRC}/blib/lib
-PLIST_DIRS=	${SITE_PERL_REL}/${PERL_ARCH}/Inline
 PLIST_FILES=	bin/pdl bin/pdldoc bin/perldl bin/pptemplate \
-		${SITE_PERL_REL}/${PERL_ARCH}/Inline/Pdlpp.pm \
-		${SITE_PERL_REL}/${PERL_ARCH}/Inline/MakePdlppInstallable.pm
+		${SITE_ARCH_REL}/Inline/Pdlpp.pm \
+		${SITE_ARCH_REL}/Inline/MakePdlppInstallable.pm
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	PGPLOT PLPLOT OPENGL GD FFTW GSL HDF PROJ F77 READLINE SINK
@@ -81,13 +80,9 @@ post-install:
 		>> ${TMPPLIST} ; \
 	  cd ${WRKSRC}/blib/man1 ; \
 	  ${FIND} *.1 | ${SED} "s,^,man/man1/,;s/1$$/1.gz/" >> ${TMPPLIST})
-	@(${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/PDL* -type f | \
+	@(${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/PDL* -type f | \
 		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ; \
-	  ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/PDL -type f ! -name '*.bs' | \
-		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ; \
-	  ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/PDL* -type d | ${SORT} -r | \
-		${SED} "s,^${STAGEDIR}${PREFIX}/,@dirrm ," >> ${TMPPLIST} ; \
-	  ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/PDL -type d | ${SORT} -r | \
-		${SED} "s,^${STAGEDIR}${PREFIX}/,@dirrm ," >> ${TMPPLIST})
+	  ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f | \
+		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/math/algotutor/Makefile b/math/algotutor/Makefile
index f7c6a294419c..ebf7deaa3717 100644
--- a/math/algotutor/Makefile
+++ b/math/algotutor/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	algotutor
 PORTVERSION=	0.8.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://www.cyut.edu.tw/~ckhung/dl/
 
@@ -31,12 +31,12 @@ post-patch:
 			${WRKSRC}/algotutor
 
 do-install:
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/algotutor
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/algotutor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/algotutor
 	${CP} -R ${WRKSRC}/data ${STAGEDIR}${PREFIX}/share/algotutor
-	${CP} -R ${WRKSRC}/cgeom ${STAGEDIR}${SITE_PERL}/algotutor
-	${CP} -R ${WRKSRC}/dp ${STAGEDIR}${SITE_PERL}/algotutor
-	${CP} -R ${WRKSRC}/graph ${STAGEDIR}${SITE_PERL}/algotutor
+	${CP} -R ${WRKSRC}/cgeom ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/algotutor
+	${CP} -R ${WRKSRC}/dp ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/algotutor
+	${CP} -R ${WRKSRC}/graph ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/algotutor
 .for file in ${MANPAGES}
 	${INSTALL_MAN} ${WRKSRC}/doc/${file} ${STAGEDIR}${PREFIX}/man/man1
 .endfor
@@ -44,7 +44,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for file in ${LIBFILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${SITE_PERL}/algotutor
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/algotutor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/p5-AI-DecisionTree/Makefile b/math/p5-AI-DecisionTree/Makefile
index 562b3d317e97..cbdfca912297 100644
--- a/math/p5-AI-DecisionTree/Makefile
+++ b/math/p5-AI-DecisionTree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AI-DecisionTree
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-AI-DecisionTree/pkg-plist b/math/p5-AI-DecisionTree/pkg-plist
index d613c230f06c..2993e24ebe3f 100644
--- a/math/p5-AI-DecisionTree/pkg-plist
+++ b/math/p5-AI-DecisionTree/pkg-plist
@@ -1,11 +1,5 @@
 %%PERL5_MAN3%%/AI::DecisionTree.3.gz
 %%PERL5_MAN3%%/AI::DecisionTree::Instance.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/AI/DecisionTree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/AI/DecisionTree/Instance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/DecisionTree/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/DecisionTree/Instance/Instance.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/DecisionTree/Instance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/DecisionTree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/AI/DecisionTree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/AI
+%%SITE_ARCH%%/AI/DecisionTree.pm
+%%SITE_ARCH%%/AI/DecisionTree/Instance.pm
+%%SITE_ARCH%%/auto/AI/DecisionTree/Instance/Instance.so
diff --git a/math/p5-AI-Genetic/Makefile b/math/p5-AI-Genetic/Makefile
index 4df3c443c176..d88fa4acd661 100644
--- a/math/p5-AI-Genetic/Makefile
+++ b/math/p5-AI-Genetic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AI-Genetic
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-AI-Genetic/pkg-plist b/math/p5-AI-Genetic/pkg-plist
index 6c9990c70259..3fb71fc04eb2 100644
--- a/math/p5-AI-Genetic/pkg-plist
+++ b/math/p5-AI-Genetic/pkg-plist
@@ -12,8 +12,3 @@
 %%SITE_PERL%%/AI/Genetic/OpCrossover.pm
 %%SITE_PERL%%/AI/Genetic/OpMutation.pm
 %%SITE_PERL%%/AI/Genetic/OpSelection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Genetic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Genetic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
-@dirrmtry %%SITE_PERL%%/AI/Genetic
-@dirrmtry %%SITE_PERL%%/AI
diff --git a/math/p5-AI-NeuralNet-BackProp/Makefile b/math/p5-AI-NeuralNet-BackProp/Makefile
index 520f16241f1b..3a419369a0bd 100644
--- a/math/p5-AI-NeuralNet-BackProp/Makefile
+++ b/math/p5-AI-NeuralNet-BackProp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AI-NeuralNet-BackProp
 PORTVERSION=	0.89
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-AI-NeuralNet-BackProp/pkg-plist b/math/p5-AI-NeuralNet-BackProp/pkg-plist
index 56da86d6ea2a..6295aca938a9 100644
--- a/math/p5-AI-NeuralNet-BackProp/pkg-plist
+++ b/math/p5-AI-NeuralNet-BackProp/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/AI::NeuralNet::BackProp.3.gz
 %%SITE_PERL%%/AI/NeuralNet/BackProp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/BackProp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/BackProp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
-@dirrmtry %%SITE_PERL%%/AI/NeuralNet
-@dirrmtry %%SITE_PERL%%/AI
diff --git a/math/p5-AI-Perceptron/Makefile b/math/p5-AI-Perceptron/Makefile
index 6513d91d1399..1fafe9e8c385 100644
--- a/math/p5-AI-Perceptron/Makefile
+++ b/math/p5-AI-Perceptron/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AI-Perceptron
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-AI-Perceptron/pkg-plist b/math/p5-AI-Perceptron/pkg-plist
index a3d316d3ce06..e34a032f65ad 100644
--- a/math/p5-AI-Perceptron/pkg-plist
+++ b/math/p5-AI-Perceptron/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/AI::Perceptron.3.gz
 %%SITE_PERL%%/AI/Perceptron.pm
-@dirrmtry %%SITE_PERL%%/AI
diff --git a/math/p5-Algorithm-Combinatorics/Makefile b/math/p5-Algorithm-Combinatorics/Makefile
index 8ac58af82496..3ba98be211b1 100644
--- a/math/p5-Algorithm-Combinatorics/Makefile
+++ b/math/p5-Algorithm-Combinatorics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Combinatorics
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FXN
diff --git a/math/p5-Algorithm-Combinatorics/pkg-plist b/math/p5-Algorithm-Combinatorics/pkg-plist
index 732f10b41ced..ca5827e6342c 100644
--- a/math/p5-Algorithm-Combinatorics/pkg-plist
+++ b/math/p5-Algorithm-Combinatorics/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Algorithm::Combinatorics.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/Combinatorics.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Combinatorics/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Combinatorics/Combinatorics.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Combinatorics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
+%%SITE_ARCH%%/Algorithm/Combinatorics.pm
+%%SITE_ARCH%%/auto/Algorithm/Combinatorics/Combinatorics.so
diff --git a/math/p5-Algorithm-CurveFit/Makefile b/math/p5-Algorithm-CurveFit/Makefile
index dcc1a730274d..0fb9d30cabf9 100644
--- a/math/p5-Algorithm-CurveFit/Makefile
+++ b/math/p5-Algorithm-CurveFit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Algorithm-CurveFit
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Algorithm-CurveFit/pkg-plist b/math/p5-Algorithm-CurveFit/pkg-plist
index cfd4d2f09172..5d718738482e 100644
--- a/math/p5-Algorithm-CurveFit/pkg-plist
+++ b/math/p5-Algorithm-CurveFit/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Algorithm::CurveFit.3.gz
 %%SITE_PERL%%/Algorithm/CurveFit.pm
-@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/math/p5-Algorithm-KMeans/Makefile b/math/p5-Algorithm-KMeans/Makefile
index 3ad08f9dad8b..6576aa0c8a76 100644
--- a/math/p5-Algorithm-KMeans/Makefile
+++ b/math/p5-Algorithm-KMeans/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Algorithm-KMeans
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AVIKAK
diff --git a/math/p5-Algorithm-KMeans/pkg-plist b/math/p5-Algorithm-KMeans/pkg-plist
index 922aba0efe3f..14c34037e692 100644
--- a/math/p5-Algorithm-KMeans/pkg-plist
+++ b/math/p5-Algorithm-KMeans/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Algorithm/KMeans.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/KMeans/.packlist
 %%PERL5_MAN3%%/Algorithm::KMeans.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/KMeans
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
-@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/math/p5-Algorithm-Munkres/Makefile b/math/p5-Algorithm-Munkres/Makefile
index 17da5324e34e..a944b7434c05 100644
--- a/math/p5-Algorithm-Munkres/Makefile
+++ b/math/p5-Algorithm-Munkres/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-Munkres
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Algorithm
diff --git a/math/p5-Algorithm-Munkres/pkg-plist b/math/p5-Algorithm-Munkres/pkg-plist
index 445f4882ed29..a65bf96db0b0 100644
--- a/math/p5-Algorithm-Munkres/pkg-plist
+++ b/math/p5-Algorithm-Munkres/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Munkres/.packlist
 %%SITE_PERL%%/Algorithm/Munkres.pm
 %%PERL5_MAN3%%/Algorithm::Munkres.3.gz
-@dirrmtry %%SITE_PERL%%/Algorithm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Munkres
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
diff --git a/math/p5-Bit-ShiftReg/Makefile b/math/p5-Bit-ShiftReg/Makefile
index ac850f0defa4..06a8b744ee1c 100644
--- a/math/p5-Bit-ShiftReg/Makefile
+++ b/math/p5-Bit-ShiftReg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bit-ShiftReg
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Bit-ShiftReg/pkg-plist b/math/p5-Bit-ShiftReg/pkg-plist
index b5d757524e4f..ce62ef7fec98 100644
--- a/math/p5-Bit-ShiftReg/pkg-plist
+++ b/math/p5-Bit-ShiftReg/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Bit/ShiftReg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.so
+%%SITE_ARCH%%/Bit/ShiftReg.pm
+%%SITE_ARCH%%/auto/Bit/ShiftReg/ShiftReg.so
 %%PERL5_MAN3%%/Bit::ShiftReg.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bit
diff --git a/math/p5-Bit-Vector-Minimal/Makefile b/math/p5-Bit-Vector-Minimal/Makefile
index d162667f4b09..aa01ccadc28e 100644
--- a/math/p5-Bit-Vector-Minimal/Makefile
+++ b/math/p5-Bit-Vector-Minimal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bit-Vector-Minimal
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Bit-Vector-Minimal/pkg-plist b/math/p5-Bit-Vector-Minimal/pkg-plist
index f8606027c447..02026064f94e 100644
--- a/math/p5-Bit-Vector-Minimal/pkg-plist
+++ b/math/p5-Bit-Vector-Minimal/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Bit::Vector::Minimal.3.gz
 %%SITE_PERL%%/Bit/Vector/Minimal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Minimal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Minimal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
-@dirrmtry %%SITE_PERL%%/Bit/Vector
-@dirrmtry %%SITE_PERL%%/Bit
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index 941eab8d9f57..aa9cf8e6ccab 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bit-Vector
 PORTVERSION=	7.3
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Bit-Vector/pkg-plist b/math/p5-Bit-Vector/pkg-plist
index 486b4253bd05..3f2740a03dc7 100644
--- a/math/p5-Bit-Vector/pkg-plist
+++ b/math/p5-Bit-Vector/pkg-plist
@@ -1,15 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector/Overload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector/Overload.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector/String.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.so
+%%SITE_ARCH%%/Bit/Vector.pm
+%%SITE_ARCH%%/Bit/Vector.pod
+%%SITE_ARCH%%/Bit/Vector/Overload.pm
+%%SITE_ARCH%%/Bit/Vector/Overload.pod
+%%SITE_ARCH%%/Bit/Vector/String.pm
+%%SITE_ARCH%%/Bit/Vector/String.pod
+%%SITE_ARCH%%/auto/Bit/Vector/Vector.so
 %%PERL5_MAN3%%/Bit::Vector.3.gz
 %%PERL5_MAN3%%/Bit::Vector::Overload.3.gz
 %%PERL5_MAN3%%/Bit::Vector::String.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bit
diff --git a/math/p5-CAD-Calc/Makefile b/math/p5-CAD-Calc/Makefile
index aa486a188c73..f1ff9070b423 100644
--- a/math/p5-CAD-Calc/Makefile
+++ b/math/p5-CAD-Calc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CAD-Calc
 PORTVERSION=	0.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-CAD-Calc/pkg-plist b/math/p5-CAD-Calc/pkg-plist
index 59f487787a62..e44ea473422a 100644
--- a/math/p5-CAD-Calc/pkg-plist
+++ b/math/p5-CAD-Calc/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/CAD::Calc.3.gz
 %%SITE_PERL%%/CAD/Calc.pm
-@dirrmtry %%SITE_PERL%%/CAD
diff --git a/math/p5-Chart-Math-Axis/Makefile b/math/p5-Chart-Math-Axis/Makefile
index e0f5476c0e3e..997a3549cde5 100644
--- a/math/p5-Chart-Math-Axis/Makefile
+++ b/math/p5-Chart-Math-Axis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chart-Math-Axis
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	math graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Chart-Math-Axis/pkg-plist b/math/p5-Chart-Math-Axis/pkg-plist
index 5aa767c084a7..436a4bdcdeea 100644
--- a/math/p5-Chart-Math-Axis/pkg-plist
+++ b/math/p5-Chart-Math-Axis/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Chart::Math::Axis.3.gz
 %%SITE_PERL%%/Chart/Math/Axis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math/Axis/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math/Axis
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart
-@dirrmtry %%SITE_PERL%%/Chart/Math
-@dirrmtry %%SITE_PERL%%/Chart
diff --git a/math/p5-Data-Float/Makefile b/math/p5-Data-Float/Makefile
index 8cae1efab7f8..89053e7884fc 100644
--- a/math/p5-Data-Float/Makefile
+++ b/math/p5-Data-Float/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Float
 PORTVERSION=	0.012
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ZEFRAM
diff --git a/math/p5-Data-Float/pkg-plist b/math/p5-Data-Float/pkg-plist
index 57ac1cfc4f99..bc2465809d6a 100644
--- a/math/p5-Data-Float/pkg-plist
+++ b/math/p5-Data-Float/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Data::Float.3.gz
 %%SITE_PERL%%/Data/Float.pm
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/math/p5-Date-Handler/Makefile b/math/p5-Date-Handler/Makefile
index adba67a26575..f23109db0f1a 100644
--- a/math/p5-Date-Handler/Makefile
+++ b/math/p5-Date-Handler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Handler
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Date-Handler/pkg-plist b/math/p5-Date-Handler/pkg-plist
index 62f03f918f97..12f15929f3b8 100644
--- a/math/p5-Date-Handler/pkg-plist
+++ b/math/p5-Date-Handler/pkg-plist
@@ -8,8 +8,3 @@
 %%SITE_PERL%%/Date/Handler/Delta.pm
 %%SITE_PERL%%/Date/Handler/Range.pm
 %%SITE_PERL%%/Date/Handler/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Handler/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
-@dirrmtry %%SITE_PERL%%/Date/Handler
-@dirrmtry %%SITE_PERL%%/Date
diff --git a/math/p5-GIS-Distance-Fast/Makefile b/math/p5-GIS-Distance-Fast/Makefile
index 560dc6a520cb..5e9203a23903 100644
--- a/math/p5-GIS-Distance-Fast/Makefile
+++ b/math/p5-GIS-Distance-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GIS-Distance-Fast
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BLUEFEET
diff --git a/math/p5-GIS-Distance-Fast/pkg-plist b/math/p5-GIS-Distance-Fast/pkg-plist
index 2ae193774827..b174acf1d80e 100644
--- a/math/p5-GIS-Distance-Fast/pkg-plist
+++ b/math/p5-GIS-Distance-Fast/pkg-plist
@@ -1,19 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Formula/Cosine/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Formula/Haversine/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Formula/Vincenty/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance/Fast/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance/Fast/Fast.so
+%%SITE_ARCH%%/GIS/Distance/Fast.pm
+%%SITE_ARCH%%/GIS/Distance/Formula/Cosine/Fast.pm
+%%SITE_ARCH%%/GIS/Distance/Formula/Haversine/Fast.pm
+%%SITE_ARCH%%/GIS/Distance/Formula/Vincenty/Fast.pm
+%%SITE_ARCH%%/auto/GIS/Distance/Fast/Fast.so
 %%PERL5_MAN3%%/GIS::Distance::Fast.3.gz
 %%PERL5_MAN3%%/GIS::Distance::Formula::Cosine::Fast.3.gz
 %%PERL5_MAN3%%/GIS::Distance::Formula::Haversine::Fast.3.gz
 %%PERL5_MAN3%%/GIS::Distance::Formula::Vincenty::Fast.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Formula/Haversine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Formula/Vincenty
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Formula/Cosine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance/Formula
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GIS/Distance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GIS
diff --git a/math/p5-GIS-Distance-Lite/Makefile b/math/p5-GIS-Distance-Lite/Makefile
index ac5787c85102..900f53bba26c 100644
--- a/math/p5-GIS-Distance-Lite/Makefile
+++ b/math/p5-GIS-Distance-Lite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GIS-Distance-Lite
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JOBERO
diff --git a/math/p5-GIS-Distance-Lite/pkg-plist b/math/p5-GIS-Distance-Lite/pkg-plist
index cbe0930c39a8..9fb3775ccbcf 100644
--- a/math/p5-GIS-Distance-Lite/pkg-plist
+++ b/math/p5-GIS-Distance-Lite/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance/Lite/.packlist
 %%SITE_PERL%%/GIS/Distance/Lite.pm
 %%PERL5_MAN3%%/GIS::Distance::Lite.3.gz
-@dirrmtry %%SITE_PERL%%/GIS/Distance
-@dirrmtry %%SITE_PERL%%/GIS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS
diff --git a/math/p5-GIS-Distance/Makefile b/math/p5-GIS-Distance/Makefile
index 52daf3f0a13f..0d0a13feb70d 100644
--- a/math/p5-GIS-Distance/Makefile
+++ b/math/p5-GIS-Distance/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GIS-Distance
 PORTVERSION=	0.08
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
diff --git a/math/p5-GIS-Distance/pkg-plist b/math/p5-GIS-Distance/pkg-plist
index 1684cce56a30..f3283d9a6051 100644
--- a/math/p5-GIS-Distance/pkg-plist
+++ b/math/p5-GIS-Distance/pkg-plist
@@ -16,9 +16,3 @@
 %%SITE_PERL%%/GIS/Distance/Formula/MathTrig.pm
 %%SITE_PERL%%/GIS/Distance/Formula/Polar.pm
 %%SITE_PERL%%/GIS/Distance/Formula/Vincenty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS/Distance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIS
-@dirrmtry %%SITE_PERL%%/GIS/Distance/Formula
-@dirrmtry %%SITE_PERL%%/GIS/Distance
-@dirrmtry %%SITE_PERL%%/GIS
diff --git a/math/p5-Geo-Coordinates-UTM/Makefile b/math/p5-Geo-Coordinates-UTM/Makefile
index 67432aa1aab9..3224ddedb257 100644
--- a/math/p5-Geo-Coordinates-UTM/Makefile
+++ b/math/p5-Geo-Coordinates-UTM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coordinates-UTM
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Geo
diff --git a/math/p5-Geo-Coordinates-UTM/pkg-plist b/math/p5-Geo-Coordinates-UTM/pkg-plist
index cd3c6267d6c1..5f9607909346 100644
--- a/math/p5-Geo-Coordinates-UTM/pkg-plist
+++ b/math/p5-Geo-Coordinates-UTM/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coordinates/UTM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/UTM/.packlist
 %%PERL5_MAN3%%/Geo::Coordinates::UTM.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/UTM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/math/p5-Geo-Distance-XS/Makefile b/math/p5-Geo-Distance-XS/Makefile
index e964e364935b..94ca9b73a75e 100644
--- a/math/p5-Geo-Distance-XS/Makefile
+++ b/math/p5-Geo-Distance-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Distance-XS
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Geo-Distance-XS/pkg-plist b/math/p5-Geo-Distance-XS/pkg-plist
index 6b38cfbdb82a..f2e29a95ef27 100644
--- a/math/p5-Geo-Distance-XS/pkg-plist
+++ b/math/p5-Geo-Distance-XS/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/Distance/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance/XS/XS.so
+%%SITE_ARCH%%/Geo/Distance/XS.pm
+%%SITE_ARCH%%/auto/Geo/Distance/XS/XS.so
 %%PERL5_MAN3%%/Geo::Distance::XS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Geo/Distance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Geo
diff --git a/math/p5-Geo-Distance/Makefile b/math/p5-Geo-Distance/Makefile
index e1d835fa290c..0d0b0b55421e 100644
--- a/math/p5-Geo-Distance/Makefile
+++ b/math/p5-Geo-Distance/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Distance
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	math perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Geo-Distance/pkg-plist b/math/p5-Geo-Distance/pkg-plist
index 588001922410..d3d70d7842b1 100644
--- a/math/p5-Geo-Distance/pkg-plist
+++ b/math/p5-Geo-Distance/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Geo::Distance.3.gz
 %%SITE_PERL%%/Geo/Distance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index 5cfd4a01fd33..392d670e4cd9 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Graph
 PORTVERSION=	0.96
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
diff --git a/math/p5-Graph/pkg-plist b/math/p5-Graph/pkg-plist
index 9a1350cf2520..e1680fddcc10 100644
--- a/math/p5-Graph/pkg-plist
+++ b/math/p5-Graph/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/.packlist
 %%SITE_PERL%%/Graph.pm
 %%SITE_PERL%%/Graph.pod
 %%SITE_PERL%%/Graph/AdjacencyMap.pm
@@ -39,12 +38,3 @@
 %%PERL5_MAN3%%/Graph::UnionFind.3.gz
 %%PERL5_MAN3%%/Heap071::Elem.3.gz
 %%PERL5_MAN3%%/Heap071::Fibonacci.3.gz
-@dirrmtry %%SITE_PERL%%/auto/Heap071/Fibonacci
-@dirrmtry %%SITE_PERL%%/auto/Heap071/Elem
-@dirrmtry %%SITE_PERL%%/auto/Heap071
-@dirrmtry %%SITE_PERL%%/Heap071
-@dirrmtry %%SITE_PERL%%/Graph/Traversal
-@dirrmtry %%SITE_PERL%%/Graph/TransitiveClosure
-@dirrmtry %%SITE_PERL%%/Graph/AdjacencyMap
-@dirrmtry %%SITE_PERL%%/Graph
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph
diff --git a/math/p5-Math-Algebra-Symbols/Makefile b/math/p5-Math-Algebra-Symbols/Makefile
index a12b07de0d2c..060a642ad968 100644
--- a/math/p5-Math-Algebra-Symbols/Makefile
+++ b/math/p5-Math-Algebra-Symbols/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Algebra-Symbols
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Algebra-Symbols/pkg-plist b/math/p5-Math-Algebra-Symbols/pkg-plist
index fcc32ff8756f..569a0b82b01d 100644
--- a/math/p5-Math-Algebra-Symbols/pkg-plist
+++ b/math/p5-Math-Algebra-Symbols/pkg-plist
@@ -7,10 +7,3 @@
 %%SITE_PERL%%/Math/Algebra/Symbols/Symbols.pm
 %%SITE_PERL%%/Math/Algebra/Symbols/Term.pm
 %%SITE_PERL%%/Math/Algebra/symbols.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Algebra/Symbols/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Algebra/Symbols
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Algebra
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Algebra/Symbols
-@dirrmtry %%SITE_PERL%%/Math/Algebra
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Base36/Makefile b/math/p5-Math-Base36/Makefile
index 1787f03b7a62..594f60acc0aa 100644
--- a/math/p5-Math-Base36/Makefile
+++ b/math/p5-Math-Base36/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Base36
 PORTVERSION=	0.10
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	math converters perl5
 MASTER_SITES=	CPAN
diff --git a/math/p5-Math-Base36/pkg-plist b/math/p5-Math-Base36/pkg-plist
index 0e5c90f7db87..5cd9185b828a 100644
--- a/math/p5-Math-Base36/pkg-plist
+++ b/math/p5-Math-Base36/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Base36/.packlist
 %%SITE_PERL%%/Math/Base36.pm
 %%PERL5_MAN3%%/Math::Base36.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Base36
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Base85/Makefile b/math/p5-Math-Base85/Makefile
index a1ed7be6ac06..c4f653fd112b 100644
--- a/math/p5-Math-Base85/Makefile
+++ b/math/p5-Math-Base85/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Base85
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	math perl5 converters net
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Base85/pkg-plist b/math/p5-Math-Base85/pkg-plist
index aee6c23c2932..caf52bc2267e 100644
--- a/math/p5-Math-Base85/pkg-plist
+++ b/math/p5-Math-Base85/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Math/Base85.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Base85/.packlist
 %%PERL5_MAN3%%/Math::Base85.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Base85
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrm %%SITE_PERL%%/Math
diff --git a/math/p5-Math-BaseCalc/Makefile b/math/p5-Math-BaseCalc/Makefile
index 33046378d8fd..eaa7152a48e0 100644
--- a/math/p5-Math-BaseCalc/Makefile
+++ b/math/p5-Math-BaseCalc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-BaseCalc
 PORTVERSION=	1.017
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-BaseCalc/pkg-plist b/math/p5-Math-BaseCalc/pkg-plist
index b5cfbdd24f87..811d4c5f9ced 100644
--- a/math/p5-Math-BaseCalc/pkg-plist
+++ b/math/p5-Math-BaseCalc/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc/.packlist
 %%SITE_PERL%%/Math/BaseCalc.pm
 %%PERL5_MAN3%%/Math::BaseCalc.3.gz
-@dirrmtry %%SITE_PERL%%/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-BaseCnv/Makefile b/math/p5-Math-BaseCnv/Makefile
index 29d802068491..912bbdee3ea5 100644
--- a/math/p5-Math-BaseCnv/Makefile
+++ b/math/p5-Math-BaseCnv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-BaseCnv
 PORTVERSION=	1.4.75
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-BaseCnv/pkg-plist b/math/p5-Math-BaseCnv/pkg-plist
index c381a661f0a8..587d4e8ec125 100644
--- a/math/p5-Math-BaseCnv/pkg-plist
+++ b/math/p5-Math-BaseCnv/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Math/BaseCnv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCnv/.packlist
 %%PERL5_MAN3%%/Math::BaseCnv.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCnv
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Bezier-Convert/Makefile b/math/p5-Math-Bezier-Convert/Makefile
index c9f9dfbb6de0..392f38a8ecfa 100644
--- a/math/p5-Math-Bezier-Convert/Makefile
+++ b/math/p5-Math-Bezier-Convert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Bezier-Convert
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Bezier-Convert/pkg-plist b/math/p5-Math-Bezier-Convert/pkg-plist
index db4ddae59ce4..9ce7e4a6c3f3 100644
--- a/math/p5-Math-Bezier-Convert/pkg-plist
+++ b/math/p5-Math-Bezier-Convert/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::Bezier::Convert.3.gz
 %%SITE_PERL%%/Math/Bezier/Convert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier/Convert/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier/Convert
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Bezier
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Bezier/Makefile b/math/p5-Math-Bezier/Makefile
index d72acefff19e..20620b402474 100644
--- a/math/p5-Math-Bezier/Makefile
+++ b/math/p5-Math-Bezier/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Bezier
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Bezier/pkg-plist b/math/p5-Math-Bezier/pkg-plist
index e6c04c0b2d74..f98b75aa91da 100644
--- a/math/p5-Math-Bezier/pkg-plist
+++ b/math/p5-Math-Bezier/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Bezier.3.gz
 %%SITE_PERL%%/Math/Bezier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-BigInt-FastCalc/Makefile b/math/p5-Math-BigInt-FastCalc/Makefile
index 4697be7693a2..7382db47bd0d 100644
--- a/math/p5-Math-BigInt-FastCalc/Makefile
+++ b/math/p5-Math-BigInt-FastCalc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-BigInt-FastCalc
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-BigInt-FastCalc/pkg-plist b/math/p5-Math-BigInt-FastCalc/pkg-plist
index f9cb0ceb08d8..da8d918e087e 100644
--- a/math/p5-Math-BigInt-FastCalc/pkg-plist
+++ b/math/p5-Math-BigInt-FastCalc/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Math::BigInt::FastCalc.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/BigInt/FastCalc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/FastCalc/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/FastCalc/FastCalc.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/FastCalc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/BigInt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/BigInt/FastCalc.pm
+%%SITE_ARCH%%/auto/Math/BigInt/FastCalc/FastCalc.so
diff --git a/math/p5-Math-BigInt-GMP/Makefile b/math/p5-Math-BigInt-GMP/Makefile
index 70e189ed3996..95bdb313366c 100644
--- a/math/p5-Math-BigInt-GMP/Makefile
+++ b/math/p5-Math-BigInt-GMP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-BigInt-GMP
 PORTVERSION=	1.38
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-BigInt-GMP/pkg-plist b/math/p5-Math-BigInt-GMP/pkg-plist
index 3d25ce383dc3..92e09dd91708 100644
--- a/math/p5-Math-BigInt-GMP/pkg-plist
+++ b/math/p5-Math-BigInt-GMP/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Math::BigInt::GMP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/BigInt/GMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/GMP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/GMP/GMP.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/GMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/BigInt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/BigInt/GMP.pm
+%%SITE_ARCH%%/auto/Math/BigInt/GMP/GMP.so
diff --git a/math/p5-Math-BigInt-Pari/Makefile b/math/p5-Math-BigInt-Pari/Makefile
index 9a4b249cc5d0..42ddf64da365 100644
--- a/math/p5-Math-BigInt-Pari/Makefile
+++ b/math/p5-Math-BigInt-Pari/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-BigInt-Pari
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-BigInt-Pari/pkg-plist b/math/p5-Math-BigInt-Pari/pkg-plist
index e70b96d74ae0..e876e29b0cb0 100644
--- a/math/p5-Math-BigInt-Pari/pkg-plist
+++ b/math/p5-Math-BigInt-Pari/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::BigInt::Pari.3.gz
 %%SITE_PERL%%/Math/BigInt/Pari.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/Pari/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/Pari
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/BigInt
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-BigInt/Makefile b/math/p5-Math-BigInt/Makefile
index 4290a3f78c00..2d818de189e9 100644
--- a/math/p5-Math-BigInt/Makefile
+++ b/math/p5-Math-BigInt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-BigInt
 PORTVERSION=	1.997
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PJACKLAM
diff --git a/math/p5-Math-BigInt/pkg-plist b/math/p5-Math-BigInt/pkg-plist
index de5ef98837f9..3d902416805b 100644
--- a/math/p5-Math-BigInt/pkg-plist
+++ b/math/p5-Math-BigInt/pkg-plist
@@ -2,12 +2,7 @@
 %%SITE_PERL%%/Math/BigInt.pm
 %%SITE_PERL%%/Math/BigInt/Calc.pm
 %%SITE_PERL%%/Math/BigInt/CalcEmu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/.packlist
 %%PERL5_MAN3%%/Math::BigFloat.3.gz
 %%PERL5_MAN3%%/Math::BigInt.3.gz
 %%PERL5_MAN3%%/Math::BigInt::Calc.3.gz
 %%PERL5_MAN3%%/Math::BigInt::CalcEmu.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/BigInt
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-BigRat/Makefile b/math/p5-Math-BigRat/Makefile
index 718af6b14fab..ec7a855ae890 100644
--- a/math/p5-Math-BigRat/Makefile
+++ b/math/p5-Math-BigRat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-BigRat
 PORTVERSION=	0.26.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-BigRat/pkg-plist b/math/p5-Math-BigRat/pkg-plist
index 76aaee307886..bb40608c0dff 100644
--- a/math/p5-Math-BigRat/pkg-plist
+++ b/math/p5-Math-BigRat/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::BigRat.3.gz
 %%SITE_PERL%%/Math/BigRat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigRat/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigRat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-CDF/Makefile b/math/p5-Math-CDF/Makefile
index b78050b65eaf..29b8ce6b2cd5 100644
--- a/math/p5-Math-CDF/Makefile
+++ b/math/p5-Math-CDF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-CDF
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-CDF/pkg-plist b/math/p5-Math-CDF/pkg-plist
index acf25cf8ed3d..d959ba40ab3e 100644
--- a/math/p5-Math-CDF/pkg-plist
+++ b/math/p5-Math-CDF/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/CDF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/CDF/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/CDF/CDF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/CDF/autosplit.ix
+%%SITE_ARCH%%/Math/CDF.pm
+%%SITE_ARCH%%/auto/Math/CDF/CDF.so
+%%SITE_ARCH%%/auto/Math/CDF/autosplit.ix
 %%PERL5_MAN3%%/Math::CDF.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/CDF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-Calc-Units/Makefile b/math/p5-Math-Calc-Units/Makefile
index 5e9fee016bdf..5841a4e04578 100644
--- a/math/p5-Math-Calc-Units/Makefile
+++ b/math/p5-Math-Calc-Units/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Calc-Units
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Calc-Units/pkg-plist b/math/p5-Math-Calc-Units/pkg-plist
index 8a19cf547fb1..24e487a83693 100644
--- a/math/p5-Math-Calc-Units/pkg-plist
+++ b/math/p5-Math-Calc-Units/pkg-plist
@@ -15,11 +15,3 @@ bin/ucalc
 %%SITE_PERL%%/Math/Calc/Units/Grammar.pm
 %%SITE_PERL%%/Math/Calc/Units/Grammar.y
 %%SITE_PERL%%/Math/Calc/Units/Rank.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Calc/Units/Convert
-@dirrmtry %%SITE_PERL%%/Math/Calc/Units
-@dirrmtry %%SITE_PERL%%/Math/Calc
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Cephes/Makefile b/math/p5-Math-Cephes/Makefile
index 57f5ce7e3697..dfed50077416 100644
--- a/math/p5-Math-Cephes/Makefile
+++ b/math/p5-Math-Cephes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Cephes
 PORTVERSION=	0.5304
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,6 +16,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Math/Cephes/Cephes.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/Cephes/Cephes.so
 
 .include <bsd.port.mk>
diff --git a/math/p5-Math-Cephes/pkg-plist b/math/p5-Math-Cephes/pkg-plist
index 6e035973daaa..dfcd58c540df 100644
--- a/math/p5-Math-Cephes/pkg-plist
+++ b/math/p5-Math-Cephes/pkg-plist
@@ -1,21 +1,15 @@
 bin/pmath
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Cephes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Cephes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Cephes/Complex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Cephes/Fraction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Cephes/Matrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Cephes/Polynomial.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Cephes/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Cephes/Cephes.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Cephes/libmd/extralibs.ld
+%%SITE_ARCH%%/Math/Cephes.pm
+%%SITE_ARCH%%/Math/Cephes.pod
+%%SITE_ARCH%%/Math/Cephes/Complex.pm
+%%SITE_ARCH%%/Math/Cephes/Fraction.pm
+%%SITE_ARCH%%/Math/Cephes/Matrix.pm
+%%SITE_ARCH%%/Math/Cephes/Polynomial.pm
+%%SITE_ARCH%%/auto/Math/Cephes/Cephes.so
+%%SITE_ARCH%%/auto/Math/Cephes/libmd/extralibs.ld
 %%PERL5_MAN3%%/Math::Cephes.3.gz
 %%PERL5_MAN3%%/Math::Cephes::Complex.3.gz
 %%PERL5_MAN3%%/Math::Cephes::Fraction.3.gz
 %%PERL5_MAN3%%/Math::Cephes::Matrix.3.gz
 %%PERL5_MAN3%%/Math::Cephes::Polynomial.3.gz
 man/man1/pmath.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Cephes/libmd
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Cephes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math/Cephes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-Combinatorics/Makefile b/math/p5-Math-Combinatorics/Makefile
index 19a770f1f41c..c4d374a49442 100644
--- a/math/p5-Math-Combinatorics/Makefile
+++ b/math/p5-Math-Combinatorics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Combinatorics
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Combinatorics/pkg-plist b/math/p5-Math-Combinatorics/pkg-plist
index 158925be9013..e2bd01b13863 100644
--- a/math/p5-Math-Combinatorics/pkg-plist
+++ b/math/p5-Math-Combinatorics/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Combinatorics.3.gz
 %%SITE_PERL%%/Math/Combinatorics.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Combinatorics/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Combinatorics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Complex/Makefile b/math/p5-Math-Complex/Makefile
index e1b107a35d2d..a15e993c6075 100644
--- a/math/p5-Math-Complex/Makefile
+++ b/math/p5-Math-Complex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Complex
 PORTVERSION=	1.59
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Complex/pkg-plist b/math/p5-Math-Complex/pkg-plist
index aade93d5cca9..a6635d6d6e90 100644
--- a/math/p5-Math-Complex/pkg-plist
+++ b/math/p5-Math-Complex/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Math::Trig.3.gz
 %%SITE_PERL%%/Math/Complex.pm
 %%SITE_PERL%%/Math/Trig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Complex/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Complex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-ConvexHull/Makefile b/math/p5-Math-ConvexHull/Makefile
index 126dc4a3c0da..a6b3226a37c0 100644
--- a/math/p5-Math-ConvexHull/Makefile
+++ b/math/p5-Math-ConvexHull/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-ConvexHull
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/math/p5-Math-ConvexHull/pkg-plist b/math/p5-Math-ConvexHull/pkg-plist
index 03a9c0559f8f..e79ef7aa9e75 100644
--- a/math/p5-Math-ConvexHull/pkg-plist
+++ b/math/p5-Math-ConvexHull/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Math/ConvexHull.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/ConvexHull/.packlist
 %%PERL5_MAN3%%/Math::ConvexHull.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/ConvexHull
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Currency/Makefile b/math/p5-Math-Currency/Makefile
index 177e9467c37e..31003a2cf3af 100644
--- a/math/p5-Math-Currency/Makefile
+++ b/math/p5-Math-Currency/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Currency
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Currency/pkg-plist b/math/p5-Math-Currency/pkg-plist
index 1e979acd29d3..d1567d7ce6e6 100644
--- a/math/p5-Math-Currency/pkg-plist
+++ b/math/p5-Math-Currency/pkg-plist
@@ -3,5 +3,3 @@
 %%SITE_PERL%%/Math/Currency/de_DE.pm
 %%SITE_PERL%%/Math/Currency/en_GB.pm
 %%SITE_PERL%%/Math/Currency/ja_JP.pm
-@dirrmtry %%SITE_PERL%%/Math/Currency
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Derivative/Makefile b/math/p5-Math-Derivative/Makefile
index cbddabdfbb24..0c549a6f709f 100644
--- a/math/p5-Math-Derivative/Makefile
+++ b/math/p5-Math-Derivative/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Derivative
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Derivative/pkg-plist b/math/p5-Math-Derivative/pkg-plist
index 0418fb67c505..ca04ef5adf24 100644
--- a/math/p5-Math-Derivative/pkg-plist
+++ b/math/p5-Math-Derivative/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Derivative.3.gz
 %%SITE_PERL%%/Math/Derivative.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Derivative/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Derivative
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Evol/Makefile b/math/p5-Math-Evol/Makefile
index 75ed8bf11553..3174ee08aeb3 100644
--- a/math/p5-Math-Evol/Makefile
+++ b/math/p5-Math-Evol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Evol
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Evol/pkg-plist b/math/p5-Math-Evol/pkg-plist
index 3596732a0fff..84befdf32c71 100644
--- a/math/p5-Math-Evol/pkg-plist
+++ b/math/p5-Math-Evol/pkg-plist
@@ -1,8 +1,4 @@
 bin/ps_evol
 %%PERL5_MAN3%%/Math::Evol.3.gz
 %%SITE_PERL%%/Math/Evol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Evol/.packlist
 man/man1/ps_evol.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Evol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Expr/Makefile b/math/p5-Math-Expr/Makefile
index 723ff822010e..7244b9e22abd 100644
--- a/math/p5-Math-Expr/Makefile
+++ b/math/p5-Math-Expr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Expr
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAKANARDO
diff --git a/math/p5-Math-Expr/pkg-plist b/math/p5-Math-Expr/pkg-plist
index 491d5d144323..49171671d878 100644
--- a/math/p5-Math-Expr/pkg-plist
+++ b/math/p5-Math-Expr/pkg-plist
@@ -20,8 +20,3 @@
 %%SITE_PERL%%/Math/Expr/TypeDB.pm
 %%SITE_PERL%%/Math/Expr/Var.pm
 %%SITE_PERL%%/Math/Expr/VarSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Expr/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Expr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Expr
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-FFT/Makefile b/math/p5-Math-FFT/Makefile
index 47c35d3279da..43fbdde9d7cb 100644
--- a/math/p5-Math-FFT/Makefile
+++ b/math/p5-Math-FFT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-FFT
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-FFT/pkg-plist b/math/p5-Math-FFT/pkg-plist
index f01114f770e8..21e882d0f07d 100644
--- a/math/p5-Math-FFT/pkg-plist
+++ b/math/p5-Math-FFT/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Math::FFT.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/FFT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FFT/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FFT/FFT.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FFT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/FFT.pm
+%%SITE_ARCH%%/auto/Math/FFT/FFT.so
diff --git a/math/p5-Math-FixedPrecision/Makefile b/math/p5-Math-FixedPrecision/Makefile
index 8ce3fd373286..2fe133417020 100644
--- a/math/p5-Math-FixedPrecision/Makefile
+++ b/math/p5-Math-FixedPrecision/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-FixedPrecision
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-FixedPrecision/pkg-plist b/math/p5-Math-FixedPrecision/pkg-plist
index 12cbfcafcdfd..378c3143ad36 100644
--- a/math/p5-Math-FixedPrecision/pkg-plist
+++ b/math/p5-Math-FixedPrecision/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::FixedPrecision.3.gz
 %%SITE_PERL%%/Math/FixedPrecision.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FixedPrecision/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FixedPrecision
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Fleximal/Makefile b/math/p5-Math-Fleximal/Makefile
index 9d910456cb0b..97eafd8fecd3 100644
--- a/math/p5-Math-Fleximal/Makefile
+++ b/math/p5-Math-Fleximal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Fleximal
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Fleximal/pkg-plist b/math/p5-Math-Fleximal/pkg-plist
index 53bc6209b469..623c882ffa2d 100644
--- a/math/p5-Math-Fleximal/pkg-plist
+++ b/math/p5-Math-Fleximal/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Fleximal.3.gz
 %%SITE_PERL%%/Math/Fleximal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Fleximal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Fleximal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-GMP/Makefile b/math/p5-Math-GMP/Makefile
index 538d21b8a1ba..25ee72b93141 100644
--- a/math/p5-Math-GMP/Makefile
+++ b/math/p5-Math-GMP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-GMP
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,6 +21,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Math/GMP/GMP.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/GMP/GMP.so
 
 .include <bsd.port.mk>
diff --git a/math/p5-Math-GMP/pkg-plist b/math/p5-Math-GMP/pkg-plist
index a02cacc90faa..17cd6cb48be4 100644
--- a/math/p5-Math-GMP/pkg-plist
+++ b/math/p5-Math-GMP/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/Math::GMP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMP/GMP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMP/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/GMP.pm
+%%SITE_ARCH%%/auto/Math/GMP/GMP.so
+%%SITE_ARCH%%/auto/Math/GMP/autosplit.ix
diff --git a/math/p5-Math-GMPf/Makefile b/math/p5-Math-GMPf/Makefile
index e8f4d2122f46..7c999c71ee46 100644
--- a/math/p5-Math-GMPf/Makefile
+++ b/math/p5-Math-GMPf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-GMPf
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
diff --git a/math/p5-Math-GMPf/pkg-plist b/math/p5-Math-GMPf/pkg-plist
index 633a725bb7f5..0ac70994191c 100644
--- a/math/p5-Math-GMPf/pkg-plist
+++ b/math/p5-Math-GMPf/pkg-plist
@@ -1,14 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPf/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPf/V.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPf/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPf/GMPf.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPf/Random/Random.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPf/V/V.so
+%%SITE_ARCH%%/Math/GMPf.pm
+%%SITE_ARCH%%/Math/GMPf/Random.pm
+%%SITE_ARCH%%/Math/GMPf/V.pm
+%%SITE_ARCH%%/auto/Math/GMPf/GMPf.so
+%%SITE_ARCH%%/auto/Math/GMPf/Random/Random.so
+%%SITE_ARCH%%/auto/Math/GMPf/V/V.so
 %%PERL5_MAN3%%/Math::GMPf.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPf/V
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPf/Random
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-GMPq/Makefile b/math/p5-Math-GMPq/Makefile
index 8bc53a0b9e7a..ed4ef7c4929b 100644
--- a/math/p5-Math-GMPq/Makefile
+++ b/math/p5-Math-GMPq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-GMPq
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
diff --git a/math/p5-Math-GMPq/pkg-plist b/math/p5-Math-GMPq/pkg-plist
index ca88d6748079..9148e6303db5 100644
--- a/math/p5-Math-GMPq/pkg-plist
+++ b/math/p5-Math-GMPq/pkg-plist
@@ -1,14 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPq.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPq/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPq/V.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPq/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPq/GMPq.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPq/Random/Random.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPq/V/V.so
+%%SITE_ARCH%%/Math/GMPq.pm
+%%SITE_ARCH%%/Math/GMPq/Random.pm
+%%SITE_ARCH%%/Math/GMPq/V.pm
+%%SITE_ARCH%%/auto/Math/GMPq/GMPq.so
+%%SITE_ARCH%%/auto/Math/GMPq/Random/Random.so
+%%SITE_ARCH%%/auto/Math/GMPq/V/V.so
 %%PERL5_MAN3%%/Math::GMPq.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPq/V
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPq/Random
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPq
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPq
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-GMPz/Makefile b/math/p5-Math-GMPz/Makefile
index b3bee68fd7e3..552e0b360387 100644
--- a/math/p5-Math-GMPz/Makefile
+++ b/math/p5-Math-GMPz/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-GMPz
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
diff --git a/math/p5-Math-GMPz/pkg-plist b/math/p5-Math-GMPz/pkg-plist
index 1a760b40c1fc..5faba13ce1bd 100644
--- a/math/p5-Math-GMPz/pkg-plist
+++ b/math/p5-Math-GMPz/pkg-plist
@@ -1,14 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPz.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPz/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPz/V.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPz/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPz/GMPz.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPz/Random/Random.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPz/V/V.so
+%%SITE_ARCH%%/Math/GMPz.pm
+%%SITE_ARCH%%/Math/GMPz/Random.pm
+%%SITE_ARCH%%/Math/GMPz/V.pm
+%%SITE_ARCH%%/auto/Math/GMPz/GMPz.so
+%%SITE_ARCH%%/auto/Math/GMPz/Random/Random.so
+%%SITE_ARCH%%/auto/Math/GMPz/V/V.so
 %%PERL5_MAN3%%/Math::GMPz.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPz/V
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPz/Random
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMPz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math/GMPz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile
index 911c7b837724..4331b1a29e94 100644
--- a/math/p5-Math-GSL/Makefile
+++ b/math/p5-Math-GSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-GSL
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-GSL/pkg-plist b/math/p5-Math-GSL/pkg-plist
index 0b781a0f5550..a8515537ee2a 100644
--- a/math/p5-Math-GSL/pkg-plist
+++ b/math/p5-Math-GSL/pkg-plist
@@ -1,110 +1,110 @@
 bin/smoke_some_mathgsl
 bin/smolder_mathgsl
 bin/smolder_smoke_signal
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/BLAS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/BSpline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/CBLAS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/CDF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Chebyshev.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Combination.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Complex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/DHT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Deriv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Diff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Eigen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Errno.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/FFT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Fit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Heapsort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Histogram.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Histogram2D.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/IEEEUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Integration.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Interp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Linalg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Machine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Matrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/MatrixComplex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Min.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Monte.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Multifit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Multimin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Multiroots.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/NTuple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/ODEIV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Permutation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Poly.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/PowInt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/QRNG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/RNG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Randist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Roots.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/SF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Siman.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Spline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Statistics.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Sum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Sys.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Vector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/VectorComplex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Wavelet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Wavelet2D.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/BLAS/BLAS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/BSpline/BSpline.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/CBLAS/CBLAS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/CDF/CDF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Chebyshev/Chebyshev.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Combination/Combination.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Complex/Complex.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Const/Const.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/DHT/DHT.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Deriv/Deriv.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Diff/Diff.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Eigen/Eigen.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Errno/Errno.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/FFT/FFT.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Fit/Fit.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Heapsort/Heapsort.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Histogram/Histogram.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Histogram2D/Histogram2D.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/IEEEUtils/IEEEUtils.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Integration/Integration.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Interp/Interp.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Linalg/Linalg.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Machine/Machine.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Matrix/Matrix.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/MatrixComplex/MatrixComplex.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Min/Min.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Monte/Monte.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multifit/Multifit.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multimin/Multimin.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multiroots/Multiroots.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/NTuple/NTuple.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/ODEIV/ODEIV.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Permutation/Permutation.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Poly/Poly.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/PowInt/PowInt.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/QRNG/QRNG.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/RNG/RNG.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Randist/Randist.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Roots/Roots.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/SF/SF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Siman/Siman.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sort/Sort.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Spline/Spline.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Statistics/Statistics.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sum/Sum.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sys/Sys.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Vector/Vector.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/VectorComplex/VectorComplex.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Version/Version.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet/Wavelet.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet2D/Wavelet2D.so
+%%SITE_ARCH%%/Math/GSL.pm
+%%SITE_ARCH%%/Math/GSL/BLAS.pm
+%%SITE_ARCH%%/Math/GSL/BSpline.pm
+%%SITE_ARCH%%/Math/GSL/CBLAS.pm
+%%SITE_ARCH%%/Math/GSL/CDF.pm
+%%SITE_ARCH%%/Math/GSL/Chebyshev.pm
+%%SITE_ARCH%%/Math/GSL/Combination.pm
+%%SITE_ARCH%%/Math/GSL/Complex.pm
+%%SITE_ARCH%%/Math/GSL/Const.pm
+%%SITE_ARCH%%/Math/GSL/DHT.pm
+%%SITE_ARCH%%/Math/GSL/Deriv.pm
+%%SITE_ARCH%%/Math/GSL/Diff.pm
+%%SITE_ARCH%%/Math/GSL/Eigen.pm
+%%SITE_ARCH%%/Math/GSL/Errno.pm
+%%SITE_ARCH%%/Math/GSL/FFT.pm
+%%SITE_ARCH%%/Math/GSL/Fit.pm
+%%SITE_ARCH%%/Math/GSL/Heapsort.pm
+%%SITE_ARCH%%/Math/GSL/Histogram.pm
+%%SITE_ARCH%%/Math/GSL/Histogram2D.pm
+%%SITE_ARCH%%/Math/GSL/IEEEUtils.pm
+%%SITE_ARCH%%/Math/GSL/Integration.pm
+%%SITE_ARCH%%/Math/GSL/Interp.pm
+%%SITE_ARCH%%/Math/GSL/Linalg.pm
+%%SITE_ARCH%%/Math/GSL/Machine.pm
+%%SITE_ARCH%%/Math/GSL/Matrix.pm
+%%SITE_ARCH%%/Math/GSL/MatrixComplex.pm
+%%SITE_ARCH%%/Math/GSL/Min.pm
+%%SITE_ARCH%%/Math/GSL/Monte.pm
+%%SITE_ARCH%%/Math/GSL/Multifit.pm
+%%SITE_ARCH%%/Math/GSL/Multimin.pm
+%%SITE_ARCH%%/Math/GSL/Multiroots.pm
+%%SITE_ARCH%%/Math/GSL/NTuple.pm
+%%SITE_ARCH%%/Math/GSL/ODEIV.pm
+%%SITE_ARCH%%/Math/GSL/Permutation.pm
+%%SITE_ARCH%%/Math/GSL/Poly.pm
+%%SITE_ARCH%%/Math/GSL/PowInt.pm
+%%SITE_ARCH%%/Math/GSL/QRNG.pm
+%%SITE_ARCH%%/Math/GSL/RNG.pm
+%%SITE_ARCH%%/Math/GSL/Randist.pm
+%%SITE_ARCH%%/Math/GSL/Roots.pm
+%%SITE_ARCH%%/Math/GSL/SF.pm
+%%SITE_ARCH%%/Math/GSL/Siman.pm
+%%SITE_ARCH%%/Math/GSL/Sort.pm
+%%SITE_ARCH%%/Math/GSL/Spline.pm
+%%SITE_ARCH%%/Math/GSL/Statistics.pm
+%%SITE_ARCH%%/Math/GSL/Sum.pm
+%%SITE_ARCH%%/Math/GSL/Sys.pm
+%%SITE_ARCH%%/Math/GSL/Test.pm
+%%SITE_ARCH%%/Math/GSL/Vector.pm
+%%SITE_ARCH%%/Math/GSL/VectorComplex.pm
+%%SITE_ARCH%%/Math/GSL/Version.pm
+%%SITE_ARCH%%/Math/GSL/Wavelet.pm
+%%SITE_ARCH%%/Math/GSL/Wavelet2D.pm
+%%SITE_ARCH%%/auto/Math/GSL/BLAS/BLAS.so
+%%SITE_ARCH%%/auto/Math/GSL/BSpline/BSpline.so
+%%SITE_ARCH%%/auto/Math/GSL/CBLAS/CBLAS.so
+%%SITE_ARCH%%/auto/Math/GSL/CDF/CDF.so
+%%SITE_ARCH%%/auto/Math/GSL/Chebyshev/Chebyshev.so
+%%SITE_ARCH%%/auto/Math/GSL/Combination/Combination.so
+%%SITE_ARCH%%/auto/Math/GSL/Complex/Complex.so
+%%SITE_ARCH%%/auto/Math/GSL/Const/Const.so
+%%SITE_ARCH%%/auto/Math/GSL/DHT/DHT.so
+%%SITE_ARCH%%/auto/Math/GSL/Deriv/Deriv.so
+%%SITE_ARCH%%/auto/Math/GSL/Diff/Diff.so
+%%SITE_ARCH%%/auto/Math/GSL/Eigen/Eigen.so
+%%SITE_ARCH%%/auto/Math/GSL/Errno/Errno.so
+%%SITE_ARCH%%/auto/Math/GSL/FFT/FFT.so
+%%SITE_ARCH%%/auto/Math/GSL/Fit/Fit.so
+%%SITE_ARCH%%/auto/Math/GSL/Heapsort/Heapsort.so
+%%SITE_ARCH%%/auto/Math/GSL/Histogram/Histogram.so
+%%SITE_ARCH%%/auto/Math/GSL/Histogram2D/Histogram2D.so
+%%SITE_ARCH%%/auto/Math/GSL/IEEEUtils/IEEEUtils.so
+%%SITE_ARCH%%/auto/Math/GSL/Integration/Integration.so
+%%SITE_ARCH%%/auto/Math/GSL/Interp/Interp.so
+%%SITE_ARCH%%/auto/Math/GSL/Linalg/Linalg.so
+%%SITE_ARCH%%/auto/Math/GSL/Machine/Machine.so
+%%SITE_ARCH%%/auto/Math/GSL/Matrix/Matrix.so
+%%SITE_ARCH%%/auto/Math/GSL/MatrixComplex/MatrixComplex.so
+%%SITE_ARCH%%/auto/Math/GSL/Min/Min.so
+%%SITE_ARCH%%/auto/Math/GSL/Monte/Monte.so
+%%SITE_ARCH%%/auto/Math/GSL/Multifit/Multifit.so
+%%SITE_ARCH%%/auto/Math/GSL/Multimin/Multimin.so
+%%SITE_ARCH%%/auto/Math/GSL/Multiroots/Multiroots.so
+%%SITE_ARCH%%/auto/Math/GSL/NTuple/NTuple.so
+%%SITE_ARCH%%/auto/Math/GSL/ODEIV/ODEIV.so
+%%SITE_ARCH%%/auto/Math/GSL/Permutation/Permutation.so
+%%SITE_ARCH%%/auto/Math/GSL/Poly/Poly.so
+%%SITE_ARCH%%/auto/Math/GSL/PowInt/PowInt.so
+%%SITE_ARCH%%/auto/Math/GSL/QRNG/QRNG.so
+%%SITE_ARCH%%/auto/Math/GSL/RNG/RNG.so
+%%SITE_ARCH%%/auto/Math/GSL/Randist/Randist.so
+%%SITE_ARCH%%/auto/Math/GSL/Roots/Roots.so
+%%SITE_ARCH%%/auto/Math/GSL/SF/SF.so
+%%SITE_ARCH%%/auto/Math/GSL/Siman/Siman.so
+%%SITE_ARCH%%/auto/Math/GSL/Sort/Sort.so
+%%SITE_ARCH%%/auto/Math/GSL/Spline/Spline.so
+%%SITE_ARCH%%/auto/Math/GSL/Statistics/Statistics.so
+%%SITE_ARCH%%/auto/Math/GSL/Sum/Sum.so
+%%SITE_ARCH%%/auto/Math/GSL/Sys/Sys.so
+%%SITE_ARCH%%/auto/Math/GSL/Vector/Vector.so
+%%SITE_ARCH%%/auto/Math/GSL/VectorComplex/VectorComplex.so
+%%SITE_ARCH%%/auto/Math/GSL/Version/Version.so
+%%SITE_ARCH%%/auto/Math/GSL/Wavelet/Wavelet.so
+%%SITE_ARCH%%/auto/Math/GSL/Wavelet2D/Wavelet2D.so
 %%PERL5_MAN3%%/Math::GSL.3.gz
 %%PERL5_MAN3%%/Math::GSL::BLAS.3.gz
 %%PERL5_MAN3%%/Math::GSL::BSpline.3.gz
diff --git a/math/p5-Math-Geometry-Planar-GPC-Polygon/Makefile b/math/p5-Math-Geometry-Planar-GPC-Polygon/Makefile
index 0c7bd66d88e7..a6dc46a2d1d9 100644
--- a/math/p5-Math-Geometry-Planar-GPC-Polygon/Makefile
+++ b/math/p5-Math-Geometry-Planar-GPC-Polygon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-Geometry-Planar-GPC-Polygon
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Geometry-Planar-GPC-Polygon/pkg-plist b/math/p5-Math-Geometry-Planar-GPC-Polygon/pkg-plist
index 99f6c5d1a60f..de7df3a7dd47 100644
--- a/math/p5-Math-Geometry-Planar-GPC-Polygon/pkg-plist
+++ b/math/p5-Math-Geometry-Planar-GPC-Polygon/pkg-plist
@@ -1,7 +1,6 @@
 %%PERL5_MAN3%%/Math::Geometry::Planar::GPC::Polygon.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/Planar/GPC/Polygon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/Planar/GPC/Polygon/functions.c
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/Planar/GPC/Polygon/include/gpc.c
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/Planar/GPC/Polygon/include/gpc.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar/GPC/Polygon/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar/GPC/Polygon/Polygon.so
+%%SITE_ARCH%%/Math/Geometry/Planar/GPC/Polygon.pm
+%%SITE_ARCH%%/Math/Geometry/Planar/GPC/Polygon/functions.c
+%%SITE_ARCH%%/Math/Geometry/Planar/GPC/Polygon/include/gpc.c
+%%SITE_ARCH%%/Math/Geometry/Planar/GPC/Polygon/include/gpc.h
+%%SITE_ARCH%%/auto/Math/Geometry/Planar/GPC/Polygon/Polygon.so
diff --git a/math/p5-Math-Geometry-Planar-GPC/Makefile b/math/p5-Math-Geometry-Planar-GPC/Makefile
index 12e850fd92a2..36d2ff0c155a 100644
--- a/math/p5-Math-Geometry-Planar-GPC/Makefile
+++ b/math/p5-Math-Geometry-Planar-GPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Geometry-Planar-GPC
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Geometry-Planar-GPC/pkg-plist b/math/p5-Math-Geometry-Planar-GPC/pkg-plist
index ed6589c9e121..249a545c5577 100644
--- a/math/p5-Math-Geometry-Planar-GPC/pkg-plist
+++ b/math/p5-Math-Geometry-Planar-GPC/pkg-plist
@@ -1,11 +1,3 @@
 %%PERL5_MAN3%%/Math::Geometry::Planar::GPC.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/Planar/GPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar/GPC/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar/GPC/GPC.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar/GPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/Planar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/Geometry/Planar/GPC.pm
+%%SITE_ARCH%%/auto/Math/Geometry/Planar/GPC/GPC.so
diff --git a/math/p5-Math-Geometry-Planar-Offset/Makefile b/math/p5-Math-Geometry-Planar-Offset/Makefile
index 4346e62455f5..6654024f54cf 100644
--- a/math/p5-Math-Geometry-Planar-Offset/Makefile
+++ b/math/p5-Math-Geometry-Planar-Offset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Geometry-Planar-Offset
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Geometry-Planar-Offset/pkg-plist b/math/p5-Math-Geometry-Planar-Offset/pkg-plist
index 49ec3a21d266..aa68f106fe67 100644
--- a/math/p5-Math-Geometry-Planar-Offset/pkg-plist
+++ b/math/p5-Math-Geometry-Planar-Offset/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Math::Geometry::Planar::Offset.3.gz
 %%SITE_PERL%%/Math/Geometry/Planar/Offset.pm
-@dirrmtry %%SITE_PERL%%/Math/Geometry/Planar
-@dirrmtry %%SITE_PERL%%/Math/Geometry
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Geometry-Planar/Makefile b/math/p5-Math-Geometry-Planar/Makefile
index 05bb28f46fd3..f28d9e96887d 100644
--- a/math/p5-Math-Geometry-Planar/Makefile
+++ b/math/p5-Math-Geometry-Planar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Geometry-Planar
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Geometry-Planar/pkg-plist b/math/p5-Math-Geometry-Planar/pkg-plist
index 1b7623b07357..2737a5118ffe 100644
--- a/math/p5-Math-Geometry-Planar/pkg-plist
+++ b/math/p5-Math-Geometry-Planar/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::Geometry::Planar.3.gz
 %%SITE_PERL%%/Math/Geometry/Planar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Planar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Geometry
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Geometry-Voronoi/Makefile b/math/p5-Math-Geometry-Voronoi/Makefile
index 4e460b601b54..5b5478384ae3 100644
--- a/math/p5-Math-Geometry-Voronoi/Makefile
+++ b/math/p5-Math-Geometry-Voronoi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-Geometry-Voronoi
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Geometry-Voronoi/pkg-plist b/math/p5-Math-Geometry-Voronoi/pkg-plist
index 9bc4a3996f8d..00f1ff470b08 100644
--- a/math/p5-Math-Geometry-Voronoi/pkg-plist
+++ b/math/p5-Math-Geometry-Voronoi/pkg-plist
@@ -1,10 +1,4 @@
 %%PERL5_MAN3%%/Math::Geometry::Voronoi.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/Voronoi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry/leak-test.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Voronoi/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Voronoi/Voronoi.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/Voronoi
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Geometry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/Geometry/Voronoi.pm
+%%SITE_ARCH%%/Math/Geometry/leak-test.pl
+%%SITE_ARCH%%/auto/Math/Geometry/Voronoi/Voronoi.so
diff --git a/math/p5-Math-Geometry/Makefile b/math/p5-Math-Geometry/Makefile
index 3631499f0124..efb5f041dbde 100644
--- a/math/p5-Math-Geometry/Makefile
+++ b/math/p5-Math-Geometry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Geometry
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Geometry/pkg-plist b/math/p5-Math-Geometry/pkg-plist
index ccbddcbc3353..b284809232ca 100644
--- a/math/p5-Math-Geometry/pkg-plist
+++ b/math/p5-Math-Geometry/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Math/Geometry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry/.packlist
 %%PERL5_MAN3%%/Math::Geometry.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Geometry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Gradient/Makefile b/math/p5-Math-Gradient/Makefile
index 6de85da21e0b..8bf6d28a605a 100644
--- a/math/p5-Math-Gradient/Makefile
+++ b/math/p5-Math-Gradient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Gradient
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Gradient/pkg-plist b/math/p5-Math-Gradient/pkg-plist
index bc23896c96de..3847bf31b952 100644
--- a/math/p5-Math-Gradient/pkg-plist
+++ b/math/p5-Math-Gradient/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Gradient.3.gz
 %%SITE_PERL%%/Math/Gradient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Gradient/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Gradient
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Int128/Makefile b/math/p5-Math-Int128/Makefile
index e53bd01c54f5..568e647fcc50 100644
--- a/math/p5-Math-Int128/Makefile
+++ b/math/p5-Math-Int128/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Int128
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -30,6 +31,6 @@ USE_GCC=	yes
 .endif
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Math/Int128/Int128.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/Int128/Int128.so
 
 .include <bsd.port.post.mk>
diff --git a/math/p5-Math-Int128/pkg-plist b/math/p5-Math-Int128/pkg-plist
index c793aae58304..a802201b3a55 100644
--- a/math/p5-Math-Int128/pkg-plist
+++ b/math/p5-Math-Int128/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Int128.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Int128/die_on_overflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Int128/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Int128/Int128.so
+%%SITE_ARCH%%/Math/Int128.pm
+%%SITE_ARCH%%/Math/Int128/die_on_overflow.pm
+%%SITE_ARCH%%/auto/Math/Int128/Int128.so
 %%PERL5_MAN3%%/Math::Int128.3.gz
 %%PERL5_MAN3%%/Math::Int128::die_on_overflow.3.gz
diff --git a/math/p5-Math-Int64/Makefile b/math/p5-Math-Int64/Makefile
index fbd5eb631e79..3e92364de40e 100644
--- a/math/p5-Math-Int64/Makefile
+++ b/math/p5-Math-Int64/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Int64
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Int64/pkg-plist b/math/p5-Math-Int64/pkg-plist
index ba2b69679a57..24769945dcab 100644
--- a/math/p5-Math-Int64/pkg-plist
+++ b/math/p5-Math-Int64/pkg-plist
@@ -1,9 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Int64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Int64/die_on_overflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Int64/native_if_available.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Int64/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Int64/Int64.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/UInt64.pm
+%%SITE_ARCH%%/Math/Int64.pm
+%%SITE_ARCH%%/Math/Int64/die_on_overflow.pm
+%%SITE_ARCH%%/Math/Int64/native_if_available.pm
+%%SITE_ARCH%%/auto/Math/Int64/Int64.so
+%%SITE_ARCH%%/Math/UInt64.pm
 %%PERL5_MAN3%%/Math::Int64.3.gz
 %%PERL5_MAN3%%/Math::Int64::die_on_overflow.3.gz
 %%PERL5_MAN3%%/Math::UInt64.3.gz
diff --git a/math/p5-Math-Interpolate/Makefile b/math/p5-Math-Interpolate/Makefile
index aef8c1d47c60..e76b19d23fbb 100644
--- a/math/p5-Math-Interpolate/Makefile
+++ b/math/p5-Math-Interpolate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Interpolate
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Interpolate/pkg-plist b/math/p5-Math-Interpolate/pkg-plist
index c5e55b85b731..80e1e6a5b22c 100644
--- a/math/p5-Math-Interpolate/pkg-plist
+++ b/math/p5-Math-Interpolate/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Math::IntervalSearch.3.gz
 %%SITE_PERL%%/Math/Interpolate.pm
 %%SITE_PERL%%/Math/IntervalSearch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Interpolate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Interpolate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Intersection-StraightLine/Makefile b/math/p5-Math-Intersection-StraightLine/Makefile
index dfae6f737427..c75c0287bce6 100644
--- a/math/p5-Math-Intersection-StraightLine/Makefile
+++ b/math/p5-Math-Intersection-StraightLine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Intersection-StraightLine
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Intersection-StraightLine/pkg-plist b/math/p5-Math-Intersection-StraightLine/pkg-plist
index 9c46118013a8..c002221fe23c 100644
--- a/math/p5-Math-Intersection-StraightLine/pkg-plist
+++ b/math/p5-Math-Intersection-StraightLine/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::Intersection::StraightLine.3.gz
 %%SITE_PERL%%/Math/Intersection/StraightLine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Intersection/StraightLine/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Intersection/StraightLine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Intersection
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Intersection
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Logic/Makefile b/math/p5-Math-Logic/Makefile
index b73a796e70ad..4cdedea35b7c 100644
--- a/math/p5-Math-Logic/Makefile
+++ b/math/p5-Math-Logic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Logic
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Logic/pkg-plist b/math/p5-Math-Logic/pkg-plist
index 30c93180e31f..3c1b62a7a358 100644
--- a/math/p5-Math-Logic/pkg-plist
+++ b/math/p5-Math-Logic/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Logic.3.gz
 %%SITE_PERL%%/Math/Logic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Logic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Logic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-MPC/Makefile b/math/p5-Math-MPC/Makefile
index fefded3a920d..1cc1482ee634 100644
--- a/math/p5-Math-MPC/Makefile
+++ b/math/p5-Math-MPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-MPC
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
diff --git a/math/p5-Math-MPC/pkg-plist b/math/p5-Math-MPC/pkg-plist
index 3448663c25d9..622a3107af28 100644
--- a/math/p5-Math-MPC/pkg-plist
+++ b/math/p5-Math-MPC/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Math::MPC.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/MPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPC/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPC/MPC.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/MPC.pm
+%%SITE_ARCH%%/auto/Math/MPC/MPC.so
diff --git a/math/p5-Math-MPFR/Makefile b/math/p5-Math-MPFR/Makefile
index d8fd87aadad8..d0e674c5d28c 100644
--- a/math/p5-Math-MPFR/Makefile
+++ b/math/p5-Math-MPFR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-MPFR
 PORTVERSION=	3.22
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SISYPHUS
@@ -26,8 +27,8 @@ USE_PERL5=	configure
 MAKE_ENV=	INC="-I${LOCALBASE}/include"
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Math/MPFR/Prec/Prec.so
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Math/MPFR/V/V.so
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Math/MPFR/MPFR.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/MPFR/Prec/Prec.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/MPFR/V/V.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/MPFR/MPFR.so
 
 .include <bsd.port.mk>
diff --git a/math/p5-Math-MPFR/pkg-plist b/math/p5-Math-MPFR/pkg-plist
index 3e871e485a79..bc6b21fee9d7 100644
--- a/math/p5-Math-MPFR/pkg-plist
+++ b/math/p5-Math-MPFR/pkg-plist
@@ -1,14 +1,7 @@
 %%PERL5_MAN3%%/Math::MPFR.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/MPFR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/MPFR/Prec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/MPFR/V.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/MPFR.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/Prec/Prec.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/V/V.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/V
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/Prec
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/MPFR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/MPFR.pm
+%%SITE_ARCH%%/Math/MPFR/Prec.pm
+%%SITE_ARCH%%/Math/MPFR/V.pm
+%%SITE_ARCH%%/auto/Math/MPFR/MPFR.so
+%%SITE_ARCH%%/auto/Math/MPFR/Prec/Prec.so
+%%SITE_ARCH%%/auto/Math/MPFR/V/V.so
diff --git a/math/p5-Math-Matrix/Makefile b/math/p5-Math-Matrix/Makefile
index 0c6acd05d15a..b8a355310983 100644
--- a/math/p5-Math-Matrix/Makefile
+++ b/math/p5-Math-Matrix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Matrix
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Matrix/pkg-plist b/math/p5-Math-Matrix/pkg-plist
index 5ffdcfc7e0b2..842d91753b10 100644
--- a/math/p5-Math-Matrix/pkg-plist
+++ b/math/p5-Math-Matrix/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Math/Matrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Matrix/.packlist
 %%PERL5_MAN3%%/Math::Matrix.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Matrix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-MatrixReal/Makefile b/math/p5-Math-MatrixReal/Makefile
index 2ca6ff21e61a..64d5ef4e205f 100644
--- a/math/p5-Math-MatrixReal/Makefile
+++ b/math/p5-Math-MatrixReal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-MatrixReal
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-MatrixReal/pkg-plist b/math/p5-Math-MatrixReal/pkg-plist
index 4b25e3104bfb..113d9efd174c 100644
--- a/math/p5-Math-MatrixReal/pkg-plist
+++ b/math/p5-Math-MatrixReal/pkg-plist
@@ -3,7 +3,3 @@
 %%SITE_PERL%%/Math/Kleene.pod
 %%SITE_PERL%%/Math/MatrixReal.pm
 %%SITE_PERL%%/Math/funcs.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MatrixReal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MatrixReal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-NumberCruncher/Makefile b/math/p5-Math-NumberCruncher/Makefile
index ec9b9c142b94..d3aca5a1f35f 100644
--- a/math/p5-Math-NumberCruncher/Makefile
+++ b/math/p5-Math-NumberCruncher/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-NumberCruncher
 PORTVERSION=	5.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-NumberCruncher/pkg-plist b/math/p5-Math-NumberCruncher/pkg-plist
index 155896e55caf..b345405f336a 100644
--- a/math/p5-Math-NumberCruncher/pkg-plist
+++ b/math/p5-Math-NumberCruncher/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Math::NumberCruncher.3.gz
 %%SITE_PERL%%/Math/NumberCruncher.pm
 %%SITE_PERL%%/Math/NumberCruncher.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/NumberCruncher/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/NumberCruncher
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index e5ded529cd31..d7230d59fee2 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Pari
 PORTVERSION=	2.01080607
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Pari/pkg-plist b/math/p5-Math-Pari/pkg-plist
index 25ab6bdecd6d..b132b4400a54 100644
--- a/math/p5-Math-Pari/pkg-plist
+++ b/math/p5-Math-Pari/pkg-plist
@@ -1,11 +1,7 @@
 %%PERL5_MAN3%%/Math::Pari.3.gz
 %%PERL5_MAN3%%/Math::PariInit.3.gz
 %%PERL5_MAN3%%/Math::libPARI.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Pari.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/PariInit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/libPARI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Pari/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Pari/Pari.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Pari
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/Pari.pm
+%%SITE_ARCH%%/Math/PariInit.pm
+%%SITE_ARCH%%/Math/libPARI.pod
+%%SITE_ARCH%%/auto/Math/Pari/Pari.so
diff --git a/math/p5-Math-Polygon-Tree/Makefile b/math/p5-Math-Polygon-Tree/Makefile
index e21d997eb9b1..663ee895ffd8 100644
--- a/math/p5-Math-Polygon-Tree/Makefile
+++ b/math/p5-Math-Polygon-Tree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Polygon-Tree
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LIOSHA
diff --git a/math/p5-Math-Polygon-Tree/pkg-plist b/math/p5-Math-Polygon-Tree/pkg-plist
index d7b4be712f68..ba6f93c82952 100644
--- a/math/p5-Math-Polygon-Tree/pkg-plist
+++ b/math/p5-Math-Polygon-Tree/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Math::Polygon::Tree.3.gz
 %%SITE_PERL%%/Math/Polygon/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Polygon/Tree/.packlist
diff --git a/math/p5-Math-Polygon/Makefile b/math/p5-Math-Polygon/Makefile
index 79fb302fba91..91ce14ce9b14 100644
--- a/math/p5-Math-Polygon/Makefile
+++ b/math/p5-Math-Polygon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Polygon
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Polygon/pkg-plist b/math/p5-Math-Polygon/pkg-plist
index c556fcaa6bbd..7a7023114662 100644
--- a/math/p5-Math-Polygon/pkg-plist
+++ b/math/p5-Math-Polygon/pkg-plist
@@ -16,8 +16,3 @@
 %%SITE_PERL%%/Math/Polygon/Surface.pod
 %%SITE_PERL%%/Math/Polygon/Transform.pm
 %%SITE_PERL%%/Math/Polygon/Transform.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Polygon/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Polygon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Polygon
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Polynomial-Solve/Makefile b/math/p5-Math-Polynomial-Solve/Makefile
index cf2f1ecc3eed..82412fc79d4b 100644
--- a/math/p5-Math-Polynomial-Solve/Makefile
+++ b/math/p5-Math-Polynomial-Solve/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Polynomial-Solve
 PORTVERSION=	2.70
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Math
diff --git a/math/p5-Math-Polynomial-Solve/pkg-plist b/math/p5-Math-Polynomial-Solve/pkg-plist
index 4952d6f0372b..07917b72f0bb 100644
--- a/math/p5-Math-Polynomial-Solve/pkg-plist
+++ b/math/p5-Math-Polynomial-Solve/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::Polynomial::Solve.3.gz
 %%SITE_PERL%%/Math/Polynomial/Solve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Polynomial/Solve/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Polynomial/Solve
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Polynomial
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Polynomial
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Prime-XS/Makefile b/math/p5-Math-Prime-XS/Makefile
index b1ef20db24bc..53797b8713c7 100644
--- a/math/p5-Math-Prime-XS/Makefile
+++ b/math/p5-Math-Prime-XS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-Prime-XS
 PORTVERSION=	0.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Prime-XS/pkg-plist b/math/p5-Math-Prime-XS/pkg-plist
index 30b308ca67ed..4e52e5b40916 100644
--- a/math/p5-Math-Prime-XS/pkg-plist
+++ b/math/p5-Math-Prime-XS/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Prime/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Prime/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Prime/XS/XS.so
+%%SITE_ARCH%%/Math/Prime/XS.pm
+%%SITE_ARCH%%/auto/Math/Prime/XS/XS.so
 %%PERL5_MAN3%%/Math::Prime::XS.3.gz
diff --git a/math/p5-Math-RPN/Makefile b/math/p5-Math-RPN/Makefile
index 70e2105c0451..efbccd8b3171 100644
--- a/math/p5-Math-RPN/Makefile
+++ b/math/p5-Math-RPN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-RPN
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-RPN/pkg-plist b/math/p5-Math-RPN/pkg-plist
index 2ebfc136880a..1bd95d0e8be2 100644
--- a/math/p5-Math-RPN/pkg-plist
+++ b/math/p5-Math-RPN/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Math/RPN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/RPN/.packlist
 %%PERL5_MAN3%%/Math::RPN.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/RPN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Random-ISAAC-XS/Makefile b/math/p5-Math-Random-ISAAC-XS/Makefile
index 069a551f4168..79048dbd2109 100644
--- a/math/p5-Math-Random-ISAAC-XS/Makefile
+++ b/math/p5-Math-Random-ISAAC-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Random-ISAAC-XS
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JAWNSY
diff --git a/math/p5-Math-Random-ISAAC-XS/pkg-plist b/math/p5-Math-Random-ISAAC-XS/pkg-plist
index a42f8e8133f6..9ec606f18680 100644
--- a/math/p5-Math-Random-ISAAC-XS/pkg-plist
+++ b/math/p5-Math-Random-ISAAC-XS/pkg-plist
@@ -1,10 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/ISAAC/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/ISAAC/XS/XS.so
+%%SITE_ARCH%%/Math/Random/ISAAC/XS.pm
+%%SITE_ARCH%%/auto/Math/Random/ISAAC/XS/XS.so
 %%PERL5_MAN3%%/Math::Random::ISAAC::XS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/ISAAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/ISAAC/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/ISAAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Random-ISAAC/Makefile b/math/p5-Math-Random-ISAAC/Makefile
index 5c5f07bc1768..bfdd381517a7 100644
--- a/math/p5-Math-Random-ISAAC/Makefile
+++ b/math/p5-Math-Random-ISAAC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Random-ISAAC
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JAWNSY
diff --git a/math/p5-Math-Random-ISAAC/pkg-plist b/math/p5-Math-Random-ISAAC/pkg-plist
index 76cf458693c9..40d4f7040a1e 100644
--- a/math/p5-Math-Random-ISAAC/pkg-plist
+++ b/math/p5-Math-Random-ISAAC/pkg-plist
@@ -1,11 +1,4 @@
 %%SITE_PERL%%/Math/Random/ISAAC/PP.pm
 %%SITE_PERL%%/Math/Random/ISAAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/ISAAC/.packlist
 %%PERL5_MAN3%%/Math::Random::ISAAC::PP.3.gz
 %%PERL5_MAN3%%/Math::Random::ISAAC.3.gz
-@dirrmtry %%SITE_PERL%%/Math/Random/ISAAC
-@dirrmtry %%SITE_PERL%%/Math/Random
-@dirrmtry %%SITE_PERL%%/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/ISAAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Random-MT-Auto/Makefile b/math/p5-Math-Random-MT-Auto/Makefile
index 34bdbeba987b..16606d86a2ae 100644
--- a/math/p5-Math-Random-MT-Auto/Makefile
+++ b/math/p5-Math-Random-MT-Auto/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Random-MT-Auto
 PORTVERSION=	6.22
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Random-MT-Auto/pkg-plist b/math/p5-Math-Random-MT-Auto/pkg-plist
index ddc37d5b56fc..62343e256a21 100644
--- a/math/p5-Math-Random-MT-Auto/pkg-plist
+++ b/math/p5-Math-Random-MT-Auto/pkg-plist
@@ -1,14 +1,5 @@
 %%PERL5_MAN3%%/Math::Random::MT::Auto.3.gz
 %%PERL5_MAN3%%/Math::Random::MT::Auto::Range.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/MT/Auto.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/MT/Auto/Range.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/Auto/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/Auto/Auto.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/Auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/MT/Auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/MT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/Random/MT/Auto.pm
+%%SITE_ARCH%%/Math/Random/MT/Auto/Range.pm
+%%SITE_ARCH%%/auto/Math/Random/MT/Auto/Auto.so
diff --git a/math/p5-Math-Random-MT/Makefile b/math/p5-Math-Random-MT/Makefile
index 830d728a9073..390786a399f8 100644
--- a/math/p5-Math-Random-MT/Makefile
+++ b/math/p5-Math-Random-MT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Random-MT
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Random-MT/pkg-plist b/math/p5-Math-Random-MT/pkg-plist
index 53d21344d11d..2d64fda468ad 100644
--- a/math/p5-Math-Random-MT/pkg-plist
+++ b/math/p5-Math-Random-MT/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Math::Random::MT.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/MT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/MT.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/Random/MT.pm
+%%SITE_ARCH%%/auto/Math/Random/MT/MT.so
diff --git a/math/p5-Math-Random-OO/Makefile b/math/p5-Math-Random-OO/Makefile
index 6dc5f6ea0a1c..7d2b3686d58f 100644
--- a/math/p5-Math-Random-OO/Makefile
+++ b/math/p5-Math-Random-OO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Random-OO
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Random-OO/pkg-plist b/math/p5-Math-Random-OO/pkg-plist
index b2f921e1e9ec..f797bf588b38 100644
--- a/math/p5-Math-Random-OO/pkg-plist
+++ b/math/p5-Math-Random-OO/pkg-plist
@@ -3,15 +3,8 @@
 %%SITE_PERL%%/Math/Random/OO/Normal.pm
 %%SITE_PERL%%/Math/Random/OO/Uniform.pm
 %%SITE_PERL%%/Math/Random/OO/UniformInt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/OO/.packlist
 %%PERL5_MAN3%%/Math::Random::OO.3.gz
 %%PERL5_MAN3%%/Math::Random::OO::Bootstrap.3.gz
 %%PERL5_MAN3%%/Math::Random::OO::Normal.3.gz
 %%PERL5_MAN3%%/Math::Random::OO::Uniform.3.gz
 %%PERL5_MAN3%%/Math::Random::OO::UniformInt.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/OO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Random/OO
-@dirrmtry %%SITE_PERL%%/Math/Random
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Random-Secure/Makefile b/math/p5-Math-Random-Secure/Makefile
index aff79113ed3b..4f7fc04bc956 100644
--- a/math/p5-Math-Random-Secure/Makefile
+++ b/math/p5-Math-Random-Secure/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Random-Secure
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Random-Secure/pkg-plist b/math/p5-Math-Random-Secure/pkg-plist
index 5215ddd02d05..beec49f31c2f 100644
--- a/math/p5-Math-Random-Secure/pkg-plist
+++ b/math/p5-Math-Random-Secure/pkg-plist
@@ -1,11 +1,4 @@
 %%SITE_PERL%%/Math/Random/Secure.pm
 %%SITE_PERL%%/Math/Random/Secure/RNG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/Secure/.packlist
 %%PERL5_MAN3%%/Math::Random::Secure.3.gz
 %%PERL5_MAN3%%/Math::Random::Secure::RNG.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/Secure
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrm %%SITE_PERL%%/Math/Random/Secure
-@dirrmtry %%SITE_PERL%%/Math/Random
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Random/Makefile b/math/p5-Math-Random/Makefile
index 85b6266de962..95f38b023d80 100644
--- a/math/p5-Math-Random/Makefile
+++ b/math/p5-Math-Random/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Random
 PORTVERSION=	0.71
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Random/pkg-plist b/math/p5-Math-Random/pkg-plist
index e61b9e41c152..96199929df46 100644
--- a/math/p5-Math-Random/pkg-plist
+++ b/math/p5-Math-Random/pkg-plist
@@ -1,11 +1,7 @@
 %%PERL5_MAN3%%/Math::Random.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/test1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/test2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/Random.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_ARCH%%/Math/Random.pm
+%%SITE_ARCH%%/Math/example.pl
+%%SITE_ARCH%%/Math/test1.pl
+%%SITE_ARCH%%/Math/test2.pl
+%%SITE_ARCH%%/auto/Math/Random/Random.so
+%%SITE_ARCH%%/auto/Math/Random/autosplit.ix
diff --git a/math/p5-Math-RandomOrg/Makefile b/math/p5-Math-RandomOrg/Makefile
index 2ecdd0e7b17c..c9d9c0dd3fee 100644
--- a/math/p5-Math-RandomOrg/Makefile
+++ b/math/p5-Math-RandomOrg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-RandomOrg
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-RandomOrg/pkg-plist b/math/p5-Math-RandomOrg/pkg-plist
index 08900452e412..4fef80273330 100644
--- a/math/p5-Math-RandomOrg/pkg-plist
+++ b/math/p5-Math-RandomOrg/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::RandomOrg.3.gz
 %%SITE_PERL%%/Math/RandomOrg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/RandomOrg/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/RandomOrg
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Round-Var/Makefile b/math/p5-Math-Round-Var/Makefile
index a4b0f3a87a07..3e7e240b690e 100644
--- a/math/p5-Math-Round-Var/Makefile
+++ b/math/p5-Math-Round-Var/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Round-Var
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Round-Var/pkg-plist b/math/p5-Math-Round-Var/pkg-plist
index fa209b4069af..15979346b631 100644
--- a/math/p5-Math-Round-Var/pkg-plist
+++ b/math/p5-Math-Round-Var/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Math::Round::Var.3.gz
 %%SITE_PERL%%/Math/Round/Var.pm
-@dirrmtry %%SITE_PERL%%/Math/Round
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Round/Makefile b/math/p5-Math-Round/Makefile
index 7a5be2ed7e28..2baf1222c2b6 100644
--- a/math/p5-Math-Round/Makefile
+++ b/math/p5-Math-Round/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Round
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Round/pkg-plist b/math/p5-Math-Round/pkg-plist
index 67552ae72331..23d9bf10dd21 100644
--- a/math/p5-Math-Round/pkg-plist
+++ b/math/p5-Math-Round/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Math/Round.pm
 %%SITE_PERL%%/auto/Math/Round/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Round/.packlist
 %%PERL5_MAN3%%/Math::Round.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Round
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/auto/Math/Round
-@dirrmtry %%SITE_PERL%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Sequence/Makefile b/math/p5-Math-Sequence/Makefile
index e641ae3c3676..504b797e91a7 100644
--- a/math/p5-Math-Sequence/Makefile
+++ b/math/p5-Math-Sequence/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Sequence
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Sequence/pkg-plist b/math/p5-Math-Sequence/pkg-plist
index e9ff5826136c..a17412c205ce 100644
--- a/math/p5-Math-Sequence/pkg-plist
+++ b/math/p5-Math-Sequence/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Sequence.3.gz
 %%SITE_PERL%%/Math/Sequence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Sequence/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Sequence
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Series/Makefile b/math/p5-Math-Series/Makefile
index 5cb5612f71bf..5e1319782619 100644
--- a/math/p5-Math-Series/Makefile
+++ b/math/p5-Math-Series/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Series
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Series/pkg-plist b/math/p5-Math-Series/pkg-plist
index 6158601e27b0..55c6c2da5b20 100644
--- a/math/p5-Math-Series/pkg-plist
+++ b/math/p5-Math-Series/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Series.3.gz
 %%SITE_PERL%%/Math/Series.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Series/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Series
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SigFigs/Makefile b/math/p5-Math-SigFigs/Makefile
index b97cb483f207..677731895d2a 100644
--- a/math/p5-Math-SigFigs/Makefile
+++ b/math/p5-Math-SigFigs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SigFigs
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SigFigs/pkg-plist b/math/p5-Math-SigFigs/pkg-plist
index 8afd7d22d5f8..826b1c708525 100644
--- a/math/p5-Math-SigFigs/pkg-plist
+++ b/math/p5-Math-SigFigs/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Math/SigFigs.pm
 %%SITE_PERL%%/Math/SigFigs.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SigFigs/.packlist
 %%PERL5_MAN3%%/Math::SigFigs.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SigFigs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SimpleVariable/Makefile b/math/p5-Math-SimpleVariable/Makefile
index 356eb6081f32..f72061bdf555 100644
--- a/math/p5-Math-SimpleVariable/Makefile
+++ b/math/p5-Math-SimpleVariable/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-SimpleVariable
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SimpleVariable/pkg-plist b/math/p5-Math-SimpleVariable/pkg-plist
index d9ed886169b2..6bddccbf8d5c 100644
--- a/math/p5-Math-SimpleVariable/pkg-plist
+++ b/math/p5-Math-SimpleVariable/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::SimpleVariable.3.gz
 %%SITE_PERL%%/Math/SimpleVariable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SimpleVariable/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SimpleVariable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Spline/Makefile b/math/p5-Math-Spline/Makefile
index a36fd7c4d77b..38e651a0dd4b 100644
--- a/math/p5-Math-Spline/Makefile
+++ b/math/p5-Math-Spline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Spline
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Spline/pkg-plist b/math/p5-Math-Spline/pkg-plist
index 55ceebd1e4d1..0813a69fa2a2 100644
--- a/math/p5-Math-Spline/pkg-plist
+++ b/math/p5-Math-Spline/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Spline.3.gz
 %%SITE_PERL%%/Math/Spline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Spline/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Spline
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-String/Makefile b/math/p5-Math-String/Makefile
index 87bff3255b80..9d6324862e26 100644
--- a/math/p5-Math-String/Makefile
+++ b/math/p5-Math-String/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-String
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-String/pkg-plist b/math/p5-Math-String/pkg-plist
index bd69a3eff0fb..67046901995b 100644
--- a/math/p5-Math-String/pkg-plist
+++ b/math/p5-Math-String/pkg-plist
@@ -8,9 +8,3 @@
 %%SITE_PERL%%/Math/String/Charset/Grouped.pm
 %%SITE_PERL%%/Math/String/Charset/Nested.pm
 %%SITE_PERL%%/Math/String/Sequence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/String/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/String
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/String/Charset
-@dirrmtry %%SITE_PERL%%/Math/String
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic-Custom-CCompiler/Makefile b/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
index c331e1223b43..3136fe106680 100644
--- a/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
+++ b/math/p5-Math-Symbolic-Custom-CCompiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic-Custom-CCompiler
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Symbolic-Custom-CCompiler/pkg-plist b/math/p5-Math-Symbolic-Custom-CCompiler/pkg-plist
index bb35221e1ce4..243916b78e41 100644
--- a/math/p5-Math-Symbolic-Custom-CCompiler/pkg-plist
+++ b/math/p5-Math-Symbolic-Custom-CCompiler/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Math::Symbolic::Custom::CCompiler.3.gz
 %%SITE_PERL%%/Math/Symbolic/Custom/CCompiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/CCompiler/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/CCompiler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic-Custom-Contains/Makefile b/math/p5-Math-Symbolic-Custom-Contains/Makefile
index 8d718755c6b7..b4348055a885 100644
--- a/math/p5-Math-Symbolic-Custom-Contains/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Contains/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic-Custom-Contains
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Symbolic-Custom-Contains/pkg-plist b/math/p5-Math-Symbolic-Custom-Contains/pkg-plist
index 2b63cff7811b..3684d9c15452 100644
--- a/math/p5-Math-Symbolic-Custom-Contains/pkg-plist
+++ b/math/p5-Math-Symbolic-Custom-Contains/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Math::Symbolic::Custom::Contains.3.gz
 %%SITE_PERL%%/Math/Symbolic/Custom/Contains.pm
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
index 0d24024f7fe5..b4908025a53c 100644
--- a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic-Custom-ErrorPropagation
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Symbolic-Custom-ErrorPropagation/pkg-plist b/math/p5-Math-Symbolic-Custom-ErrorPropagation/pkg-plist
index 983c32b521d1..d3497c4b2aea 100644
--- a/math/p5-Math-Symbolic-Custom-ErrorPropagation/pkg-plist
+++ b/math/p5-Math-Symbolic-Custom-ErrorPropagation/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Math::Symbolic::Custom::ErrorPropagation.3.gz
 %%SITE_PERL%%/Math/Symbolic/Custom/ErrorPropagation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/ErrorPropagation/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/ErrorPropagation
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile b/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
index 0c498de60b60..0de9494bc468 100644
--- a/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
+++ b/math/p5-Math-Symbolic-Custom-LaTeXDumper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic-Custom-LaTeXDumper
 PORTVERSION=	0.208
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Symbolic-Custom-LaTeXDumper/pkg-plist b/math/p5-Math-Symbolic-Custom-LaTeXDumper/pkg-plist
index 851cc67a3ea6..ff7cad5a3bad 100644
--- a/math/p5-Math-Symbolic-Custom-LaTeXDumper/pkg-plist
+++ b/math/p5-Math-Symbolic-Custom-LaTeXDumper/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Math::Symbolic::Custom::LaTeXDumper.3.gz
 %%SITE_PERL%%/Math/Symbolic/Custom/LaTeXDumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/LaTeXDumper/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/LaTeXDumper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic-Custom-Pattern/Makefile b/math/p5-Math-Symbolic-Custom-Pattern/Makefile
index a7ff1589eb80..ceb667754e7a 100644
--- a/math/p5-Math-Symbolic-Custom-Pattern/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Pattern/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic-Custom-Pattern
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Symbolic-Custom-Pattern/pkg-plist b/math/p5-Math-Symbolic-Custom-Pattern/pkg-plist
index e57682e7f8af..7b5189c48a5d 100644
--- a/math/p5-Math-Symbolic-Custom-Pattern/pkg-plist
+++ b/math/p5-Math-Symbolic-Custom-Pattern/pkg-plist
@@ -2,12 +2,3 @@
 %%PERL5_MAN3%%/Math::Symbolic::Custom::Pattern::Export.3.gz
 %%SITE_PERL%%/Math/Symbolic/Custom/Pattern.pm
 %%SITE_PERL%%/Math/Symbolic/Custom/Pattern/Export.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/Pattern/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/Pattern
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom/Pattern
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic-Custom-Simplification/Makefile b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
index 6aae405bede3..97cc3b9bb792 100644
--- a/math/p5-Math-Symbolic-Custom-Simplification/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic-Custom-Simplification
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Symbolic-Custom-Simplification/pkg-plist b/math/p5-Math-Symbolic-Custom-Simplification/pkg-plist
index 2dab20b8b698..8133f76b214d 100644
--- a/math/p5-Math-Symbolic-Custom-Simplification/pkg-plist
+++ b/math/p5-Math-Symbolic-Custom-Simplification/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Math::Symbolic::Custom::Simplification.3.gz
 %%SITE_PERL%%/Math/Symbolic/Custom/Simplification.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/Simplification/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/Simplification
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic-Custom-Transformation/Makefile b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
index 746975712a56..5da95f8bc780 100644
--- a/math/p5-Math-Symbolic-Custom-Transformation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic-Custom-Transformation
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Symbolic-Custom-Transformation/pkg-plist b/math/p5-Math-Symbolic-Custom-Transformation/pkg-plist
index 1002588bf962..59dfef06bbed 100644
--- a/math/p5-Math-Symbolic-Custom-Transformation/pkg-plist
+++ b/math/p5-Math-Symbolic-Custom-Transformation/pkg-plist
@@ -2,12 +2,3 @@
 %%PERL5_MAN3%%/Math::Symbolic::Custom::Transformation::Group.3.gz
 %%SITE_PERL%%/Math/Symbolic/Custom/Transformation.pm
 %%SITE_PERL%%/Math/Symbolic/Custom/Transformation/Group.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/Transformation/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom/Transformation
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom/Transformation
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Symbolic/Makefile b/math/p5-Math-Symbolic/Makefile
index 7e728f71b5ed..e08b117fbedc 100644
--- a/math/p5-Math-Symbolic/Makefile
+++ b/math/p5-Math-Symbolic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Symbolic
 PORTVERSION=	0.612
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/math/p5-Math-Symbolic/pkg-plist b/math/p5-Math-Symbolic/pkg-plist
index f94e49f66f0b..91efce950c74 100644
--- a/math/p5-Math-Symbolic/pkg-plist
+++ b/math/p5-Math-Symbolic/pkg-plist
@@ -38,10 +38,3 @@
 %%SITE_PERL%%/Math/Symbolic/Variable.pm
 %%SITE_PERL%%/Math/Symbolic/VectorCalculus.pm
 %%SITE_PERL%%/Math/compile_yapp_parser.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Parser
-@dirrmtry %%SITE_PERL%%/Math/Symbolic/Custom
-@dirrmtry %%SITE_PERL%%/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SymbolicX-BigNum/Makefile b/math/p5-Math-SymbolicX-BigNum/Makefile
index b2be7b1a8330..3db01d3a67e6 100644
--- a/math/p5-Math-SymbolicX-BigNum/Makefile
+++ b/math/p5-Math-SymbolicX-BigNum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SymbolicX-BigNum
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SymbolicX-BigNum/pkg-plist b/math/p5-Math-SymbolicX-BigNum/pkg-plist
index 91e135d9e5f2..e44402155836 100644
--- a/math/p5-Math-SymbolicX-BigNum/pkg-plist
+++ b/math/p5-Math-SymbolicX-BigNum/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::SymbolicX::BigNum.3.gz
 %%SITE_PERL%%/Math/SymbolicX/BigNum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/BigNum/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/BigNum
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SymbolicX-Complex/Makefile b/math/p5-Math-SymbolicX-Complex/Makefile
index d32d36deed36..f21f801e0939 100644
--- a/math/p5-Math-SymbolicX-Complex/Makefile
+++ b/math/p5-Math-SymbolicX-Complex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SymbolicX-Complex
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SymbolicX-Complex/pkg-plist b/math/p5-Math-SymbolicX-Complex/pkg-plist
index 0920ab47a7b0..760480083b2d 100644
--- a/math/p5-Math-SymbolicX-Complex/pkg-plist
+++ b/math/p5-Math-SymbolicX-Complex/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::SymbolicX::Complex.3.gz
 %%SITE_PERL%%/Math/SymbolicX/Complex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Complex/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Complex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SymbolicX-Error/Makefile b/math/p5-Math-SymbolicX-Error/Makefile
index f01a8a9f814e..18e9d0edaff0 100644
--- a/math/p5-Math-SymbolicX-Error/Makefile
+++ b/math/p5-Math-SymbolicX-Error/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SymbolicX-Error
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SymbolicX-Error/pkg-plist b/math/p5-Math-SymbolicX-Error/pkg-plist
index cbe4dfd3629b..0b11d9e44f84 100644
--- a/math/p5-Math-SymbolicX-Error/pkg-plist
+++ b/math/p5-Math-SymbolicX-Error/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Math::SymbolicX::Error.3.gz
 %%SITE_PERL%%/Math/SymbolicX/Error.pm
 %%SITE_PERL%%/Math/SymbolicX/t.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Error/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Error
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SymbolicX-Inline/Makefile b/math/p5-Math-SymbolicX-Inline/Makefile
index fcd95066a7d6..e6923b5887d7 100644
--- a/math/p5-Math-SymbolicX-Inline/Makefile
+++ b/math/p5-Math-SymbolicX-Inline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SymbolicX-Inline
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SymbolicX-Inline/pkg-plist b/math/p5-Math-SymbolicX-Inline/pkg-plist
index 1161ef4d5b39..9558040ade98 100644
--- a/math/p5-Math-SymbolicX-Inline/pkg-plist
+++ b/math/p5-Math-SymbolicX-Inline/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::SymbolicX::Inline.3.gz
 %%SITE_PERL%%/Math/SymbolicX/Inline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Inline/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Inline
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SymbolicX-NoSimplification/Makefile b/math/p5-Math-SymbolicX-NoSimplification/Makefile
index eea8a4564d7e..b8a7d10b6d4d 100644
--- a/math/p5-Math-SymbolicX-NoSimplification/Makefile
+++ b/math/p5-Math-SymbolicX-NoSimplification/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SymbolicX-NoSimplification
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SymbolicX-NoSimplification/pkg-plist b/math/p5-Math-SymbolicX-NoSimplification/pkg-plist
index fbed378cf93e..c2100c7e28b4 100644
--- a/math/p5-Math-SymbolicX-NoSimplification/pkg-plist
+++ b/math/p5-Math-SymbolicX-NoSimplification/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::SymbolicX::NoSimplification.3.gz
 %%SITE_PERL%%/Math/SymbolicX/NoSimplification.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/NoSimplification/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/NoSimplification
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
index ec2ce1d7b98f..b80c8d60c3ea 100644
--- a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
+++ b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SymbolicX-ParserExtensionFactory
 PORTVERSION=	3.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SymbolicX-ParserExtensionFactory/pkg-plist b/math/p5-Math-SymbolicX-ParserExtensionFactory/pkg-plist
index 803fb869f4fd..87a22ee02906 100644
--- a/math/p5-Math-SymbolicX-ParserExtensionFactory/pkg-plist
+++ b/math/p5-Math-SymbolicX-ParserExtensionFactory/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Math::SymbolicX::ParserExtensionFactory.3.gz
 %%SITE_PERL%%/Math/SymbolicX/ParserExtensionFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/ParserExtensionFactory/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/ParserExtensionFactory
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
index 572fe9a36ebf..28d162b238fe 100644
--- a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
+++ b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-SymbolicX-Statistics-Distributions
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-SymbolicX-Statistics-Distributions/pkg-plist b/math/p5-Math-SymbolicX-Statistics-Distributions/pkg-plist
index 2c4804693f31..7e20684a51fa 100644
--- a/math/p5-Math-SymbolicX-Statistics-Distributions/pkg-plist
+++ b/math/p5-Math-SymbolicX-Statistics-Distributions/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Math::SymbolicX::Statistics::Distributions.3.gz
 %%SITE_PERL%%/Math/SymbolicX/Statistics/Distributions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Statistics/Distributions/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Statistics/Distributions
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX/Statistics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX/Statistics
-@dirrmtry %%SITE_PERL%%/Math/SymbolicX
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-TrulyRandom/Makefile b/math/p5-Math-TrulyRandom/Makefile
index 191ccd59d701..7ba4d27f23a5 100644
--- a/math/p5-Math-TrulyRandom/Makefile
+++ b/math/p5-Math-TrulyRandom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-TrulyRandom
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -25,6 +26,6 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/truerand.c ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/truerand.h ${STAGEDIR}${DOCSDIR}
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Math/TrulyRandom/TrulyRandom.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/TrulyRandom/TrulyRandom.so
 
 .include <bsd.port.mk>
diff --git a/math/p5-Math-TrulyRandom/pkg-plist b/math/p5-Math-TrulyRandom/pkg-plist
index ccb93ba448e6..499f64703023 100644
--- a/math/p5-Math-TrulyRandom/pkg-plist
+++ b/math/p5-Math-TrulyRandom/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/TrulyRandom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Math/TrulyRandom.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/.packlist
+%%SITE_ARCH%%/Math/TrulyRandom.pm
+%%SITE_ARCH%%/Math/TrulyRandom.pod
+%%SITE_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.so
 %%PERL5_MAN3%%/Math::TrulyRandom.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-Units/Makefile b/math/p5-Math-Units/Makefile
index 8155121f6f8a..d8cd9012d96b 100644
--- a/math/p5-Math-Units/Makefile
+++ b/math/p5-Math-Units/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Units
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Units/pkg-plist b/math/p5-Math-Units/pkg-plist
index 937624fdc1ea..e490a41569ce 100644
--- a/math/p5-Math-Units/pkg-plist
+++ b/math/p5-Math-Units/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::Units.3.gz
 %%SITE_PERL%%/Math/Units.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Units/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Units
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Vec/Makefile b/math/p5-Math-Vec/Makefile
index 1a2c00647a2b..d87755e7f394 100644
--- a/math/p5-Math-Vec/Makefile
+++ b/math/p5-Math-Vec/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Math-Vec
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Vec/pkg-plist b/math/p5-Math-Vec/pkg-plist
index 222f8cb80d4d..abfd79bd3fa2 100644
--- a/math/p5-Math-Vec/pkg-plist
+++ b/math/p5-Math-Vec/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Math/Vec.pm
 %%PERL5_MAN3%%/Math::Vec.3.gz
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-VecStat/Makefile b/math/p5-Math-VecStat/Makefile
index 17e9e46cbf08..36e1de43c8d7 100644
--- a/math/p5-Math-VecStat/Makefile
+++ b/math/p5-Math-VecStat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-VecStat
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-VecStat/pkg-plist b/math/p5-Math-VecStat/pkg-plist
index af243e42ffa0..2dc5e223bcf4 100644
--- a/math/p5-Math-VecStat/pkg-plist
+++ b/math/p5-Math-VecStat/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Math::VecStat.3.gz
 %%SITE_PERL%%/Math/VecStat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/VecStat/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/VecStat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-VectorReal/Makefile b/math/p5-Math-VectorReal/Makefile
index c31e1665482b..b5c283accea7 100644
--- a/math/p5-Math-VectorReal/Makefile
+++ b/math/p5-Math-VectorReal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-VectorReal
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-VectorReal/pkg-plist b/math/p5-Math-VectorReal/pkg-plist
index 2ba36c892e4f..d42c81f67079 100644
--- a/math/p5-Math-VectorReal/pkg-plist
+++ b/math/p5-Math-VectorReal/pkg-plist
@@ -2,8 +2,4 @@
 %%SITE_PERL%%/Math/VectorReal.pm
 %%SITE_PERL%%/Math/vector_test.pl
 %%SITE_PERL%%/Math/matrix_test.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/VectorReal/.packlist
 %%PERL5_MAN3%%/Math::VectorReal.3.gz
-@dirrmtry %%SITE_PERL%%/Math
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/VectorReal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-NetCDF/Makefile b/math/p5-NetCDF/Makefile
index 4b28385cc5c1..2b2a55ee29d6 100644
--- a/math/p5-NetCDF/Makefile
+++ b/math/p5-NetCDF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	NetCDF
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math perl5
 MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/netcdf-perl/
 PKGNAMEPREFIX=	p5-
@@ -24,7 +24,4 @@ CONFIGURE_ENV=	CPP_NETCDF=-I${LOCALBASE}/include LD_NETCDF=-lnetcdf \
 pre-install:
 	@${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/perl/Makefile
 
-post-install:
-	-@[ -d ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto ] && ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
-
 .include <bsd.port.mk>
diff --git a/math/p5-NetCDF/pkg-plist b/math/p5-NetCDF/pkg-plist
index f8a71e018a4c..12eaff22b654 100644
--- a/math/p5-NetCDF/pkg-plist
+++ b/math/p5-NetCDF/pkg-plist
@@ -1,6 +1,4 @@
 man/man1/netCDFPerl.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/NetCDF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF/NetCDF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF
+%%SITE_ARCH%%/NetCDF.pm
+%%SITE_ARCH%%/auto/NetCDF/NetCDF.so
+%%SITE_ARCH%%/auto/NetCDF/autosplit.ix
diff --git a/math/p5-Number-Compare/Makefile b/math/p5-Number-Compare/Makefile
index ac9b45ecbe04..644883d52910 100644
--- a/math/p5-Number-Compare/Makefile
+++ b/math/p5-Number-Compare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Compare
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Number-Compare/pkg-plist b/math/p5-Number-Compare/pkg-plist
index a8b231478019..4ea36b259c53 100644
--- a/math/p5-Number-Compare/pkg-plist
+++ b/math/p5-Number-Compare/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Number::Compare.3.gz
 %%SITE_PERL%%/Number/Compare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Compare/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Compare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
-@dirrmtry %%SITE_PERL%%/Number
diff --git a/math/p5-Number-Fraction/Makefile b/math/p5-Number-Fraction/Makefile
index 0098b26a3d5c..3d530ee85058 100644
--- a/math/p5-Number-Fraction/Makefile
+++ b/math/p5-Number-Fraction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Fraction
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAVECROSS
diff --git a/math/p5-Number-Fraction/pkg-plist b/math/p5-Number-Fraction/pkg-plist
index 3e7b64335a67..61c25d4bfe55 100644
--- a/math/p5-Number-Fraction/pkg-plist
+++ b/math/p5-Number-Fraction/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Number/Fraction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Fraction/.packlist
 %%PERL5_MAN3%%/Number::Fraction.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Fraction
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
-@dirrmtry %%SITE_PERL%%/Number
diff --git a/math/p5-Number-Uncertainty/Makefile b/math/p5-Number-Uncertainty/Makefile
index 69bd6643b94a..9eda83a27307 100644
--- a/math/p5-Number-Uncertainty/Makefile
+++ b/math/p5-Number-Uncertainty/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Uncertainty
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Number-Uncertainty/pkg-plist b/math/p5-Number-Uncertainty/pkg-plist
index ac35bac867e3..e70fbdccc397 100644
--- a/math/p5-Number-Uncertainty/pkg-plist
+++ b/math/p5-Number-Uncertainty/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Number/Uncertainty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Uncertainty/.packlist
 %%PERL5_MAN3%%/Number::Uncertainty.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Uncertainty
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
-@dirrmtry %%SITE_PERL%%/Number
diff --git a/math/p5-Number-WithError-LaTeX/Makefile b/math/p5-Number-WithError-LaTeX/Makefile
index 752b8c7571fd..ba35db6636b4 100644
--- a/math/p5-Number-WithError-LaTeX/Makefile
+++ b/math/p5-Number-WithError-LaTeX/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Number-WithError-LaTeX
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Number-WithError-LaTeX/pkg-plist b/math/p5-Number-WithError-LaTeX/pkg-plist
index 7cb9fee48190..2b63bd696ed9 100644
--- a/math/p5-Number-WithError-LaTeX/pkg-plist
+++ b/math/p5-Number-WithError-LaTeX/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Number::WithError::LaTeX.3.gz
 %%SITE_PERL%%/Number/WithError/LaTeX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/WithError/LaTeX/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/WithError/LaTeX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/WithError
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
-@dirrmtry %%SITE_PERL%%/Number/WithError
-@dirrmtry %%SITE_PERL%%/Number
diff --git a/math/p5-Number-WithError/Makefile b/math/p5-Number-WithError/Makefile
index c3e28afcfe43..0af3555d289f 100644
--- a/math/p5-Number-WithError/Makefile
+++ b/math/p5-Number-WithError/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-WithError
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Number-WithError/pkg-plist b/math/p5-Number-WithError/pkg-plist
index a9b2cd8fc1f8..204bf0970a06 100644
--- a/math/p5-Number-WithError/pkg-plist
+++ b/math/p5-Number-WithError/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Number/WithError.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/WithError/.packlist
 %%PERL5_MAN3%%/Number::WithError.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/WithError
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
-@dirrmtry %%SITE_PERL%%/Number
diff --git a/math/p5-Parse-Range/Makefile b/math/p5-Parse-Range/Makefile
index 61281bd24b38..a0608df45614 100644
--- a/math/p5-Parse-Range/Makefile
+++ b/math/p5-Parse-Range/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Range
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PERLER
diff --git a/math/p5-Parse-Range/pkg-plist b/math/p5-Parse-Range/pkg-plist
index 9c879126bed6..eaf82f2fdfce 100644
--- a/math/p5-Parse-Range/pkg-plist
+++ b/math/p5-Parse-Range/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Parse/Range.pm
 %%PERL5_MAN3%%/Parse::Range.3.gz
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/math/p5-Roman/Makefile b/math/p5-Roman/Makefile
index 8544c08cb48b..919ace679054 100644
--- a/math/p5-Roman/Makefile
+++ b/math/p5-Roman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Roman
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Roman/pkg-plist b/math/p5-Roman/pkg-plist
index ed204ba25b15..1c15aacc1293 100644
--- a/math/p5-Roman/pkg-plist
+++ b/math/p5-Roman/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Roman.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Roman/.packlist
 %%PERL5_MAN3%%/Roman.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Roman
diff --git a/math/p5-Set-IntSpan-Fast-XS/Makefile b/math/p5-Set-IntSpan-Fast-XS/Makefile
index de199858388e..cf991232b095 100644
--- a/math/p5-Set-IntSpan-Fast-XS/Makefile
+++ b/math/p5-Set-IntSpan-Fast-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-IntSpan-Fast-XS
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Set
diff --git a/math/p5-Set-IntSpan-Fast-XS/pkg-plist b/math/p5-Set-IntSpan-Fast-XS/pkg-plist
index 4c3bee4ab876..536fe106179c 100644
--- a/math/p5-Set-IntSpan-Fast-XS/pkg-plist
+++ b/math/p5-Set-IntSpan-Fast-XS/pkg-plist
@@ -1,11 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Set/IntSpan/Fast/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/Fast/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/Fast/XS/XS.so
+%%SITE_ARCH%%/Set/IntSpan/Fast/XS.pm
+%%SITE_ARCH%%/auto/Set/IntSpan/Fast/XS/XS.so
 %%PERL5_MAN3%%/Set::IntSpan::Fast::XS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/Fast/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Set/IntSpan/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Set/IntSpan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Set
diff --git a/math/p5-Set-IntSpan-Fast/Makefile b/math/p5-Set-IntSpan-Fast/Makefile
index a1da03f76192..14c0465dbcda 100644
--- a/math/p5-Set-IntSpan-Fast/Makefile
+++ b/math/p5-Set-IntSpan-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-IntSpan-Fast
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Set-IntSpan-Fast/pkg-plist b/math/p5-Set-IntSpan-Fast/pkg-plist
index a0e9c8cc23b3..dbdc94b256ca 100644
--- a/math/p5-Set-IntSpan-Fast/pkg-plist
+++ b/math/p5-Set-IntSpan-Fast/pkg-plist
@@ -1,11 +1,4 @@
 %%SITE_PERL%%/Set/IntSpan/Fast.pm
 %%SITE_PERL%%/Set/IntSpan/Fast/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/Fast/.packlist
 %%PERL5_MAN3%%/Set::IntSpan::Fast.3.gz
 %%PERL5_MAN3%%/Set::IntSpan::Fast::PP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@dirrmtry %%SITE_PERL%%/Set/IntSpan/Fast
-@dirrmtry %%SITE_PERL%%/Set/IntSpan
-@dirrmtry %%SITE_PERL%%/Set
diff --git a/math/p5-Set-IntSpan/Makefile b/math/p5-Set-IntSpan/Makefile
index baa9e9f48811..b068fedff075 100644
--- a/math/p5-Set-IntSpan/Makefile
+++ b/math/p5-Set-IntSpan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-IntSpan
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Set-IntSpan/pkg-plist b/math/p5-Set-IntSpan/pkg-plist
index 5777e4584fdb..771f34784e39 100644
--- a/math/p5-Set-IntSpan/pkg-plist
+++ b/math/p5-Set-IntSpan/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Set/IntSpan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/.packlist
 %%PERL5_MAN3%%/Set::IntSpan.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@dirrmtry %%SITE_PERL%%/Set
diff --git a/math/p5-Set-Partition/Makefile b/math/p5-Set-Partition/Makefile
index 084dfd17b75a..0dd7f053b90a 100644
--- a/math/p5-Set-Partition/Makefile
+++ b/math/p5-Set-Partition/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Partition
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Set-Partition/pkg-plist b/math/p5-Set-Partition/pkg-plist
index a0a34349d521..46c0d8c78531 100644
--- a/math/p5-Set-Partition/pkg-plist
+++ b/math/p5-Set-Partition/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Set::Partition.3.gz
 %%SITE_PERL%%/Set/Partition.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Partition/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Partition
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@dirrmtry %%SITE_PERL%%/Set
diff --git a/math/p5-Set-Window/Makefile b/math/p5-Set-Window/Makefile
index 2fa298ef2d64..f7454a9dd7f6 100644
--- a/math/p5-Set-Window/Makefile
+++ b/math/p5-Set-Window/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Set-Window
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Set-Window/pkg-plist b/math/p5-Set-Window/pkg-plist
index 9787b8ded149..c583e88a6597 100644
--- a/math/p5-Set-Window/pkg-plist
+++ b/math/p5-Set-Window/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Window/.packlist
 %%SITE_PERL%%/Set/Window.pm
 %%PERL5_MAN3%%/Set::Window.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Window
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@dirrmtry %%SITE_PERL%%/Set
diff --git a/math/p5-Statistics-Basic/Makefile b/math/p5-Statistics-Basic/Makefile
index 8c4fe4cd06e6..38c3fef85ead 100644
--- a/math/p5-Statistics-Basic/Makefile
+++ b/math/p5-Statistics-Basic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Basic
 PORTVERSION=	1.6607
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Statistics
diff --git a/math/p5-Statistics-Basic/pkg-plist b/math/p5-Statistics-Basic/pkg-plist
index 10c554fad6d5..96329744d099 100644
--- a/math/p5-Statistics-Basic/pkg-plist
+++ b/math/p5-Statistics-Basic/pkg-plist
@@ -24,7 +24,6 @@
 %%SITE_PERL%%/Statistics/Basic/_OneVectorBase.pod
 %%SITE_PERL%%/Statistics/Basic/_TwoVectorBase.pm
 %%SITE_PERL%%/Statistics/Basic/_TwoVectorBase.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Basic/.packlist
 %%PERL5_MAN3%%/Statistics::Basic.3.gz
 %%PERL5_MAN3%%/Statistics::Basic::ComputedVector.3.gz
 %%PERL5_MAN3%%/Statistics::Basic::Correlation.3.gz
@@ -38,7 +37,3 @@
 %%PERL5_MAN3%%/Statistics::Basic::Vector.3.gz
 %%PERL5_MAN3%%/Statistics::Basic::_OneVectorBase.3.gz
 %%PERL5_MAN3%%/Statistics::Basic::_TwoVectorBase.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Basic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics/Basic
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Benford/Makefile b/math/p5-Statistics-Benford/Makefile
index 270b9ea7bc90..ccb59cfef55a 100644
--- a/math/p5-Statistics-Benford/Makefile
+++ b/math/p5-Statistics-Benford/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Benford
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-Benford/pkg-plist b/math/p5-Statistics-Benford/pkg-plist
index 49eef41c0338..93ebc877f635 100644
--- a/math/p5-Statistics-Benford/pkg-plist
+++ b/math/p5-Statistics-Benford/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Benford/.packlist
 %%SITE_PERL%%/Statistics/Benford.pm
 %%PERL5_MAN3%%/Statistics::Benford.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Benford
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-ChiSquare/Makefile b/math/p5-Statistics-ChiSquare/Makefile
index 1b5f55bccac8..99999f8b04d2 100644
--- a/math/p5-Statistics-ChiSquare/Makefile
+++ b/math/p5-Statistics-ChiSquare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-ChiSquare
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-ChiSquare/pkg-plist b/math/p5-Statistics-ChiSquare/pkg-plist
index 32cbc7469028..abfcdb8aab40 100644
--- a/math/p5-Statistics-ChiSquare/pkg-plist
+++ b/math/p5-Statistics-ChiSquare/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare/.packlist
 %%SITE_PERL%%/Statistics/ChiSquare.pm
 %%PERL5_MAN3%%/Statistics::ChiSquare.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Contingency/Makefile b/math/p5-Statistics-Contingency/Makefile
index b264dc4c0562..d764ff6b7780 100644
--- a/math/p5-Statistics-Contingency/Makefile
+++ b/math/p5-Statistics-Contingency/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Contingency
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-Contingency/pkg-plist b/math/p5-Statistics-Contingency/pkg-plist
index cb5c72a20e3b..a1750d871438 100644
--- a/math/p5-Statistics-Contingency/pkg-plist
+++ b/math/p5-Statistics-Contingency/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Statistics::Contingency.3.gz
 %%SITE_PERL%%/Statistics/Contingency.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Contingency/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Contingency
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Descriptive-Discrete/Makefile b/math/p5-Statistics-Descriptive-Discrete/Makefile
index f2b44df8e922..d1602cb7b7ea 100644
--- a/math/p5-Statistics-Descriptive-Discrete/Makefile
+++ b/math/p5-Statistics-Descriptive-Discrete/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Descriptive-Discrete
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-Descriptive-Discrete/pkg-plist b/math/p5-Statistics-Descriptive-Discrete/pkg-plist
index 2fcee9a915f2..e3021c616451 100644
--- a/math/p5-Statistics-Descriptive-Discrete/pkg-plist
+++ b/math/p5-Statistics-Descriptive-Discrete/pkg-plist
@@ -1,12 +1,3 @@
 %%PERL5_MAN3%%/Statistics::Descriptive::Discrete.3.gz
 %%SITE_PERL%%/Statistics/Descriptive/Discrete.pm
 %%SITE_PERL%%/auto/Statistics/Descriptive/Discrete/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive/Discrete/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive/Discrete
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/auto/Statistics/Descriptive/Discrete
-@dirrmtry %%SITE_PERL%%/auto/Statistics/Descriptive
-@dirrmtry %%SITE_PERL%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics/Descriptive
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Descriptive/Makefile b/math/p5-Statistics-Descriptive/Makefile
index cd367c7f8c32..2d0250870875 100644
--- a/math/p5-Statistics-Descriptive/Makefile
+++ b/math/p5-Statistics-Descriptive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Descriptive
 PORTVERSION=	3.0605
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-Descriptive/pkg-plist b/math/p5-Statistics-Descriptive/pkg-plist
index 621fc204131e..d4a4dc3ae123 100644
--- a/math/p5-Statistics-Descriptive/pkg-plist
+++ b/math/p5-Statistics-Descriptive/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive/.packlist
 %%SITE_PERL%%/Statistics/Descriptive.pm
 %%SITE_PERL%%/Statistics/Descriptive/Smoother.pm
 %%SITE_PERL%%/Statistics/Descriptive/Smoother/Exponential.pm
@@ -7,8 +6,3 @@
 %%PERL5_MAN3%%/Statistics::Descriptive::Smoother.3.gz
 %%PERL5_MAN3%%/Statistics::Descriptive::Smoother::Exponential.3.gz
 %%PERL5_MAN3%%/Statistics::Descriptive::Smoother::Weightedexponential.3.gz
-@dirrmtry %%SITE_PERL%%/Statistics/Descriptive/Smoother
-@dirrmtry %%SITE_PERL%%/Statistics/Descriptive
-@dirrmtry %%SITE_PERL%%/Statistics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
diff --git a/math/p5-Statistics-Distributions/Makefile b/math/p5-Statistics-Distributions/Makefile
index 4d7a4901476c..311e8950b8b8 100644
--- a/math/p5-Statistics-Distributions/Makefile
+++ b/math/p5-Statistics-Distributions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Distributions
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-Distributions/pkg-plist b/math/p5-Statistics-Distributions/pkg-plist
index cc291a518fd7..d97527e1434c 100644
--- a/math/p5-Statistics-Distributions/pkg-plist
+++ b/math/p5-Statistics-Distributions/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Statistics/Distributions.pm
 %%SITE_PERL%%/auto/Statistics/Distributions/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Distributions/.packlist
 %%PERL5_MAN3%%/Statistics::Distributions.3.gz
-@dirrm %%SITE_PERL%%/auto/Statistics/Distributions
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Distributions
-@dirrmtry %%SITE_PERL%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Forecast/Makefile b/math/p5-Statistics-Forecast/Makefile
index 1a1ece6d4acd..09ccbfe2c744 100644
--- a/math/p5-Statistics-Forecast/Makefile
+++ b/math/p5-Statistics-Forecast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Forecast
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Statistics
diff --git a/math/p5-Statistics-Forecast/pkg-plist b/math/p5-Statistics-Forecast/pkg-plist
index de0ec18b1171..3dfbfa3dbc48 100644
--- a/math/p5-Statistics-Forecast/pkg-plist
+++ b/math/p5-Statistics-Forecast/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Statistics::Forecast.3.gz
 %%SITE_PERL%%/Statistics/Forecast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Forecast/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Forecast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Frequency/Makefile b/math/p5-Statistics-Frequency/Makefile
index fb13246a187c..9fe4f9d854a4 100644
--- a/math/p5-Statistics-Frequency/Makefile
+++ b/math/p5-Statistics-Frequency/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Frequency
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Statistics
diff --git a/math/p5-Statistics-Frequency/pkg-plist b/math/p5-Statistics-Frequency/pkg-plist
index d67db026bfb3..07395f956e18 100644
--- a/math/p5-Statistics-Frequency/pkg-plist
+++ b/math/p5-Statistics-Frequency/pkg-plist
@@ -1,5 +1 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Frequency/.packlist
 %%SITE_PERL%%/Statistics/Frequency.pm
-@dirrmtry %%SITE_PERL%%/Statistics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Frequency
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
diff --git a/math/p5-Statistics-LTU/Makefile b/math/p5-Statistics-LTU/Makefile
index a29323eb0e53..f6324e5dff81 100644
--- a/math/p5-Statistics-LTU/Makefile
+++ b/math/p5-Statistics-LTU/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-LTU
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-LTU/pkg-plist b/math/p5-Statistics-LTU/pkg-plist
index 454a258d333e..1a21966448df 100644
--- a/math/p5-Statistics-LTU/pkg-plist
+++ b/math/p5-Statistics-LTU/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/LTU/.packlist
 %%SITE_PERL%%/Statistics/LTU.pod
 %%SITE_PERL%%/Statistics/weather.pl
 %%SITE_PERL%%/Statistics/LTU.pm
 %%PERL5_MAN3%%/Statistics::LTU.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/LTU
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-LineFit/Makefile b/math/p5-Statistics-LineFit/Makefile
index cc481f75b2e4..4dd634c2db00 100644
--- a/math/p5-Statistics-LineFit/Makefile
+++ b/math/p5-Statistics-LineFit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-LineFit
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Statistics
diff --git a/math/p5-Statistics-LineFit/pkg-plist b/math/p5-Statistics-LineFit/pkg-plist
index 8cd74d0719f2..8f7f54b2ca4e 100644
--- a/math/p5-Statistics-LineFit/pkg-plist
+++ b/math/p5-Statistics-LineFit/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Statistics::LineFit.3.gz
 %%SITE_PERL%%/Statistics/LineFit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/LineFit/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/LineFit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Lite/Makefile b/math/p5-Statistics-Lite/Makefile
index da5409b48bc1..ab0501da7049 100644
--- a/math/p5-Statistics-Lite/Makefile
+++ b/math/p5-Statistics-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Lite
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-Lite/pkg-plist b/math/p5-Statistics-Lite/pkg-plist
index 82d87ff89cd7..cfa60b261153 100644
--- a/math/p5-Statistics-Lite/pkg-plist
+++ b/math/p5-Statistics-Lite/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Lite/.packlist
 %%SITE_PERL%%/Statistics/Lite.pm
 %%PERL5_MAN3%%/Statistics::Lite.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-OLS/Makefile b/math/p5-Statistics-OLS/Makefile
index 407b9aba888a..391b48034477 100644
--- a/math/p5-Statistics-OLS/Makefile
+++ b/math/p5-Statistics-OLS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-OLS
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-OLS/pkg-plist b/math/p5-Statistics-OLS/pkg-plist
index 25b836e06844..2bcbfd0c4735 100644
--- a/math/p5-Statistics-OLS/pkg-plist
+++ b/math/p5-Statistics-OLS/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/OLS/.packlist
 %%SITE_PERL%%/Statistics/OLS.pm
 %%PERL5_MAN3%%/Statistics::OLS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/OLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-R/Makefile b/math/p5-Statistics-R/Makefile
index acf999b00d60..0366fd8eaa29 100644
--- a/math/p5-Statistics-R/Makefile
+++ b/math/p5-Statistics-R/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Statistics-R
 PORTVERSION=	0.32
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FANGLY
diff --git a/math/p5-Statistics-R/pkg-plist b/math/p5-Statistics-R/pkg-plist
index 0c451aaed152..89faa47ff906 100644
--- a/math/p5-Statistics-R/pkg-plist
+++ b/math/p5-Statistics-R/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Statistics/R.pm
 %%SITE_PERL%%/Statistics/R/Legacy.pm
 %%SITE_PERL%%/Statistics/R/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/R/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/R
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics/R
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Regression/Makefile b/math/p5-Statistics-Regression/Makefile
index f2cd9844aa87..f6b6c55497a5 100644
--- a/math/p5-Statistics-Regression/Makefile
+++ b/math/p5-Statistics-Regression/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Statistics-Regression
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Statistics-Regression/pkg-plist b/math/p5-Statistics-Regression/pkg-plist
index c637b72c671d..b731412ea3f1 100644
--- a/math/p5-Statistics-Regression/pkg-plist
+++ b/math/p5-Statistics-Regression/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Regression/.packlist
 %%SITE_PERL%%/Statistics/Regression.pm
 %%PERL5_MAN3%%/Statistics::Regression.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Regression
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-TTest/Makefile b/math/p5-Statistics-TTest/Makefile
index 3e7917883f11..011672ed2c22 100644
--- a/math/p5-Statistics-TTest/Makefile
+++ b/math/p5-Statistics-TTest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Statistics-TTest
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Statistics
diff --git a/math/p5-Statistics-TTest/pkg-plist b/math/p5-Statistics-TTest/pkg-plist
index a2677a3f5da5..3e3e80eedd88 100644
--- a/math/p5-Statistics-TTest/pkg-plist
+++ b/math/p5-Statistics-TTest/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Statistics::TTest.3.gz
 %%SITE_PERL%%/Statistics/PointEstimation.pm
 %%SITE_PERL%%/Statistics/TTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/TTest/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/TTest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Task-Math-Symbolic/Makefile b/math/p5-Task-Math-Symbolic/Makefile
index aafa2f513f14..fd1ac54f71e8 100644
--- a/math/p5-Task-Math-Symbolic/Makefile
+++ b/math/p5-Task-Math-Symbolic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Task-Math-Symbolic
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/math/p5-Task-Math-Symbolic/pkg-plist b/math/p5-Task-Math-Symbolic/pkg-plist
index 83370d93ff82..0e9680da4150 100644
--- a/math/p5-Task-Math-Symbolic/pkg-plist
+++ b/math/p5-Task-Math-Symbolic/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Task::Math::Symbolic.3.gz
 %%SITE_PERL%%/Task/Math/Symbolic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Math/Symbolic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Math/Symbolic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Math
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task
-@dirrmtry %%SITE_PERL%%/Task/Math
-@dirrmtry %%SITE_PERL%%/Task
diff --git a/math/p5-Text-AsciiTeX/Makefile b/math/p5-Text-AsciiTeX/Makefile
index be8884bd753f..d50bef818c53 100644
--- a/math/p5-Text-AsciiTeX/Makefile
+++ b/math/p5-Text-AsciiTeX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-AsciiTeX
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Text-AsciiTeX/pkg-plist b/math/p5-Text-AsciiTeX/pkg-plist
index 71f792ec1b05..98fb5c2e9f1b 100644
--- a/math/p5-Text-AsciiTeX/pkg-plist
+++ b/math/p5-Text-AsciiTeX/pkg-plist
@@ -1,9 +1,5 @@
 %%PERL5_MAN3%%/Text::AsciiTeX.3.gz
 %%PERL5_MAN3%%/Text::AsciiTeX::Syntax.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/AsciiTeX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/AsciiTeX/Syntax.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/AsciiTeX/AsciiTeX.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/AsciiTeX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text/AsciiTeX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/AsciiTeX.pm
+%%SITE_ARCH%%/Text/AsciiTeX/Syntax.pod
+%%SITE_ARCH%%/auto/Text/AsciiTeX/AsciiTeX.so
diff --git a/math/p5-bignum/Makefile b/math/p5-bignum/Makefile
index d9e09ff75e13..4b44c3624685 100644
--- a/math/p5-bignum/Makefile
+++ b/math/p5-bignum/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bignum
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PJACKLAM
diff --git a/math/p5-bignum/pkg-plist b/math/p5-bignum/pkg-plist
index 8b87385fc56f..1ff5234507bf 100644
--- a/math/p5-bignum/pkg-plist
+++ b/math/p5-bignum/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/bigint.pm
 %%SITE_PERL%%/bignum.pm
 %%SITE_PERL%%/bigrat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/bignum/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/bignum
-@dirrmtry %%SITE_PERL%%/Math/BigInt
-@dirrmtry %%SITE_PERL%%/Math/BigFloat
-@dirrmtry %%SITE_PERL%%/Math
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index caeb8e261b39..0067e247c167 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amanda
 PORTVERSION=	3.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
diff --git a/misc/auto-multiple-choice/Makefile b/misc/auto-multiple-choice/Makefile
index d3bf734c069d..2b54fcefa77b 100644
--- a/misc/auto-multiple-choice/Makefile
+++ b/misc/auto-multiple-choice/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	auto-multiple-choice
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://download.gna.org/auto-qcm/
 DISTNAME=	auto-multiple-choice_${PORTVERSION}_precomp
diff --git a/misc/p5-Acme-ButFirst/Makefile b/misc/p5-Acme-ButFirst/Makefile
index be0cb03d0600..aeb300befb9f 100644
--- a/misc/p5-Acme-ButFirst/Makefile
+++ b/misc/p5-Acme-ButFirst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Acme-ButFirst
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Acme-ButFirst/pkg-plist b/misc/p5-Acme-ButFirst/pkg-plist
index f45be5f780dc..ea17e53def3e 100644
--- a/misc/p5-Acme-ButFirst/pkg-plist
+++ b/misc/p5-Acme-ButFirst/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Acme::ButFirst.3.gz
 %%SITE_PERL%%/Acme/ButFirst.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/ButFirst/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/ButFirst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme
-@dirrmtry %%SITE_PERL%%/Acme
diff --git a/misc/p5-Array-Compare/Makefile b/misc/p5-Array-Compare/Makefile
index ee5443f0b637..b56c33e257f6 100644
--- a/misc/p5-Array-Compare/Makefile
+++ b/misc/p5-Array-Compare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-Compare
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAVECROSS
diff --git a/misc/p5-Array-Diff/Makefile b/misc/p5-Array-Diff/Makefile
index f94cdb80296e..94fdbcb20c53 100644
--- a/misc/p5-Array-Diff/Makefile
+++ b/misc/p5-Array-Diff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-Diff
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Array-Diff/pkg-plist b/misc/p5-Array-Diff/pkg-plist
index 770a43e2ca9a..9330ff3af586 100644
--- a/misc/p5-Array-Diff/pkg-plist
+++ b/misc/p5-Array-Diff/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Array::Diff.3.gz
 %%SITE_PERL%%/Array/Diff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Diff/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Diff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
-@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-FileReader/Makefile b/misc/p5-Array-FileReader/Makefile
index 1d33b17c65e1..c722aa470fa7 100644
--- a/misc/p5-Array-FileReader/Makefile
+++ b/misc/p5-Array-FileReader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Array-FileReader
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Array-FileReader/pkg-plist b/misc/p5-Array-FileReader/pkg-plist
index 4c86d3d0ee9e..787e5e574ae7 100644
--- a/misc/p5-Array-FileReader/pkg-plist
+++ b/misc/p5-Array-FileReader/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Array::FileReader.3.gz
 %%SITE_PERL%%/Array/FileReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/FileReader/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/FileReader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
-@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-IntSpan/Makefile b/misc/p5-Array-IntSpan/Makefile
index 0cb2def775c2..a0766468ec48 100644
--- a/misc/p5-Array-IntSpan/Makefile
+++ b/misc/p5-Array-IntSpan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-IntSpan
 PORTVERSION=	2.002
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Array-IntSpan/pkg-plist b/misc/p5-Array-IntSpan/pkg-plist
index ed1bffe1c8c3..ea213df6a96b 100644
--- a/misc/p5-Array-IntSpan/pkg-plist
+++ b/misc/p5-Array-IntSpan/pkg-plist
@@ -1,10 +1,5 @@
 %%SITE_PERL%%/Array/IntSpan.pm
 %%SITE_PERL%%/Array/IntSpan/IP.pm
 %%SITE_PERL%%/Array/IntSpan/Fields.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan/.packlist
 %%PERL5_MAN3%%/Array::IntSpan.3.gz
 %%PERL5_MAN3%%/Array::IntSpan::Fields.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
-@dirrm %%SITE_PERL%%/Array/IntSpan
-@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-LineReader/Makefile b/misc/p5-Array-LineReader/Makefile
index a03578e66d5f..89b3ccd0b71c 100644
--- a/misc/p5-Array-LineReader/Makefile
+++ b/misc/p5-Array-LineReader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Array-LineReader
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Array-LineReader/pkg-plist b/misc/p5-Array-LineReader/pkg-plist
index 3250db6bffe1..fb4bf0f2ba07 100644
--- a/misc/p5-Array-LineReader/pkg-plist
+++ b/misc/p5-Array-LineReader/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Array::LineReader.3.gz
 %%SITE_PERL%%/Array/LineReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/LineReader/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/LineReader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
-@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index 4abf0f172840..a87dd5211234 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-PrintCols
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Array-PrintCols/pkg-plist b/misc/p5-Array-PrintCols/pkg-plist
index 247fed3d730d..3eabe420cb4f 100644
--- a/misc/p5-Array-PrintCols/pkg-plist
+++ b/misc/p5-Array-PrintCols/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Array/PrintCols.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols/.packlist
 %%PERL5_MAN3%%/Array::PrintCols.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
-@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-RefElem/Makefile b/misc/p5-Array-RefElem/Makefile
index 8a17736cf022..284a065ea714 100644
--- a/misc/p5-Array-RefElem/Makefile
+++ b/misc/p5-Array-RefElem/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Array-RefElem
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Array-RefElem/pkg-plist b/misc/p5-Array-RefElem/pkg-plist
index c1253be62d09..c5ce63f6e88b 100644
--- a/misc/p5-Array-RefElem/pkg-plist
+++ b/misc/p5-Array-RefElem/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Array/RefElem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.so
+%%SITE_ARCH%%/Array/RefElem.pm
+%%SITE_ARCH%%/auto/Array/RefElem/RefElem.so
 %%PERL5_MAN3%%/Array::RefElem.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Array
diff --git a/misc/p5-Asterisk-FastAGI/Makefile b/misc/p5-Asterisk-FastAGI/Makefile
index 4be658c02aac..f3f12cdf6940 100644
--- a/misc/p5-Asterisk-FastAGI/Makefile
+++ b/misc/p5-Asterisk-FastAGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Asterisk-FastAGI
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Asterisk-FastAGI/pkg-plist b/misc/p5-Asterisk-FastAGI/pkg-plist
index f646b0dbe82e..686c7c0a319b 100644
--- a/misc/p5-Asterisk-FastAGI/pkg-plist
+++ b/misc/p5-Asterisk-FastAGI/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Asterisk/FastAGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Asterisk/FastAGI/.packlist
 %%PERL5_MAN3%%/Asterisk::FastAGI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Asterisk/FastAGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Asterisk
-@dirrmtry %%SITE_PERL%%/Asterisk
diff --git a/misc/p5-Asterisk/Makefile b/misc/p5-Asterisk/Makefile
index 5fb6120ef583..1f994ba324e5 100644
--- a/misc/p5-Asterisk/Makefile
+++ b/misc/p5-Asterisk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Asterisk
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JAMESGOL
diff --git a/misc/p5-Asterisk/pkg-plist b/misc/p5-Asterisk/pkg-plist
index 5941da0ec2d1..9031f13a8b2e 100644
--- a/misc/p5-Asterisk/pkg-plist
+++ b/misc/p5-Asterisk/pkg-plist
@@ -4,10 +4,7 @@
 %%SITE_PERL%%/Asterisk/Outgoing.pm
 %%SITE_PERL%%/Asterisk/QCall.pm
 %%SITE_PERL%%/Asterisk/Voicemail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/asterisk-perl/.packlist
 %%PERL5_MAN3%%/Asterisk::AGI.3.gz
 %%PERL5_MAN3%%/Asterisk::Manager.3.gz
 %%PERL5_MAN3%%/Asterisk::Outgoing.3.gz
 %%PERL5_MAN3%%/Asterisk::Voicemail.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/asterisk-perl
-@dirrm %%SITE_PERL%%/Asterisk
diff --git a/misc/p5-Bot-Training-MegaHAL/Makefile b/misc/p5-Bot-Training-MegaHAL/Makefile
index 4d7ffa4268dd..d8635e6f2afa 100644
--- a/misc/p5-Bot-Training-MegaHAL/Makefile
+++ b/misc/p5-Bot-Training-MegaHAL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bot-Training-MegaHAL
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AVAR
diff --git a/misc/p5-Bot-Training-MegaHAL/pkg-plist b/misc/p5-Bot-Training-MegaHAL/pkg-plist
index 07bd76fb3931..5cb68553163e 100644
--- a/misc/p5-Bot-Training-MegaHAL/pkg-plist
+++ b/misc/p5-Bot-Training-MegaHAL/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/Bot/Training/MegaHAL.pm
 %%SITE_PERL%%/auto/share/dist/Bot-Training-MegaHAL/megahal.trn
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training/MegaHAL/.packlist
 %%PERL5_MAN3%%/Bot::Training::MegaHAL.3.gz
-@dirrm %%SITE_PERL%%/auto/share/dist/Bot-Training-MegaHAL
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training/MegaHAL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot
-@dirrmtry %%SITE_PERL%%/Bot/Training
-@dirrmtry %%SITE_PERL%%/Bot
diff --git a/misc/p5-Bot-Training-StarCraft/Makefile b/misc/p5-Bot-Training-StarCraft/Makefile
index cdb657d68807..529003b5b7ad 100644
--- a/misc/p5-Bot-Training-StarCraft/Makefile
+++ b/misc/p5-Bot-Training-StarCraft/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bot-Training-StarCraft
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AVAR
diff --git a/misc/p5-Bot-Training-StarCraft/pkg-plist b/misc/p5-Bot-Training-StarCraft/pkg-plist
index 8f0c12e382b5..c6c42c2dce38 100644
--- a/misc/p5-Bot-Training-StarCraft/pkg-plist
+++ b/misc/p5-Bot-Training-StarCraft/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/Bot/Training/StarCraft.pm
 %%SITE_PERL%%/auto/share/dist/Bot-Training-StarCraft/starcraft.trn
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training/StarCraft/.packlist
 %%PERL5_MAN3%%/Bot::Training::StarCraft.3.gz
-@dirrm %%SITE_PERL%%/auto/share/dist/Bot-Training-StarCraft
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training/StarCraft
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot
-@dirrmtry %%SITE_PERL%%/Bot/Training
-@dirrmtry %%SITE_PERL%%/Bot
diff --git a/misc/p5-Bot-Training/Makefile b/misc/p5-Bot-Training/Makefile
index 8540434ce8bb..4d1e53a29d63 100644
--- a/misc/p5-Bot-Training/Makefile
+++ b/misc/p5-Bot-Training/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Bot-Training
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AVAR
diff --git a/misc/p5-Bot-Training/pkg-plist b/misc/p5-Bot-Training/pkg-plist
index 7b0b7601bc88..b1107a75cade 100644
--- a/misc/p5-Bot-Training/pkg-plist
+++ b/misc/p5-Bot-Training/pkg-plist
@@ -1,10 +1,5 @@
 bin/bot-training
 %%SITE_PERL%%/Bot/Training.pm
 %%SITE_PERL%%/Bot/Training/Plugin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training/.packlist
 %%PERL5_MAN3%%/Bot::Training.3.gz
 man/man1/bot-training.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/Training
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot
-@dirrmtry %%SITE_PERL%%/Bot/Training
-@dirrmtry %%SITE_PERL%%/Bot
diff --git a/misc/p5-Business-EDI/Makefile b/misc/p5-Business-EDI/Makefile
index 0728ec006e68..6d779417a90d 100644
--- a/misc/p5-Business-EDI/Makefile
+++ b/misc/p5-Business-EDI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-EDI
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JOEATZ
diff --git a/misc/p5-Business-EDI/pkg-plist b/misc/p5-Business-EDI/pkg-plist
index 63a8b1a71292..5a3b16e9bee4 100644
--- a/misc/p5-Business-EDI/pkg-plist
+++ b/misc/p5-Business-EDI/pkg-plist
@@ -650,18 +650,7 @@
 %%SITE_PERL%%/Business/EDI/data/edifact/untdid/IDSD.d98b.csv
 %%SITE_PERL%%/Business/EDI/data/edifact/untdid/IDSD.d99a.csv
 %%SITE_PERL%%/Business/EDI/data/edifact/untdid/IDSD.d99b.csv
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/EDI/.packlist
 %%PERL5_MAN3%%/Business::EDI.3.gz
 %%PERL5_MAN3%%/Business::EDI::CodeList.3.gz
 %%PERL5_MAN3%%/Business::EDI::Composite.3.gz
 %%PERL5_MAN3%%/Business::EDI::Spec.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/EDI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@dirrm %%SITE_PERL%%/Business/EDI/data/edifact/untdid
-@dirrm %%SITE_PERL%%/Business/EDI/data/edifact/iso9735
-@dirrm %%SITE_PERL%%/Business/EDI/data/edifact
-@dirrm %%SITE_PERL%%/Business/EDI/data
-@dirrm %%SITE_PERL%%/Business/EDI/Segment
-@dirrm %%SITE_PERL%%/Business/EDI/CodeList
-@dirrm %%SITE_PERL%%/Business/EDI
-@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-Hours/Makefile b/misc/p5-Business-Hours/Makefile
index 2f3bee582842..0a2f03b0c5e6 100644
--- a/misc/p5-Business-Hours/Makefile
+++ b/misc/p5-Business-Hours/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-Hours
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Business-Hours/pkg-plist b/misc/p5-Business-Hours/pkg-plist
index a13681609d2d..ba4c589c58e1 100644
--- a/misc/p5-Business-Hours/pkg-plist
+++ b/misc/p5-Business-Hours/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/Hours/.packlist
 %%SITE_PERL%%/Business/Hours.pm
 %%PERL5_MAN3%%/Business::Hours.3.gz
-@dirrmtry %%SITE_PERL%%/Business
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/Hours
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
diff --git a/misc/p5-Business-ISBN-Data/Makefile b/misc/p5-Business-ISBN-Data/Makefile
index 13ac8540b128..16d221601de6 100644
--- a/misc/p5-Business-ISBN-Data/Makefile
+++ b/misc/p5-Business-ISBN-Data/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-ISBN-Data
 PORTVERSION=	20120719.001
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Business-ISBN-Data/pkg-plist b/misc/p5-Business-ISBN-Data/pkg-plist
index 0be94d31aa12..12b982054107 100644
--- a/misc/p5-Business-ISBN-Data/pkg-plist
+++ b/misc/p5-Business-ISBN-Data/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Business/ISBN/Data.pm
 %%SITE_PERL%%/Business/ISBN/RangeMessage.xml
 %%SITE_PERL%%/Business/ISBN/make_data.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/Data/.packlist
 %%PERL5_MAN3%%/Business::ISBN::Data.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/Data
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@dirrm %%SITE_PERL%%/Business/ISBN
-@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index 1c1819cfbc89..1627434af8e3 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-ISBN
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Business-ISBN/pkg-plist b/misc/p5-Business-ISBN/pkg-plist
index 2c87b8400ffb..6b5bd4244639 100644
--- a/misc/p5-Business-ISBN/pkg-plist
+++ b/misc/p5-Business-ISBN/pkg-plist
@@ -4,7 +4,3 @@
 %%SITE_PERL%%/Business/ISBN.pm
 %%SITE_PERL%%/Business/ISBN10.pm
 %%SITE_PERL%%/Business/ISBN13.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-ISIN/Makefile b/misc/p5-Business-ISIN/Makefile
index eb33cca27c9f..e1683a69d104 100644
--- a/misc/p5-Business-ISIN/Makefile
+++ b/misc/p5-Business-ISIN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-ISIN
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Business-ISIN/pkg-plist b/misc/p5-Business-ISIN/pkg-plist
index 668d6eb0ed7b..786519f21028 100644
--- a/misc/p5-Business-ISIN/pkg-plist
+++ b/misc/p5-Business-ISIN/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN/.packlist
 %%SITE_PERL%%/Business/ISIN.pm
 %%PERL5_MAN3%%/Business::ISIN.3.gz
-@dirrmtry %%SITE_PERL%%/Business
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
diff --git a/misc/p5-Business-ISSN/Makefile b/misc/p5-Business-ISSN/Makefile
index 2a3d2e2dffda..74da4870a61e 100644
--- a/misc/p5-Business-ISSN/Makefile
+++ b/misc/p5-Business-ISSN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-ISSN
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Business-ISSN/pkg-plist b/misc/p5-Business-ISSN/pkg-plist
index 6646080b4327..7ece0fd6144d 100644
--- a/misc/p5-Business-ISSN/pkg-plist
+++ b/misc/p5-Business-ISSN/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Business::ISSN.3.gz
 %%SITE_PERL%%/Business/ISSN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index d1fc21236e7d..f355a3fc64bf 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-UPS
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JWHEELER
diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist
index b76615118285..3d93e36fb176 100644
--- a/misc/p5-Business-UPS/pkg-plist
+++ b/misc/p5-Business-UPS/pkg-plist
@@ -1,11 +1,5 @@
 %%PERL5_MAN3%%/Business::UPS.3.gz
 %%SITE_PERL%%/Business/UPS.pm
 %%SITE_PERL%%/auto/Business/UPS/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@dirrmtry %%SITE_PERL%%/auto/Business/UPS
-@dirrmtry %%SITE_PERL%%/auto/Business
-@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Chatbot-Eliza/Makefile b/misc/p5-Chatbot-Eliza/Makefile
index e4b4be1c6666..15baafb21c69 100644
--- a/misc/p5-Chatbot-Eliza/Makefile
+++ b/misc/p5-Chatbot-Eliza/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chatbot-Eliza
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Chatbot-Eliza/pkg-plist b/misc/p5-Chatbot-Eliza/pkg-plist
index 3f97dae9ebb8..d9611cf18240 100644
--- a/misc/p5-Chatbot-Eliza/pkg-plist
+++ b/misc/p5-Chatbot-Eliza/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Chatbot::Eliza.3.gz
 %%SITE_PERL%%/Chatbot/Eliza.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chatbot/Eliza/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chatbot/Eliza
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chatbot
-@dirrmtry %%SITE_PERL%%/Chatbot
diff --git a/misc/p5-Data-Buffer/Makefile b/misc/p5-Data-Buffer/Makefile
index 3e372dd980fe..81a94a5b104f 100644
--- a/misc/p5-Data-Buffer/Makefile
+++ b/misc/p5-Data-Buffer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Buffer
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Data-Buffer/pkg-plist b/misc/p5-Data-Buffer/pkg-plist
index bab2111381c3..04cd894642b1 100644
--- a/misc/p5-Data-Buffer/pkg-plist
+++ b/misc/p5-Data-Buffer/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Buffer/.packlist
 %%SITE_PERL%%/Data/Buffer.pm
 %%PERL5_MAN3%%/Data::Buffer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Buffer
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrm %%SITE_PERL%%/Data
diff --git a/misc/p5-File-CounterFile/Makefile b/misc/p5-File-CounterFile/Makefile
index 104408bb18af..fed7f3d6f974 100644
--- a/misc/p5-File-CounterFile/Makefile
+++ b/misc/p5-File-CounterFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-CounterFile
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-File-CounterFile/pkg-plist b/misc/p5-File-CounterFile/pkg-plist
index 14522033fbf5..d06ea45eb01f 100644
--- a/misc/p5-File-CounterFile/pkg-plist
+++ b/misc/p5-File-CounterFile/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/File/CounterFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CounterFile/.packlist
 %%PERL5_MAN3%%/File::CounterFile.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CounterFile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/misc/p5-File-Sort/Makefile b/misc/p5-File-Sort/Makefile
index d097e5f7c1d2..9ca87f584fcf 100644
--- a/misc/p5-File-Sort/Makefile
+++ b/misc/p5-File-Sort/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Sort
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-File-Sort/pkg-plist b/misc/p5-File-Sort/pkg-plist
index 85693a73d746..212bebf3a2d0 100644
--- a/misc/p5-File-Sort/pkg-plist
+++ b/misc/p5-File-Sort/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/File::Sort.3.gz
 %%SITE_PERL%%/File/Sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/misc/p5-Geo-Cache/Makefile b/misc/p5-Geo-Cache/Makefile
index 259e5c02c2f2..56b22b5802c7 100644
--- a/misc/p5-Geo-Cache/Makefile
+++ b/misc/p5-Geo-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Cache
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	misc perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Cache/pkg-plist b/misc/p5-Geo-Cache/pkg-plist
index 445f182f2b5f..8b9726c66603 100644
--- a/misc/p5-Geo-Cache/pkg-plist
+++ b/misc/p5-Geo-Cache/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Geo::Cache.3.gz
 %%SITE_PERL%%/Geo/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Cache/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Bing/Makefile b/misc/p5-Geo-Coder-Bing/Makefile
index 572c112f7bd1..1d36af01f7fc 100644
--- a/misc/p5-Geo-Coder-Bing/Makefile
+++ b/misc/p5-Geo-Coder-Bing/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Bing
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Bing/pkg-plist b/misc/p5-Geo-Coder-Bing/pkg-plist
index 2fe0de77d09d..1a3da2626a8f 100644
--- a/misc/p5-Geo-Coder-Bing/pkg-plist
+++ b/misc/p5-Geo-Coder-Bing/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/Bing.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Bing/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Bing.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Bing
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Geocoder-US/Makefile b/misc/p5-Geo-Coder-Geocoder-US/Makefile
index b071112f903b..b1b47cb06ef2 100644
--- a/misc/p5-Geo-Coder-Geocoder-US/Makefile
+++ b/misc/p5-Geo-Coder-Geocoder-US/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Geocoder-US
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/misc/p5-Geo-Coder-Geocoder-US/pkg-plist b/misc/p5-Geo-Coder-Geocoder-US/pkg-plist
index 6786be3f78e2..c8f3f89ec7f9 100644
--- a/misc/p5-Geo-Coder-Geocoder-US/pkg-plist
+++ b/misc/p5-Geo-Coder-Geocoder-US/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/Geocoder/US.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Geocoder/US/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Geocoder::US.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Geocoder/US
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Geocoder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder/Geocoder
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Google/Makefile b/misc/p5-Geo-Coder-Google/Makefile
index bc805709729a..15f21e615160 100644
--- a/misc/p5-Geo-Coder-Google/Makefile
+++ b/misc/p5-Geo-Coder-Google/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Google
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ARCANEZ
diff --git a/misc/p5-Geo-Coder-Google/pkg-plist b/misc/p5-Geo-Coder-Google/pkg-plist
index 3d29448ec04d..7b47bc7454f5 100644
--- a/misc/p5-Geo-Coder-Google/pkg-plist
+++ b/misc/p5-Geo-Coder-Google/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/Geo/Coder/Google.pm
 %%SITE_PERL%%/Geo/Coder/Google/V2.pm
 %%SITE_PERL%%/Geo/Coder/Google/V3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Google/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Google.3.gz
 %%PERL5_MAN3%%/Geo::Coder::Google::V2.3.gz
 %%PERL5_MAN3%%/Geo::Coder::Google::V3.3.gz
diff --git a/misc/p5-Geo-Coder-Googlev3/Makefile b/misc/p5-Geo-Coder-Googlev3/Makefile
index 1dec50b50153..11d0d8cead0c 100644
--- a/misc/p5-Geo-Coder-Googlev3/Makefile
+++ b/misc/p5-Geo-Coder-Googlev3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Googlev3
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Googlev3/pkg-plist b/misc/p5-Geo-Coder-Googlev3/pkg-plist
index 0f9b8d005686..72452e19d681 100644
--- a/misc/p5-Geo-Coder-Googlev3/pkg-plist
+++ b/misc/p5-Geo-Coder-Googlev3/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/Googlev3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Googlev3/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Googlev3.3.gz
diff --git a/misc/p5-Geo-Coder-Many/Makefile b/misc/p5-Geo-Coder-Many/Makefile
index 11f5e1818827..104727868807 100644
--- a/misc/p5-Geo-Coder-Many/Makefile
+++ b/misc/p5-Geo-Coder-Many/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Many
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Many/pkg-plist b/misc/p5-Geo-Coder-Many/pkg-plist
index 58655fab5364..c78644dab419 100644
--- a/misc/p5-Geo-Coder-Many/pkg-plist
+++ b/misc/p5-Geo-Coder-Many/pkg-plist
@@ -16,7 +16,6 @@
 %%SITE_PERL%%/Geo/Coder/Many/Scheduler/UniquenessScheduler/WRR.pm
 %%SITE_PERL%%/Geo/Coder/Many/Scheduler/UniquenessScheduler/WeightedRandom.pm
 %%SITE_PERL%%/Geo/Coder/Many/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Many/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Many.3.gz
 %%PERL5_MAN3%%/Geo::Coder::Many::Bing.3.gz
 %%PERL5_MAN3%%/Geo::Coder::Many::Generic.3.gz
@@ -35,11 +34,3 @@
 %%PERL5_MAN3%%/Geo::Coder::Many::Scheduler::UniquenessScheduler::WRR.3.gz
 %%PERL5_MAN3%%/Geo::Coder::Many::Scheduler::UniquenessScheduler::WeightedRandom.3.gz
 %%PERL5_MAN3%%/Geo::Coder::Many::Util.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Many
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrm %%SITE_PERL%%/Geo/Coder/Many/Scheduler/UniquenessScheduler
-@dirrm %%SITE_PERL%%/Geo/Coder/Many/Scheduler
-@dirrm %%SITE_PERL%%/Geo/Coder/Many
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Mapquest/Makefile b/misc/p5-Geo-Coder-Mapquest/Makefile
index 9f18a9f0fc5b..815a206e8732 100644
--- a/misc/p5-Geo-Coder-Mapquest/Makefile
+++ b/misc/p5-Geo-Coder-Mapquest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Mapquest
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Mapquest/pkg-plist b/misc/p5-Geo-Coder-Mapquest/pkg-plist
index 113e9c44510c..8671a6281e8e 100644
--- a/misc/p5-Geo-Coder-Mapquest/pkg-plist
+++ b/misc/p5-Geo-Coder-Mapquest/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/Mapquest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Mapquest/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Mapquest.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Mapquest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Multimap/Makefile b/misc/p5-Geo-Coder-Multimap/Makefile
index 9114a826c41f..d57f81415597 100644
--- a/misc/p5-Geo-Coder-Multimap/Makefile
+++ b/misc/p5-Geo-Coder-Multimap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Multimap
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Multimap/pkg-plist b/misc/p5-Geo-Coder-Multimap/pkg-plist
index 64cf0ed8c5b4..7ad8b787a1d6 100644
--- a/misc/p5-Geo-Coder-Multimap/pkg-plist
+++ b/misc/p5-Geo-Coder-Multimap/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/Multimap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Multimap/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Multimap.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Multimap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Multiple/Makefile b/misc/p5-Geo-Coder-Multiple/Makefile
index 56d080e8172c..7b9d9d316dc2 100644
--- a/misc/p5-Geo-Coder-Multiple/Makefile
+++ b/misc/p5-Geo-Coder-Multiple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Geo-Coder-Multiple
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	misc perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Multiple/pkg-plist b/misc/p5-Geo-Coder-Multiple/pkg-plist
index 98d5b3233eae..6be2d89ef134 100644
--- a/misc/p5-Geo-Coder-Multiple/pkg-plist
+++ b/misc/p5-Geo-Coder-Multiple/pkg-plist
@@ -5,11 +5,4 @@
 %%SITE_PERL%%/Geo/Coder/Multiple/Yahoo.pm
 %%SITE_PERL%%/Geo/Coder/Multiple/Response.pm
 %%SITE_PERL%%/Geo/Coder/Multiple/Multimap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Multiple/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Multiple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Multiple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder/Multiple
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Navteq/Makefile b/misc/p5-Geo-Coder-Navteq/Makefile
index 1de72f8a0ece..c39b083f101b 100644
--- a/misc/p5-Geo-Coder-Navteq/Makefile
+++ b/misc/p5-Geo-Coder-Navteq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Navteq
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Navteq/pkg-plist b/misc/p5-Geo-Coder-Navteq/pkg-plist
index 096a98e2e418..65bfc2551ad4 100644
--- a/misc/p5-Geo-Coder-Navteq/pkg-plist
+++ b/misc/p5-Geo-Coder-Navteq/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/Navteq.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Navteq/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Navteq.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Navteq
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-OSM/Makefile b/misc/p5-Geo-Coder-OSM/Makefile
index 180cde33d097..63b6363edb8e 100644
--- a/misc/p5-Geo-Coder-OSM/Makefile
+++ b/misc/p5-Geo-Coder-OSM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-OSM
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-OSM/pkg-plist b/misc/p5-Geo-Coder-OSM/pkg-plist
index 6e55b1e9ee8f..b17a8698e1a1 100644
--- a/misc/p5-Geo-Coder-OSM/pkg-plist
+++ b/misc/p5-Geo-Coder-OSM/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/OSM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/OSM/.packlist
 %%PERL5_MAN3%%/Geo::Coder::OSM.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/OSM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-OpenCage/Makefile b/misc/p5-Geo-Coder-OpenCage/Makefile
index d5484d9c420a..0caf86119d5e 100644
--- a/misc/p5-Geo-Coder-OpenCage/Makefile
+++ b/misc/p5-Geo-Coder-OpenCage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-OpenCage
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAORU
diff --git a/misc/p5-Geo-Coder-OpenCage/pkg-plist b/misc/p5-Geo-Coder-OpenCage/pkg-plist
index ddc367c8d87c..45ba6463a6d4 100644
--- a/misc/p5-Geo-Coder-OpenCage/pkg-plist
+++ b/misc/p5-Geo-Coder-OpenCage/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/OpenCage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/OpenCage/.packlist
 %%PERL5_MAN3%%/Geo::Coder::OpenCage.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/OpenCage
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-Ovi/Makefile b/misc/p5-Geo-Coder-Ovi/Makefile
index e7f6618dfea8..9dab83c04993 100644
--- a/misc/p5-Geo-Coder-Ovi/Makefile
+++ b/misc/p5-Geo-Coder-Ovi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-Ovi
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-Ovi/pkg-plist b/misc/p5-Geo-Coder-Ovi/pkg-plist
index 7dfb7c215e15..53b997154670 100644
--- a/misc/p5-Geo-Coder-Ovi/pkg-plist
+++ b/misc/p5-Geo-Coder-Ovi/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/Ovi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Ovi/.packlist
 %%PERL5_MAN3%%/Geo::Coder::Ovi.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/Ovi
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-PlaceFinder/Makefile b/misc/p5-Geo-Coder-PlaceFinder/Makefile
index b8c63d38b5d5..669208ebf38a 100644
--- a/misc/p5-Geo-Coder-PlaceFinder/Makefile
+++ b/misc/p5-Geo-Coder-PlaceFinder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-PlaceFinder
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-PlaceFinder/pkg-plist b/misc/p5-Geo-Coder-PlaceFinder/pkg-plist
index fa64903c08d8..d95541178b00 100644
--- a/misc/p5-Geo-Coder-PlaceFinder/pkg-plist
+++ b/misc/p5-Geo-Coder-PlaceFinder/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/PlaceFinder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/PlaceFinder/.packlist
 %%PERL5_MAN3%%/Geo::Coder::PlaceFinder.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/PlaceFinder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Coder-TomTom/Makefile b/misc/p5-Geo-Coder-TomTom/Makefile
index 4b7e70dd5e59..366907973b9a 100644
--- a/misc/p5-Geo-Coder-TomTom/Makefile
+++ b/misc/p5-Geo-Coder-TomTom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coder-TomTom
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Coder-TomTom/pkg-plist b/misc/p5-Geo-Coder-TomTom/pkg-plist
index ebb25720bfd7..c7b2174c9956 100644
--- a/misc/p5-Geo-Coder-TomTom/pkg-plist
+++ b/misc/p5-Geo-Coder-TomTom/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Geo/Coder/TomTom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/TomTom/.packlist
 %%PERL5_MAN3%%/Geo::Coder::TomTom.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder/TomTom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coder
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Postcodes-DK/Makefile b/misc/p5-Geo-Postcodes-DK/Makefile
index 65fe13267fd2..4e6b7595014b 100644
--- a/misc/p5-Geo-Postcodes-DK/Makefile
+++ b/misc/p5-Geo-Postcodes-DK/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Postcodes-DK
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Postcodes-DK/pkg-plist b/misc/p5-Geo-Postcodes-DK/pkg-plist
index 6ca64eee9c18..2913fb3d4051 100644
--- a/misc/p5-Geo-Postcodes-DK/pkg-plist
+++ b/misc/p5-Geo-Postcodes-DK/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes/DK/.packlist
 %%SITE_PERL%%/Geo/Postcodes/DK.pm
 %%PERL5_MAN3%%/Geo::Postcodes::DK.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes/DK
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Postcodes
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Postcodes-NO/Makefile b/misc/p5-Geo-Postcodes-NO/Makefile
index d61ecd5ca22b..3afbcb2e0349 100644
--- a/misc/p5-Geo-Postcodes-NO/Makefile
+++ b/misc/p5-Geo-Postcodes-NO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Postcodes-NO
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Postcodes-NO/pkg-plist b/misc/p5-Geo-Postcodes-NO/pkg-plist
index 758925320a02..2617da9d9c75 100644
--- a/misc/p5-Geo-Postcodes-NO/pkg-plist
+++ b/misc/p5-Geo-Postcodes-NO/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes/NO/.packlist
 %%SITE_PERL%%/Geo/Postcodes/NO.pm
 %%PERL5_MAN3%%/Geo::Postcodes::NO.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes/NO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Postcodes
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geo-Postcodes/Makefile b/misc/p5-Geo-Postcodes/Makefile
index d92b11a23f19..e5405155a4d1 100644
--- a/misc/p5-Geo-Postcodes/Makefile
+++ b/misc/p5-Geo-Postcodes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Postcodes
 PORTVERSION=	0.320
+PORTREVISION=	1
 CATEGORIES=	misc perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geo-Postcodes/pkg-plist b/misc/p5-Geo-Postcodes/pkg-plist
index cce1df50a0f0..5b73491d7ecf 100644
--- a/misc/p5-Geo-Postcodes/pkg-plist
+++ b/misc/p5-Geo-Postcodes/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes/.packlist
 %%SITE_PERL%%/Geo/Postcodes.pm
 %%SITE_PERL%%/Geo/Postcodes/Ajax.pod
 %%SITE_PERL%%/Geo/Postcodes/Selection.pod
@@ -11,7 +10,3 @@
 %%PERL5_MAN3%%/Geo::Postcodes::Subclass.3.gz
 %%PERL5_MAN3%%/Geo::Postcodes::Tutorial.3.gz
 %%PERL5_MAN3%%/Geo::Postcodes::Update.3.gz
-@dirrmtry %%SITE_PERL%%/Geo/Postcodes
-@dirrmtry %%SITE_PERL%%/Geo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Postcodes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
diff --git a/misc/p5-Geo-Weather/Makefile b/misc/p5-Geo-Weather/Makefile
index 65e48cecdd54..eaf59af77ffa 100644
--- a/misc/p5-Geo-Weather/Makefile
+++ b/misc/p5-Geo-Weather/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Weather
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	misc perl5 geography
 MASTER_SITES=	CPAN \
 		ftp://ftp.innercite.com/pub/perl/
diff --git a/misc/p5-Geo-Weather/pkg-plist b/misc/p5-Geo-Weather/pkg-plist
index b95ad3a220c7..d7d33b8b307e 100644
--- a/misc/p5-Geo-Weather/pkg-plist
+++ b/misc/p5-Geo-Weather/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Geo/Weather.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather/.packlist
 %%PERL5_MAN3%%/Geo::Weather.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geography-Countries/Makefile b/misc/p5-Geography-Countries/Makefile
index ff91ad9cd6fa..268a75473fed 100644
--- a/misc/p5-Geography-Countries/Makefile
+++ b/misc/p5-Geography-Countries/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geography-Countries
 PORTVERSION=	2009041301
+PORTREVISION=	1
 CATEGORIES=	misc perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Geography-Countries/pkg-plist b/misc/p5-Geography-Countries/pkg-plist
index 557224578c4a..b08f7d222332 100644
--- a/misc/p5-Geography-Countries/pkg-plist
+++ b/misc/p5-Geography-Countries/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Geography/Countries.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries/.packlist
 %%PERL5_MAN3%%/Geography::Countries.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography
-@dirrmtry %%SITE_PERL%%/Geography
diff --git a/misc/p5-I18N-Charset/Makefile b/misc/p5-I18N-Charset/Makefile
index 8fef54918433..deed84f8bc9c 100644
--- a/misc/p5-I18N-Charset/Makefile
+++ b/misc/p5-I18N-Charset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	I18N-Charset
 PORTVERSION=	1.39.4
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-I18N-Charset/pkg-plist b/misc/p5-I18N-Charset/pkg-plist
index e874d94f1eaf..8ad65bb674c6 100644
--- a/misc/p5-I18N-Charset/pkg-plist
+++ b/misc/p5-I18N-Charset/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/I18N/Charset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/Charset/.packlist
 %%PERL5_MAN3%%/I18N::Charset.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/Charset
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N
-@dirrmtry %%SITE_PERL%%/I18N
diff --git a/misc/p5-I18N-LangTags/Makefile b/misc/p5-I18N-LangTags/Makefile
index f658b32a308a..3c55999c43eb 100644
--- a/misc/p5-I18N-LangTags/Makefile
+++ b/misc/p5-I18N-LangTags/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	I18N-LangTags
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-I18N-LangTags/pkg-plist b/misc/p5-I18N-LangTags/pkg-plist
index 01d9946e72e3..94d3eda79d32 100644
--- a/misc/p5-I18N-LangTags/pkg-plist
+++ b/misc/p5-I18N-LangTags/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/I18N/LangTags.pm
 %%SITE_PERL%%/I18N/LangTags/List.pm
 %%SITE_PERL%%/I18N/LangTags/Detect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/LangTags/.packlist
 %%PERL5_MAN3%%/I18N::LangTags.3.gz
 %%PERL5_MAN3%%/I18N::LangTags::Detect.3.gz
 %%PERL5_MAN3%%/I18N::LangTags::List.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/LangTags
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N
-@dirrm %%SITE_PERL%%/I18N/LangTags
-@dirrmtry %%SITE_PERL%%/I18N
diff --git a/misc/p5-LEGO-RCX/Makefile b/misc/p5-LEGO-RCX/Makefile
index 1f5d34219ef9..fe83c498435c 100644
--- a/misc/p5-LEGO-RCX/Makefile
+++ b/misc/p5-LEGO-RCX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LEGO-RCX
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-LEGO-RCX/pkg-plist b/misc/p5-LEGO-RCX/pkg-plist
index b97b9f10b6b7..b0336264625c 100644
--- a/misc/p5-LEGO-RCX/pkg-plist
+++ b/misc/p5-LEGO-RCX/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/LEGO::RCX.3.gz
 %%SITE_PERL%%/LEGO/RCX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LEGO/RCX/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LEGO/RCX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LEGO
-@dirrmtry %%SITE_PERL%%/LEGO
diff --git a/misc/p5-List-Compare/Makefile b/misc/p5-List-Compare/Makefile
index 0d56be75600c..a364a255f12c 100644
--- a/misc/p5-List-Compare/Makefile
+++ b/misc/p5-List-Compare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Compare
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-List-Compare/pkg-plist b/misc/p5-List-Compare/pkg-plist
index f79fca6fcb8b..bbe114b72aad 100644
--- a/misc/p5-List-Compare/pkg-plist
+++ b/misc/p5-List-Compare/pkg-plist
@@ -6,9 +6,3 @@
 %%SITE_PERL%%/List/Compare/Functional.pm
 %%SITE_PERL%%/List/Compare/Base/_Auxiliary.pm
 %%SITE_PERL%%/List/Compare/Base/_Engine.pm
-%%SITE_PERL%%/mach/auto/List/Compare/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/List/Compare
-@dirrmtry %%SITE_PERL%%/mach/auto/List
-@dirrmtry %%SITE_PERL%%/List/Compare/Base
-@dirrmtry %%SITE_PERL%%/List/Compare
-@dirrmtry %%SITE_PERL%%/List
diff --git a/misc/p5-List-Util-WeightedRoundRobin/Makefile b/misc/p5-List-Util-WeightedRoundRobin/Makefile
index c65a2525a8fd..7e49cc0b9976 100644
--- a/misc/p5-List-Util-WeightedRoundRobin/Makefile
+++ b/misc/p5-List-Util-WeightedRoundRobin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	List-Util-WeightedRoundRobin
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	misc perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-List-Util-WeightedRoundRobin/pkg-plist b/misc/p5-List-Util-WeightedRoundRobin/pkg-plist
index d5bd18da3a6e..7d5661dd1728 100644
--- a/misc/p5-List-Util-WeightedRoundRobin/pkg-plist
+++ b/misc/p5-List-Util-WeightedRoundRobin/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/List/Util/WeightedRoundRobin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/WeightedRoundRobin/.packlist
 %%PERL5_MAN3%%/List::Util::WeightedRoundRobin.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/WeightedRoundRobin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
-@dirrmtry %%SITE_PERL%%/List/Util
-@dirrmtry %%SITE_PERL%%/List
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index d286fd5ca352..29f95f995152 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-Codes
 PORTVERSION=	3.31
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Locale-Codes/pkg-plist b/misc/p5-Locale-Codes/pkg-plist
index daa22c0deeab..09bf828e90c3 100644
--- a/misc/p5-Locale-Codes/pkg-plist
+++ b/misc/p5-Locale-Codes/pkg-plist
@@ -56,8 +56,3 @@
 %%SITE_PERL%%/Locale/Language.pod
 %%SITE_PERL%%/Locale/Script.pm
 %%SITE_PERL%%/Locale/Script.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Codes/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Codes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
-@dirrm %%SITE_PERL%%/Locale/Codes
-@dirrmtry %%SITE_PERL%%/Locale
diff --git a/misc/p5-Locale-Geocode/Makefile b/misc/p5-Locale-Geocode/Makefile
index ed4bad079ee8..160517f21897 100644
--- a/misc/p5-Locale-Geocode/Makefile
+++ b/misc/p5-Locale-Geocode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-Geocode
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Locale-Geocode/pkg-plist b/misc/p5-Locale-Geocode/pkg-plist
index b847561375c5..a8e31fd2fc81 100644
--- a/misc/p5-Locale-Geocode/pkg-plist
+++ b/misc/p5-Locale-Geocode/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/Locale/Geocode.pm
 %%SITE_PERL%%/Locale/Geocode/Division.pm
 %%SITE_PERL%%/Locale/Geocode/Territory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Geocode/.packlist
 %%PERL5_MAN3%%/Locale::Geocode.3.gz
 %%PERL5_MAN3%%/Locale::Geocode::Division.3.gz
 %%PERL5_MAN3%%/Locale::Geocode::Territory.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Geocode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
-@dirrmtry %%SITE_PERL%%/Locale/Geocode
-@dirrmtry %%SITE_PERL%%/Locale
diff --git a/misc/p5-Locale-Msgcat/Makefile b/misc/p5-Locale-Msgcat/Makefile
index 77867aa7bd34..18cc715c60f2 100644
--- a/misc/p5-Locale-Msgcat/Makefile
+++ b/misc/p5-Locale-Msgcat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Msgcat
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Locale
diff --git a/misc/p5-Locale-Msgcat/pkg-plist b/misc/p5-Locale-Msgcat/pkg-plist
index e6ec52cece44..23bd586f33d9 100644
--- a/misc/p5-Locale-Msgcat/pkg-plist
+++ b/misc/p5-Locale-Msgcat/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Locale::Msgcat.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Locale/Msgcat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Msgcat/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Msgcat/Msgcat.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Msgcat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Locale
+%%SITE_ARCH%%/Locale/Msgcat.pm
+%%SITE_ARCH%%/auto/Locale/Msgcat/Msgcat.so
diff --git a/misc/p5-Locale-SubCountry/Makefile b/misc/p5-Locale-SubCountry/Makefile
index 92fe982bd06d..3a760f75a801 100644
--- a/misc/p5-Locale-SubCountry/Makefile
+++ b/misc/p5-Locale-SubCountry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-SubCountry
 PORTVERSION=	1.63
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Locale-SubCountry/pkg-plist b/misc/p5-Locale-SubCountry/pkg-plist
index 871ba77999fe..c4184a250807 100644
--- a/misc/p5-Locale-SubCountry/pkg-plist
+++ b/misc/p5-Locale-SubCountry/pkg-plist
@@ -2,5 +2,3 @@
 %%PERL5_MAN3%%/Locale::SubCountry::Data.3.gz
 %%SITE_PERL%%/Locale/SubCountry.pm
 %%SITE_PERL%%/Locale/SubCountry/Data.pm
-@dirrmtry %%SITE_PERL%%/Locale/SubCountry
-@dirrmtry %%SITE_PERL%%/Locale
diff --git a/misc/p5-Locale-US/Makefile b/misc/p5-Locale-US/Makefile
index e20f7d811ba3..b0d58896d800 100644
--- a/misc/p5-Locale-US/Makefile
+++ b/misc/p5-Locale-US/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Locale-US
 PORTVERSION=	2.112.150
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Locale-US/pkg-plist b/misc/p5-Locale-US/pkg-plist
index db76922e2ea5..51dfdeee4848 100644
--- a/misc/p5-Locale-US/pkg-plist
+++ b/misc/p5-Locale-US/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Locale/US.pm
 %%SITE_PERL%%/Locale/kruft2codes.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/US/.packlist
 %%PERL5_MAN3%%/Locale::US.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/US
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
-@dirrmtry %%SITE_PERL%%/Locale
diff --git a/misc/p5-Net-vCard/Makefile b/misc/p5-Net-vCard/Makefile
index 779ccc4cd9a6..41c82e5ab735 100644
--- a/misc/p5-Net-vCard/Makefile
+++ b/misc/p5-Net-vCard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Net-vCard
 PORTVERSION=		0.5
+PORTREVISION=	1
 CATEGORIES=		misc perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/misc/p5-Net-vCard/pkg-plist b/misc/p5-Net-vCard/pkg-plist
index 5fd15261ba77..0804910217ff 100644
--- a/misc/p5-Net-vCard/pkg-plist
+++ b/misc/p5-Net-vCard/pkg-plist
@@ -2,10 +2,5 @@ bin/vCard2label
 %%SITE_PERL%%/Net/vCard.pm
 %%SITE_PERL%%/Net/vCard/ADR.pm
 %%SITE_PERL%%/Net/vFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vCard/.packlist
 %%PERL5_MAN3%%/Net::vFile.3.gz
 %%PERL5_MAN3%%/Net::vCard.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vCard
-@dirrm %%SITE_PERL%%/Net/vCard
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/misc/p5-Norge/Makefile b/misc/p5-Norge/Makefile
index 3ecc89b55894..8a517e5d6838 100644
--- a/misc/p5-Norge/Makefile
+++ b/misc/p5-Norge/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Norge
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	misc textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Norge/pkg-plist b/misc/p5-Norge/pkg-plist
index 3148f098a9b2..79da5176858a 100644
--- a/misc/p5-Norge/pkg-plist
+++ b/misc/p5-Norge/pkg-plist
@@ -2,10 +2,7 @@
 %%SITE_PERL%%/No/KontoNr.pm
 %%SITE_PERL%%/No/PersonNr.pm
 %%SITE_PERL%%/No/Sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/No/.packlist
 %%PERL5_MAN3%%/No::Sort.3.gz
 %%PERL5_MAN3%%/No::KontoNr.3.gz
 %%PERL5_MAN3%%/No::PersonNr.3.gz
 %%PERL5_MAN3%%/No::Dato.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/No
-@dirrmtry %%SITE_PERL%%/No
diff --git a/misc/p5-OSSP-uuid/pkg-plist b/misc/p5-OSSP-uuid/pkg-plist
index 599ffab980a7..5cdc9d655757 100644
--- a/misc/p5-OSSP-uuid/pkg-plist
+++ b/misc/p5-OSSP-uuid/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/OSSP::uuid.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/uuid.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OSSP
+%%SITE_ARCH%%/OSSP/uuid.pm
+%%SITE_ARCH%%/OSSP/uuid.pod
+%%SITE_ARCH%%/auto/OSSP/uuid/uuid.so
diff --git a/misc/p5-Software-License/Makefile b/misc/p5-Software-License/Makefile
index 8fa769c1ef8f..42f2689129ae 100644
--- a/misc/p5-Software-License/Makefile
+++ b/misc/p5-Software-License/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Software-License
 PORTVERSION=	0.103010
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/misc/p5-Software-License/pkg-plist b/misc/p5-Software-License/pkg-plist
index 5a5155e29201..96335f7bb9cc 100644
--- a/misc/p5-Software-License/pkg-plist
+++ b/misc/p5-Software-License/pkg-plist
@@ -28,7 +28,6 @@
 %%SITE_PERL%%/Software/License/Sun.pm
 %%SITE_PERL%%/Software/License/Zlib.pm
 %%SITE_PERL%%/Software/LicenseUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Software/License/.packlist
 %%PERL5_MAN3%%/Software::License.3.gz
 %%PERL5_MAN3%%/Software::License::AGPL_3.3.gz
 %%PERL5_MAN3%%/Software::License::Apache_1_1.3.gz
@@ -59,7 +58,3 @@
 %%PERL5_MAN3%%/Software::License::Sun.3.gz
 %%PERL5_MAN3%%/Software::License::Zlib.3.gz
 %%PERL5_MAN3%%/Software::LicenseUtils.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Software/License
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Software
-@dirrmtry %%SITE_PERL%%/Software/License
-@dirrmtry %%SITE_PERL%%/Software
diff --git a/misc/p5-Test-Dir/Makefile b/misc/p5-Test-Dir/Makefile
index 6c27a9979e81..78f7fcdc8598 100644
--- a/misc/p5-Test-Dir/Makefile
+++ b/misc/p5-Test-Dir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Dir
 PORTVERSION=	1.014
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Test-Dir/pkg-plist b/misc/p5-Test-Dir/pkg-plist
index 9e30b22581f1..c3e931d6149f 100644
--- a/misc/p5-Test-Dir/pkg-plist
+++ b/misc/p5-Test-Dir/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/Test/Dir.pm
 %%SITE_PERL%%/Test/Dir/Base.pm
 %%SITE_PERL%%/Test/Folder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Dir/.packlist
 %%PERL5_MAN3%%/Test::Dir.3.gz
 %%PERL5_MAN3%%/Test::Dir::Base.3.gz
 %%PERL5_MAN3%%/Test::Folder.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Dir
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
-@dirrm %%SITE_PERL%%/Test/Dir
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/misc/p5-Text-FIGlet/Makefile b/misc/p5-Text-FIGlet/Makefile
index 725697393947..52645e292f50 100644
--- a/misc/p5-Text-FIGlet/Makefile
+++ b/misc/p5-Text-FIGlet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-FIGlet
 PORTVERSION=	2.19.3
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Text-FIGlet/pkg-plist b/misc/p5-Text-FIGlet/pkg-plist
index fb88aa79c30f..c57fb00d734d 100644
--- a/misc/p5-Text-FIGlet/pkg-plist
+++ b/misc/p5-Text-FIGlet/pkg-plist
@@ -8,7 +8,6 @@ bin/showfigfonts.pl
 %%SITE_PERL%%/Text/FIGlet/Illuminated.pm
 %%SITE_PERL%%/Text/FIGlet/LICENSE.pod
 %%SITE_PERL%%/Text/FIGlet/Ransom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet/.packlist
 %%PERL5_MAN3%%/Text::FIGlet.3.gz
 %%PERL5_MAN3%%/Text::FIGlet::Control.3.gz
 %%PERL5_MAN3%%/Text::FIGlet::Font.3.gz
@@ -19,7 +18,3 @@ man/man1/charmap.pl.1.gz
 man/man1/figlet.pl.1.gz
 man/man1/minifig.pl.1.gz
 man/man1/showfigfonts.pl.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet
-@dirrm %%SITE_PERL%%/Text/FIGlet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/misc/p5-Tie-DxHash/Makefile b/misc/p5-Tie-DxHash/Makefile
index d71e200df929..e95d89ac309c 100644
--- a/misc/p5-Tie-DxHash/Makefile
+++ b/misc/p5-Tie-DxHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-DxHash
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Tie-DxHash/pkg-plist b/misc/p5-Tie-DxHash/pkg-plist
index c6c57408c2e7..9bf5d7ed6c51 100644
--- a/misc/p5-Tie-DxHash/pkg-plist
+++ b/misc/p5-Tie-DxHash/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash/.packlist
 %%SITE_PERL%%/Tie/DxHash.pm
 %%PERL5_MAN3%%/Tie::DxHash.3.gz
-@dirrmtry %%SITE_PERL%%/Tie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
diff --git a/misc/p5-Zen-Koans/Makefile b/misc/p5-Zen-Koans/Makefile
index 4ff79a5511d1..61edef477ed5 100644
--- a/misc/p5-Zen-Koans/Makefile
+++ b/misc/p5-Zen-Koans/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Zen-Koans
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LUKEC
diff --git a/misc/p5-Zen-Koans/pkg-plist b/misc/p5-Zen-Koans/pkg-plist
index feffa34995f2..118e42649538 100644
--- a/misc/p5-Zen-Koans/pkg-plist
+++ b/misc/p5-Zen-Koans/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Zen::Koans.3.gz
 %%SITE_PERL%%/Zen/Koan.pm
 %%SITE_PERL%%/Zen/Koans.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Zen/Koans/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Zen/Koans
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Zen
-@dirrmtry %%SITE_PERL%%/Zen
diff --git a/misc/pfm/Makefile b/misc/pfm/Makefile
index c2ed3ae52169..bf6b474d6dac 100644
--- a/misc/pfm/Makefile
+++ b/misc/pfm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pfm
 PORTVERSION=	2.12.3
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	SF/p-f-m/${PORTNAME}/${PORTVERSION}
 
diff --git a/misc/pfm/pkg-plist b/misc/pfm/pkg-plist
index 5f9e04057d44..1c830d003e1e 100644
--- a/misc/pfm/pkg-plist
+++ b/misc/pfm/pkg-plist
@@ -90,12 +90,3 @@ man/man1/pfm.1.gz
 %%SITE_PERL%%/App/PFM/Screen/Listing.pm
 %%SITE_PERL%%/App/PFM/State.pm
 %%SITE_PERL%%/App/PFM/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pfm/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/pfm
-@dirrm %%SITE_PERL%%/App/PFM/Screen
-@dirrm %%SITE_PERL%%/App/PFM/OS
-@dirrm %%SITE_PERL%%/App/PFM/Job
-@dirrm %%SITE_PERL%%/App/PFM/Config
-@dirrm %%SITE_PERL%%/App/PFM/Browser
-@dirrm %%SITE_PERL%%/App/PFM
-@dirrmtry %%SITE_PERL%%/App
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index 381152f340ec..4dcb28d45f8d 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	acidrip
 PORTVERSION=	0.14
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20Your%20two-wheeled%20knife
 
diff --git a/multimedia/acidrip/pkg-plist b/multimedia/acidrip/pkg-plist
index f1eacfd18b79..5782d8fe434b 100644
--- a/multimedia/acidrip/pkg-plist
+++ b/multimedia/acidrip/pkg-plist
@@ -4,7 +4,4 @@ bin/acidrip
 %%SITE_PERL%%/AcidRip/logo.png
 %%SITE_PERL%%/AcidRip/messages.pm
 %%SITE_PERL%%/AcidRip/signals.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AcidRip/.packlist
 man/man1/acidrip.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AcidRip
-@dirrm %%SITE_PERL%%/AcidRip
diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 18575ff7a3dd..4727e1a01d78 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	clive
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}
 
@@ -25,8 +26,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 PLIST_FILES=	bin/clive \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/clive/.packlist \
 		man/man1/clive.1.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/clive
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index bfcf7e5e312d..6a3e323f087f 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dvdrip
 PORTVERSION=	0.98.11
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	CPAN http://www.exit1.org/dvdrip/dist/
 MASTER_SITE_SUBDIR=	CPAN:JRED
diff --git a/multimedia/dvdrip/pkg-plist b/multimedia/dvdrip/pkg-plist
index 0a1ea525a7ab..779776220144 100644
--- a/multimedia/dvdrip/pkg-plist
+++ b/multimedia/dvdrip/pkg-plist
@@ -98,33 +98,3 @@ man/man1/dvdrip-splitpipe.1.gz
 %%SITE_PERL%%/Video/DVDRip/splash.sr@Latn.png
 %%SITE_PERL%%/Video/DVDRip/splash.sr.png
 %%SITE_PERL%%/Video/DVDRip/translators.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
-@dirrm %%SITE_PERL%%/Video/DVDRip/Term
-@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Project
-@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Icons
-@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/FormFactory
-@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Cluster
-@dirrm %%SITE_PERL%%/Video/DVDRip/GUI
-@dirrm %%SITE_PERL%%/Video/DVDRip/Cluster
-@dirrm %%SITE_PERL%%/Video/DVDRip/CPAN
-@dirrm %%SITE_PERL%%/Video/DVDRip
-@dirrmtry %%SITE_PERL%%/Video
-@dirrmtry %%SITE_PERL%%/LocaleData/sr@Latn/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/sr@Latn
-@dirrmtry %%SITE_PERL%%/LocaleData/sr/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/sr
-@dirrmtry %%SITE_PERL%%/LocaleData/it/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/it
-@dirrmtry %%SITE_PERL%%/LocaleData/fr/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/fr
-@dirrmtry %%SITE_PERL%%/LocaleData/es/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/es
-@dirrmtry %%SITE_PERL%%/LocaleData/de/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/de
-@dirrmtry %%SITE_PERL%%/LocaleData/da/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/da
-@dirrmtry %%SITE_PERL%%/LocaleData/cs/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/cs
-@dirrmtry %%SITE_PERL%%/LocaleData
diff --git a/multimedia/gcap/Makefile b/multimedia/gcap/Makefile
index 486a20213c0f..e1d0fd6509ad 100644
--- a/multimedia/gcap/Makefile
+++ b/multimedia/gcap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcap
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 
@@ -25,8 +26,6 @@ TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_DIRS=	${SITE_PERL_REL}/${PERL_ARCH}/auto/gcap
-PLIST_FILES=	bin/gcap ${SITE_PERL_REL}/${PERL_ARCH}/auto/gcap/.packlist \
-		man/man1/gcap.1.gz
+PLIST_FILES=	bin/gcap man/man1/gcap.1.gz
 
 .include <bsd.port.mk>
diff --git a/multimedia/grake/Makefile b/multimedia/grake/Makefile
index 5b2d40487e82..1553fa188b60 100644
--- a/multimedia/grake/Makefile
+++ b/multimedia/grake/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	grake
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 
@@ -23,8 +24,6 @@ TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_DIRS=	${SITE_PERL_REL}/${PERL_ARCH}/auto/grake
-PLIST_FILES=	bin/grake ${SITE_PERL_REL}/${PERL_ARCH}/auto/grake/.packlist \
-		man/man1/grake.1.gz
+PLIST_FILES=	bin/grake man/man1/grake.1.gz
 
 .include <bsd.port.mk>
diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile
index f3c6f2eeed70..bad16bd82d15 100644
--- a/multimedia/gtk-youtube-viewer/Makefile
+++ b/multimedia/gtk-youtube-viewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtk-youtube-viewer
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia perl5
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/gtk-youtube-viewer/pkg-plist b/multimedia/gtk-youtube-viewer/pkg-plist
index 3a751dd0bda5..42e70480960b 100644
--- a/multimedia/gtk-youtube-viewer/pkg-plist
+++ b/multimedia/gtk-youtube-viewer/pkg-plist
@@ -24,6 +24,3 @@ bin/youtube-viewer
 man/man1/youtube-viewer.1.gz
 %%GTK2%%share/applications/gtk-youtube-viewer.desktop
 %%GTK2%%share/pixmaps/gtk-youtube-viewer.png
-%%GTK2%%@dirrm %%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons
-%%GTK2%%@dirrm %%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer
-@dirrm %%SITE_PERL%%/WWW/YoutubeViewer
diff --git a/multimedia/mp3cd/Makefile b/multimedia/mp3cd/Makefile
index 594025b454e3..a40c02a6274a 100644
--- a/multimedia/mp3cd/Makefile
+++ b/multimedia/mp3cd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mp3cd
 PORTVERSION=	1.027
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://outflux.net/software/pkgs/mp3cd/download/
diff --git a/multimedia/mp3cd/pkg-plist b/multimedia/mp3cd/pkg-plist
index a1800983c3e7..79b9fe45b430 100644
--- a/multimedia/mp3cd/pkg-plist
+++ b/multimedia/mp3cd/pkg-plist
@@ -1,4 +1,2 @@
 bin/mp3cd
 man/man1/mp3cd.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mp3cd/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/mp3cd
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 7a86f42bc504..0e666af35761 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mythtv
 PORTVERSION=	0.27.0.20140121
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freebsd.org/~decke/distfiles/
 
@@ -29,7 +29,7 @@ GH_COMMIT=	5a5e1cd
 WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/${GH_PROJECT}
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_PERL5=	run build fixpacklist
+USE_PERL5=	run build
 NOPRECIOUSMAKEVARS=	# don't override $(ARCH) in ffmpeg makefiles
 USES=		gmake libtool perl5 pkgconfig pathfix
 USE_QT4=	gui sql network script linguist_build l10n sql-mysql_run \
diff --git a/multimedia/mythtv/pkg-plist b/multimedia/mythtv/pkg-plist
index a8d0dac9c4af..5a9084754ce5 100644
--- a/multimedia/mythtv/pkg-plist
+++ b/multimedia/mythtv/pkg-plist
@@ -493,7 +493,6 @@ include/mythtv/xmlparse.h
 include/mythtv/zeromq/zmq.h
 include/mythtv/zeromq/zmq.hpp
 include/mythtv/zeromq/zmq_utils.h
-%%BINDINGS%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/MythTV/.packlist
 %%BINDINGS%%%%SITE_PERL%%/IO/Socket/INET/MythTV.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/Channel.pm
@@ -2327,9 +2326,6 @@ libdata/pkgconfig/libmythzmq.pc
 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/ttvdb
 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb3
 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV
-%%BINDINGS%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MythTV
-%%BINDINGS%%@dirrmtry %%SITE_PERL%%/IO/Socket/INET
-%%BINDINGS%%@dirrm %%SITE_PERL%%/MythTV
 @dirrm include/mythtv/zeromq
 @dirrm include/mythtv/upnp
 @dirrm include/mythtv/mpeg2dec
diff --git a/multimedia/p5-Audio-M4P/Makefile b/multimedia/p5-Audio-M4P/Makefile
index a13a113ac5dd..e75362ef5f9b 100644
--- a/multimedia/p5-Audio-M4P/Makefile
+++ b/multimedia/p5-Audio-M4P/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Audio-M4P
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/multimedia/p5-Audio-M4P/pkg-plist b/multimedia/p5-Audio-M4P/pkg-plist
index 5e0b5f5463ac..153ce35fa00f 100644
--- a/multimedia/p5-Audio-M4P/pkg-plist
+++ b/multimedia/p5-Audio-M4P/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/Audio/M4P/Atom.pm
 %%SITE_PERL%%/Audio/M4P/Decrypt.pm
 %%SITE_PERL%%/Audio/M4P/QuickTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/M4P/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/M4P
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
-@dirrmtry %%SITE_PERL%%/Audio/M4P
-@dirrmtry %%SITE_PERL%%/Audio
diff --git a/multimedia/p5-FFmpeg-Command/Makefile b/multimedia/p5-FFmpeg-Command/Makefile
index 02daccb9b5de..8835a56d086f 100644
--- a/multimedia/p5-FFmpeg-Command/Makefile
+++ b/multimedia/p5-FFmpeg-Command/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FFmpeg-Command
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIZZY
diff --git a/multimedia/p5-FFmpeg-Command/pkg-plist b/multimedia/p5-FFmpeg-Command/pkg-plist
index f82aedf82d05..d6871e253e2e 100644
--- a/multimedia/p5-FFmpeg-Command/pkg-plist
+++ b/multimedia/p5-FFmpeg-Command/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/FFmpeg/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FFmpeg/Command/.packlist
 %%PERL5_MAN3%%/FFmpeg::Command.3.gz
-@dirrmtry %%SITE_PERL%%/FFmpeg
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FFmpeg/Command/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FFmpeg/
diff --git a/multimedia/p5-FLV-Info/Makefile b/multimedia/p5-FLV-Info/Makefile
index a0d878651347..32a1c7af5e42 100644
--- a/multimedia/p5-FLV-Info/Makefile
+++ b/multimedia/p5-FLV-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FLV-Info
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CDOLAN
diff --git a/multimedia/p5-FLV-Info/pkg-plist b/multimedia/p5-FLV-Info/pkg-plist
index 7bf478b67db5..c5d01c55941c 100644
--- a/multimedia/p5-FLV-Info/pkg-plist
+++ b/multimedia/p5-FLV-Info/pkg-plist
@@ -37,12 +37,8 @@ bin/swf2flv
 %%SITE_PERL%%/FLV/ToSWF.pm
 %%SITE_PERL%%/FLV/Util.pm
 %%SITE_PERL%%/FLV/VideoTag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FLV/Info/.packlist
 man/man1/flv2flv.1.gz
 man/man1/flv2mp3.1.gz
 man/man1/flv2swf.1.gz
 man/man1/flvinfo.1.gz
 man/man1/swf2flv.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FLV/Info
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FLV
-@dirrmtry %%SITE_PERL%%/FLV
diff --git a/multimedia/p5-File-Format-RIFF/Makefile b/multimedia/p5-File-Format-RIFF/Makefile
index 97fcfb75dbe5..250f221ea4ac 100644
--- a/multimedia/p5-File-Format-RIFF/Makefile
+++ b/multimedia/p5-File-Format-RIFF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Format-RIFF
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/multimedia/p5-File-Format-RIFF/pkg-plist b/multimedia/p5-File-Format-RIFF/pkg-plist
index 1a467cc1d5d0..2ff965682c9d 100644
--- a/multimedia/p5-File-Format-RIFF/pkg-plist
+++ b/multimedia/p5-File-Format-RIFF/pkg-plist
@@ -6,10 +6,3 @@
 %%SITE_PERL%%/File/Format/RIFF/Chunk.pm
 %%SITE_PERL%%/File/Format/RIFF/Container.pm
 %%SITE_PERL%%/File/Format/RIFF/List.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Format/RIFF/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Format/RIFF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Format
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File/Format/RIFF
-@dirrmtry %%SITE_PERL%%/File/Format
-@dirrmtry %%SITE_PERL%%/File
diff --git a/multimedia/p5-GStreamer/Makefile b/multimedia/p5-GStreamer/Makefile
index d83bf698300e..3b963d12e379 100644
--- a/multimedia/p5-GStreamer/Makefile
+++ b/multimedia/p5-GStreamer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GStreamer
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
diff --git a/multimedia/p5-GStreamer/pkg-plist b/multimedia/p5-GStreamer/pkg-plist
index 7b261a2ab579..3e91f775f512 100644
--- a/multimedia/p5-GStreamer/pkg-plist
+++ b/multimedia/p5-GStreamer/pkg-plist
@@ -70,92 +70,83 @@
 %%PERL5_MAN3%%/GStreamer::TagSetter.3.gz
 %%PERL5_MAN3%%/GStreamer::TypeFindFactory.3.gz
 %%PERL5_MAN3%%/GStreamer::index.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Bin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Buffer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Bus.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Caps.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Caps/Any.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Caps/Empty.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Caps/Full.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Caps/Simple.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/ChildProxy.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Clock.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/ClockID.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Element.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/ElementFactory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/BufferSize.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/Custom.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/EOS.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/FlushStart.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/FlushStop.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/Navigation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/NewSegment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/QOS.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/Seek.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event/Tag.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Format.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/GhostPad.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/IndexEntry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/IndexFactory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install/gst.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install/gst2perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install/gst2perl-version.h
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install/gst2perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install/gst2perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Iterator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Iterator/Tie.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Application.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/AsyncDone.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/AsyncStart.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/ClockLost.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/ClockProvide.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Custom.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Duration.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/EOS.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Element.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Latency.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/NewClock.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/SegmentDone.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/SegmentStart.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/StateChanged.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/StateDirty.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Tag.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message/Warning.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/MiniObject.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Object.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Pad.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/PadTemplate.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Pipeline.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Plugin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/PluginFeature.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Query.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Query/Application.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Query/Convert.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Query/Duration.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Query/Position.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Query/Segment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/QueryType.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Registry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Structure.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/SystemClock.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Tag.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/TagSetter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/TypeFindFactory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GStreamer/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GStreamer/GStreamer.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GStreamer
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Query
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Message
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Iterator
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Event
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GStreamer/Caps
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GStreamer
+%%SITE_ARCH%%/GStreamer.pm
+%%SITE_ARCH%%/GStreamer/Bin.pod
+%%SITE_ARCH%%/GStreamer/Buffer.pod
+%%SITE_ARCH%%/GStreamer/Bus.pod
+%%SITE_ARCH%%/GStreamer/Caps.pod
+%%SITE_ARCH%%/GStreamer/Caps/Any.pod
+%%SITE_ARCH%%/GStreamer/Caps/Empty.pod
+%%SITE_ARCH%%/GStreamer/Caps/Full.pod
+%%SITE_ARCH%%/GStreamer/Caps/Simple.pod
+%%SITE_ARCH%%/GStreamer/ChildProxy.pod
+%%SITE_ARCH%%/GStreamer/Clock.pod
+%%SITE_ARCH%%/GStreamer/ClockID.pod
+%%SITE_ARCH%%/GStreamer/Element.pod
+%%SITE_ARCH%%/GStreamer/ElementFactory.pod
+%%SITE_ARCH%%/GStreamer/Event.pod
+%%SITE_ARCH%%/GStreamer/Event/BufferSize.pod
+%%SITE_ARCH%%/GStreamer/Event/Custom.pod
+%%SITE_ARCH%%/GStreamer/Event/EOS.pod
+%%SITE_ARCH%%/GStreamer/Event/FlushStart.pod
+%%SITE_ARCH%%/GStreamer/Event/FlushStop.pod
+%%SITE_ARCH%%/GStreamer/Event/Navigation.pod
+%%SITE_ARCH%%/GStreamer/Event/NewSegment.pod
+%%SITE_ARCH%%/GStreamer/Event/QOS.pod
+%%SITE_ARCH%%/GStreamer/Event/Seek.pod
+%%SITE_ARCH%%/GStreamer/Event/Tag.pod
+%%SITE_ARCH%%/GStreamer/Format.pod
+%%SITE_ARCH%%/GStreamer/GhostPad.pod
+%%SITE_ARCH%%/GStreamer/Index.pod
+%%SITE_ARCH%%/GStreamer/IndexEntry.pod
+%%SITE_ARCH%%/GStreamer/IndexFactory.pod
+%%SITE_ARCH%%/GStreamer/Install/Files.pm
+%%SITE_ARCH%%/GStreamer/Install/doctypes
+%%SITE_ARCH%%/GStreamer/Install/gst.typemap
+%%SITE_ARCH%%/GStreamer/Install/gst2perl-autogen.h
+%%SITE_ARCH%%/GStreamer/Install/gst2perl-version.h
+%%SITE_ARCH%%/GStreamer/Install/gst2perl.h
+%%SITE_ARCH%%/GStreamer/Install/gst2perl.typemap
+%%SITE_ARCH%%/GStreamer/Iterator.pod
+%%SITE_ARCH%%/GStreamer/Iterator/Tie.pod
+%%SITE_ARCH%%/GStreamer/Message.pod
+%%SITE_ARCH%%/GStreamer/Message/Application.pod
+%%SITE_ARCH%%/GStreamer/Message/AsyncDone.pod
+%%SITE_ARCH%%/GStreamer/Message/AsyncStart.pod
+%%SITE_ARCH%%/GStreamer/Message/ClockLost.pod
+%%SITE_ARCH%%/GStreamer/Message/ClockProvide.pod
+%%SITE_ARCH%%/GStreamer/Message/Custom.pod
+%%SITE_ARCH%%/GStreamer/Message/Duration.pod
+%%SITE_ARCH%%/GStreamer/Message/EOS.pod
+%%SITE_ARCH%%/GStreamer/Message/Element.pod
+%%SITE_ARCH%%/GStreamer/Message/Error.pod
+%%SITE_ARCH%%/GStreamer/Message/Latency.pod
+%%SITE_ARCH%%/GStreamer/Message/NewClock.pod
+%%SITE_ARCH%%/GStreamer/Message/SegmentDone.pod
+%%SITE_ARCH%%/GStreamer/Message/SegmentStart.pod
+%%SITE_ARCH%%/GStreamer/Message/StateChanged.pod
+%%SITE_ARCH%%/GStreamer/Message/StateDirty.pod
+%%SITE_ARCH%%/GStreamer/Message/Tag.pod
+%%SITE_ARCH%%/GStreamer/Message/Warning.pod
+%%SITE_ARCH%%/GStreamer/MiniObject.pod
+%%SITE_ARCH%%/GStreamer/Object.pod
+%%SITE_ARCH%%/GStreamer/Pad.pod
+%%SITE_ARCH%%/GStreamer/PadTemplate.pod
+%%SITE_ARCH%%/GStreamer/Pipeline.pod
+%%SITE_ARCH%%/GStreamer/Plugin.pod
+%%SITE_ARCH%%/GStreamer/PluginFeature.pod
+%%SITE_ARCH%%/GStreamer/Query.pod
+%%SITE_ARCH%%/GStreamer/Query/Application.pod
+%%SITE_ARCH%%/GStreamer/Query/Convert.pod
+%%SITE_ARCH%%/GStreamer/Query/Duration.pod
+%%SITE_ARCH%%/GStreamer/Query/Position.pod
+%%SITE_ARCH%%/GStreamer/Query/Segment.pod
+%%SITE_ARCH%%/GStreamer/QueryType.pod
+%%SITE_ARCH%%/GStreamer/Registry.pod
+%%SITE_ARCH%%/GStreamer/Structure.pod
+%%SITE_ARCH%%/GStreamer/SystemClock.pod
+%%SITE_ARCH%%/GStreamer/Tag.pod
+%%SITE_ARCH%%/GStreamer/TagSetter.pod
+%%SITE_ARCH%%/GStreamer/TypeFindFactory.pod
+%%SITE_ARCH%%/GStreamer/index.pod
+%%SITE_ARCH%%/auto/GStreamer/GStreamer.so
diff --git a/multimedia/p5-MP4-Info/Makefile b/multimedia/p5-MP4-Info/Makefile
index 5750bda8eaae..fb305666d147 100644
--- a/multimedia/p5-MP4-Info/Makefile
+++ b/multimedia/p5-MP4-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MP4-Info
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/multimedia/p5-MP4-Info/pkg-plist b/multimedia/p5-MP4-Info/pkg-plist
index cb4e62eb2d38..90ba18e8ba56 100644
--- a/multimedia/p5-MP4-Info/pkg-plist
+++ b/multimedia/p5-MP4-Info/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/MP4::Info.3.gz
 %%SITE_PERL%%/MP4/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4/Info/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4/Info
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4
-@dirrmtry %%SITE_PERL%%/MP4
diff --git a/multimedia/p5-Net-UPnP/Makefile b/multimedia/p5-Net-UPnP/Makefile
index 546fc86abbf6..0f22cfa8abc7 100644
--- a/multimedia/p5-Net-UPnP/Makefile
+++ b/multimedia/p5-Net-UPnP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-UPnP
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	multimedia devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SKONNO
diff --git a/multimedia/p5-Net-UPnP/pkg-plist b/multimedia/p5-Net-UPnP/pkg-plist
index 1ae53145ade9..0eea8c618e45 100644
--- a/multimedia/p5-Net-UPnP/pkg-plist
+++ b/multimedia/p5-Net-UPnP/pkg-plist
@@ -26,10 +26,3 @@
 %%SITE_PERL%%/Net/UPnP/HTTPResponse.pm
 %%SITE_PERL%%/Net/UPnP/QueryResponse.pm
 %%SITE_PERL%%/Net/UPnP/Service.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UPnP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UPnP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/UPnP/GW
-@dirrmtry %%SITE_PERL%%/Net/UPnP/AV
-@dirrmtry %%SITE_PERL%%/Net/UPnP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/multimedia/p5-Subtitles/Makefile b/multimedia/p5-Subtitles/Makefile
index f015bcb92680..efc9e72eb2bb 100644
--- a/multimedia/p5-Subtitles/Makefile
+++ b/multimedia/p5-Subtitles/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Subtitles
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	CPAN/Prima/KARASIK
 PKGNAMEPREFIX=	p5-
diff --git a/multimedia/p5-Subtitles/pkg-plist b/multimedia/p5-Subtitles/pkg-plist
index 04622c7a8735..32580fd09643 100644
--- a/multimedia/p5-Subtitles/pkg-plist
+++ b/multimedia/p5-Subtitles/pkg-plist
@@ -4,5 +4,3 @@ man/man1/subs.1.gz
 %%SUBPLAY%%bin/subplay
 %%SUBPLAY%%man/man1/subplay.1.gz
 %%SITE_PERL%%/Subtitles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Subtitles/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Subtitles
diff --git a/multimedia/p5-Umph-Prompt/Makefile b/multimedia/p5-Umph-Prompt/Makefile
index d08a96951f55..68266a3824b7 100644
--- a/multimedia/p5-Umph-Prompt/Makefile
+++ b/multimedia/p5-Umph-Prompt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Umph-Prompt
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	p5-
diff --git a/multimedia/p5-Umph-Prompt/pkg-plist b/multimedia/p5-Umph-Prompt/pkg-plist
index 944cc7e32a2b..71f0cd3f610a 100644
--- a/multimedia/p5-Umph-Prompt/pkg-plist
+++ b/multimedia/p5-Umph-Prompt/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Umph/Prompt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Umph/Prompt/.packlist
 %%PERL5_MAN3%%/Umph::Prompt.3.gz
diff --git a/multimedia/p5-Video-OpenQuicktime/Makefile b/multimedia/p5-Video-OpenQuicktime/Makefile
index 90d2dac1d6bd..dca66b963060 100644
--- a/multimedia/p5-Video-OpenQuicktime/Makefile
+++ b/multimedia/p5-Video-OpenQuicktime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Video-OpenQuicktime
 PORTVERSION=	1.02
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/multimedia/p5-Video-OpenQuicktime/pkg-plist b/multimedia/p5-Video-OpenQuicktime/pkg-plist
index 4b3a6be77c3d..5843ef0f2f8f 100644
--- a/multimedia/p5-Video-OpenQuicktime/pkg-plist
+++ b/multimedia/p5-Video-OpenQuicktime/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Video/OpenQuicktime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime/OpenQuicktime.so
+%%SITE_ARCH%%/Video/OpenQuicktime.pm
+%%SITE_ARCH%%/auto/Video/OpenQuicktime/OpenQuicktime.so
 %%PERL5_MAN3%%/Video::OpenQuicktime.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Video
diff --git a/multimedia/umph/Makefile b/multimedia/umph/Makefile
index e0cdf8c74b43..2278b436ac99 100644
--- a/multimedia/umph/Makefile
+++ b/multimedia/umph/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	umph
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 
@@ -19,9 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USE_PERL5=	configure
 USES=		perl5
 
-PLIST_DIRS=	${SITE_PERL_REL}/${PERL_ARCH}/auto/umph
-PLIST_FILES=	bin/umph \
-		${SITE_PERL_REL}/${PERL_ARCH}/auto/umph/.packlist \
-		man/man1/umph.1.gz
+PLIST_FILES=	bin/umph man/man1/umph.1.gz
 
 .include <bsd.port.mk>
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index e44af5546662..c92316a1b816 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zoneminder
 PORTVERSION=	1.25.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www2.zoneminder.com/downloads/ \
 		http://www.zoneminder.com/downloads/
@@ -36,7 +36,7 @@ USE_PHP=	json mysql session
 USE_MYSQL=	yes
 USE_RC_SUBR=	zoneminder
 USE_GCC=	any
-USE_PERL5=	run build fixpacklist
+USE_PERL5=	run build
 
 CFLAGS+=	-I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib/ffmpeg0
@@ -142,7 +142,6 @@ post-install:
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
-	-${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
 	${MKDIR} -p ${STAGEDIR}${M_TMPDIR}
 	${MKDIR} -p ${STAGEDIR}${M_RUNDIR}
 	${MKDIR} -p ${STAGEDIR}${M_LOGDIR}
diff --git a/multimedia/zoneminder/pkg-plist b/multimedia/zoneminder/pkg-plist
index 9ff0bb7a2989..6bd3071abe57 100644
--- a/multimedia/zoneminder/pkg-plist
+++ b/multimedia/zoneminder/pkg-plist
@@ -69,7 +69,6 @@ bin/zmx10.pl
 %%SITE_PERL%%/ZoneMinder/Trigger/Channel/Unix.pm
 %%SITE_PERL%%/ZoneMinder/Trigger/Connection.pm
 %%SITE_PERL%%/ZoneMinder/Trigger/Connection/Example.pm
-%%SITE_PERL%%/mach/auto/ZoneMinder/.packlist
 %%WWWDIR%%/cgi-bin/nph-zms
 %%WWWDIR%%/cgi-bin/zms
 %%WWWDIR%%/data/ajax/alarm.php
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index fc01828b12aa..5f9209c09376 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.10.10
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -325,10 +325,4 @@ post-patch:
 		's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|'
 .endif
 
-.if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL}
-post-stage:
-	@${SED} -i '' -e 's|^${STAGEDIR}||g' \
-		${STAGEDIR}${PREFIX}/lib/purple-2/perl/auto/Purple/.packlist
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 1ab126d501b8..eadae40a48ec 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -135,7 +135,6 @@ lib/purple-2/offlinemsg.so
 %%PERL:%%lib/purple-2/perl.a
 %%PERL:%%lib/purple-2/perl.so
 %%PERL:%%lib/purple-2/perl/Purple.pm
-%%PERL:%%lib/purple-2/perl/auto/Purple/.packlist
 %%PERL:%%lib/purple-2/perl/auto/Purple/Purple.so
 %%PERL:%%lib/purple-2/perl/auto/Purple/autosplit.ix
 lib/purple-2/psychic.a
@@ -320,9 +319,6 @@ share/sounds/purple/send.wav
 @dir share/locale/bn_IN
 @dir share/locale/be@latin/LC_MESSAGES
 @dir share/locale/be@latin
-%%PERL:%%@dir lib/purple-2/perl/auto/Purple
-%%PERL:%%@dir lib/purple-2/perl/auto
-%%PERL:%%@dir lib/purple-2/perl
 @dir lib/purple-2
 @dir include/libpurple/media
 @dir include/libpurple
diff --git a/net-im/p5-AnyEvent-XMPP/Makefile b/net-im/p5-AnyEvent-XMPP/Makefile
index b67d73ee0d42..3b6d043f003f 100644
--- a/net-im/p5-AnyEvent-XMPP/Makefile
+++ b/net-im/p5-AnyEvent-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-XMPP
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-AnyEvent-XMPP/pkg-plist b/net-im/p5-AnyEvent-XMPP/pkg-plist
index 1e697045ddf8..7d059385011f 100644
--- a/net-im/p5-AnyEvent-XMPP/pkg-plist
+++ b/net-im/p5-AnyEvent-XMPP/pkg-plist
@@ -96,13 +96,3 @@
 %%SITE_PERL%%/AnyEvent/XMPP/TestClient.pm
 %%SITE_PERL%%/AnyEvent/XMPP/Util.pm
 %%SITE_PERL%%/AnyEvent/XMPP/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/IM
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Ext/MUC
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Ext/Disco
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Ext
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Error
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index 6683b0717c16..3292cee8ea21 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DJabberd
 PORTVERSION=	0.85
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MART
diff --git a/net-im/p5-DJabberd/pkg-plist b/net-im/p5-DJabberd/pkg-plist
index 1bef53fbbd12..1cfe849500ca 100644
--- a/net-im/p5-DJabberd/pkg-plist
+++ b/net-im/p5-DJabberd/pkg-plist
@@ -95,20 +95,3 @@ bin/djabberd
 %%SITE_PERL%%/DJabberd/VHost.pm
 %%SITE_PERL%%/DJabberd/XMLElement.pm
 %%SITE_PERL%%/DJabberd/XMLParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DJabberd/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DJabberd
-@dirrmtry %%SITE_PERL%%/DJabberd/Stanza
-@dirrmtry %%SITE_PERL%%/DJabberd/SASL/Manager
-@dirrmtry %%SITE_PERL%%/DJabberd/SASL/Connection
-@dirrmtry %%SITE_PERL%%/DJabberd/SASL
-@dirrmtry %%SITE_PERL%%/DJabberd/RosterStorage
-@dirrmtry %%SITE_PERL%%/DJabberd/Queue
-@dirrmtry %%SITE_PERL%%/DJabberd/PresenceChecker
-@dirrmtry %%SITE_PERL%%/DJabberd/Delivery
-@dirrmtry %%SITE_PERL%%/DJabberd/Connection
-@dirrmtry %%SITE_PERL%%/DJabberd/Component
-@dirrmtry %%SITE_PERL%%/DJabberd/ClusterMessage
-@dirrmtry %%SITE_PERL%%/DJabberd/Bot
-@dirrmtry %%SITE_PERL%%/DJabberd/Authen
-@dirrmtry %%SITE_PERL%%/DJabberd/Agent
-@dirrmtry %%SITE_PERL%%/DJabberd
diff --git a/net-im/p5-Jabber-Connection/Makefile b/net-im/p5-Jabber-Connection/Makefile
index 2e2eb511c739..7fcec4e1a8ae 100644
--- a/net-im/p5-Jabber-Connection/Makefile
+++ b/net-im/p5-Jabber-Connection/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jabber-Connection
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Jabber-Connection/pkg-plist b/net-im/p5-Jabber-Connection/pkg-plist
index 4952f56412da..b2723d94497d 100644
--- a/net-im/p5-Jabber-Connection/pkg-plist
+++ b/net-im/p5-Jabber-Connection/pkg-plist
@@ -1,10 +1,6 @@
 %%SITE_PERL%%/Jabber/Connection.pm
 %%SITE_PERL%%/Jabber/NS.pm
 %%SITE_PERL%%/Jabber/NodeFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Connection/.packlist
 %%PERL5_MAN3%%/Jabber::Connection.3.gz
 %%PERL5_MAN3%%/Jabber::NS.3.gz
 %%PERL5_MAN3%%/Jabber::NodeFactory.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Connection
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber
-@dirrm %%SITE_PERL%%/Jabber
diff --git a/net-im/p5-Jabber-Lite/Makefile b/net-im/p5-Jabber-Lite/Makefile
index 2eea8a846757..63e709380070 100644
--- a/net-im/p5-Jabber-Lite/Makefile
+++ b/net-im/p5-Jabber-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jabber-Lite
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BEECEE
diff --git a/net-im/p5-Jabber-Lite/pkg-plist b/net-im/p5-Jabber-Lite/pkg-plist
index 0d7812dbe4f4..5222fb74f305 100644
--- a/net-im/p5-Jabber-Lite/pkg-plist
+++ b/net-im/p5-Jabber-Lite/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Jabber/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Lite/.packlist
 %%PERL5_MAN3%%/Jabber::Lite.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber
-@dirrmtry %%SITE_PERL%%/Jabber
diff --git a/net-im/p5-Jabber-SimpleSend/Makefile b/net-im/p5-Jabber-SimpleSend/Makefile
index 30134e2cab02..2d7871395daa 100644
--- a/net-im/p5-Jabber-SimpleSend/Makefile
+++ b/net-im/p5-Jabber-SimpleSend/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jabber-SimpleSend
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Jabber-SimpleSend/pkg-plist b/net-im/p5-Jabber-SimpleSend/pkg-plist
index cfbf85d06c56..f505bd30c589 100644
--- a/net-im/p5-Jabber-SimpleSend/pkg-plist
+++ b/net-im/p5-Jabber-SimpleSend/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Jabber::SimpleSend.3.gz
 %%SITE_PERL%%/Jabber/SimpleSend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/SimpleSend/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/SimpleSend
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber
-@dirrmtry %%SITE_PERL%%/Jabber
diff --git a/net-im/p5-Net-AIM/Makefile b/net-im/p5-Net-AIM/Makefile
index a411239199b3..195879fe2b1b 100644
--- a/net-im/p5-Net-AIM/Makefile
+++ b/net-im/p5-Net-AIM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-AIM
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-AIM/pkg-plist b/net-im/p5-Net-AIM/pkg-plist
index 536240489530..e9fd0715bf96 100644
--- a/net-im/p5-Net-AIM/pkg-plist
+++ b/net-im/p5-Net-AIM/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Net/AIM.pm
 %%SITE_PERL%%/Net/AIM/Connection.pm
 %%SITE_PERL%%/Net/AIM/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/AIM
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-AOLIM/Makefile b/net-im/p5-Net-AOLIM/Makefile
index 8e4867382742..40865b4f5421 100644
--- a/net-im/p5-Net-AOLIM/Makefile
+++ b/net-im/p5-Net-AOLIM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-AOLIM
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-AOLIM/pkg-plist b/net-im/p5-Net-AOLIM/pkg-plist
index 9a956ebbf358..183f2280aa3c 100644
--- a/net-im/p5-Net-AOLIM/pkg-plist
+++ b/net-im/p5-Net-AOLIM/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Net::AOLIM.3.gz
 %%SITE_PERL%%/Net/AOLIM.pm
 %%SITE_PERL%%/Net/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-Async-XMPP/Makefile b/net-im/p5-Net-Async-XMPP/Makefile
index b4a4843009dd..976bb84ad05e 100644
--- a/net-im/p5-Net-Async-XMPP/Makefile
+++ b/net-im/p5-Net-Async-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Async-XMPP
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEAM
diff --git a/net-im/p5-Net-Async-XMPP/pkg-plist b/net-im/p5-Net-Async-XMPP/pkg-plist
index 7803e9158845..11bbffa73298 100644
--- a/net-im/p5-Net-Async-XMPP/pkg-plist
+++ b/net-im/p5-Net-Async-XMPP/pkg-plist
@@ -8,10 +8,3 @@
 %%SITE_PERL%%/Net/Async/XMPP/Protocol.pm
 %%SITE_PERL%%/Net/Async/XMPP/Protocol.pod
 %%SITE_PERL%%/Net/Async/XMPP/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Async/XMPP
-@dirrmtry %%SITE_PERL%%/Net/Async
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-ICQ2000/Makefile b/net-im/p5-Net-ICQ2000/Makefile
index 0051fe5aa376..aec2365496e9 100644
--- a/net-im/p5-Net-ICQ2000/Makefile
+++ b/net-im/p5-Net-ICQ2000/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-ICQ2000
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://gonzo.kiev.ua/projects/vicq.old/
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-ICQ2000/pkg-plist b/net-im/p5-Net-ICQ2000/pkg-plist
index 8117fd44b386..8a9b28645004 100644
--- a/net-im/p5-Net-ICQ2000/pkg-plist
+++ b/net-im/p5-Net-ICQ2000/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/ICQ2000.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
 %%PERL5_MAN3%%/Net::ICQ2000.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 691e9674b9b1..b3ddd2e37f82 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Jabber
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist
index e16c3cf1a8f8..8b97351b6b80 100644
--- a/net-im/p5-Net-Jabber/pkg-plist
+++ b/net-im/p5-Net-Jabber/pkg-plist
@@ -36,9 +36,3 @@
 %%SITE_PERL%%/Net/Jabber/Server.pm
 %%SITE_PERL%%/Net/Jabber/Stanza.pm
 %%SITE_PERL%%/Net/Jabber/XDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Jabber/Dialback
-@dirrmtry %%SITE_PERL%%/Net/Jabber
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-NetSend/Makefile b/net-im/p5-Net-NetSend/Makefile
index ada5f9b2df5a..ab2899a99989 100644
--- a/net-im/p5-Net-NetSend/Makefile
+++ b/net-im/p5-Net-NetSend/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-NetSend
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-NetSend/pkg-plist b/net-im/p5-Net-NetSend/pkg-plist
index 458b6681797c..c9b5ddd3c789 100644
--- a/net-im/p5-Net-NetSend/pkg-plist
+++ b/net-im/p5-Net-NetSend/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/NetSend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend/.packlist
 %%PERL5_MAN3%%/Net::NetSend.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index 93bd6e6fd465..ca24868ca161 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OSCAR
 PORTVERSION=	1.928
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-OSCAR/pkg-plist b/net-im/p5-Net-OSCAR/pkg-plist
index 11f4f72cd9f6..7a01f03948f3 100644
--- a/net-im/p5-Net-OSCAR/pkg-plist
+++ b/net-im/p5-Net-OSCAR/pkg-plist
@@ -93,31 +93,3 @@ bin/oscartest
 %%SITE_PERL%%/Net/OSCAR/XML/Protocol.xml
 %%SITE_PERL%%/Net/OSCAR/XML/Template.pm
 %%SITE_PERL%%/Net/OSCAR/_BLInternal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OSCAR/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OSCAR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/XML
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/9
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/4
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/3
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/23
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/2
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/19
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Connection
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/9
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/7
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/4
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/3
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/23
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/21
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/2
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/19
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/16
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/14
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/13
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/1
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks
-@dirrmtry %%SITE_PERL%%/Net/OSCAR
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-Stomp/Makefile b/net-im/p5-Net-Stomp/Makefile
index 2004a4b4aae9..b0ef2d62a51b 100644
--- a/net-im/p5-Net-Stomp/Makefile
+++ b/net-im/p5-Net-Stomp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Stomp
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-Stomp/pkg-plist b/net-im/p5-Net-Stomp/pkg-plist
index 6cece596d7a0..2080740d7315 100644
--- a/net-im/p5-Net-Stomp/pkg-plist
+++ b/net-im/p5-Net-Stomp/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Net/Stomp.pm
 %%SITE_PERL%%/Net/Stomp/Frame.pm
 %%SITE_PERL%%/Net/Stomp/StupidLogger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Stomp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Stomp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Stomp
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-XMPP/Makefile b/net-im/p5-Net-XMPP/Makefile
index 968652e52901..2913b3c98be2 100644
--- a/net-im/p5-Net-XMPP/Makefile
+++ b/net-im/p5-Net-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-XMPP
 PORTVERSION=	1.02.04
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAPATRICK
diff --git a/net-im/p5-Net-XMPP/pkg-plist b/net-im/p5-Net-XMPP/pkg-plist
index 59100c318963..12ccb64d8941 100644
--- a/net-im/p5-Net-XMPP/pkg-plist
+++ b/net-im/p5-Net-XMPP/pkg-plist
@@ -24,8 +24,3 @@
 %%SITE_PERL%%/Net/XMPP/Protocol.pm
 %%SITE_PERL%%/Net/XMPP/Roster.pm
 %%SITE_PERL%%/Net/XMPP/Stanza.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/XMPP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-XMPP2/Makefile b/net-im/p5-Net-XMPP2/Makefile
index ae3d213aee5c..1f9b916f396c 100644
--- a/net-im/p5-Net-XMPP2/Makefile
+++ b/net-im/p5-Net-XMPP2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-XMPP2
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net-im/p5-Net-XMPP2/pkg-plist b/net-im/p5-Net-XMPP2/pkg-plist
index 0ba2c7cab535..7767dde003bd 100644
--- a/net-im/p5-Net-XMPP2/pkg-plist
+++ b/net-im/p5-Net-XMPP2/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP2/.packlist
 %%SITE_PERL%%/Net/XMPP2.pm
 %%SITE_PERL%%/Net/XMPP2/Client.pm
 %%SITE_PERL%%/Net/XMPP2/Component.pm
@@ -95,12 +94,3 @@
 %%PERL5_MAN3%%/Net::XMPP2::TestClient.3.gz
 %%PERL5_MAN3%%/Net::XMPP2::Util.3.gz
 %%PERL5_MAN3%%/Net::XMPP2::Writer.3.gz
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/IM
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Ext/MUC
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Ext/Disco
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Ext
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Error
-@dirrmtry %%SITE_PERL%%/Net/XMPP2
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net-im/p5-Protocol-XMPP/Makefile b/net-im/p5-Protocol-XMPP/Makefile
index b8e3d942d324..549db8c65116 100644
--- a/net-im/p5-Protocol-XMPP/Makefile
+++ b/net-im/p5-Protocol-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Protocol-XMPP
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEAM
diff --git a/net-im/p5-Protocol-XMPP/pkg-plist b/net-im/p5-Protocol-XMPP/pkg-plist
index c36f66af9e1f..ae898220bc15 100644
--- a/net-im/p5-Protocol-XMPP/pkg-plist
+++ b/net-im/p5-Protocol-XMPP/pkg-plist
@@ -97,10 +97,3 @@
 %%SITE_PERL%%/Protocol/XMPP/TextElement.pm
 %%SITE_PERL%%/Protocol/XMPP/TextElement.pod
 %%SITE_PERL%%/Protocol/XMPP/User.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol
-@dirrmtry %%SITE_PERL%%/Protocol/XMPP/IQ
-@dirrmtry %%SITE_PERL%%/Protocol/XMPP/Element
-@dirrmtry %%SITE_PERL%%/Protocol/XMPP
-@dirrmtry %%SITE_PERL%%/Protocol
diff --git a/net-im/p5-SOAP-Transport-JABBER/Makefile b/net-im/p5-SOAP-Transport-JABBER/Makefile
index 7b321ec04a83..2680488c98c7 100644
--- a/net-im/p5-SOAP-Transport-JABBER/Makefile
+++ b/net-im/p5-SOAP-Transport-JABBER/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP-Transport-JABBER
 PORTVERSION=	0.713
+PORTREVISION=	1
 CATEGORIES=	net-im net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-SOAP-Transport-JABBER/pkg-plist b/net-im/p5-SOAP-Transport-JABBER/pkg-plist
index 447e4daef868..588f357f7b63 100644
--- a/net-im/p5-SOAP-Transport-JABBER/pkg-plist
+++ b/net-im/p5-SOAP-Transport-JABBER/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SOAP/Transport/JABBER.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/JABBER/.packlist
 %%PERL5_MAN3%%/SOAP::Transport::JABBER.3.gz
diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile
index a3046d7f5905..0adae8c29d79 100644
--- a/net-im/sendxmpp/Makefile
+++ b/net-im/sendxmpp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sendxmpp
 PORTVERSION=	0.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://www.djcbsoftware.nl/code/sendxmpp/
 
@@ -16,9 +16,6 @@ RUN_DEPENDS+=	p5-Net-XMPP>0.0:${PORTSDIR}/net-im/p5-Net-XMPP \
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	bin/sendxmpp \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/sendxmpp/.packlist \
-		man/man1/sendxmpp.1.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/sendxmpp
+PLIST_FILES=	bin/sendxmpp man/man1/sendxmpp.1.gz
 
 .include <bsd.port.mk>
diff --git a/net-im/twitmail/Makefile b/net-im/twitmail/Makefile
index 36c59b788bb5..0ed97844f6ea 100644
--- a/net-im/twitmail/Makefile
+++ b/net-im/twitmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	twitmail
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://www.hardakers.net/twitmail/releases/
 
diff --git a/net-im/twitmail/pkg-plist b/net-im/twitmail/pkg-plist
index 14bf040b639f..8fe81b7d535b 100644
--- a/net-im/twitmail/pkg-plist
+++ b/net-im/twitmail/pkg-plist
@@ -1,5 +1,2 @@
 bin/twitmail
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/twitmail/.packlist
 man/man1/twitmail.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/twitmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 27d00c36e9fb..986f1d175794 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.4.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 PKGNAMESUFFIX=	5
@@ -484,9 +484,4 @@ post-install:
 		${STAGEDIR}${WWWDIR}/collection.conf.sample
 .endif
 
-post-stage:
-.if ${PORT_OPTIONS:MPERL}
-	@${SED} -i '' -e 's,${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Collectd/.packlist
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist
index ca2d9994e74a..e8292772f2be 100644
--- a/net-mgmt/collectd5/pkg-plist
+++ b/net-mgmt/collectd5/pkg-plist
@@ -47,7 +47,6 @@ lib/collectd/ntpd.so
 %%NUTUPS%%lib/collectd/nut.so
 lib/collectd/openvpn.so
 %%PERL%%lib/collectd/perl.so
-%%PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod.gz
 %%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz
 %%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm
 %%PING%%lib/collectd/ping.so
@@ -97,7 +96,6 @@ libdata/pkgconfig/libcollectdclient.pc
 %%DATADIR%%/types.db
 %%PERL%%%%SITE_PERL%%/Collectd.pm
 %%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Collectd/.packlist
 man/man1/collectd-nagios.1.gz
 man/man1/collectd-tg.1.gz
 man/man1/collectd.1.gz
diff --git a/net-mgmt/fetchconfig/Makefile b/net-mgmt/fetchconfig/Makefile
index 7467d037f9cc..a0695641816c 100644
--- a/net-mgmt/fetchconfig/Makefile
+++ b/net-mgmt/fetchconfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fetchconfig
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SAVANNAH
 
diff --git a/net-mgmt/fetchconfig/pkg-plist b/net-mgmt/fetchconfig/pkg-plist
index f063ae9e41f4..2298d605a340 100644
--- a/net-mgmt/fetchconfig/pkg-plist
+++ b/net-mgmt/fetchconfig/pkg-plist
@@ -18,8 +18,5 @@ bin/fetchconfig
 %%SITE_PERL%%/fetchconfig/model/Terayon.pm
 %%SITE_PERL%%/fetchconfig/Constants.pm
 %%SITE_PERL%%/fetchconfig/Logger.pm
-@dirrm %%SITE_PERL%%/fetchconfig/model
-@dirrm %%SITE_PERL%%/fetchconfig
 @dirrm lib/perl5/site_perl
 @dirrm lib/perl5
-@dirrm %%SITE_PERL%%
diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile
index 591a8b0abaf4..8eebfb0256e5 100644
--- a/net-mgmt/flowd/Makefile
+++ b/net-mgmt/flowd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	flowd
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	GOOGLE_CODE \
 		http://www2.mindrot.org/files/flowd/
@@ -31,7 +31,7 @@ GROUPS=		${FLOWD_USER}
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
-USE_PERL5+=	build run fixpacklist
+USE_PERL5+=	build run
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
@@ -66,8 +66,7 @@ post-install:
 
 .if ${PORT_OPTIONS:MPERL}
 	( cd ${WRKSRC}/Flowd-perl && ${MAKE_CMD} install )
-	-${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Flowd/Flowd.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
diff --git a/net-mgmt/flowd/pkg-plist b/net-mgmt/flowd/pkg-plist
index 00d504f72f32..adbe58a6d254 100644
--- a/net-mgmt/flowd/pkg-plist
+++ b/net-mgmt/flowd/pkg-plist
@@ -9,9 +9,8 @@ include/flowd/store-v2.h
 include/flowd/store.h
 lib/libflowd.a
 %%PERL%%%%PERL5_MAN3%%/Flowd.3.gz
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Flowd.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flowd/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flowd/Flowd.so
+%%PERL%%%%SITE_ARCH%%/Flowd.pm
+%%PERL%%%%SITE_ARCH%%/auto/Flowd/Flowd.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/flowd-0.9.1-py%%PYTHON_VER%%.egg-info
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/flowd.so
 man/man5/flowd.conf.5.gz
@@ -30,6 +29,5 @@ sbin/flowd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wormsuspects.pl
 @dirrm include/flowd
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flowd
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/flowrrd
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net-mgmt/icli/Makefile b/net-mgmt/icli/Makefile
index 33fe104df081..36b59c5a40f4 100644
--- a/net-mgmt/icli/Makefile
+++ b/net-mgmt/icli/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	icli
 DISTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	http://finalrewind.org/projects/icli/
 
diff --git a/net-mgmt/icli/pkg-plist b/net-mgmt/icli/pkg-plist
index bb3ad88ac610..bae60566e56b 100644
--- a/net-mgmt/icli/pkg-plist
+++ b/net-mgmt/icli/pkg-plist
@@ -4,5 +4,3 @@ bin/icli
 %%SITE_PERL%%/App/Icli.pm
 %%SITE_PERL%%/App/Icli/ConfigData.pm
 man/man1/icli.1.gz
-@dirrmtry %%SITE_PERL%%/App/Icli
-@dirrmtry %%SITE_PERL%%/App
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 1b9b79f42c69..92a281641979 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.17.4
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
diff --git a/net-mgmt/nagios-check_postgres/Makefile b/net-mgmt/nagios-check_postgres/Makefile
index aaadbfa86df0..4df47e35eebf 100644
--- a/net-mgmt/nagios-check_postgres/Makefile
+++ b/net-mgmt/nagios-check_postgres/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	check_postgres
 PORTVERSION=	2.21.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt databases perl5
 MASTER_SITES=	http://bucardo.org/downloads/
 PKGNAMEPREFIX=	nagios-
diff --git a/net-mgmt/nagios-check_postgres/pkg-plist b/net-mgmt/nagios-check_postgres/pkg-plist
index 648922ab42db..3fb83429ba51 100644
--- a/net-mgmt/nagios-check_postgres/pkg-plist
+++ b/net-mgmt/nagios-check_postgres/pkg-plist
@@ -1,5 +1,4 @@
 bin/check_postgres.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/check_postgres/.packlist
 %%NAGIOS%%libexec/nagios/check_postgres_archive_ready
 %%NAGIOS%%libexec/nagios/check_postgres_autovac_freeze
 %%NAGIOS%%libexec/nagios/check_postgres_backends
@@ -61,4 +60,3 @@ man/man1/check_postgres.1p.gz
 %%CACTI%%@dirrmtry share/cacti/scripts
 %%CACTI%%@dirrmtry share/cacti
 %%NAGIOS%%@dirrmtry libexec/nagios
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/check_postgres
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 58239d0ed7a0..dfb806be0485 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.7.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
@@ -37,7 +37,7 @@ USE_RC_SUBR=	snmpd snmptrapd
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 USES=		perl5 libtool
-USE_PERL5=	build run fixpacklist
+USE_PERL5=	build run
 
 CFLAGS+=	-I${LOCALBASE}/include -I${PKG_PREFIX}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 4a7e894b055c..b7680825fb9a 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -365,31 +365,30 @@ man/man8/snmptrapd.8.gz
 %%WITH_PERL%%man/man3/NetSNMP::default_store.3.gz
 %%WITH_PERL%%man/man3/NetSNMP::netsnmp_request_infoPtr.3.gz
 %%WITH_PERL%%man/man3/SNMP.3.gz
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/TrapReceiver.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/Support.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/Bundle/Makefile.subs.pl
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/ASN.pm
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/OID.pm
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/TrapReceiver.pm
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent.pm
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent/Support.pm
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent/default_store.pm
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm
+%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/default_store.pm
+%%WITH_PERL%%%%SITE_ARCH%%/SNMP.pm
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/ASN/ASN.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/OID/OID.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/OID/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/TrapReceiver/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/agent.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/default_store/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/default_store/default_store.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/SNMP/SNMP.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/SNMP/autosplit.ix
 sbin/snmpd
 sbin/snmptrapd
 %%PORTDOCS%%%%DOCSDIR%%/AGENT.txt
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index b609d74beec3..38da7f0a66f9 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netdisco
 PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF
 
diff --git a/net-mgmt/netspoc/Makefile b/net-mgmt/netspoc/Makefile
index 227e431e5ee1..ac5ae65bc287 100644
--- a/net-mgmt/netspoc/Makefile
+++ b/net-mgmt/netspoc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	netspoc
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	BERLIOS
 DISTNAME=	Netspoc-${PORTVERSION}
diff --git a/net-mgmt/netspoc/pkg-plist b/net-mgmt/netspoc/pkg-plist
index 634cba98dfda..71e4e0ebe117 100644
--- a/net-mgmt/netspoc/pkg-plist
+++ b/net-mgmt/netspoc/pkg-plist
@@ -3,7 +3,5 @@ bin/netspoc
 bin/print-group
 %%PERL5_MAN3%%/Netspoc.3.gz
 %%SITE_PERL%%/Netspoc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Netspoc/.packlist
 man/man1/netspoc.1.gz
 man/man1/print-group.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Netspoc
diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile
index 09e0fa5c7261..a93ffb64327c 100644
--- a/net-mgmt/ocsinventory-agent/Makefile
+++ b/net-mgmt/ocsinventory-agent/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Ocsinventory
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://launchpad.net/ocsinventory-unix-agent/stable-2.1/${PORTVERSION}/+download/
diff --git a/net-mgmt/ocsinventory-agent/pkg-plist b/net-mgmt/ocsinventory-agent/pkg-plist
index edd82094a022..89dd30c2a84b 100644
--- a/net-mgmt/ocsinventory-agent/pkg-plist
+++ b/net-mgmt/ocsinventory-agent/pkg-plist
@@ -214,50 +214,4 @@ bin/ocsinventory-agent
 %%SITE_PERL%%/Ocsinventory/LoggerBackend/Stderr.pm
 %%SITE_PERL%%/Ocsinventory/LoggerBackend/Syslog.pm
 %%SITE_PERL%%/Ocsinventory/Unix/postinst.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ocsinventory/Unix/Agent/.packlist
 man/man1/ocsinventory-agent.1.gz
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/IpDiscover
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/AIX
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/BSD/Archs
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/BSD
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Lspci
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Lsusb
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Packaging
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Printers
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/HPUX
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/ARM
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/Alpha
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/MIPS
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/PowerPC
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/SPARC
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/i386
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/m68k
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Network
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Solaris
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/Virtualization/Xen
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend/Virtualization
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Backend
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Modules/Apache/Vhosts
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Modules/Apache
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Modules/Databases/Oracle
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Modules/Databases
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Modules/Snmp
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/Modules
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/XML/Response
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent/XML
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Agent
-@dirrmtry %%SITE_PERL%%/Ocsinventory/LoggerBackend
-@dirrmtry %%SITE_PERL%%/Ocsinventory/Unix
-@dirrmtry %%SITE_PERL%%/Ocsinventory
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ocsinventory/Unix/Agent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ocsinventory/Unix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ocsinventory
diff --git a/net-mgmt/p5-AnyEvent-SNMP/Makefile b/net-mgmt/p5-AnyEvent-SNMP/Makefile
index d11b09b47fac..4794aa9e36c3 100644
--- a/net-mgmt/p5-AnyEvent-SNMP/Makefile
+++ b/net-mgmt/p5-AnyEvent-SNMP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-SNMP
 PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-AnyEvent-SNMP/pkg-plist b/net-mgmt/p5-AnyEvent-SNMP/pkg-plist
index 8ee78d355561..f67cbd2af9ab 100644
--- a/net-mgmt/p5-AnyEvent-SNMP/pkg-plist
+++ b/net-mgmt/p5-AnyEvent-SNMP/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/AnyEvent/SNMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/SNMP/.packlist
 %%PERL5_MAN3%%/AnyEvent::SNMP.3.gz
-@dirrmtry %%SITE_PERL%%/AnyEvent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/SNMP
diff --git a/net-mgmt/p5-BigIP-iControl/Makefile b/net-mgmt/p5-BigIP-iControl/Makefile
index 63060d28407f..625260511ba6 100644
--- a/net-mgmt/p5-BigIP-iControl/Makefile
+++ b/net-mgmt/p5-BigIP-iControl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BigIP-iControl
 PORTVERSION=	0.095
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-BigIP-iControl/pkg-plist b/net-mgmt/p5-BigIP-iControl/pkg-plist
index 22f7bde8e621..e4ca934cccee 100644
--- a/net-mgmt/p5-BigIP-iControl/pkg-plist
+++ b/net-mgmt/p5-BigIP-iControl/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/BigIP/iControl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BigIP/iControl/.packlist
 %%PERL5_MAN3%%/BigIP::iControl.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BigIP/iControl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BigIP
-@dirrmtry %%SITE_PERL%%/BigIP
diff --git a/net-mgmt/p5-Cflow/Makefile b/net-mgmt/p5-Cflow/Makefile
index f7f67da5c6b4..3ad3f369ed85 100644
--- a/net-mgmt/p5-Cflow/Makefile
+++ b/net-mgmt/p5-Cflow/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Cflow
 PORTVERSION=	1.053
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	http://net.doit.wisc.edu/~plonka/Cflow/ \
 		http://net.doit.wisc.edu/~plonka/Cflow/old/
diff --git a/net-mgmt/p5-Cflow/pkg-plist b/net-mgmt/p5-Cflow/pkg-plist
index 0a4b3b25bb11..fc6ef10a66a3 100644
--- a/net-mgmt/p5-Cflow/pkg-plist
+++ b/net-mgmt/p5-Cflow/pkg-plist
@@ -1,8 +1,6 @@
 bin/flowdumper
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/Cflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/.packlist
+%%SITE_ARCH%%/auto/Cflow/Cflow.so
+%%SITE_ARCH%%/auto/Cflow/autosplit.ix
+%%SITE_ARCH%%/Cflow.pm
 %%PERL5_MAN3%%/Cflow.3.gz
 man/man1/flowdumper.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow
diff --git a/net-mgmt/p5-Cisco-Reconfig/Makefile b/net-mgmt/p5-Cisco-Reconfig/Makefile
index 825e9950a569..eeb417549c45 100644
--- a/net-mgmt/p5-Cisco-Reconfig/Makefile
+++ b/net-mgmt/p5-Cisco-Reconfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cisco-Reconfig
 PORTVERSION=	0.911
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Cisco-Reconfig/pkg-plist b/net-mgmt/p5-Cisco-Reconfig/pkg-plist
index 71f45d612c2f..de92003d4609 100644
--- a/net-mgmt/p5-Cisco-Reconfig/pkg-plist
+++ b/net-mgmt/p5-Cisco-Reconfig/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Cisco/Reconfig.pm
 %%SITE_PERL%%/Cisco/Reconfig.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/Reconfig/.packlist
 %%PERL5_MAN3%%/Cisco::Reconfig.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/Reconfig
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco
-@dirrmtry %%SITE_PERL%%/Cisco
diff --git a/net-mgmt/p5-Data-Validate-IP/Makefile b/net-mgmt/p5-Data-Validate-IP/Makefile
index 7244c55ac975..c9df5853ccbe 100644
--- a/net-mgmt/p5-Data-Validate-IP/Makefile
+++ b/net-mgmt/p5-Data-Validate-IP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Validate-IP
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/net-mgmt/p5-Data-Validate-IP/pkg-plist b/net-mgmt/p5-Data-Validate-IP/pkg-plist
index d8512b928f81..1ddce0addcaf 100644
--- a/net-mgmt/p5-Data-Validate-IP/pkg-plist
+++ b/net-mgmt/p5-Data-Validate-IP/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Data/Validate/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/IP/.packlist
 %%PERL5_MAN3%%/Data::Validate::IP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data/Validate
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
index a9cf44ba619f..914505a566b4 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FusionInventory-Agent-Task-NetDiscovery
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FUSINV
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist
index 5849a09ab560..29897516d2c8 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist
@@ -12,16 +12,6 @@
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Samsung.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Wyse.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Zebranet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent/Task/NetDiscovery/.packlist
 %%PERL5_MAN3%%/FusionInventory::Agent::SNMP.3.gz
 %%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery.3.gz
 %%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery::Dictionary.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent/Task/NetDiscovery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent/Task
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory
-@dirrm %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer
-@dirrm %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery
-@dirrmtry %%SITE_PERL%%/FusionInventory/Agent/Task
-@dirrmtry %%SITE_PERL%%/FusionInventory/Agent
-@dirrmtry %%SITE_PERL%%/FusionInventory
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
index b675bf36c629..dc763bab3ba3 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FusionInventory-Agent-Task-SNMPQuery
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FUSINV
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist
index eb05b58e4a62..d0d3cf47ccd5 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist
@@ -3,14 +3,3 @@
 %%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery/Nortel.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery/Procurve.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery/ThreeCom.pm
-%%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task/SNMPQuery/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task/SNMPQuery
-@dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task
-@dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory/Agent
-@dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory
-@dirrmtry %%SITE_PERL%%/mach/auto
-@dirrmtry %%SITE_PERL%%/mach
-@dirrm %%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery
-@dirrmtry %%SITE_PERL%%/FusionInventory/Agent/Task
-@dirrmtry %%SITE_PERL%%/FusionInventory/Agent
-@dirrmtry %%SITE_PERL%%/FusionInventory
diff --git a/net-mgmt/p5-GRNOC-Config/Makefile b/net-mgmt/p5-GRNOC-Config/Makefile
index aca675a5844c..40f76c3fbf60 100644
--- a/net-mgmt/p5-GRNOC-Config/Makefile
+++ b/net-mgmt/p5-GRNOC-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GRNOC-Config
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	SF/routerproxy/${PORTNAME}
 PKGNAMEPREFIX=	p5-
@@ -19,10 +20,6 @@ USE_PERL5=	configure
 USES=		perl5
 
 PLIST_FILES=	%%SITE_PERL%%/GRNOC/Config.pm \
-		%%PERL5_MAN3%%/GRNOC::Config.3.gz \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/GRNOC/Config/.packlist
-PLIST_DIRSTRY=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GRNOC/Config \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/GRNOC \
-		%%SITE_PERL%%/GRNOC
+		%%PERL5_MAN3%%/GRNOC::Config.3.gz
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-GRNOC-TL1/Makefile b/net-mgmt/p5-GRNOC-TL1/Makefile
index 0ba9395567cb..89118dbfd288 100644
--- a/net-mgmt/p5-GRNOC-TL1/Makefile
+++ b/net-mgmt/p5-GRNOC-TL1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GRNOC-TL1
 PORTVERSION=	1.3.10
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	SF/routerproxy/${PORTNAME}
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-GRNOC-TL1/pkg-plist b/net-mgmt/p5-GRNOC-TL1/pkg-plist
index 048dfdac6358..337a651f8337 100644
--- a/net-mgmt/p5-GRNOC-TL1/pkg-plist
+++ b/net-mgmt/p5-GRNOC-TL1/pkg-plist
@@ -14,16 +14,3 @@
 %%SITE_PERL%%/GRNOC/TL1/Device/Nortel/HDXc.pm
 %%SITE_PERL%%/GRNOC/TL1/Device/Nortel/OME6500.pm
 %%SITE_PERL%%/GRNOC/TL1/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GRNOC/TL1/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GRNOC/TL1
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GRNOC
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device/Nortel
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device/Infinera
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device/GlimmerGlass
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device/Fujitsu
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device/Cisco
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device/Ciena
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device/ADVA
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1/Device
-@dirrmtry %%SITE_PERL%%/GRNOC/TL1
-@dirrmtry %%SITE_PERL%%/GRNOC
diff --git a/net-mgmt/p5-MRTG-Parse/Makefile b/net-mgmt/p5-MRTG-Parse/Makefile
index bd808b80bdb4..48db384bd906 100644
--- a/net-mgmt/p5-MRTG-Parse/Makefile
+++ b/net-mgmt/p5-MRTG-Parse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MRTG-Parse
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-MRTG-Parse/pkg-plist b/net-mgmt/p5-MRTG-Parse/pkg-plist
index 15eff4aab7b3..e7bc16800868 100644
--- a/net-mgmt/p5-MRTG-Parse/pkg-plist
+++ b/net-mgmt/p5-MRTG-Parse/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/MRTG/Parse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MRTG/Parse/.packlist
 %%PERL5_MAN3%%/MRTG::Parse.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MRTG/Parse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MRTG
-@dirrmtry %%SITE_PERL%%/MRTG
diff --git a/net-mgmt/p5-Mon/Makefile b/net-mgmt/p5-Mon/Makefile
index 1d1079b6797e..7b6c1ac47c68 100644
--- a/net-mgmt/p5-Mon/Makefile
+++ b/net-mgmt/p5-Mon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mon
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Mon/pkg-plist b/net-mgmt/p5-Mon/pkg-plist
index 56d5fc23c522..36bbaf253456 100644
--- a/net-mgmt/p5-Mon/pkg-plist
+++ b/net-mgmt/p5-Mon/pkg-plist
@@ -4,6 +4,3 @@
 %%SITE_PERL%%/Mon/Client.pm
 %%SITE_PERL%%/Mon/Protocol.pm
 %%SITE_PERL%%/Mon/SNMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon
-@dirrmtry %%SITE_PERL%%/Mon
diff --git a/net-mgmt/p5-Monitoring-Plugin/Makefile b/net-mgmt/p5-Monitoring-Plugin/Makefile
index eb1255e6a0b1..770d5649a197 100644
--- a/net-mgmt/p5-Monitoring-Plugin/Makefile
+++ b/net-mgmt/p5-Monitoring-Plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Monitoring-Plugin
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NIERLEIN
diff --git a/net-mgmt/p5-Monitoring-Plugin/pkg-plist b/net-mgmt/p5-Monitoring-Plugin/pkg-plist
index b3c21d9dfa3d..dea2e9edc0ea 100644
--- a/net-mgmt/p5-Monitoring-Plugin/pkg-plist
+++ b/net-mgmt/p5-Monitoring-Plugin/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Monitoring/Plugin/Performance.pm
 %%SITE_PERL%%/Monitoring/Plugin/Range.pm
 %%SITE_PERL%%/Monitoring/Plugin/Threshold.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Monitoring/Plugin/.packlist
 %%PERL5_MAN3%%/Monitoring::Plugin.3.gz
 %%PERL5_MAN3%%/Monitoring::Plugin::Config.3.gz
 %%PERL5_MAN3%%/Monitoring::Plugin::ExitResult.3.gz
diff --git a/net-mgmt/p5-NSNMP/Makefile b/net-mgmt/p5-NSNMP/Makefile
index 78850ee9a3f3..5929beb175c8 100644
--- a/net-mgmt/p5-NSNMP/Makefile
+++ b/net-mgmt/p5-NSNMP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NSNMP
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KRAGEN
diff --git a/net-mgmt/p5-NSNMP/pkg-plist b/net-mgmt/p5-NSNMP/pkg-plist
index d40449bbdfc8..54aca3034016 100644
--- a/net-mgmt/p5-NSNMP/pkg-plist
+++ b/net-mgmt/p5-NSNMP/pkg-plist
@@ -2,8 +2,5 @@
 %%SITE_PERL%%/NSNMP/Agent.pm
 %%SITE_PERL%%/NSNMP/Mapper.pm
 %%SITE_PERL%%/NSNMP/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP/.packlist
 %%PERL5_MAN3%%/NSNMP.3.gz
 %%PERL5_MAN3%%/NSNMP::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP
-@dirrmtry %%SITE_PERL%%/NSNMP
diff --git a/net-mgmt/p5-Nagios-Object/Makefile b/net-mgmt/p5-Nagios-Object/Makefile
index d606c58c92d9..5b0c65db34d8 100644
--- a/net-mgmt/p5-Nagios-Object/Makefile
+++ b/net-mgmt/p5-Nagios-Object/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nagios-Object
 PORTVERSION=	0.21.18
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Nagios-Object/pkg-plist b/net-mgmt/p5-Nagios-Object/pkg-plist
index 3064c64e37bd..9c1ea0045f2d 100644
--- a/net-mgmt/p5-Nagios-Object/pkg-plist
+++ b/net-mgmt/p5-Nagios-Object/pkg-plist
@@ -18,6 +18,3 @@ man/man1/test_configuration.pl.1.gz
 %%PERL5_MAN3%%/Nagios::Object.3.gz
 %%PERL5_MAN3%%/Nagios::Object::Config.3.gz
 %%PERL5_MAN3%%/Nagios::StatusLog.3.gz
-@dirrm %%SITE_PERL%%/Nagios/Config
-@dirrm %%SITE_PERL%%/Nagios/Object
-@dirrmtry %%SITE_PERL%%/Nagios
diff --git a/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile b/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
index 985c4aa9a682..428e6b865088 100644
--- a/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin-Beanstalk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nagios-Plugin-Beanstalk
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GBARR
diff --git a/net-mgmt/p5-Nagios-Plugin-Beanstalk/pkg-plist b/net-mgmt/p5-Nagios-Plugin-Beanstalk/pkg-plist
index a6413d6269f8..7c2eea129e22 100644
--- a/net-mgmt/p5-Nagios-Plugin-Beanstalk/pkg-plist
+++ b/net-mgmt/p5-Nagios-Plugin-Beanstalk/pkg-plist
@@ -1,10 +1,4 @@
 libexec/nagios/check_beanstalkd
 %%SITE_PERL%%/Nagios/Plugin/Beanstalk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin/Beanstalk/.packlist
 %%PERL5_MAN3%%/Nagios::Plugin::Beanstalk.3.gz
 @dirrmtry libexec/nagios
-@dirrmtry %%SITE_PERL%%/Nagios/Plugin
-@dirrmtry %%SITE_PERL%%/Nagios
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin/Beanstalk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios
diff --git a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
index 58fbc25dae2a..0812f66d6d5f 100644
--- a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nagios-Plugin-LDAP
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Nagios-Plugin-LDAP/pkg-plist b/net-mgmt/p5-Nagios-Plugin-LDAP/pkg-plist
index 6c54e9bab43f..42c717b4cb29 100644
--- a/net-mgmt/p5-Nagios-Plugin-LDAP/pkg-plist
+++ b/net-mgmt/p5-Nagios-Plugin-LDAP/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin/LDAP/.packlist
 bin/check_ldap_repl
 %%SITE_PERL%%/Nagios/Plugin/LDAP.pm
 %%PERL5_MAN3%%/Nagios::Plugin::LDAP.3.gz
-@dirrmtry %%SITE_PERL%%/Nagios/Plugin
-@dirrmtry %%SITE_PERL%%/Nagios
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios
diff --git a/net-mgmt/p5-Nagios-Plugin/Makefile b/net-mgmt/p5-Nagios-Plugin/Makefile
index 1e182619912a..cffe76f88588 100644
--- a/net-mgmt/p5-Nagios-Plugin/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nagios-Plugin
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TONVOON
diff --git a/net-mgmt/p5-Nagios-Plugin/pkg-plist b/net-mgmt/p5-Nagios-Plugin/pkg-plist
index 5a6be821f2cf..717848039c3b 100644
--- a/net-mgmt/p5-Nagios-Plugin/pkg-plist
+++ b/net-mgmt/p5-Nagios-Plugin/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/Nagios/Plugin/Performance.pm
 %%SITE_PERL%%/Nagios/Plugin/Range.pm
 %%SITE_PERL%%/Nagios/Plugin/Threshold.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin/.packlist
 %%PERL5_MAN3%%/Nagios::Plugin.3.gz
 %%PERL5_MAN3%%/Nagios::Plugin::Config.3.gz
 %%PERL5_MAN3%%/Nagios::Plugin::ExitResult.3.gz
@@ -15,7 +14,3 @@
 %%PERL5_MAN3%%/Nagios::Plugin::Performance.3.gz
 %%PERL5_MAN3%%/Nagios::Plugin::Range.3.gz
 %%PERL5_MAN3%%/Nagios::Plugin::Threshold.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios
-@dirrm %%SITE_PERL%%/Nagios/Plugin
-@dirrmtry %%SITE_PERL%%/Nagios
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
index 26f73de4b591..f024f9b84496 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Nagios-Plugins-Memcached
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ZIGOROU
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist b/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist
index dbf99741aea4..b165749799c9 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist
@@ -1,10 +1,4 @@
 %%PERL5_MAN3%%/Nagios::Plugins::Memcached.3.gz
 %%SITE_PERL%%/Nagios/Plugins/Memcached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugins/Memcached/.packlist
 libexec/nagios/check_memcached
 @dirrmtry libexec/nagios
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugins/Memcached
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugins
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios
-@dirrmtry %%SITE_PERL%%/Nagios/Plugins
-@dirrmtry %%SITE_PERL%%/Nagios
diff --git a/net-mgmt/p5-Net-ACL/Makefile b/net-mgmt/p5-Net-ACL/Makefile
index b6687a7be6ef..b5e5bc557541 100644
--- a/net-mgmt/p5-Net-ACL/Makefile
+++ b/net-mgmt/p5-Net-ACL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-ACL
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-ACL/pkg-plist b/net-mgmt/p5-Net-ACL/pkg-plist
index f39e11aa7eb7..36cdc8d18f64 100644
--- a/net-mgmt/p5-Net-ACL/pkg-plist
+++ b/net-mgmt/p5-Net-ACL/pkg-plist
@@ -22,7 +22,6 @@
 %%SITE_PERL%%/Net/ACL/Set/Add.pm
 %%SITE_PERL%%/Net/ACL/Set/Scalar.pm
 %%SITE_PERL%%/Net/ACL/Set/Union.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ACL/.packlist
 %%PERL5_MAN3%%/Net::ACL.3.gz
 %%PERL5_MAN3%%/Net::ACL::Bootstrap.3.gz
 %%PERL5_MAN3%%/Net::ACL::File.3.gz
@@ -47,10 +46,3 @@
 %%PERL5_MAN3%%/Net::ACL::Set::Add.3.gz
 %%PERL5_MAN3%%/Net::ACL::Set::Scalar.3.gz
 %%PERL5_MAN3%%/Net::ACL::Set::Union.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ACL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/ACL/Set
-@dirrm %%SITE_PERL%%/Net/ACL/Match
-@dirrm %%SITE_PERL%%/Net/ACL/File
-@dirrm %%SITE_PERL%%/Net/ACL
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
index f7a7936f25ea..1b224d226f0d 100644
--- a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
+++ b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-Abuse-Utils-Spamhaus
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/pkg-plist b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/pkg-plist
index 17165815509c..6e9e58d32222 100644
--- a/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/pkg-plist
+++ b/net-mgmt/p5-Net-Abuse-Utils-Spamhaus/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Net::Abuse::Utils::Spamhaus.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Abuse/Utils/Spamhaus/.packlist
 %%SITE_PERL%%/Net/Abuse/Utils/Spamhaus.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Abuse/Utils/Spamhaus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Abuse/Utils
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Abuse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Abuse/Utils
-@dirrmtry %%SITE_PERL%%/Net/Abuse
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-Abuse-Utils/Makefile b/net-mgmt/p5-Net-Abuse-Utils/Makefile
index 56c384c803c3..295e0f7e45a7 100644
--- a/net-mgmt/p5-Net-Abuse-Utils/Makefile
+++ b/net-mgmt/p5-Net-Abuse-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Abuse-Utils
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-Abuse-Utils/pkg-plist b/net-mgmt/p5-Net-Abuse-Utils/pkg-plist
index 18b027c5366c..9f4fb58f8903 100644
--- a/net-mgmt/p5-Net-Abuse-Utils/pkg-plist
+++ b/net-mgmt/p5-Net-Abuse-Utils/pkg-plist
@@ -1,9 +1,3 @@
 sbin/ip-info.pl
 %%SITE_PERL%%/Net/Abuse/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Abuse/Utils/.packlist
 %%PERL5_MAN3%%/Net::Abuse::Utils.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Abuse/Utils
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Abuse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Abuse
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-CIDR/Makefile b/net-mgmt/p5-Net-CIDR/Makefile
index 60ec63125a1c..31081278cbc0 100644
--- a/net-mgmt/p5-Net-CIDR/Makefile
+++ b/net-mgmt/p5-Net-CIDR/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-CIDR
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-CIDR/pkg-plist b/net-mgmt/p5-Net-CIDR/pkg-plist
index 495e6a996762..5a448d0ecac3 100644
--- a/net-mgmt/p5-Net-CIDR/pkg-plist
+++ b/net-mgmt/p5-Net-CIDR/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::CIDR.3.gz
 %%SITE_PERL%%/Net/CIDR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-ILO/Makefile b/net-mgmt/p5-Net-ILO/Makefile
index 34af5abe4922..303bf4a842bf 100644
--- a/net-mgmt/p5-Net-ILO/Makefile
+++ b/net-mgmt/p5-Net-ILO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-ILO
 PORTVERSION=	0.54
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-ILO/pkg-plist b/net-mgmt/p5-Net-ILO/pkg-plist
index 43399cd38fe1..84a790abaa6b 100644
--- a/net-mgmt/p5-Net-ILO/pkg-plist
+++ b/net-mgmt/p5-Net-ILO/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/ILO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ILO/.packlist
 %%PERL5_MAN3%%/Net::ILO.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ILO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IP-Match-Regexp/Makefile b/net-mgmt/p5-Net-IP-Match-Regexp/Makefile
index f1c37c366ceb..c46616be0d3a 100644
--- a/net-mgmt/p5-Net-IP-Match-Regexp/Makefile
+++ b/net-mgmt/p5-Net-IP-Match-Regexp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-IP-Match-Regexp
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-IP-Match-Regexp/pkg-plist b/net-mgmt/p5-Net-IP-Match-Regexp/pkg-plist
index cf60eba7047c..172bad25f105 100644
--- a/net-mgmt/p5-Net-IP-Match-Regexp/pkg-plist
+++ b/net-mgmt/p5-Net-IP-Match-Regexp/pkg-plist
@@ -1,10 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Match/Regexp/.packlist
 %%SITE_PERL%%/Net/IP/Match/Regexp.pm
 %%PERL5_MAN3%%/Net::IP::Match::Regexp.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Match/Regexp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Match
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IP/Match
-@dirrmtry %%SITE_PERL%%/Net/IP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IP-Match-XS/Makefile b/net-mgmt/p5-Net-IP-Match-XS/Makefile
index 49e7cba497e9..6d6945ce3679 100644
--- a/net-mgmt/p5-Net-IP-Match-XS/Makefile
+++ b/net-mgmt/p5-Net-IP-Match-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IP-Match-XS
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-IP-Match-XS/pkg-plist b/net-mgmt/p5-Net-IP-Match-XS/pkg-plist
index 82f9f587d0b9..9b3bb9253000 100644
--- a/net-mgmt/p5-Net-IP-Match-XS/pkg-plist
+++ b/net-mgmt/p5-Net-IP-Match-XS/pkg-plist
@@ -1,11 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IP/Match/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Match/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Match/XS/XS.so
+%%SITE_ARCH%%/Net/IP/Match/XS.pm
+%%SITE_ARCH%%/auto/Net/IP/Match/XS/XS.so
 %%PERL5_MAN3%%/Net::IP::Match::XS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Match/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Match
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/IP/Match
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net-mgmt/p5-Net-IP-Resolver/Makefile b/net-mgmt/p5-Net-IP-Resolver/Makefile
index ce21b06b34e1..d36ea0cd5713 100644
--- a/net-mgmt/p5-Net-IP-Resolver/Makefile
+++ b/net-mgmt/p5-Net-IP-Resolver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IP-Resolver
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-IP-Resolver/pkg-plist b/net-mgmt/p5-Net-IP-Resolver/pkg-plist
index cf040111688f..40f8c887e7fc 100644
--- a/net-mgmt/p5-Net-IP-Resolver/pkg-plist
+++ b/net-mgmt/p5-Net-IP-Resolver/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/IP/Resolver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Resolver/.packlist
 %%PERL5_MAN3%%/Net::IP::Resolver.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Resolver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IP/Makefile b/net-mgmt/p5-Net-IP/Makefile
index 5ccd63ec9a5d..92ebe6807551 100644
--- a/net-mgmt/p5-Net-IP/Makefile
+++ b/net-mgmt/p5-Net-IP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IP
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5 ipv6
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-IP/pkg-plist b/net-mgmt/p5-Net-IP/pkg-plist
index 705512c368b1..38b93de7fcfd 100644
--- a/net-mgmt/p5-Net-IP/pkg-plist
+++ b/net-mgmt/p5-Net-IP/pkg-plist
@@ -1,10 +1,4 @@
 bin/iptab
 bin/ipcount
 %%SITE_PERL%%/Net/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/.packlist
 %%PERL5_MAN3%%/Net::IP.3.gz
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/mach
-@dirrmtry %%SITE_PERL%%
diff --git a/net-mgmt/p5-Net-IPAddress/Makefile b/net-mgmt/p5-Net-IPAddress/Makefile
index 86d36d042265..66b6ffb51245 100644
--- a/net-mgmt/p5-Net-IPAddress/Makefile
+++ b/net-mgmt/p5-Net-IPAddress/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IPAddress
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARENNER
diff --git a/net-mgmt/p5-Net-IPAddress/pkg-plist b/net-mgmt/p5-Net-IPAddress/pkg-plist
index 883e771633fb..26960018bfc5 100644
--- a/net-mgmt/p5-Net-IPAddress/pkg-plist
+++ b/net-mgmt/p5-Net-IPAddress/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/IPAddress.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPAddress/.packlist
 %%PERL5_MAN3%%/Net::IPAddress.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPAddress
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IPv4Addr/Makefile b/net-mgmt/p5-Net-IPv4Addr/Makefile
index 0340575da181..4a940bce8d2d 100644
--- a/net-mgmt/p5-Net-IPv4Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv4Addr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IPv4Addr
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-IPv4Addr/pkg-plist b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
index 162d6dd534f7..af7b716808b8 100644
--- a/net-mgmt/p5-Net-IPv4Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
@@ -2,10 +2,4 @@ bin/ipv4calc
 %%PERL5_MAN3%%/Net::IPv4Addr.3.gz
 %%SITE_PERL%%/Net/IPv4Addr.pm
 %%SITE_PERL%%/auto/Net/IPv4Addr/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
 man/man1/ipv4calc.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/IPv4Addr
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IPv6Addr/Makefile b/net-mgmt/p5-Net-IPv6Addr/Makefile
index a40bc206905c..a3ca0552015f 100644
--- a/net-mgmt/p5-Net-IPv6Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv6Addr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IPv6Addr
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5 ipv6
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-IPv6Addr/pkg-plist b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
index 41b439f22532..eb1a60a37aca 100644
--- a/net-mgmt/p5-Net-IPv6Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::IPv6Addr.3.gz
 %%SITE_PERL%%/Net/IPv6Addr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-NSCA-Client/Makefile b/net-mgmt/p5-Net-NSCA-Client/Makefile
index 219c75123eac..425fce2ce816 100644
--- a/net-mgmt/p5-Net-NSCA-Client/Makefile
+++ b/net-mgmt/p5-Net-NSCA-Client/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-NSCA-Client
 PORTVERSION=	0.009002
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-NSCA-Client/pkg-plist b/net-mgmt/p5-Net-NSCA-Client/pkg-plist
index 8842a28b1037..68d92a861090 100644
--- a/net-mgmt/p5-Net-NSCA-Client/pkg-plist
+++ b/net-mgmt/p5-Net-NSCA-Client/pkg-plist
@@ -16,7 +16,3 @@
 %%PERL5_MAN3%%/Net::NSCA::Client::ServerConfig.3.gz
 %%PERL5_MAN3%%/Net::NSCA::Client::Troubleshooting.3.gz
 %%PERL5_MAN3%%/Net::NSCA::Client::Utils.3.gz
-@dirrm %%SITE_PERL%%/Net/NSCA/Client/Connection
-@dirrm %%SITE_PERL%%/Net/NSCA/Client
-@dirrmtry %%SITE_PERL%%/Net/NSCA
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-Netmask/Makefile b/net-mgmt/p5-Net-Netmask/Makefile
index cc5b70018648..5c51cf646cf6 100644
--- a/net-mgmt/p5-Net-Netmask/Makefile
+++ b/net-mgmt/p5-Net-Netmask/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Netmask
 PORTVERSION=	1.9019
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-Netmask/pkg-plist b/net-mgmt/p5-Net-Netmask/pkg-plist
index 8b6244b2f816..4b3af3e732f1 100644
--- a/net-mgmt/p5-Net-Netmask/pkg-plist
+++ b/net-mgmt/p5-Net-Netmask/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Net/Netmask.pod
 %%SITE_PERL%%/Net/Netmask.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
 %%PERL5_MAN3%%/Net::Netmask.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-SNMP-Util/Makefile b/net-mgmt/p5-Net-SNMP-Util/Makefile
index feba1fe31c35..8dfe4956f7b6 100644
--- a/net-mgmt/p5-Net-SNMP-Util/Makefile
+++ b/net-mgmt/p5-Net-SNMP-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SNMP-Util
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TONODERA
diff --git a/net-mgmt/p5-Net-SNMP-Util/pkg-plist b/net-mgmt/p5-Net-SNMP-Util/pkg-plist
index 2b7e6fd51072..0e857e85b44f 100644
--- a/net-mgmt/p5-Net-SNMP-Util/pkg-plist
+++ b/net-mgmt/p5-Net-SNMP-Util/pkg-plist
@@ -1,13 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/Util/.packlist
 %%SITE_PERL%%/Net/SNMP/Util.pm
 %%SITE_PERL%%/Net/SNMP/Util/OID.pm
 %%SITE_PERL%%/Net/SNMP/Util/TC.pm
 %%PERL5_MAN3%%/Net::SNMP::Util.3.gz
 %%PERL5_MAN3%%/Net::SNMP::Util::OID.3.gz
 %%PERL5_MAN3%%/Net::SNMP::Util::TC.3.gz
-@dirrmtry %%SITE_PERL%%/Net/SNMP/Util
-@dirrmtry %%SITE_PERL%%/Net/SNMP
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/Util
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index 1e36d94ae494..8d72f761d24c 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SNMP
 PORTVERSION=	6.0.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DTOWN
diff --git a/net-mgmt/p5-Net-SNMP/pkg-plist b/net-mgmt/p5-Net-SNMP/pkg-plist
index 08c820f4327f..6c84f50d8c7c 100644
--- a/net-mgmt/p5-Net-SNMP/pkg-plist
+++ b/net-mgmt/p5-Net-SNMP/pkg-plist
@@ -14,14 +14,5 @@ bin/snmpkey
 %%SITE_PERL%%/Net/SNMP/Transport/IPv6.pm
 %%SITE_PERL%%/Net/SNMP/Transport/IPv6/TCP.pm
 %%SITE_PERL%%/Net/SNMP/Transport/IPv6/UDP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist
 %%PERL5_MAN3%%/Net::SNMP.3.gz
 man/man1/snmpkey.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/SNMP/Transport/IPv6
-@dirrm %%SITE_PERL%%/Net/SNMP/Transport/IPv4
-@dirrm %%SITE_PERL%%/Net/SNMP/Transport
-@dirrm %%SITE_PERL%%/Net/SNMP/Security
-@dirrm %%SITE_PERL%%/Net/SNMP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-SNMPTrapd/Makefile b/net-mgmt/p5-Net-SNMPTrapd/Makefile
index 1dff8876e7ea..f63530270c34 100644
--- a/net-mgmt/p5-Net-SNMPTrapd/Makefile
+++ b/net-mgmt/p5-Net-SNMPTrapd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SNMPTrapd
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-SNMPTrapd/pkg-plist b/net-mgmt/p5-Net-SNMPTrapd/pkg-plist
index 6cc32b51229c..d4f9e0e63dfb 100644
--- a/net-mgmt/p5-Net-SNMPTrapd/pkg-plist
+++ b/net-mgmt/p5-Net-SNMPTrapd/pkg-plist
@@ -1,8 +1,6 @@
 bin/snmptrapd-simple.pl
 bin/snmptrapd-sendtest.pl
 %%SITE_PERL%%/Net/SNMPTrapd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMPTrapd/.packlist
 %%PERL5_MAN3%%/Net::SNMPTrapd.3.gz
 man/man1/snmptrapd-sendtest.pl.1.gz
 man/man1/snmptrapd-simple.pl.1.gz
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
index c7bc63115089..eae15ea45bde 100644
--- a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
+++ b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Telnet-Cisco-IOS
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Net-Telnet-Cisco-IOS/pkg-plist b/net-mgmt/p5-Net-Telnet-Cisco-IOS/pkg-plist
index c4834d443bd1..0b8db5fa81f2 100644
--- a/net-mgmt/p5-Net-Telnet-Cisco-IOS/pkg-plist
+++ b/net-mgmt/p5-Net-Telnet-Cisco-IOS/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Net/Telnet/Cisco/IOS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/IOS/.packlist
 %%PERL5_MAN3%%/Net::Telnet::Cisco::IOS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/IOS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Telnet/Cisco
-@dirrmtry %%SITE_PERL%%/Net/Telnet
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-NetAddr-IP-Lite/Makefile b/net-mgmt/p5-NetAddr-IP-Lite/Makefile
index 7c573b7ddd65..a8d1760c8247 100644
--- a/net-mgmt/p5-NetAddr-IP-Lite/Makefile
+++ b/net-mgmt/p5-NetAddr-IP-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NetAddr-IP-Lite
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist b/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist
index 5bb703f9056b..e41ae7262d27 100644
--- a/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist
+++ b/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist
@@ -37,16 +37,6 @@
 %%SITE_PERL%%/auto/NetAddr/IP/UtilPP/_bcdcheck.al
 %%SITE_PERL%%/auto/NetAddr/IP/UtilPP/simple_pack.al
 %%SITE_PERL%%/auto/NetAddr/IP/UtilPP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Lite/.packlist
 %%PERL5_MAN3%%/NetAddr::IP::UtilPP.3.gz
 %%PERL5_MAN3%%/NetAddr::IP::Util.3.gz
 %%PERL5_MAN3%%/NetAddr::IP::Lite.3.gz
-@dirrm %%SITE_PERL%%/NetAddr/IP
-@dirrm %%SITE_PERL%%/auto/NetAddr/IP/UtilPP
-@dirrm %%SITE_PERL%%/auto/NetAddr/IP/Util
-@dirrm %%SITE_PERL%%/auto/NetAddr/IP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Lite
-@dirrmtry %%SITE_PERL%%/NetAddr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrmtry %%SITE_PERL%%/auto/NetAddr/
diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile
index 9bc4eea1103d..00cc72cca58c 100644
--- a/net-mgmt/p5-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-NetAddr-IP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	NetAddr-IP
 PORTVERSION=	4.069
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-NetAddr-IP/pkg-plist b/net-mgmt/p5-NetAddr-IP/pkg-plist
index 14895eb70242..19e79f92204d 100644
--- a/net-mgmt/p5-NetAddr-IP/pkg-plist
+++ b/net-mgmt/p5-NetAddr-IP/pkg-plist
@@ -1,74 +1,66 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/InetBase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/UtilPP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/Util_IS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/_inet_ntop.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/_inet_pton.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/_packzeros.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/inet_any2n.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/inet_n2ad.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/inet_n2dx.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/inet_ntoa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/ipv6_aton.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase/ipv6_ntoa.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/Util.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_128x10.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_128x2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_bcd2bin.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_bcdcheck.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_bin2bcdn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_deadlen.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_sa128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/add128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/addconst.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bcd2bin.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bcdn2bin.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bcdn2txt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bin2bcd.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bin2bcdn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/comp128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/hasbits.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/ipanyto6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/ipv4to6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/ipv6to4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/mask4to6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/maskanyto6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/notcontiguous.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/shiftleft.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/simple_pack.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/slowadd128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/sub128.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/_compV6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/_compact_v6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/_splitplan.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/_splitref.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/coalesce.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/compactref.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/do_prefix.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/hostenum.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/mod_version.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/nprefix.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/prefix.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/re.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/re6.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/short.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/wildcard.al
+%%SITE_ARCH%%/NetAddr/IP.pm
+%%SITE_ARCH%%/NetAddr/IP/InetBase.pm
+%%SITE_ARCH%%/NetAddr/IP/Lite.pm
+%%SITE_ARCH%%/NetAddr/IP/Util.pm
+%%SITE_ARCH%%/NetAddr/IP/UtilPP.pm
+%%SITE_ARCH%%/NetAddr/IP/Util_IS.pm
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/_inet_ntop.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/_inet_pton.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/_packzeros.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/autosplit.ix
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/inet_any2n.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/inet_n2ad.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/inet_n2dx.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/inet_ntoa.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/ipv6_aton.al
+%%SITE_ARCH%%/auto/NetAddr/IP/InetBase/ipv6_ntoa.al
+%%SITE_ARCH%%/auto/NetAddr/IP/Util/Util.so
+%%SITE_ARCH%%/auto/NetAddr/IP/Util/autosplit.ix
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/_128x10.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/_128x2.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/_bcd2bin.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/_bcdcheck.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/_bin2bcdn.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/_deadlen.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/_sa128.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/add128.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/addconst.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/autosplit.ix
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/bcd2bin.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/bcdn2bin.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/bcdn2txt.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/bin2bcd.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/bin2bcdn.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/comp128.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/hasbits.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/ipanyto6.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/ipv4to6.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/ipv6to4.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/mask4to6.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/maskanyto6.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/notcontiguous.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/shiftleft.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/simple_pack.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/slowadd128.al
+%%SITE_ARCH%%/auto/NetAddr/IP/UtilPP/sub128.al
+%%SITE_ARCH%%/auto/NetAddr/IP/_compV6.al
+%%SITE_ARCH%%/auto/NetAddr/IP/_compact_v6.al
+%%SITE_ARCH%%/auto/NetAddr/IP/_splitplan.al
+%%SITE_ARCH%%/auto/NetAddr/IP/_splitref.al
+%%SITE_ARCH%%/auto/NetAddr/IP/autosplit.ix
+%%SITE_ARCH%%/auto/NetAddr/IP/coalesce.al
+%%SITE_ARCH%%/auto/NetAddr/IP/compactref.al
+%%SITE_ARCH%%/auto/NetAddr/IP/do_prefix.al
+%%SITE_ARCH%%/auto/NetAddr/IP/hostenum.al
+%%SITE_ARCH%%/auto/NetAddr/IP/mod_version.al
+%%SITE_ARCH%%/auto/NetAddr/IP/nprefix.al
+%%SITE_ARCH%%/auto/NetAddr/IP/prefix.al
+%%SITE_ARCH%%/auto/NetAddr/IP/re.al
+%%SITE_ARCH%%/auto/NetAddr/IP/re6.al
+%%SITE_ARCH%%/auto/NetAddr/IP/short.al
+%%SITE_ARCH%%/auto/NetAddr/IP/wildcard.al
 %%PERL5_MAN3%%/NetAddr::IP.3.gz
 %%PERL5_MAN3%%/NetAddr::IP::InetBase.3.gz
 %%PERL5_MAN3%%/NetAddr::IP::Lite.3.gz
 %%PERL5_MAN3%%/NetAddr::IP::Util.3.gz
 %%PERL5_MAN3%%/NetAddr::IP::UtilPP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/InetBase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/NetAddr
diff --git a/net-mgmt/p5-NetApp/Makefile b/net-mgmt/p5-NetApp/Makefile
index cb1d072ccdfc..377cba3e2a30 100644
--- a/net-mgmt/p5-NetApp/Makefile
+++ b/net-mgmt/p5-NetApp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NetApp
 PORTVERSION=	500.002
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-NetApp/pkg-plist b/net-mgmt/p5-NetApp/pkg-plist
index 8bbe6e7777a7..5bc9b20cabdd 100644
--- a/net-mgmt/p5-NetApp/pkg-plist
+++ b/net-mgmt/p5-NetApp/pkg-plist
@@ -31,7 +31,6 @@
 %%SITE_PERL%%/NetApp/Volume.pm
 %%SITE_PERL%%/NetApp/Volume.pod
 %%SITE_PERL%%/NetApp/Volume/Source.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetApp/.packlist
 %%PERL5_MAN3%%/NetApp::Aggregate.3.gz
 %%PERL5_MAN3%%/NetApp::Aggregate::Plex.3.gz
 %%PERL5_MAN3%%/NetApp::Aggregate::RAIDGroup.3.gz
@@ -46,10 +45,3 @@
 %%PERL5_MAN3%%/NetApp::Snapshot::Delta.3.gz
 %%PERL5_MAN3%%/NetApp::Snapshot::Schedule.3.gz
 %%PERL5_MAN3%%/NetApp::Volume.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetApp
-@dirrmtry %%SITE_PERL%%/NetApp/Volume
-@dirrmtry %%SITE_PERL%%/NetApp/Snapshot
-@dirrmtry %%SITE_PERL%%/NetApp/Snapmirror
-@dirrmtry %%SITE_PERL%%/NetApp/Filer
-@dirrmtry %%SITE_PERL%%/NetApp/Aggregate
-@dirrmtry %%SITE_PERL%%/NetApp
diff --git a/net-mgmt/p5-POE-Component-SNMP/Makefile b/net-mgmt/p5-POE-Component-SNMP/Makefile
index 79c6b2428058..9878d126c053 100644
--- a/net-mgmt/p5-POE-Component-SNMP/Makefile
+++ b/net-mgmt/p5-POE-Component-SNMP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-SNMP
 PORTVERSION=	1.1006
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-POE-Component-SNMP/pkg-plist b/net-mgmt/p5-POE-Component-SNMP/pkg-plist
index 08a7b2057d8a..88fc565efd99 100644
--- a/net-mgmt/p5-POE-Component-SNMP/pkg-plist
+++ b/net-mgmt/p5-POE-Component-SNMP/pkg-plist
@@ -1,10 +1,3 @@
 %%PERL5_MAN3%%/POE::Component::SNMP.3.gz
 %%SITE_PERL%%/POE/Component/SNMP.pm
 %%SITE_PERL%%/POE/Component/SNMP/Dispatcher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/SNMP
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net-mgmt/p5-SNMP-Info/Makefile b/net-mgmt/p5-SNMP-Info/Makefile
index ba618dcc1521..07f14caf5324 100644
--- a/net-mgmt/p5-SNMP-Info/Makefile
+++ b/net-mgmt/p5-SNMP-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SNMP-Info
 PORTVERSION=	3.20
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-SNMP-Info/pkg-plist b/net-mgmt/p5-SNMP-Info/pkg-plist
index 95119309ecd2..72c4f015dbc9 100644
--- a/net-mgmt/p5-SNMP-Info/pkg-plist
+++ b/net-mgmt/p5-SNMP-Info/pkg-plist
@@ -106,7 +106,6 @@
 %%SITE_PERL%%/SNMP/Info/SONMP.pm
 %%SITE_PERL%%/SNMP/Info/AMAP.pm
 %%SITE_PERL%%/SNMP/Info/MRO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Info/.packlist
 %%PERL5_MAN3%%/SNMP::Info.3.gz
 %%PERL5_MAN3%%/SNMP::Info::AMAP.3.gz
 %%PERL5_MAN3%%/SNMP::Info::AdslLine.3.gz
@@ -215,11 +214,3 @@
 %%PERL5_MAN3%%/SNMP::Info::PowerEthernet.3.gz
 %%PERL5_MAN3%%/SNMP::Info::RapidCity.3.gz
 %%PERL5_MAN3%%/SNMP::Info::SONMP.3.gz
-@dirrm %%SITE_PERL%%/SNMP/Info/Layer7
-@dirrm %%SITE_PERL%%/SNMP/Info/Layer3
-@dirrm %%SITE_PERL%%/SNMP/Info/Layer2
-@dirrm %%SITE_PERL%%/SNMP/Info/Layer1
-@dirrm %%SITE_PERL%%/SNMP/Info
-@dirrm %%SITE_PERL%%/SNMP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Info
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
index c7d4781eead9..ac5078d7fd27 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SNMP-MIB-Compiler
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
index 87356c310634..69ed98aab5b6 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
@@ -2,14 +2,5 @@ bin/mibbrowser
 bin/mibcompiler
 %%SITE_PERL%%/SNMP/MIB/Compiler.pm
 %%SITE_PERL%%/Bundle/SNMP/MIB/Compiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
 %%PERL5_MAN3%%/SNMP::MIB::Compiler.3.gz
 %%PERL5_MAN3%%/Bundle::SNMP::MIB::Compiler.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
-@dirrm %%SITE_PERL%%/SNMP/MIB
-@dirrm %%SITE_PERL%%/SNMP
-@dirrm %%SITE_PERL%%/Bundle/SNMP/MIB
-@dirrm %%SITE_PERL%%/Bundle/SNMP
-@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/net-mgmt/p5-SNMP-Simple/Makefile b/net-mgmt/p5-SNMP-Simple/Makefile
index 9fc61dfaa75a..51a1153d0faa 100644
--- a/net-mgmt/p5-SNMP-Simple/Makefile
+++ b/net-mgmt/p5-SNMP-Simple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SNMP-Simple
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-SNMP-Simple/pkg-plist b/net-mgmt/p5-SNMP-Simple/pkg-plist
index caa0bcf096db..5bdbcab40587 100644
--- a/net-mgmt/p5-SNMP-Simple/pkg-plist
+++ b/net-mgmt/p5-SNMP-Simple/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/SNMP/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Simple/.packlist
 %%PERL5_MAN3%%/SNMP::Simple.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
-@dirrm %%SITE_PERL%%/SNMP
diff --git a/net-mgmt/p5-SNMP-Trapinfo/Makefile b/net-mgmt/p5-SNMP-Trapinfo/Makefile
index 889f0aa6d87b..461b488656ce 100644
--- a/net-mgmt/p5-SNMP-Trapinfo/Makefile
+++ b/net-mgmt/p5-SNMP-Trapinfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SNMP-Trapinfo
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-SNMP-Trapinfo/pkg-plist b/net-mgmt/p5-SNMP-Trapinfo/pkg-plist
index 6fd625341273..d01a8d02c876 100644
--- a/net-mgmt/p5-SNMP-Trapinfo/pkg-plist
+++ b/net-mgmt/p5-SNMP-Trapinfo/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/SNMP/Trapinfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Trapinfo/.packlist
 %%PERL5_MAN3%%/SNMP::Trapinfo.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Trapinfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/SNMP
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index 3af3721cf40e..a6a00bf819c7 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SNMP-Util
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-SNMP-Util/pkg-plist b/net-mgmt/p5-SNMP-Util/pkg-plist
index d6ea768aae61..07154fd35e7f 100644
--- a/net-mgmt/p5-SNMP-Util/pkg-plist
+++ b/net-mgmt/p5-SNMP-Util/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/SNMP/Util.pm
 %%SITE_PERL%%/SNMP/Util_env.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
 %%PERL5_MAN3%%/SNMP::Util.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util
-@dirrm %%SITE_PERL%%/SNMP
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index 6eac1eb9f2f1..c5a2a93a215c 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SNMP_Session
 PORTVERSION=	1.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	snmp-session
diff --git a/net-mgmt/p5-SNMP_Session/pkg-plist b/net-mgmt/p5-SNMP_Session/pkg-plist
index 9f02e0f4f0f9..31630fc594d6 100644
--- a/net-mgmt/p5-SNMP_Session/pkg-plist
+++ b/net-mgmt/p5-SNMP_Session/pkg-plist
@@ -1,9 +1,7 @@
 %%SITE_PERL%%/BER.pm
 %%SITE_PERL%%/SNMP_Session.pm
 %%SITE_PERL%%/SNMP_util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.SNMP_util
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session
diff --git a/net-mgmt/p5-Telnet-Cisco/Makefile b/net-mgmt/p5-Telnet-Cisco/Makefile
index 86b3907b2d1a..e94bd3dd1b1c 100644
--- a/net-mgmt/p5-Telnet-Cisco/Makefile
+++ b/net-mgmt/p5-Telnet-Cisco/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Telnet-Cisco
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Telnet-Cisco/pkg-plist b/net-mgmt/p5-Telnet-Cisco/pkg-plist
index 39843dd222bb..8dcb79fad1a8 100644
--- a/net-mgmt/p5-Telnet-Cisco/pkg-plist
+++ b/net-mgmt/p5-Telnet-Cisco/pkg-plist
@@ -1,12 +1,3 @@
 %%SITE_PERL%%/Net/Telnet/Cisco.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
 %%SITE_PERL%%/auto/Net/Telnet/Cisco/autosplit.ix
 %%PERL5_MAN3%%/Net::Telnet::Cisco.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Telnet
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/Telnet/Cisco
-@dirrmtry %%SITE_PERL%%/auto/Net/Telnet
-@dirrmtry %%SITE_PERL%%/auto/Net
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/Makefile b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
index 1162cbdd71f6..e79f82b4f3ec 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-NetAddr-IP
 PORTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist b/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist
index 06ed004ce968..566beeb143af 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist
+++ b/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP/.packlist
 %%SITE_PERL%%/Tie/NetAddr/IP.pm
 %%PERL5_MAN3%%/Tie::NetAddr::IP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
-@dirrmtry %%SITE_PERL%%/Tie/NetAddr
-@dirrmtry %%SITE_PERL%%/Tie
diff --git a/net-mgmt/p5-Xymon-Client/Makefile b/net-mgmt/p5-Xymon-Client/Makefile
index 474a579696f8..65c553675f3d 100644
--- a/net-mgmt/p5-Xymon-Client/Makefile
+++ b/net-mgmt/p5-Xymon-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Xymon-Client
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Xymon-Client/pkg-plist b/net-mgmt/p5-Xymon-Client/pkg-plist
index 7794f40dd78d..13cb91c0d750 100644
--- a/net-mgmt/p5-Xymon-Client/pkg-plist
+++ b/net-mgmt/p5-Xymon-Client/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Xymon/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon/Client/.packlist
 %%PERL5_MAN3%%/Xymon::Client.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon
-@dirrmtry %%SITE_PERL%%/Xymon
diff --git a/net-mgmt/p5-Xymon-Server/Makefile b/net-mgmt/p5-Xymon-Server/Makefile
index c308a505ccdc..ba410f8b0ff4 100644
--- a/net-mgmt/p5-Xymon-Server/Makefile
+++ b/net-mgmt/p5-Xymon-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Xymon-Server
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Xymon-Server/pkg-plist b/net-mgmt/p5-Xymon-Server/pkg-plist
index e9c9a2422110..44777d2c45ad 100644
--- a/net-mgmt/p5-Xymon-Server/pkg-plist
+++ b/net-mgmt/p5-Xymon-Server/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Xymon/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon/Server/.packlist
 %%PERL5_MAN3%%/Xymon::Server.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon
-@dirrmtry %%SITE_PERL%%/Xymon
diff --git a/net-mgmt/p5-Xymon/Makefile b/net-mgmt/p5-Xymon/Makefile
index f55679a37bea..60d866a897d5 100644
--- a/net-mgmt/p5-Xymon/Makefile
+++ b/net-mgmt/p5-Xymon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Xymon
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Xymon/pkg-plist b/net-mgmt/p5-Xymon/pkg-plist
index 0ee8b5829864..698cf46d8a42 100644
--- a/net-mgmt/p5-Xymon/pkg-plist
+++ b/net-mgmt/p5-Xymon/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Xymon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon/.packlist
 %%PERL5_MAN3%%/Xymon.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xymon
diff --git a/net-mgmt/p5-Zenoss/Makefile b/net-mgmt/p5-Zenoss/Makefile
index 574a0e64f04c..e20478fe08fc 100644
--- a/net-mgmt/p5-Zenoss/Makefile
+++ b/net-mgmt/p5-Zenoss/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Zenoss
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/p5-Zenoss/pkg-plist b/net-mgmt/p5-Zenoss/pkg-plist
index fa84ddf31dfe..b5bf739707f3 100644
--- a/net-mgmt/p5-Zenoss/pkg-plist
+++ b/net-mgmt/p5-Zenoss/pkg-plist
@@ -18,7 +18,6 @@
 %%SITE_PERL%%/Zenoss/Router/Template.pm
 %%SITE_PERL%%/Zenoss/Router/Tree.pm
 %%SITE_PERL%%/Zenoss/Router/ZenPack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Zenoss/.packlist
 %%PERL5_MAN3%%/Zenoss.3.gz
 %%PERL5_MAN3%%/Zenoss::Connector.3.gz
 %%PERL5_MAN3%%/Zenoss::Error.3.gz
@@ -39,6 +38,3 @@
 %%PERL5_MAN3%%/Zenoss::Router::Template.3.gz
 %%PERL5_MAN3%%/Zenoss::Router::Tree.3.gz
 %%PERL5_MAN3%%/Zenoss::Router::ZenPack.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Zenoss
-@dirrm %%SITE_PERL%%/Zenoss/Router
-@dirrm %%SITE_PERL%%/Zenoss
diff --git a/net-mgmt/p5-jmx4perl/Makefile b/net-mgmt/p5-jmx4perl/Makefile
index ad3d5dc16564..2d0f81e9456c 100644
--- a/net-mgmt/p5-jmx4perl/Makefile
+++ b/net-mgmt/p5-jmx4perl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	jmx4perl
 PORTVERSION=	1.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/R/RO/ROLAND
diff --git a/net-mgmt/p5-jmx4perl/pkg-plist b/net-mgmt/p5-jmx4perl/pkg-plist
index c9b40317b3af..7cd9a86785f4 100644
--- a/net-mgmt/p5-jmx4perl/pkg-plist
+++ b/net-mgmt/p5-jmx4perl/pkg-plist
@@ -114,14 +114,4 @@ man/man1/jolokia.1.gz
 %%ETCDIR%%/threads.cfg.sample
 %%ETCDIR%%/tomcat.cfg.sample
 %%ETCDIR%%/weblogic.cfg.sample
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/Agent
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/Alias
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/Command
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/J4psh
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/Nagios
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl/Product
-@dirrm %%SITE_PERL%%/JMX/Jmx4Perl
-@dirrmtry %%SITE_PERL%%/JMX
 @dirrmtry %%ETCDIR%%
diff --git a/net-mgmt/pancho/Makefile b/net-mgmt/pancho/Makefile
index e875f911e051..232a6c2988af 100644
--- a/net-mgmt/pancho/Makefile
+++ b/net-mgmt/pancho/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pancho
 PORTVERSION=	9.3.9
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.pancho.org/archives/pancho/ \
 		http://200ok.org/distfiles/pancho/
diff --git a/net-mgmt/pancho/pkg-plist b/net-mgmt/pancho/pkg-plist
index c06f4f393ab3..19c7edf740c4 100644
--- a/net-mgmt/pancho/pkg-plist
+++ b/net-mgmt/pancho/pkg-plist
@@ -13,10 +13,6 @@ man/man1/pancho.1.gz
 %%SITE_PERL%%/Pancho/Plugins/Alteon.pm
 %%SITE_PERL%%/Pancho/Plugins/Baystack.pm
 %%SITE_PERL%%/Pancho/Plugins/Passport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho/.packlist
-@dirrmtry %%SITE_PERL%%/Pancho/Plugins
-@dirrmtry %%SITE_PERL%%/Pancho
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.plugins
 %%PORTDOCS%%%%DOCSDIR%%/Plugin.sample
diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile
index 77f82ffb543a..acbb47b9578a 100644
--- a/net-mgmt/pandorafms_server/Makefile
+++ b/net-mgmt/pandorafms_server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pandora_server
-PORTREVISION=	1
+PORTREVISION=	2
 
 CATEGORIES=	net-mgmt
 
@@ -41,7 +41,7 @@ ORACLE_DESC=	Use Oracle backend (experimental)
 EXTRAS_DESC=	Extra dependencies for util scripts
 
 USES=		perl5
-USE_PERL5+=	fixpacklist
+USE_PERL5=	build run
 SUB_LIST+=	PERL="${PERL}" DATADIR="${DATADIR}"
 SUB_FILES=	pkg-message
 
@@ -96,7 +96,6 @@ post-patch:
 		`${GREP} -rl /usr/bin/perl ${WRKSRC} | ${GREP} -v pandora_server_installer`
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
 	@${FIND} ${STAGEDIR}${DATADIR} -type l -name PandoraFMS -delete
 .for x in pandora_server tentacle_server
 	@cd ${STAGEDIR}${PREFIX}/etc/rc.d && test -f ${x} \
diff --git a/net-mgmt/pandorafms_server/pkg-plist b/net-mgmt/pandorafms_server/pkg-plist
index 2230fa5984f9..21043e2b151e 100644
--- a/net-mgmt/pandorafms_server/pkg-plist
+++ b/net-mgmt/pandorafms_server/pkg-plist
@@ -34,7 +34,6 @@ etc/rc.d/tentacle_server
 %%SITE_PERL%%/PandoraFMS/Traceroute.pm
 %%SITE_PERL%%/PandoraFMS/Traceroute/PurePerl.pm
 %%SITE_PERL%%/PandoraFMS/WMIServer.pm
-%%SITE_PERL%%/mach/auto/PandoraFMS/.packlist
 man/man1/pandora_server.1.gz
 man/man1/tentacle_server.1.gz
 %%DATADIR%%/util/alert_multicast.pl
@@ -112,9 +111,6 @@ man/man1/tentacle_server.1.gz
 %%DATADIR%%/util/trap_rate.sh
 %%DATADIR%%/util/udp_client.pl
 %%DATADIR%%/util/windows.README
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PandoraFMS
-@dirrm %%SITE_PERL%%/PandoraFMS/Traceroute
-@dirrmtry %%SITE_PERL%%/PandoraFMS
 @dirrm %%DATADIR%%/util/plugin/babel_plugin
 @dirrm %%DATADIR%%/util/plugin/integria_plugin
 @dirrm %%DATADIR%%/util/pandora2ast
diff --git a/net-mgmt/remarp/Makefile b/net-mgmt/remarp/Makefile
index db355bfc4b4c..4da54ff8b712 100644
--- a/net-mgmt/remarp/Makefile
+++ b/net-mgmt/remarp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	remarp
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://freebsdcluster.org/~mich/software/ \
 		http://www.raccoon.kiev.ua/projects/remarp/
diff --git a/net-mgmt/remarp/pkg-plist b/net-mgmt/remarp/pkg-plist
index b4a69caad407..cf2f7a219326 100644
--- a/net-mgmt/remarp/pkg-plist
+++ b/net-mgmt/remarp/pkg-plist
@@ -2,5 +2,4 @@ sbin/remarp
 etc/remarp.conf.sample
 %%SITE_PERL%%/remarp/config.pm
 %%SITE_PERL%%/remarp/configure.pm
-@dirrm %%SITE_PERL%%/remarp
 @unexec rmdir /var/spool/remarp || true
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index 83512f5ddbcc..77a522af0975 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	torrus
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/torrus/torrus/
 
diff --git a/net-mgmt/torrus/pkg-plist b/net-mgmt/torrus/pkg-plist
index 4ccd759e7c50..7c9852c11ed7 100644
--- a/net-mgmt/torrus/pkg-plist
+++ b/net-mgmt/torrus/pkg-plist
@@ -352,13 +352,3 @@ man/man7/torrus_install_plugin.7.gz
 @dirrmtry etc/torrus/discovery
 @dirrmtry etc/torrus/conf
 @dirrmtry etc/torrus
-@dirrm %%SITE_PERL%%/Torrus/SQL
-@dirrm %%SITE_PERL%%/Torrus/Scheduler
-@dirrm %%SITE_PERL%%/Torrus/ReportOutput
-@dirrm %%SITE_PERL%%/Torrus/ReportGenerator
-@dirrm %%SITE_PERL%%/Torrus/Renderer
-@dirrm %%SITE_PERL%%/Torrus/DevDiscover
-@dirrm %%SITE_PERL%%/Torrus/ConfigTree
-@dirrm %%SITE_PERL%%/Torrus/Collector
-@dirrm %%SITE_PERL%%/Torrus/ACL
-@dirrm %%SITE_PERL%%/Torrus
diff --git a/net-p2p/p5-Net-BitTorrent-File/Makefile b/net-p2p/p5-Net-BitTorrent-File/Makefile
index 1e07bb443095..bf87e752cc6f 100644
--- a/net-p2p/p5-Net-BitTorrent-File/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-BitTorrent-File
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	net-p2p perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-p2p/p5-Net-BitTorrent-File/pkg-plist b/net-p2p/p5-Net-BitTorrent-File/pkg-plist
index 763ca8f34623..2efb5b491c9d 100644
--- a/net-p2p/p5-Net-BitTorrent-File/pkg-plist
+++ b/net-p2p/p5-Net-BitTorrent-File/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BitTorrent/File/.packlist
 %%SITE_PERL%%/Net/BitTorrent/File.pm
 %%PERL5_MAN3%%/Net::BitTorrent::File.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BitTorrent/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BitTorrent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/BitTorrent
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
index 07faffedc66c..e6b3e8578bb9 100644
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-BitTorrent-PeerPacket
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
index 10922a4156bd..18e109d71981 100644
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
+++ b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Net::BitTorrent::PeerPacket.3.gz
 %%SITE_PERL%%/Net/BitTorrent/PeerPacket.pm
-@dirrmtry %%SITE_PERL%%/Net/BitTorrent
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-p2p/p5-Net-BitTorrent/Makefile b/net-p2p/p5-Net-BitTorrent/Makefile
index e87ba4535299..c0c7a9b90fa5 100644
--- a/net-p2p/p5-Net-BitTorrent/Makefile
+++ b/net-p2p/p5-Net-BitTorrent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-BitTorrent
 PORTVERSION=	0.052
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SANKO
diff --git a/net-p2p/p5-Net-BitTorrent/pkg-plist b/net-p2p/p5-Net-BitTorrent/pkg-plist
index 96b83e012a29..af9987895f71 100644
--- a/net-p2p/p5-Net-BitTorrent/pkg-plist
+++ b/net-p2p/p5-Net-BitTorrent/pkg-plist
@@ -26,7 +26,3 @@ bin/net-bittorrent.pl
 %%SITE_PERL%%/Net/BitTorrent/Util.pm
 %%SITE_PERL%%/Net/BitTorrent/Version.pm
 man/man1/net-bittorrent.pl.1.gz
-@dirrmtry %%SITE_PERL%%/Net/BitTorrent/Torrent/Tracker
-@dirrmtry %%SITE_PERL%%/Net/BitTorrent/Torrent
-@dirrmtry %%SITE_PERL%%/Net/BitTorrent
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-p2p/p5-Net-DirectConnect/Makefile b/net-p2p/p5-Net-DirectConnect/Makefile
index 1094d23db01b..1e4794fbf68d 100644
--- a/net-p2p/p5-Net-DirectConnect/Makefile
+++ b/net-p2p/p5-Net-DirectConnect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DirectConnect
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	net-p2p net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-p2p/p5-Net-DirectConnect/pkg-plist b/net-p2p/p5-Net-DirectConnect/pkg-plist
index d95788a0965a..934f9b7f895a 100644
--- a/net-p2p/p5-Net-DirectConnect/pkg-plist
+++ b/net-p2p/p5-Net-DirectConnect/pkg-plist
@@ -17,12 +17,7 @@ bin/dcshare
 %%SITE_PERL%%/Net/DirectConnect/pslib/psweb.pm
 %%SITE_PERL%%/Net/DirectConnect/pslib/pssql.pm
 %%SITE_PERL%%/Net/DirectConnect/sctp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DirectConnect/.packlist
 %%PERL5_MAN3%%/Net::DirectConnect.3.gz
 %%PERL5_MAN3%%/Net::DirectConnect::filelist.3.gz
 man/man1/dcget.1.gz
 man/man1/dcshare.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DirectConnect
-@dirrm %%SITE_PERL%%/Net/DirectConnect/pslib
-@dirrmtry %%SITE_PERL%%/Net/DirectConnect
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-p2p/p5-WWW-BitTorrent/Makefile b/net-p2p/p5-WWW-BitTorrent/Makefile
index 5ed2ea870088..2706da030881 100644
--- a/net-p2p/p5-WWW-BitTorrent/Makefile
+++ b/net-p2p/p5-WWW-BitTorrent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-BitTorrent
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net-p2p perl5 www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-p2p/p5-WWW-BitTorrent/pkg-plist b/net-p2p/p5-WWW-BitTorrent/pkg-plist
index 79c92dd02b92..6dcc5d023207 100644
--- a/net-p2p/p5-WWW-BitTorrent/pkg-plist
+++ b/net-p2p/p5-WWW-BitTorrent/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/WWW/BitTorrent.pm
 %%SITE_PERL%%/WWW/bittorrent.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/BitTorrent/.packlist
 %%PERL5_MAN3%%/WWW::BitTorrent.3.gz
diff --git a/net-p2p/torrentsniff/Makefile b/net-p2p/torrentsniff/Makefile
index 138b0b23c9e5..be5ac642575d 100644
--- a/net-p2p/torrentsniff/Makefile
+++ b/net-p2p/torrentsniff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	torrentsniff
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	net-p2p perl5
 MASTER_SITES=	http://www.highprogrammer.com/alan/perl/
 
@@ -18,7 +19,7 @@ SHEBANG_FILES=	torrentsniff
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/torrentsniff ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/BitTorrent
-	${INSTALL_DATA} ${WRKSRC}/BitTorrent/BDecode.pm ${STAGEDIR}${SITE_PERL}/BitTorrent
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/BitTorrent
+	${INSTALL_DATA} ${WRKSRC}/BitTorrent/BDecode.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/BitTorrent
 
 .include <bsd.port.mk>
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index 4d2997dc7d76..f066e151ff4b 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	beacon
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5 mbone ipv6
 MASTER_SITES=	SF/multicastbeacon/multicastbeacon/beacon%20v${PORTVERSION}
 
@@ -20,7 +20,6 @@ WWW_DIR?=	${PREFIX}/www/
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 USES=		perl5
-USE_PERL5+=	fixpacklist
 USE_AUTOTOOLS=	autoconf
 PORTDOCS=	README
 
@@ -31,8 +30,7 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 IPV6_BUILD_DEPENDS=	p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/Multicast/Beacon/Beacon.so
-	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/Multicast/Beacon/Beacon.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/net/beacon/pkg-plist b/net/beacon/pkg-plist
index 148c99c28c04..d26f76e8baed 100644
--- a/net/beacon/pkg-plist
+++ b/net/beacon/pkg-plist
@@ -1,10 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon/Beacon.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/Beacon.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+%%SITE_ARCH%%/auto/Net/Multicast/Beacon/Beacon.so
+%%SITE_ARCH%%/Net/Multicast/Beacon.pm
 bin/beacon
 @sample etc/beacon.conf.sample
 etc/rc.d/beacon
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index 9cc841c3749a..8d71ff55fef6 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ldapsh
 PORTVERSION=	2.00
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	CPAN
diff --git a/net/ldapsh/pkg-plist b/net/ldapsh/pkg-plist
index c4c45fea674d..68aa6df80ee2 100644
--- a/net/ldapsh/pkg-plist
+++ b/net/ldapsh/pkg-plist
@@ -1,5 +1,4 @@
 bin/ldapsh
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ldapsh/.packlist
 %%SITE_PERL%%/Net/LDAP/Config.pm
 %%SITE_PERL%%/Net/LDAP/Shell.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/cat.pm
@@ -27,8 +26,5 @@ bin/ldapsh
 man/man1/ldapsh.1.gz
 %%DOCSDIR%%/COMMANDS
 %%EXAMPLESDIR%%/ldapsh_config
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ldapsh
-@dirrm %%SITE_PERL%%/Net/LDAP/Shell/Commands
-@dirrm %%SITE_PERL%%/Net/LDAP/Shell
 @dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
diff --git a/net/libproxy-perl/Makefile b/net/libproxy-perl/Makefile
index d5f4e9a74623..dd7008ed41e3 100644
--- a/net/libproxy-perl/Makefile
+++ b/net/libproxy-perl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #    $MCom: ports/net/libproxy-perl/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net lang
 PKGNAMESUFFIX=	-perl
 
@@ -19,10 +19,10 @@ USES=		perl5
 LIBPROXY_SLAVE=	perl
 
 do-install:
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/Libproxy ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/Net
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/Libproxy ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/Net
 	${INSTALL_LIB} ${WRKSRC}/perl/blib/arch/auto/Net/Libproxy.so \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/Libproxy/
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/Libproxy
 	${INSTALL_DATA} ${WRKSRC}/perl/blib/lib/Libproxy.pm \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/Net/
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/Net
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-perl/pkg-plist b/net/libproxy-perl/pkg-plist
index f6fe0295e541..ab21782fbf98 100644
--- a/net/libproxy-perl/pkg-plist
+++ b/net/libproxy-perl/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libproxy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libproxy/Libproxy.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libproxy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+%%SITE_ARCH%%/Net/Libproxy.pm
+%%SITE_ARCH%%/auto/Net/Libproxy/Libproxy.so
diff --git a/net/p5-AddressBook/Makefile b/net/p5-AddressBook/Makefile
index f11192654493..03424152ffc2 100644
--- a/net/p5-AddressBook/Makefile
+++ b/net/p5-AddressBook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AddressBook
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DLEIGH
diff --git a/net/p5-AddressBook/pkg-plist b/net/p5-AddressBook/pkg-plist
index f7d01fed9c48..9976d7e37e1f 100644
--- a/net/p5-AddressBook/pkg-plist
+++ b/net/p5-AddressBook/pkg-plist
@@ -18,7 +18,3 @@
 %%SITE_PERL%%/AddressBook/DB/PDB.pm
 %%SITE_PERL%%/AddressBook/DB/Text.pm
 %%SITE_PERL%%/AddressBook/Entry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AddressBook/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AddressBook
-@dirrmtry %%SITE_PERL%%/AddressBook/DB
-@dirrmtry %%SITE_PERL%%/AddressBook
diff --git a/net/p5-Amazon-SQS-Simple/Makefile b/net/p5-Amazon-SQS-Simple/Makefile
index 328e887e2807..550459e47e64 100644
--- a/net/p5-Amazon-SQS-Simple/Makefile
+++ b/net/p5-Amazon-SQS-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Amazon-SQS-Simple
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SWHITAKER
diff --git a/net/p5-Amazon-SQS-Simple/pkg-plist b/net/p5-Amazon-SQS-Simple/pkg-plist
index 9b70e39c2bf2..1a2d72b80a0e 100644
--- a/net/p5-Amazon-SQS-Simple/pkg-plist
+++ b/net/p5-Amazon-SQS-Simple/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SQS/Simple/.packlist
 %%SITE_PERL%%/Amazon/SQS/Simple.pm
 %%SITE_PERL%%/Amazon/SQS/Simple/Base.pm
 %%SITE_PERL%%/Amazon/SQS/Simple/Message.pm
@@ -9,12 +8,3 @@
 %%PERL5_MAN3%%/Amazon::SQS::Simple::Message.3.gz
 %%PERL5_MAN3%%/Amazon::SQS::Simple::Queue.3.gz
 %%PERL5_MAN3%%/Amazon::SQS::Simple::SendResponse.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SQS/Simple
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon/SQS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amazon
-@dirrm %%SITE_PERL%%/Amazon/SQS/Simple
-@dirrm %%SITE_PERL%%/Amazon/SQS
-@dirrm %%SITE_PERL%%/Amazon
-@dirrmtry %%SITE_PERL%%/Amazon/SQS/Simple
-@dirrmtry %%SITE_PERL%%/Amazon/SQS
-@dirrmtry %%SITE_PERL%%/Amazon
diff --git a/net/p5-AnyEvent-MPRPC/Makefile b/net/p5-AnyEvent-MPRPC/Makefile
index 689b61120a02..187f081ff18a 100644
--- a/net/p5-AnyEvent-MPRPC/Makefile
+++ b/net/p5-AnyEvent-MPRPC/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-MPRPC
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-AnyEvent-MPRPC/pkg-plist b/net/p5-AnyEvent-MPRPC/pkg-plist
index cfba81e1a4d0..88d6c84b6b4b 100644
--- a/net/p5-AnyEvent-MPRPC/pkg-plist
+++ b/net/p5-AnyEvent-MPRPC/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/MPRPC/.packlist
 %%SITE_PERL%%/AnyEvent/MPRPC.pm
 %%SITE_PERL%%/AnyEvent/MPRPC/Client.pm
 %%SITE_PERL%%/AnyEvent/MPRPC/CondVar.pm
@@ -8,6 +7,3 @@
 %%PERL5_MAN3%%/AnyEvent::MPRPC::Client.3.gz
 %%PERL5_MAN3%%/AnyEvent::MPRPC::CondVar.3.gz
 %%PERL5_MAN3%%/AnyEvent::MPRPC::Server.3.gz
-@dirrm %%SITE_PERL%%/AnyEvent/MPRPC
-@dirrmtry %%SITE_PERL%%/AnyEvent
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/MPRPC
diff --git a/net/p5-AnyEvent-RabbitMQ/Makefile b/net/p5-AnyEvent-RabbitMQ/Makefile
index 5ccef0fef33a..15c92cd04c7f 100644
--- a/net/p5-AnyEvent-RabbitMQ/Makefile
+++ b/net/p5-AnyEvent-RabbitMQ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-RabbitMQ
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/net/p5-AnyEvent-RabbitMQ/pkg-plist b/net/p5-AnyEvent-RabbitMQ/pkg-plist
index 5108f171383a..569e5b8fb6b4 100644
--- a/net/p5-AnyEvent-RabbitMQ/pkg-plist
+++ b/net/p5-AnyEvent-RabbitMQ/pkg-plist
@@ -6,11 +6,3 @@
 %%SITE_PERL%%/auto/share/dist/AnyEvent-RabbitMQ/README
 %%SITE_PERL%%/auto/share/dist/AnyEvent-RabbitMQ/fixed_amqp0-8.xml
 %%SITE_PERL%%/auto/share/dist/AnyEvent-RabbitMQ/fixed_amqp0-9-1.xml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/RabbitMQ/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/RabbitMQ
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
-@dirrmtry %%SITE_PERL%%/auto/share/dist/AnyEvent-RabbitMQ
-@dirrmtry %%SITE_PERL%%/auto/share/dist
-@dirrmtry %%SITE_PERL%%/auto/share
-@dirrmtry %%SITE_PERL%%/AnyEvent/RabbitMQ
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/net/p5-AnyEvent-Twitter-Stream/Makefile b/net/p5-AnyEvent-Twitter-Stream/Makefile
index 2b1ada1c1226..1f744ba329c4 100644
--- a/net/p5-AnyEvent-Twitter-Stream/Makefile
+++ b/net/p5-AnyEvent-Twitter-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Twitter-Stream
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-AnyEvent-Twitter-Stream/pkg-plist b/net/p5-AnyEvent-Twitter-Stream/pkg-plist
index cc0670c9abfc..576478532d98 100644
--- a/net/p5-AnyEvent-Twitter-Stream/pkg-plist
+++ b/net/p5-AnyEvent-Twitter-Stream/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/AnyEvent/Twitter/Stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Twitter/Stream/.packlist
 %%PERL5_MAN3%%/AnyEvent::Twitter::Stream.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Twitter/Stream
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Twitter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
-@dirrmtry %%SITE_PERL%%/AnyEvent/Twitter
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/net/p5-AnyEvent-Twitter/Makefile b/net/p5-AnyEvent-Twitter/Makefile
index 0781ad33b6d0..f804cb60a68e 100644
--- a/net/p5-AnyEvent-Twitter/Makefile
+++ b/net/p5-AnyEvent-Twitter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-Twitter
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-AnyEvent-Twitter/pkg-plist b/net/p5-AnyEvent-Twitter/pkg-plist
index db67f6b969cf..565c7b425c88 100644
--- a/net/p5-AnyEvent-Twitter/pkg-plist
+++ b/net/p5-AnyEvent-Twitter/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/AnyEvent::Twitter.3.gz
 %%SITE_PERL%%/AnyEvent/Twitter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Twitter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Twitter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/net/p5-AnyMQ-AMQP/Makefile b/net/p5-AnyMQ-AMQP/Makefile
index dfe79cb8b9dc..bbc144a48c03 100644
--- a/net/p5-AnyMQ-AMQP/Makefile
+++ b/net/p5-AnyMQ-AMQP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyMQ-AMQP
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
diff --git a/net/p5-AnyMQ-AMQP/pkg-plist b/net/p5-AnyMQ-AMQP/pkg-plist
index f8b64bfd2851..a21397ec916a 100644
--- a/net/p5-AnyMQ-AMQP/pkg-plist
+++ b/net/p5-AnyMQ-AMQP/pkg-plist
@@ -2,10 +2,3 @@
 %%SITE_PERL%%/AnyMQ/AMQP.pm
 %%SITE_PERL%%/AnyMQ/Topic/Trait/AMQP.pm
 %%SITE_PERL%%/AnyMQ/Trait/AMQP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyMQ/AMQP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyMQ/AMQP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyMQ
-@dirrmtry %%SITE_PERL%%/AnyMQ/Trait
-@dirrmtry %%SITE_PERL%%/AnyMQ/Topic/Trait
-@dirrmtry %%SITE_PERL%%/AnyMQ/Topic
-@dirrmtry %%SITE_PERL%%/AnyMQ
diff --git a/net/p5-Apache2-SOAP/Makefile b/net/p5-Apache2-SOAP/Makefile
index 53207049a520..558dd9a8f1cd 100644
--- a/net/p5-Apache2-SOAP/Makefile
+++ b/net/p5-Apache2-SOAP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache2-SOAP
 PORTVERSION=	0.73
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Apache2-SOAP/pkg-plist b/net/p5-Apache2-SOAP/pkg-plist
index 1c3c70495d68..7b2dba05fda4 100644
--- a/net/p5-Apache2-SOAP/pkg-plist
+++ b/net/p5-Apache2-SOAP/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Apache2/SOAP.pm
 %%SITE_PERL%%/SOAP/Transport/HTTP2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SOAP/.packlist
 %%PERL5_MAN3%%/Apache2::SOAP.3.gz
-@dirrmtry %%SITE_PERL%%/Apache2
-@dirrmtry %%SITE_PERL%%/SOAP/Transport
-@dirrmtry %%SITE_PERL%%/SOAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SOAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2
diff --git a/net/p5-BBS-Client/Makefile b/net/p5-BBS-Client/Makefile
index cdd5fdd692b9..64bf7b188fce 100644
--- a/net/p5-BBS-Client/Makefile
+++ b/net/p5-BBS-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BBS-Client
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CORNELIUS
diff --git a/net/p5-BBS-Client/pkg-plist b/net/p5-BBS-Client/pkg-plist
index 636a28e413ca..7c8a360a4d85 100644
--- a/net/p5-BBS-Client/pkg-plist
+++ b/net/p5-BBS-Client/pkg-plist
@@ -3,8 +3,3 @@ bin/bbs_listen.pl
 %%PERL5_MAN3%%/BBS::Client.3.gz
 %%SITE_PERL%%/BBS/Client.pm
 %%SITE_PERL%%/BBS/Client/Scheme.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/Client/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS
-@dirrmtry %%SITE_PERL%%/BBS/Client
-@dirrmtry %%SITE_PERL%%/BBS
diff --git a/net/p5-BBS-UserInfo-Maple3/Makefile b/net/p5-BBS-UserInfo-Maple3/Makefile
index 5cb0e0968ff4..33a1affc74e4 100644
--- a/net/p5-BBS-UserInfo-Maple3/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BBS-UserInfo-Maple3
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSLIN
diff --git a/net/p5-BBS-UserInfo-Maple3/pkg-plist b/net/p5-BBS-UserInfo-Maple3/pkg-plist
index dab7abe4e4af..5f1547efed76 100644
--- a/net/p5-BBS-UserInfo-Maple3/pkg-plist
+++ b/net/p5-BBS-UserInfo-Maple3/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/BBS/UserInfo/Maple3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Maple3/.packlist
 %%PERL5_MAN3%%/BBS::UserInfo::Maple3.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Maple3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS
-@dirrmtry %%SITE_PERL%%/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/BBS
diff --git a/net/p5-BBS-UserInfo-Maple3itoc/Makefile b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
index 1c6ca572a732..213f7d5c1aaa 100644
--- a/net/p5-BBS-UserInfo-Maple3itoc/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BBS-UserInfo-Maple3itoc
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSLIN
diff --git a/net/p5-BBS-UserInfo-Maple3itoc/pkg-plist b/net/p5-BBS-UserInfo-Maple3itoc/pkg-plist
index dd7a669429a1..83e4bf53ed12 100644
--- a/net/p5-BBS-UserInfo-Maple3itoc/pkg-plist
+++ b/net/p5-BBS-UserInfo-Maple3itoc/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/BBS/UserInfo/Maple3itoc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Maple3itoc/.packlist
 %%PERL5_MAN3%%/BBS::UserInfo::Maple3itoc.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Maple3itoc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS
-@dirrmtry %%SITE_PERL%%/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/BBS
diff --git a/net/p5-BBS-UserInfo-Ptt/Makefile b/net/p5-BBS-UserInfo-Ptt/Makefile
index 7f1cad59e3fe..c41147247460 100644
--- a/net/p5-BBS-UserInfo-Ptt/Makefile
+++ b/net/p5-BBS-UserInfo-Ptt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BBS-UserInfo-Ptt
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSLIN
diff --git a/net/p5-BBS-UserInfo-Ptt/pkg-plist b/net/p5-BBS-UserInfo-Ptt/pkg-plist
index 18bf6e5fabf4..85c6ac8cfe36 100644
--- a/net/p5-BBS-UserInfo-Ptt/pkg-plist
+++ b/net/p5-BBS-UserInfo-Ptt/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/BBS/UserInfo/Ptt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Ptt/.packlist
 %%PERL5_MAN3%%/BBS::UserInfo::Ptt.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Ptt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS
-@dirrmtry %%SITE_PERL%%/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/BBS
diff --git a/net/p5-BBS-UserInfo-SOB/Makefile b/net/p5-BBS-UserInfo-SOB/Makefile
index 41f6426c9943..a6627c0df0fd 100644
--- a/net/p5-BBS-UserInfo-SOB/Makefile
+++ b/net/p5-BBS-UserInfo-SOB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BBS-UserInfo-SOB
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSLIN
diff --git a/net/p5-BBS-UserInfo-SOB/pkg-plist b/net/p5-BBS-UserInfo-SOB/pkg-plist
index 73bca8a5681e..95c21cac8584 100644
--- a/net/p5-BBS-UserInfo-SOB/pkg-plist
+++ b/net/p5-BBS-UserInfo-SOB/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/BBS/UserInfo/SOB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/SOB/.packlist
 %%PERL5_MAN3%%/BBS::UserInfo::SOB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/SOB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS
-@dirrmtry %%SITE_PERL%%/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/BBS
diff --git a/net/p5-BBS-UserInfo-Wretch/Makefile b/net/p5-BBS-UserInfo-Wretch/Makefile
index f5ba839160c2..6bd1795188bc 100644
--- a/net/p5-BBS-UserInfo-Wretch/Makefile
+++ b/net/p5-BBS-UserInfo-Wretch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BBS-UserInfo-Wretch
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSLIN
diff --git a/net/p5-BBS-UserInfo-Wretch/pkg-plist b/net/p5-BBS-UserInfo-Wretch/pkg-plist
index 1583f900a191..b1dd6d64903b 100644
--- a/net/p5-BBS-UserInfo-Wretch/pkg-plist
+++ b/net/p5-BBS-UserInfo-Wretch/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/BBS/UserInfo/Wretch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Wretch/.packlist
 %%PERL5_MAN3%%/BBS::UserInfo::Wretch.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/Wretch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS
-@dirrmtry %%SITE_PERL%%/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/BBS
diff --git a/net/p5-BBS-UserInfo/Makefile b/net/p5-BBS-UserInfo/Makefile
index 1f5980cbfb24..df95678a0274 100644
--- a/net/p5-BBS-UserInfo/Makefile
+++ b/net/p5-BBS-UserInfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BBS-UserInfo
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSLIN
diff --git a/net/p5-BBS-UserInfo/pkg-plist b/net/p5-BBS-UserInfo/pkg-plist
index cf1c609ae68e..8fb634a35690 100644
--- a/net/p5-BBS-UserInfo/pkg-plist
+++ b/net/p5-BBS-UserInfo/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/BBS/UserInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo/.packlist
 %%PERL5_MAN3%%/BBS::UserInfo.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS/UserInfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BBS
-@dirrmtry %%SITE_PERL%%/BBS
diff --git a/net/p5-Beanstalk-Client/Makefile b/net/p5-Beanstalk-Client/Makefile
index 4dc709577bd3..680ba8ffea68 100644
--- a/net/p5-Beanstalk-Client/Makefile
+++ b/net/p5-Beanstalk-Client/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Beanstalk-Client
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GBARR
diff --git a/net/p5-Beanstalk-Client/pkg-plist b/net/p5-Beanstalk-Client/pkg-plist
index 72635709367a..2cf275100436 100644
--- a/net/p5-Beanstalk-Client/pkg-plist
+++ b/net/p5-Beanstalk-Client/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Beanstalk/Client/.packlist
 %%SITE_PERL%%/Beanstalk/Client.pm
 %%SITE_PERL%%/Beanstalk/Job.pm
 %%SITE_PERL%%/Beanstalk/Pool.pm
@@ -7,6 +6,3 @@
 %%PERL5_MAN3%%/Beanstalk::Pool.3.gz
 %%PERL5_MAN3%%/Beanstalk::Stats.3.gz
 %%PERL5_MAN3%%/Beanstalk::Job.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Beanstalk/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Beanstalk
-@dirrmtry %%SITE_PERL%%/Beanstalk
diff --git a/net/p5-Cisco-IPPhone/Makefile b/net/p5-Cisco-IPPhone/Makefile
index 279c0f0c6ae6..da823042a2df 100644
--- a/net/p5-Cisco-IPPhone/Makefile
+++ b/net/p5-Cisco-IPPhone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cisco-IPPhone
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Cisco-IPPhone/pkg-plist b/net/p5-Cisco-IPPhone/pkg-plist
index bf87ff5bf255..b8c26e71b13f 100644
--- a/net/p5-Cisco-IPPhone/pkg-plist
+++ b/net/p5-Cisco-IPPhone/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/IPPhone/.packlist
 %%SITE_PERL%%/Cisco/IPPhone.pm
 %%PERL5_MAN3%%/Cisco::IPPhone.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/IPPhone
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco
-@dirrmtry %%SITE_PERL%%/Cisco
diff --git a/net/p5-Crypt-DH-GMP/Makefile b/net/p5-Crypt-DH-GMP/Makefile
index a2bfe9e9f107..fc896908c270 100644
--- a/net/p5-Crypt-DH-GMP/Makefile
+++ b/net/p5-Crypt-DH-GMP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-DH-GMP
 PORTVERSION=	0.00012
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Crypt-DH-GMP/pkg-plist b/net/p5-Crypt-DH-GMP/pkg-plist
index 551bb4559c81..7cbdf34634c5 100644
--- a/net/p5-Crypt-DH-GMP/pkg-plist
+++ b/net/p5-Crypt-DH-GMP/pkg-plist
@@ -1,12 +1,5 @@
 %%PERL5_MAN3%%/Crypt::DH::GMP.3.gz
 %%PERL5_MAN3%%/Crypt::DH::GMP::Compat.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DH/GMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DH/GMP/Compat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DH/GMP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DH/GMP/GMP.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DH/GMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DH/GMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/DH/GMP.pm
+%%SITE_ARCH%%/Crypt/DH/GMP/Compat.pm
+%%SITE_ARCH%%/auto/Crypt/DH/GMP/GMP.so
diff --git a/net/p5-Daemon-Generic/Makefile b/net/p5-Daemon-Generic/Makefile
index 00f5654ba5b5..3463807b86f6 100644
--- a/net/p5-Daemon-Generic/Makefile
+++ b/net/p5-Daemon-Generic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Daemon-Generic
 PORTVERSION=	0.84
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Daemon-Generic/pkg-plist b/net/p5-Daemon-Generic/pkg-plist
index 367b45eced2d..b86fbf430c2d 100644
--- a/net/p5-Daemon-Generic/pkg-plist
+++ b/net/p5-Daemon-Generic/pkg-plist
@@ -3,12 +3,7 @@
 %%SITE_PERL%%/Daemon/Generic/AnyEvent.pm
 %%SITE_PERL%%/Daemon/Generic/Event.pm
 %%SITE_PERL%%/Daemon/Generic/While1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Daemon/Generic/.packlist
 %%PERL5_MAN3%%/Daemon::Generic.3.gz
 %%PERL5_MAN3%%/Daemon::Generic::Event.3.gz
 %%PERL5_MAN3%%/Daemon::Generic::While1.3.gz
 %%PERL5_MAN3%%/Daemon::Generic::AnyEvent.3.gz
-@dirrm %%SITE_PERL%%/Daemon/Generic
-@dirrmtry %%SITE_PERL%%/Daemon
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Daemon/Generic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Daemon
diff --git a/net/p5-Data-IPV4-Range-Parse/Makefile b/net/p5-Data-IPV4-Range-Parse/Makefile
index b586a564f13d..402554a85ec1 100644
--- a/net/p5-Data-IPV4-Range-Parse/Makefile
+++ b/net/p5-Data-IPV4-Range-Parse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-IPV4-Range-Parse
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Data-IPV4-Range-Parse/pkg-plist b/net/p5-Data-IPV4-Range-Parse/pkg-plist
index 24f3811601c7..f5b10f2e2d49 100644
--- a/net/p5-Data-IPV4-Range-Parse/pkg-plist
+++ b/net/p5-Data-IPV4-Range-Parse/pkg-plist
@@ -1,11 +1,3 @@
 %%SITE_PERL%%/Data/IPV4/Range/Parse.pm
 %%SITE_PERL%%/Data/IPV4/Range/Parse.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/IPV4/Range/Parse/.packlist
 %%PERL5_MAN3%%/Data::IPV4::Range::Parse.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/IPV4/Range/Parse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/IPV4/Range
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/IPV4
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data/IPV4/Range
-@dirrmtry %%SITE_PERL%%/Data/IPV4
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/net/p5-EasyTCP/Makefile b/net/p5-EasyTCP/Makefile
index 291bc33e1a19..bad96a78d324 100644
--- a/net/p5-EasyTCP/Makefile
+++ b/net/p5-EasyTCP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	EasyTCP
 PORTVERSION=	0.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MNAGUIB
diff --git a/net/p5-EasyTCP/pkg-plist b/net/p5-EasyTCP/pkg-plist
index 1b86bfb91cc7..c3ee637e579f 100644
--- a/net/p5-EasyTCP/pkg-plist
+++ b/net/p5-EasyTCP/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::EasyTCP.3.gz
 %%SITE_PERL%%/Net/EasyTCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Event-tcp/Makefile b/net/p5-Event-tcp/Makefile
index 4e498ebf3865..a76da713ca5d 100644
--- a/net/p5-Event-tcp/Makefile
+++ b/net/p5-Event-tcp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Event-tcp
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Event-tcp/pkg-plist b/net/p5-Event-tcp/pkg-plist
index 2153f2f6132b..3d63eb256a6b 100644
--- a/net/p5-Event-tcp/pkg-plist
+++ b/net/p5-Event-tcp/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Event::tcpsession.3.gz
 %%SITE_PERL%%/Event/tcplisten.pm
 %%SITE_PERL%%/Event/tcpsession.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/tcp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/tcp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Event
-@dirrmtry %%SITE_PERL%%/Event
diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile
index e5644bb6ff69..72e199a55f62 100644
--- a/net/p5-File-Rsync/Makefile
+++ b/net/p5-File-Rsync/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Rsync
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-File-Rsync/pkg-plist b/net/p5-File-Rsync/pkg-plist
index 8eb91cbba8b5..a76c47d154a5 100644
--- a/net/p5-File-Rsync/pkg-plist
+++ b/net/p5-File-Rsync/pkg-plist
@@ -1,8 +1,3 @@
 %%PERL5_MAN3%%/File::Rsync.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Rsync.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/Rsync/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Rsync/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Rsync
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File/Rsync
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
+%%SITE_ARCH%%/File/Rsync.pm
+%%SITE_ARCH%%/File/Rsync/Config.pm
diff --git a/net/p5-File-RsyncP/Makefile b/net/p5-File-RsyncP/Makefile
index 8ebec5698467..ce50033b9b39 100644
--- a/net/p5-File-RsyncP/Makefile
+++ b/net/p5-File-RsyncP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-RsyncP
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-File-RsyncP/pkg-plist b/net/p5-File-RsyncP/pkg-plist
index 3426204182f0..3a6998313799 100644
--- a/net/p5-File-RsyncP/pkg-plist
+++ b/net/p5-File-RsyncP/pkg-plist
@@ -1,19 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP/Digest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP/FileIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP/FileList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/Digest/Digest.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/Digest/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList/FileList.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/.packlist
+%%SITE_ARCH%%/File/RsyncP.pm
+%%SITE_ARCH%%/File/RsyncP/Digest.pm
+%%SITE_ARCH%%/File/RsyncP/FileIO.pm
+%%SITE_ARCH%%/File/RsyncP/FileList.pm
+%%SITE_ARCH%%/auto/File/RsyncP/Digest/Digest.so
+%%SITE_ARCH%%/auto/File/RsyncP/Digest/autosplit.ix
+%%SITE_ARCH%%/auto/File/RsyncP/FileList/FileList.so
+%%SITE_ARCH%%/auto/File/RsyncP/FileList/autosplit.ix
 %%PERL5_MAN3%%/File::RsyncP.3.gz
 %%PERL5_MAN3%%/File::RsyncP::Digest.3.gz
 %%PERL5_MAN3%%/File::RsyncP::FileIO.3.gz
 %%PERL5_MAN3%%/File::RsyncP::FileList.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
diff --git a/net/p5-Filesys-SmbClient/Makefile b/net/p5-Filesys-SmbClient/Makefile
index 8476b41c5015..55fa4edf2d65 100644
--- a/net/p5-Filesys-SmbClient/Makefile
+++ b/net/p5-Filesys-SmbClient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-SmbClient
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Filesys-SmbClient/pkg-plist b/net/p5-Filesys-SmbClient/pkg-plist
index 50ff155d1c2b..ba608967cf7a 100644
--- a/net/p5-Filesys-SmbClient/pkg-plist
+++ b/net/p5-Filesys-SmbClient/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient/SmbClient.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Filesys/SmbClient.pm
+%%SITE_ARCH%%/auto/Filesys/SmbClient/SmbClient.so
+%%SITE_ARCH%%/auto/Filesys/SmbClient/autosplit.ix
+%%SITE_ARCH%%/Filesys/SmbClient.pm
 %%PERL5_MAN3%%/Filesys::SmbClient.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filesys
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index cb60511ffffd..f5dda7672e2c 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Frontier-RPC
 PORTVERSION=	0.07.b4
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN \
 		http://bitsko.slc.ut.us/~ken/xml-rpc/
diff --git a/net/p5-Frontier-RPC/pkg-plist b/net/p5-Frontier-RPC/pkg-plist
index 7359fabb64f0..7e3c1a7254fe 100644
--- a/net/p5-Frontier-RPC/pkg-plist
+++ b/net/p5-Frontier-RPC/pkg-plist
@@ -8,8 +8,3 @@
 %%SITE_PERL%%/Frontier/Daemon.pm
 %%SITE_PERL%%/Frontier/RPC2.pm
 %%SITE_PERL%%/Frontier/Responder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier/RPC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier/RPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier
-@dirrmtry %%SITE_PERL%%/Frontier
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/net/p5-Geo-IP-PurePerl/Makefile b/net/p5-Geo-IP-PurePerl/Makefile
index c7a5a9ea199b..3dfe2dbcdb82 100644
--- a/net/p5-Geo-IP-PurePerl/Makefile
+++ b/net/p5-Geo-IP-PurePerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-IP-PurePerl
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Geo-IP-PurePerl/pkg-plist b/net/p5-Geo-IP-PurePerl/pkg-plist
index ed351639cfb2..7ce2b0997d5d 100644
--- a/net/p5-Geo-IP-PurePerl/pkg-plist
+++ b/net/p5-Geo-IP-PurePerl/pkg-plist
@@ -1,10 +1,4 @@
 bin/geoip-lookup
 %%PERL5_MAN3%%/Geo::IP::PurePerl.3.gz
 %%SITE_PERL%%/Geo/IP/PurePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IP/PurePerl/.packlist
 man/man1/geoip-lookup.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IP/PurePerl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/IP
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/net/p5-Geo-IP/Makefile b/net/p5-Geo-IP/Makefile
index 6275a3863fca..d99fb1932a57 100644
--- a/net/p5-Geo-IP/Makefile
+++ b/net/p5-Geo-IP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Geo-IP
 PORTVERSION=	1.43
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Geo-IP/pkg-plist b/net/p5-Geo-IP/pkg-plist
index 8884b7fd7b78..ebf5fac028de 100644
--- a/net/p5-Geo-IP/pkg-plist
+++ b/net/p5-Geo-IP/pkg-plist
@@ -1,13 +1,8 @@
 %%PERL5_MAN3%%/Geo::IP.3.gz
 %%PERL5_MAN3%%/Geo::IP::Record.3.gz
 %%PERL5_MAN3%%/Geo::Mirror.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/IP/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/IP/Record.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/Mirror.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IP/IP.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Geo/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Geo
+%%SITE_ARCH%%/Geo/IP.pm
+%%SITE_ARCH%%/Geo/IP/Record.pm
+%%SITE_ARCH%%/Geo/IP/Record.pod
+%%SITE_ARCH%%/Geo/Mirror.pm
+%%SITE_ARCH%%/auto/Geo/IP/IP.so
diff --git a/net/p5-Geo-IPfree/Makefile b/net/p5-Geo-IPfree/Makefile
index 0bf87b4196ce..4c047e63b951 100644
--- a/net/p5-Geo-IPfree/Makefile
+++ b/net/p5-Geo-IPfree/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Geo-IPfree
 PORTVERSION=	1.131650
+PORTREVISION=	1
 CATEGORIES=	net perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Geo-IPfree/pkg-plist b/net/p5-Geo-IPfree/pkg-plist
index c5d3058a0728..efe745987e63 100644
--- a/net/p5-Geo-IPfree/pkg-plist
+++ b/net/p5-Geo-IPfree/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IPfree/.packlist
 %%SITE_PERL%%/Geo/IPfree.pm
 %%SITE_PERL%%/Geo/ipscountry.dat
 %%PERL5_MAN3%%/Geo::IPfree.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IPfree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/net/p5-GeoIP2/Makefile b/net/p5-GeoIP2/Makefile
index 800379ac3561..6eb979c7e7bd 100644
--- a/net/p5-GeoIP2/Makefile
+++ b/net/p5-GeoIP2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GeoIP2
 PORTVERSION=	2.001000
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAXMIND
diff --git a/net/p5-GeoIP2/pkg-plist b/net/p5-GeoIP2/pkg-plist
index 3b5863c2ee2f..0a6458e51779 100644
--- a/net/p5-GeoIP2/pkg-plist
+++ b/net/p5-GeoIP2/pkg-plist
@@ -33,7 +33,6 @@ bin/web-service-request
 %%SITE_PERL%%/GeoIP2/Role/Record/HasNames.pm
 %%SITE_PERL%%/GeoIP2/Types.pm
 %%SITE_PERL%%/GeoIP2/WebService/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GeoIP2/.packlist
 %%PERL5_MAN3%%/GeoIP2.3.gz
 %%PERL5_MAN3%%/GeoIP2::Database::Reader.3.gz
 %%PERL5_MAN3%%/GeoIP2::Error::Generic.3.gz
diff --git a/net/p5-Google-SAML-Request/Makefile b/net/p5-Google-SAML-Request/Makefile
index ffd7c9b65fcd..6c4f29ec5f25 100644
--- a/net/p5-Google-SAML-Request/Makefile
+++ b/net/p5-Google-SAML-Request/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Google-SAML-Request
 PORTVERSION=	0.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Google-SAML-Request/pkg-plist b/net/p5-Google-SAML-Request/pkg-plist
index 48423623b622..d3af50389aa7 100644
--- a/net/p5-Google-SAML-Request/pkg-plist
+++ b/net/p5-Google-SAML-Request/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Google::SAML::Request.3.gz
 %%SITE_PERL%%/Google/SAML/Request.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/SAML/Request/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/SAML/Request
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/SAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google
-@dirrmtry %%SITE_PERL%%/Google/SAML
-@dirrmtry %%SITE_PERL%%/Google
diff --git a/net/p5-Google-SAML-Response/Makefile b/net/p5-Google-SAML-Response/Makefile
index cc4a7fba1b79..8e8401ead3a8 100644
--- a/net/p5-Google-SAML-Response/Makefile
+++ b/net/p5-Google-SAML-Response/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Google-SAML-Response
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Google-SAML-Response/pkg-plist b/net/p5-Google-SAML-Response/pkg-plist
index ecbcc4946160..c144d750a5e4 100644
--- a/net/p5-Google-SAML-Response/pkg-plist
+++ b/net/p5-Google-SAML-Response/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Google::SAML::Response.3.gz
 %%SITE_PERL%%/Google/SAML/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/SAML/Response/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/SAML/Response
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/SAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google
-@dirrmtry %%SITE_PERL%%/Google/SAML
-@dirrmtry %%SITE_PERL%%/Google
diff --git a/net/p5-Growl-GNTP/Makefile b/net/p5-Growl-GNTP/Makefile
index 37d931077dab..7622d8ffcbca 100644
--- a/net/p5-Growl-GNTP/Makefile
+++ b/net/p5-Growl-GNTP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Growl-GNTP
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Growl-GNTP/pkg-plist b/net/p5-Growl-GNTP/pkg-plist
index 25e325aeede5..603bd6993521 100644
--- a/net/p5-Growl-GNTP/pkg-plist
+++ b/net/p5-Growl-GNTP/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Growl::GNTP.3.gz
 %%SITE_PERL%%/Growl/GNTP.pm
-@dirrmtry %%SITE_PERL%%/Growl
diff --git a/net/p5-IO-Interface/Makefile b/net/p5-IO-Interface/Makefile
index 13b4e8009cc6..460a90c663e6 100644
--- a/net/p5-IO-Interface/Makefile
+++ b/net/p5-IO-Interface/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IO-Interface
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-IO-Interface/pkg-plist b/net/p5-IO-Interface/pkg-plist
index eb2a15696966..3d5342c19b71 100644
--- a/net/p5-IO-Interface/pkg-plist
+++ b/net/p5-IO-Interface/pkg-plist
@@ -1,11 +1,6 @@
 %%PERL5_MAN3%%/IO::Interface.3.gz
 %%PERL5_MAN3%%/IO::Interface::Simple.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/Interface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/Interface/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Interface
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
+%%SITE_ARCH%%/IO/Interface.pm
+%%SITE_ARCH%%/IO/Interface/Simple.pm
+%%SITE_ARCH%%/auto/IO/Interface/Interface.so
+%%SITE_ARCH%%/auto/IO/Interface/autosplit.ix
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
index 37d58a85f0bf..b19babea995a 100644
--- a/net/p5-IO-Socket-INET6/Makefile
+++ b/net/p5-IO-Socket-INET6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Socket-INET6
 PORTVERSION=	2.69
+PORTREVISION=	1
 CATEGORIES=	net perl5 ipv6
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SHLOMIF
diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist
index c22b9e3b4518..2ac9f7351873 100644
--- a/net/p5-IO-Socket-INET6/pkg-plist
+++ b/net/p5-IO-Socket-INET6/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/IO/Socket/INET6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
 %%PERL5_MAN3%%/IO::Socket::INET6.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
-@dirrmtry %%SITE_PERL%%/IO/Socket
-@dirrmtry %%SITE_PERL%%/IO
diff --git a/net/p5-IO-Socket-IP/Makefile b/net/p5-IO-Socket-IP/Makefile
index 627da3bbec2c..3e28369f44c8 100644
--- a/net/p5-IO-Socket-IP/Makefile
+++ b/net/p5-IO-Socket-IP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Socket-IP
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	net ipv6 perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-IO-Socket-IP/pkg-plist b/net/p5-IO-Socket-IP/pkg-plist
index e5916a39fb87..0a7cc258596e 100644
--- a/net/p5-IO-Socket-IP/pkg-plist
+++ b/net/p5-IO-Socket-IP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/IO/Socket/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/IP/.packlist
 %%PERL5_MAN3%%/IO::Socket::IP.3.gz
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index a9e144a87bec..b1e267f34d2d 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Socket-Multicast
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-IO-Socket-Multicast/pkg-plist b/net/p5-IO-Socket-Multicast/pkg-plist
index cbe8150b00ed..3b5bad57f958 100644
--- a/net/p5-IO-Socket-Multicast/pkg-plist
+++ b/net/p5-IO-Socket-Multicast/pkg-plist
@@ -1,12 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket/Multicast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.so
+%%SITE_ARCH%%/IO/Socket/Multicast.pm
+%%SITE_ARCH%%/auto/IO/Socket/Multicast/Multicast.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/client.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.pl
 %%PERL5_MAN3%%/IO::Socket::Multicast.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net/p5-IO-Socket-Multicast6/Makefile b/net/p5-IO-Socket-Multicast6/Makefile
index a2e9fafa40a4..0ceb977ae00c 100644
--- a/net/p5-IO-Socket-Multicast6/Makefile
+++ b/net/p5-IO-Socket-Multicast6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IO-Socket-Multicast6
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-IO-Socket-Multicast6/pkg-plist b/net/p5-IO-Socket-Multicast6/pkg-plist
index e23360b48ef8..e350f57c965f 100644
--- a/net/p5-IO-Socket-Multicast6/pkg-plist
+++ b/net/p5-IO-Socket-Multicast6/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/IO/Socket/Multicast6.pm
 %%PERL5_MAN3%%/IO::Socket::Multicast6.3.gz
-@dirrmtry %%SITE_PERL%%/IO/Socket
-@dirrmtry %%SITE_PERL%%/IO
diff --git a/net/p5-IP-Anonymous/Makefile b/net/p5-IP-Anonymous/Makefile
index 48f6c3108648..246df2745090 100644
--- a/net/p5-IP-Anonymous/Makefile
+++ b/net/p5-IP-Anonymous/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IP-Anonymous
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-IP-Anonymous/pkg-plist b/net/p5-IP-Anonymous/pkg-plist
index 8011cb1932f5..2d08ce44be54 100644
--- a/net/p5-IP-Anonymous/pkg-plist
+++ b/net/p5-IP-Anonymous/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/IP/Anonymous.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IP/Anonymous/.packlist
 %%PERL5_MAN3%%/IP::Anonymous.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IP/Anonymous
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/IP
diff --git a/net/p5-IP-Country/Makefile b/net/p5-IP-Country/Makefile
index 99db1b61c8ae..c79ebd128928 100644
--- a/net/p5-IP-Country/Makefile
+++ b/net/p5-IP-Country/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IP-Country
 PORTVERSION=	2.28
+PORTREVISION=	1
 CATEGORIES=	net perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-IP-Country/pkg-plist b/net/p5-IP-Country/pkg-plist
index 9b64500c94c1..eb459e168735 100644
--- a/net/p5-IP-Country/pkg-plist
+++ b/net/p5-IP-Country/pkg-plist
@@ -16,10 +16,3 @@ man/man1/ip2cc.1.gz
 %%SITE_PERL%%/IP/Country/MaxMind.pm
 %%SITE_PERL%%/IP/Country/Medium.pm
 %%SITE_PERL%%/IP/Country/Slow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IP/Country/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IP/Country
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IP
-@dirrm %%SITE_PERL%%/IP/Country/Fast
-@dirrm %%SITE_PERL%%/IP/Country
-@dirrm %%SITE_PERL%%/IP/Authority
-@dirrmtry %%SITE_PERL%%/IP
diff --git a/net/p5-IPC-Session/Makefile b/net/p5-IPC-Session/Makefile
index 53e5777136be..ca2e351b75b1 100644
--- a/net/p5-IPC-Session/Makefile
+++ b/net/p5-IPC-Session/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IPC-Session
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-IPC-Session/pkg-plist b/net/p5-IPC-Session/pkg-plist
index 1a9cf7135cac..003fbadad215 100644
--- a/net/p5-IPC-Session/pkg-plist
+++ b/net/p5-IPC-Session/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Session/.packlist
 %%SITE_PERL%%/IPC/Session.pm
 %%PERL5_MAN3%%/IPC::Session.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
-@dirrmtry %%SITE_PERL%%/IPC
diff --git a/net/p5-JavaScript-RPC/Makefile b/net/p5-JavaScript-RPC/Makefile
index b4f1e3c97327..7ca8c84e278f 100644
--- a/net/p5-JavaScript-RPC/Makefile
+++ b/net/p5-JavaScript-RPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JavaScript-RPC
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-JavaScript-RPC/pkg-plist b/net/p5-JavaScript-RPC/pkg-plist
index aada130cf03c..f9a14dffb465 100644
--- a/net/p5-JavaScript-RPC/pkg-plist
+++ b/net/p5-JavaScript-RPC/pkg-plist
@@ -2,9 +2,3 @@
 %%PERL5_MAN3%%/JavaScript::RPC::Server::CGI.3.gz
 %%SITE_PERL%%/JavaScript/RPC.pm
 %%SITE_PERL%%/JavaScript/RPC/Server/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/RPC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/RPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
-@dirrmtry %%SITE_PERL%%/JavaScript/RPC/Server
-@dirrmtry %%SITE_PERL%%/JavaScript/RPC
-@dirrmtry %%SITE_PERL%%/JavaScript
diff --git a/net/p5-MaxMind-DB-Common/Makefile b/net/p5-MaxMind-DB-Common/Makefile
index b6dad75340c5..14f507aee9d2 100644
--- a/net/p5-MaxMind-DB-Common/Makefile
+++ b/net/p5-MaxMind-DB-Common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MaxMind-DB-Common
 PORTVERSION=	0.031003
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/net/p5-MaxMind-DB-Common/pkg-plist b/net/p5-MaxMind-DB-Common/pkg-plist
index dbe433e090df..79a2b4d3abde 100644
--- a/net/p5-MaxMind-DB-Common/pkg-plist
+++ b/net/p5-MaxMind-DB-Common/pkg-plist
@@ -4,16 +4,5 @@
 %%SITE_PERL%%/MaxMind/DB/Types.pm
 %%SITE_PERL%%/Test/MaxMind/DB/Common/Data.pm
 %%SITE_PERL%%/Test/MaxMind/DB/Common/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MaxMind/DB/Common/.packlist
 %%PERL5_MAN3%%/MaxMind::DB::Common.3.gz
 %%PERL5_MAN3%%/MaxMind::DB::Metadata.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MaxMind/DB/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MaxMind/DB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MaxMind
-@dirrm %%SITE_PERL%%/Test/MaxMind/DB/Common
-@dirrmtry %%SITE_PERL%%/Test/MaxMind/DB
-@dirrmtry %%SITE_PERL%%/Test/MaxMind
-@dirrmtry %%SITE_PERL%%/Test
-@dirrmtry %%SITE_PERL%%/MaxMind/DB/Role
-@dirrmtry %%SITE_PERL%%/MaxMind/DB
-@dirrmtry %%SITE_PERL%%/MaxMind
diff --git a/net/p5-MaxMind-DB-Reader/Makefile b/net/p5-MaxMind-DB-Reader/Makefile
index a6d256a6f598..29e7934c900f 100644
--- a/net/p5-MaxMind-DB-Reader/Makefile
+++ b/net/p5-MaxMind-DB-Reader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MaxMind-DB-Reader
 PORTVERSION=	1.000000
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAXMIND
diff --git a/net/p5-MaxMind-DB-Reader/pkg-plist b/net/p5-MaxMind-DB-Reader/pkg-plist
index d4f278431677..9c9e1a0f4434 100644
--- a/net/p5-MaxMind-DB-Reader/pkg-plist
+++ b/net/p5-MaxMind-DB-Reader/pkg-plist
@@ -13,5 +13,4 @@ bin/mmdb-verify-database
 %%SITE_PERL%%/MaxMind/DB/Reader/Role/Reader.pm
 %%SITE_PERL%%/MaxMind/DB/Reader/Role/Sysreader.pm
 %%SITE_PERL%%/MaxMind/DB/Verifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MaxMind/DB/Reader/.packlist
 %%PERL5_MAN3%%/MaxMind::DB::Reader.3.gz
diff --git a/net/p5-Net-AMQP/Makefile b/net/p5-Net-AMQP/Makefile
index a470b5670ea7..d5365f07e4a1 100644
--- a/net/p5-Net-AMQP/Makefile
+++ b/net/p5-Net-AMQP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-AMQP
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-AMQP/pkg-plist b/net/p5-Net-AMQP/pkg-plist
index a97e0896f6e0..f732ff08b6d2 100644
--- a/net/p5-Net-AMQP/pkg-plist
+++ b/net/p5-Net-AMQP/pkg-plist
@@ -28,7 +28,3 @@
 %%SITE_PERL%%/Net/AMQP/Protocol/Base.pm
 %%SITE_PERL%%/Net/AMQP/Protocol/v0_8.pm
 %%SITE_PERL%%/Net/AMQP/Value.pm
-@dirrmtry %%SITE_PERL%%/Net/AMQP/Protocol
-@dirrmtry %%SITE_PERL%%/Net/AMQP/Frame
-@dirrmtry %%SITE_PERL%%/Net/AMQP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-APNS/Makefile b/net/p5-Net-APNS/Makefile
index c8c5bd93cc3c..e5fee37f9228 100644
--- a/net/p5-Net-APNS/Makefile
+++ b/net/p5-Net-APNS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-APNS
 PORTVERSION=	0.0202
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-APNS/pkg-plist b/net/p5-Net-APNS/pkg-plist
index 96027f49ef52..bec5245162d6 100644
--- a/net/p5-Net-APNS/pkg-plist
+++ b/net/p5-Net-APNS/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/APNS/.packlist
 %%SITE_PERL%%/Net/APNS.pm
 %%SITE_PERL%%/Net/APNS/Notification.pm
 %%PERL5_MAN3%%/Net::APNS.3.gz
 %%PERL5_MAN3%%/Net::APNS::Notification.3.gz
-@dirrm %%SITE_PERL%%/Net/APNS
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/APNS
diff --git a/net/p5-Net-APNs-Extended/Makefile b/net/p5-Net-APNs-Extended/Makefile
index 4217ae011554..fe1c5ae6d6e5 100644
--- a/net/p5-Net-APNs-Extended/Makefile
+++ b/net/p5-Net-APNs-Extended/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-APNs-Extended
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-ARP/Makefile b/net/p5-Net-ARP/Makefile
index 3ba0dd33756b..e5fe7405e5ba 100644
--- a/net/p5-Net-ARP/Makefile
+++ b/net/p5-Net-ARP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-ARP
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-ARP/pkg-plist b/net/p5-Net-ARP/pkg-plist
index 1b14561c8ec6..b1f5cfa9bcb3 100644
--- a/net/p5-Net-ARP/pkg-plist
+++ b/net/p5-Net-ARP/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/ARP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ARP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ARP/ARP.so
+%%SITE_ARCH%%/Net/ARP.pm
+%%SITE_ARCH%%/auto/Net/ARP/ARP.so
 %%PERL5_MAN3%%/Net::ARP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ARP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Address-Ethernet/Makefile b/net/p5-Net-Address-Ethernet/Makefile
index 02493645d0a3..0a3efce8b6ff 100644
--- a/net/p5-Net-Address-Ethernet/Makefile
+++ b/net/p5-Net-Address-Ethernet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Address-Ethernet
 PORTVERSION=	1.122
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Address-Ethernet/pkg-plist b/net/p5-Net-Address-Ethernet/pkg-plist
index 39df95f7385a..3dd8d2f80056 100644
--- a/net/p5-Net-Address-Ethernet/pkg-plist
+++ b/net/p5-Net-Address-Ethernet/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::Address::Ethernet.3.gz
 %%SITE_PERL%%/Net/Address/Ethernet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Address/Ethernet/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Address/Ethernet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Address
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Address-IPv4-Local/Makefile b/net/p5-Net-Address-IPv4-Local/Makefile
index 6512652e3306..3c4d0d6bda3b 100644
--- a/net/p5-Net-Address-IPv4-Local/Makefile
+++ b/net/p5-Net-Address-IPv4-Local/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Address-IPv4-Local
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Address-IPv4-Local/pkg-plist b/net/p5-Net-Address-IPv4-Local/pkg-plist
index ed144d1b87fb..5ef4a9697174 100644
--- a/net/p5-Net-Address-IPv4-Local/pkg-plist
+++ b/net/p5-Net-Address-IPv4-Local/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Net::Address::IPv4::Local.3.gz
 %%SITE_PERL%%/Net/Address/IPv4/Local.pm
-@dirrmtry %%SITE_PERL%%/Net/Address/IPv4
-@dirrmtry %%SITE_PERL%%/Net/Address
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Amazon-AWSSign/Makefile b/net/p5-Net-Amazon-AWSSign/Makefile
index 115731167ca7..c6e17605f07f 100644
--- a/net/p5-Net-Amazon-AWSSign/Makefile
+++ b/net/p5-Net-Amazon-AWSSign/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Amazon-AWSSign
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NATON
diff --git a/net/p5-Net-Amazon-AWSSign/pkg-plist b/net/p5-Net-Amazon-AWSSign/pkg-plist
index 255f58da5d23..0a6abbb201b7 100644
--- a/net/p5-Net-Amazon-AWSSign/pkg-plist
+++ b/net/p5-Net-Amazon-AWSSign/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::Amazon::AWSSign.3.gz
 %%SITE_PERL%%/Net/Amazon/AWSSign.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/AWSSign/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/AWSSign
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Amazon-EC2/Makefile b/net/p5-Net-Amazon-EC2/Makefile
index 767cf9703ffc..80022c248730 100644
--- a/net/p5-Net-Amazon-EC2/Makefile
+++ b/net/p5-Net-Amazon-EC2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Amazon-EC2
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Amazon-EC2/pkg-plist b/net/p5-Net-Amazon-EC2/pkg-plist
index e3d0727a12a1..03322aba6506 100644
--- a/net/p5-Net-Amazon-EC2/pkg-plist
+++ b/net/p5-Net-Amazon-EC2/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/EC2/.packlist
 %%SITE_PERL%%/Net/Amazon/EC2.pm
 %%SITE_PERL%%/Net/Amazon/EC2/Attachment.pm
 %%SITE_PERL%%/Net/Amazon/EC2/AvailabilityZone.pm
@@ -91,9 +90,3 @@
 %%PERL5_MAN3%%/Net::Amazon::EC2::UserData.3.gz
 %%PERL5_MAN3%%/Net::Amazon::EC2::UserIdGroupPair.3.gz
 %%PERL5_MAN3%%/Net::Amazon::EC2::Volume.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/EC2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/Amazon/EC2
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Amazon-MechanicalTurk/Makefile b/net/p5-Net-Amazon-MechanicalTurk/Makefile
index 620a1c888546..e2e1e4139e55 100644
--- a/net/p5-Net-Amazon-MechanicalTurk/Makefile
+++ b/net/p5-Net-Amazon-MechanicalTurk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Amazon-MechanicalTurk
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Amazon-MechanicalTurk/pkg-plist b/net/p5-Net-Amazon-MechanicalTurk/pkg-plist
index f5c7da05ec31..e1c6a6e2bec5 100644
--- a/net/p5-Net-Amazon-MechanicalTurk/pkg-plist
+++ b/net/p5-Net-Amazon-MechanicalTurk/pkg-plist
@@ -39,7 +39,6 @@
 %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Transport/RESTTransport.pm
 %%SITE_PERL%%/Net/Amazon/MechanicalTurk/XMLParser.pm
 %%SITE_PERL%%/Net/Amazon/mturk_install.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/MechanicalTurk/.packlist
 %%PERL5_MAN3%%/Net::Amazon::MechanicalTurk.3.gz
 %%PERL5_MAN3%%/Net::Amazon::MechanicalTurk::BulkSupport.3.gz
 %%PERL5_MAN3%%/Net::Amazon::MechanicalTurk::Command::AddRetry.3.gz
@@ -51,14 +50,3 @@
 %%PERL5_MAN3%%/Net::Amazon::MechanicalTurk::Command::ParseAssignmentAnswer.3.gz
 %%PERL5_MAN3%%/Net::Amazon::MechanicalTurk::Command::RetrieveResults.3.gz
 %%PERL5_MAN3%%/Net::Amazon::MechanicalTurk::Command::UpdateHITs.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/MechanicalTurk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Transport
-@dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Template
-@dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/RowData
-@dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/QAPValidator
-@dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Command
-@dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Amazon-S3/Makefile b/net/p5-Net-Amazon-S3/Makefile
index 6faa292e2c12..a28455b716a8 100644
--- a/net/p5-Net-Amazon-S3/Makefile
+++ b/net/p5-Net-Amazon-S3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Amazon-S3
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Amazon-S3/pkg-plist b/net/p5-Net-Amazon-S3/pkg-plist
index 07a485b1a871..6933c0301de1 100644
--- a/net/p5-Net-Amazon-S3/pkg-plist
+++ b/net/p5-Net-Amazon-S3/pkg-plist
@@ -47,13 +47,4 @@ bin/s3cl
 %%SITE_PERL%%/Net/Amazon/S3/Request/PutPart.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/SetBucketAccessControl.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/SetObjectAccessControl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/S3/.packlist
 man/man1/s3cl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/S3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Amazon/S3/Request
-@dirrmtry %%SITE_PERL%%/Net/Amazon/S3/Client
-@dirrmtry %%SITE_PERL%%/Net/Amazon/S3
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Amazon-Signature/Makefile b/net/p5-Net-Amazon-Signature/Makefile
index 60fc309af17e..ac22a2348dc9 100644
--- a/net/p5-Net-Amazon-Signature/Makefile
+++ b/net/p5-Net-Amazon-Signature/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Amazon-Signature
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Amazon-Signature/pkg-plist b/net/p5-Net-Amazon-Signature/pkg-plist
index 8f002de3367f..bbdd85545919 100644
--- a/net/p5-Net-Amazon-Signature/pkg-plist
+++ b/net/p5-Net-Amazon-Signature/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/Amazon/Signature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/Signature/.packlist
 %%PERL5_MAN3%%/Net::Amazon::Signature.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/Signature
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Amazon-Thumbnail/Makefile b/net/p5-Net-Amazon-Thumbnail/Makefile
index 71c6fa68b753..2793dacd84b0 100644
--- a/net/p5-Net-Amazon-Thumbnail/Makefile
+++ b/net/p5-Net-Amazon-Thumbnail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Amazon-Thumbnail
 PORTVERSION=	0.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Amazon-Thumbnail/pkg-plist b/net/p5-Net-Amazon-Thumbnail/pkg-plist
index 2853019ed42a..f420a0c82252 100644
--- a/net/p5-Net-Amazon-Thumbnail/pkg-plist
+++ b/net/p5-Net-Amazon-Thumbnail/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Net/Amazon/Thumbnail.pm
 %%PERL5_MAN3%%/Net::Amazon::Thumbnail.3.gz
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Amazon/Makefile b/net/p5-Net-Amazon/Makefile
index 98a86150bb00..2a44c14f24cd 100644
--- a/net/p5-Net-Amazon/Makefile
+++ b/net/p5-Net-Amazon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Amazon
 PORTVERSION=	0.62
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Amazon/pkg-plist b/net/p5-Net-Amazon/pkg-plist
index 135e8a9172e6..91880f3e482e 100644
--- a/net/p5-Net-Amazon/pkg-plist
+++ b/net/p5-Net-Amazon/pkg-plist
@@ -862,25 +862,3 @@
 %%SITE_PERL%%/Net/Amazon/Validate/Type/VehiclePartLookup.pm
 %%SITE_PERL%%/Net/Amazon/Validate/Type/VehiclePartSearch.pm
 %%SITE_PERL%%/Net/Amazon/Validate/Type/VehicleSearch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/Type
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/us
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/uk
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/jp
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/it
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/fr
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/es
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/de
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch/ca
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate/ItemSearch
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Validate
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Result/Seller
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Result
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Response
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Request
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Property
-@dirrmtry %%SITE_PERL%%/Net/Amazon/Attribute
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Analysis/Makefile b/net/p5-Net-Analysis/Makefile
index 2f4587c922d1..1d39c7f1495f 100644
--- a/net/p5-Net-Analysis/Makefile
+++ b/net/p5-Net-Analysis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Analysis
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Analysis/pkg-plist b/net/p5-Net-Analysis/pkg-plist
index 2c3abcbaa74d..9b280ea887af 100644
--- a/net/p5-Net-Analysis/pkg-plist
+++ b/net/p5-Net-Analysis/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Analysis/.packlist
 %%SITE_PERL%%/Net/Analysis.pm
 %%SITE_PERL%%/Net/Analysis/Constants.pm
 %%SITE_PERL%%/Net/Analysis/Dispatcher.pm
@@ -31,9 +30,3 @@
 %%PERL5_MAN3%%/Net::Analysis::TCPMonologue.3.gz
 %%PERL5_MAN3%%/Net::Analysis::TCPSession.3.gz
 %%PERL5_MAN3%%/Net::Analysis::Time.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Analysis
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Analysis/Listener
-@dirrmtry %%SITE_PERL%%/Net/Analysis
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%
diff --git a/net/p5-Net-Appliance-Phrasebook/Makefile b/net/p5-Net-Appliance-Phrasebook/Makefile
index 99c25c60ee5a..b31b87e8756a 100644
--- a/net/p5-Net-Appliance-Phrasebook/Makefile
+++ b/net/p5-Net-Appliance-Phrasebook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Appliance-Phrasebook
 PORTVERSION=	2.103.642
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Appliance-Phrasebook/pkg-plist b/net/p5-Net-Appliance-Phrasebook/pkg-plist
index 1a4d13886931..b8df313d0812 100644
--- a/net/p5-Net-Appliance-Phrasebook/pkg-plist
+++ b/net/p5-Net-Appliance-Phrasebook/pkg-plist
@@ -1,10 +1,3 @@
 %%PERL5_MAN3%%/Net::Appliance::Phrasebook.3.gz
 %%SITE_PERL%%/Net/Appliance/Phrasebook.pm
 %%SITE_PERL%%/Net/Appliance/Phrasebook/nas-pb.yml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance/Phrasebook/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance/Phrasebook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Appliance/Phrasebook
-@dirrmtry %%SITE_PERL%%/Net/Appliance
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Appliance-Session/Makefile b/net/p5-Net-Appliance-Session/Makefile
index 22eb4a271bf4..55da97ad54a5 100644
--- a/net/p5-Net-Appliance-Session/Makefile
+++ b/net/p5-Net-Appliance-Session/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Appliance-Session
 PORTVERSION=	4.131.260
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Appliance-Session/pkg-plist b/net/p5-Net-Appliance-Session/pkg-plist
index 1e1542d7f946..f26436677fe6 100644
--- a/net/p5-Net-Appliance-Session/pkg-plist
+++ b/net/p5-Net-Appliance-Session/pkg-plist
@@ -5,11 +5,4 @@ bin/nas
 %%SITE_PERL%%/Net/Appliance/Session/Engine.pm
 %%SITE_PERL%%/Net/Appliance/Session/Scripting.pm
 %%SITE_PERL%%/Net/Appliance/Session/Transport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance/Session/.packlist
 man/man1/nas.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Appliance/Session
-@dirrmtry %%SITE_PERL%%/Net/Appliance
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-BGP/Makefile b/net/p5-Net-BGP/Makefile
index a837e15099a6..be954322da5a 100644
--- a/net/p5-Net-BGP/Makefile
+++ b/net/p5-Net-BGP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-BGP
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-BGP/pkg-plist b/net/p5-Net-BGP/pkg-plist
index 117121d88d4f..86b00a028cb5 100644
--- a/net/p5-Net-BGP/pkg-plist
+++ b/net/p5-Net-BGP/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BGP/.packlist
 %%SITE_PERL%%/Net/BGP.pm
 %%SITE_PERL%%/Net/BGP/ASPath.pm
 %%SITE_PERL%%/Net/BGP/NLRI.pm
@@ -17,7 +16,3 @@
 %%PERL5_MAN3%%/Net::BGP::Refresh.3.gz
 %%PERL5_MAN3%%/Net::BGP::Transport.3.gz
 %%PERL5_MAN3%%/Net::BGP::Update.3.gz
-@dirrm %%SITE_PERL%%/Net/BGP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BGP
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Blogger/Makefile b/net/p5-Net-Blogger/Makefile
index 37e1bd234edb..21fc9c7103c3 100644
--- a/net/p5-Net-Blogger/Makefile
+++ b/net/p5-Net-Blogger/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Blogger
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Blogger/pkg-plist b/net/p5-Net-Blogger/pkg-plist
index 8cb52fffd5d9..df797a627823 100644
--- a/net/p5-Net-Blogger/pkg-plist
+++ b/net/p5-Net-Blogger/pkg-plist
@@ -24,10 +24,3 @@
 %%SITE_PERL%%/Net/Blogger/Engine/Slash/slashcode.pm
 %%SITE_PERL%%/Net/Blogger/Engine/Userland.pm
 %%SITE_PERL%%/Net/Blogger/Engine/Userland/metaWeblog.pm
-@dirrmtry %%SITE_PERL%%/Net/Blogger/Engine/Userland
-@dirrmtry %%SITE_PERL%%/Net/Blogger/Engine/Slash
-@dirrmtry %%SITE_PERL%%/Net/Blogger/Engine/Movabletype
-@dirrmtry %%SITE_PERL%%/Net/Blogger/Engine
-@dirrmtry %%SITE_PERL%%/Net/Blogger/API
-@dirrmtry %%SITE_PERL%%/Net/Blogger
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-CIDR-Lite/Makefile b/net/p5-Net-CIDR-Lite/Makefile
index 3c249592f8a3..789da83720be 100644
--- a/net/p5-Net-CIDR-Lite/Makefile
+++ b/net/p5-Net-CIDR-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-CIDR-Lite
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	net perl5 ipv6
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-CIDR-Lite/pkg-plist b/net/p5-Net-CIDR-Lite/pkg-plist
index 31a3a9e04634..a2a34736ec91 100644
--- a/net/p5-Net-CIDR-Lite/pkg-plist
+++ b/net/p5-Net-CIDR-Lite/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::CIDR::Lite.3.gz
 %%SITE_PERL%%/Net/CIDR/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/Lite/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/CIDR
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-CIDR-MobileJP/Makefile b/net/p5-Net-CIDR-MobileJP/Makefile
index 8a84b70c84d9..7f1766ba4ae3 100644
--- a/net/p5-Net-CIDR-MobileJP/Makefile
+++ b/net/p5-Net-CIDR-MobileJP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-CIDR-MobileJP
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-CIDR-MobileJP/pkg-plist b/net/p5-Net-CIDR-MobileJP/pkg-plist
index c8209655c3bb..a126da3a4a64 100644
--- a/net/p5-Net-CIDR-MobileJP/pkg-plist
+++ b/net/p5-Net-CIDR-MobileJP/pkg-plist
@@ -1,9 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/MobileJP/.packlist
 %%SITE_PERL%%/Net/CIDR/MobileJP.pm
 %%SITE_PERL%%/Net/CIDR/net-cidr-mobilejp-scraper.pl
 %%SITE_PERL%%/auto/share/dist/Net-CIDR-MobileJP/cidr.yaml
 %%PERL5_MAN3%%/Net::CIDR::MobileJP.3.gz
 %%PERL5_MAN3%%/Net::CIDR::net-cidr-mobilejp-scraper.3.gz
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Net-CIDR-MobileJP
-@dirrmtry %%SITE_PERL%%/Net/CIDR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/MobileJP
diff --git a/net/p5-Net-CIDR-Set/Makefile b/net/p5-Net-CIDR-Set/Makefile
index 29cb26b59259..aaa7265d3806 100644
--- a/net/p5-Net-CIDR-Set/Makefile
+++ b/net/p5-Net-CIDR-Set/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-CIDR-Set
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-CIDR-Set/pkg-plist b/net/p5-Net-CIDR-Set/pkg-plist
index aed44f8c055b..1b859b031b36 100644
--- a/net/p5-Net-CIDR-Set/pkg-plist
+++ b/net/p5-Net-CIDR-Set/pkg-plist
@@ -4,6 +4,3 @@
 %%SITE_PERL%%/Net/CIDR/Set.pm
 %%SITE_PERL%%/Net/CIDR/Set/IPv4.pm
 %%SITE_PERL%%/Net/CIDR/Set/IPv6.pm
-@dirrm %%SITE_PERL%%/Net/CIDR/Set
-@dirrmtry %%SITE_PERL%%/Net/CIDR
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-CLI-Interact/Makefile b/net/p5-Net-CLI-Interact/Makefile
index 2d445a9b7898..f1424f3f2edb 100644
--- a/net/p5-Net-CLI-Interact/Makefile
+++ b/net/p5-Net-CLI-Interact/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-CLI-Interact
 PORTVERSION=	2.143070
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-CLI-Interact/pkg-plist b/net/p5-Net-CLI-Interact/pkg-plist
index cfb9bc5e7ef8..b4d2531c8d68 100644
--- a/net/p5-Net-CLI-Interact/pkg-plist
+++ b/net/p5-Net-CLI-Interact/pkg-plist
@@ -36,7 +36,6 @@
 %%SITE_PERL%%/Net/CLI/Interact/phrasebook/unix/bash/pb
 %%SITE_PERL%%/Net/CLI/Interact/phrasebook/unix/csh/pb
 %%SITE_PERL%%/Net/CLI/Interact/phrasebook/unix/csh/sdf/pb
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CLI/Interact/.packlist
 %%PERL5_MAN3%%/Net::CLI::Interact.3.gz
 %%PERL5_MAN3%%/Net::CLI::Interact::Action.3.gz
 %%PERL5_MAN3%%/Net::CLI::Interact::ActionSet.3.gz
diff --git a/net/p5-Net-CSTA/Makefile b/net/p5-Net-CSTA/Makefile
index 1ec76cf95d63..7a8e5f48f25f 100644
--- a/net/p5-Net-CSTA/Makefile
+++ b/net/p5-Net-CSTA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-CSTA
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-CSTA/pkg-plist b/net/p5-Net-CSTA/pkg-plist
index d5a6ab60260a..870f5c85f45d 100644
--- a/net/p5-Net-CSTA/pkg-plist
+++ b/net/p5-Net-CSTA/pkg-plist
@@ -2,10 +2,3 @@
 %%SITE_PERL%%/Net/CSTA.pm
 %%SITE_PERL%%/Net/CSTA/ASN.pm
 %%SITE_PERL%%/auto/Net/CSTA/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CSTA/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CSTA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/CSTA
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/CSTA
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-CascadeCopy/Makefile b/net/p5-Net-CascadeCopy/Makefile
index 407e972e1e93..9596a3816c81 100644
--- a/net/p5-Net-CascadeCopy/Makefile
+++ b/net/p5-Net-CascadeCopy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-CascadeCopy
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net-CascadeCopy/pkg-plist b/net/p5-Net-CascadeCopy/pkg-plist
index 399ce30d2667..b38f22387874 100644
--- a/net/p5-Net-CascadeCopy/pkg-plist
+++ b/net/p5-Net-CascadeCopy/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::CascadeCopy.3.gz
 %%SITE_PERL%%/Net/CascadeCopy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CascadeCopy/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CascadeCopy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Cassandra-Easy/Makefile b/net/p5-Net-Cassandra-Easy/Makefile
index 2b1effd4bf4d..21e20e676e11 100644
--- a/net/p5-Net-Cassandra-Easy/Makefile
+++ b/net/p5-Net-Cassandra-Easy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Cassandra-Easy
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Cassandra-Easy/pkg-plist b/net/p5-Net-Cassandra-Easy/pkg-plist
index 36aaa61c46f7..388c510b5954 100644
--- a/net/p5-Net-Cassandra-Easy/pkg-plist
+++ b/net/p5-Net-Cassandra-Easy/pkg-plist
@@ -15,12 +15,3 @@ bin/cassidy.pl
 %%SITE_PERL%%/Net/GenThrift/Thrift/Protocol.pm
 %%SITE_PERL%%/Net/GenThrift/Thrift/Socket.pm
 %%SITE_PERL%%/Net/GenThrift/Thrift/Transport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra/Easy/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra/Easy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/GenThrift/Thrift
-@dirrmtry %%SITE_PERL%%/Net/GenThrift
-@dirrmtry %%SITE_PERL%%/Net/GenCassandra
-@dirrmtry %%SITE_PERL%%/Net/Cassandra
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Cassandra/Makefile b/net/p5-Net-Cassandra/Makefile
index f2c10d5ffe7a..7ee903b9e417 100644
--- a/net/p5-Net-Cassandra/Makefile
+++ b/net/p5-Net-Cassandra/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Cassandra
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Cassandra/pkg-plist b/net/p5-Net-Cassandra/pkg-plist
index cb51066198b5..09ec708d4209 100644
--- a/net/p5-Net-Cassandra/pkg-plist
+++ b/net/p5-Net-Cassandra/pkg-plist
@@ -12,11 +12,4 @@
 %%SITE_PERL%%/Net/Cassandra/Backend/Thrift/Socket.pm
 %%SITE_PERL%%/Net/Cassandra/Backend/Thrift/Transport.pm
 %%SITE_PERL%%/Net/Cassandra/Backend/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra/.packlist
 %%PERL5_MAN3%%/Net::Cassandra.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Cassandra/Backend/Thrift
-@dirrmtry %%SITE_PERL%%/Net/Cassandra/Backend
-@dirrmtry %%SITE_PERL%%/Net/Cassandra
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-DAV-Server/Makefile b/net/p5-Net-DAV-Server/Makefile
index df61ad274cd0..726fbedbb7c8 100644
--- a/net/p5-Net-DAV-Server/Makefile
+++ b/net/p5-Net-DAV-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DAV-Server
 PORTVERSION=	1.30.5
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-DAV-Server/pkg-plist b/net/p5-Net-DAV-Server/pkg-plist
index 9927b6836a58..15271810b1d2 100644
--- a/net/p5-Net-DAV-Server/pkg-plist
+++ b/net/p5-Net-DAV-Server/pkg-plist
@@ -7,6 +7,3 @@
 %%SITE_PERL%%/Net/DAV/LockManager/Simple.pm
 %%SITE_PERL%%/Net/DAV/Server.pm
 %%SITE_PERL%%/Net/DAV/UUID.pm
-@dirrmtry %%SITE_PERL%%/Net/DAV/LockManager
-@dirrmtry %%SITE_PERL%%/Net/DAV
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-DHCP-Watch/Makefile b/net/p5-Net-DHCP-Watch/Makefile
index 37c927f8223d..047563901e6b 100644
--- a/net/p5-Net-DHCP-Watch/Makefile
+++ b/net/p5-Net-DHCP-Watch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DHCP-Watch
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-DHCP-Watch/pkg-plist b/net/p5-Net-DHCP-Watch/pkg-plist
index 51d9bb578705..0de4a93b17c1 100644
--- a/net/p5-Net-DHCP-Watch/pkg-plist
+++ b/net/p5-Net-DHCP-Watch/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/DHCP/Watch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCP/Watch/.packlist
 %%PERL5_MAN3%%/Net::DHCP::Watch.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCP/Watch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/DHCP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-DHCP/Makefile b/net/p5-Net-DHCP/Makefile
index c8b5ee53fb88..70147e06fd12 100644
--- a/net/p5-Net-DHCP/Makefile
+++ b/net/p5-Net-DHCP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DHCP
 PORTVERSION=	0.693
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-DHCP/pkg-plist b/net/p5-Net-DHCP/pkg-plist
index 921f5938849e..2c502b248daf 100644
--- a/net/p5-Net-DHCP/pkg-plist
+++ b/net/p5-Net-DHCP/pkg-plist
@@ -2,5 +2,3 @@
 %%SITE_PERL%%/Net/DHCP/Packet.pm
 %%PERL5_MAN3%%/Net::DHCP::Constants.3.gz
 %%PERL5_MAN3%%/Net::DHCP::Packet.3.gz
-@dirrmtry %%SITE_PERL%%/Net/DHCP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-DHCPClient/Makefile b/net/p5-Net-DHCPClient/Makefile
index 7b5e88bccc3a..af0dbd6773b7 100644
--- a/net/p5-Net-DHCPClient/Makefile
+++ b/net/p5-Net-DHCPClient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DHCPClient
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-DHCPClient/pkg-plist b/net/p5-Net-DHCPClient/pkg-plist
index 5e7a0c349e58..8c1867ba1728 100644
--- a/net/p5-Net-DHCPClient/pkg-plist
+++ b/net/p5-Net-DHCPClient/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/DHCPClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCPClient/.packlist
 %%PERL5_MAN3%%/Net::DHCPClient.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCPClient
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-DLookup/Makefile b/net/p5-Net-DLookup/Makefile
index 8da02257e45c..84e0bc675809 100644
--- a/net/p5-Net-DLookup/Makefile
+++ b/net/p5-Net-DLookup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-DLookup
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-DLookup/pkg-plist b/net/p5-Net-DLookup/pkg-plist
index 9a50e2921f5c..1015cd1a9085 100644
--- a/net/p5-Net-DLookup/pkg-plist
+++ b/net/p5-Net-DLookup/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::DLookup.3.gz
 %%SITE_PERL%%/Net/DLookup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index 51fd4b9a20c9..786e97a4fafe 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Daemon
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MNOONING
diff --git a/net/p5-Net-Daemon/pkg-plist b/net/p5-Net-Daemon/pkg-plist
index b8aa1d9abd89..45f3c14dbaab 100644
--- a/net/p5-Net-Daemon/pkg-plist
+++ b/net/p5-Net-Daemon/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Net/Daemon.pm
 %%SITE_PERL%%/Net/Daemon/Log.pm
 %%SITE_PERL%%/Net/Daemon/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Daemon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Delicious/Makefile b/net/p5-Net-Delicious/Makefile
index 105cbc7af865..f505cd23c95d 100644
--- a/net/p5-Net-Delicious/Makefile
+++ b/net/p5-Net-Delicious/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Delicious
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Delicious/pkg-plist b/net/p5-Net-Delicious/pkg-plist
index b57214e657ac..c54241bfbdd4 100644
--- a/net/p5-Net-Delicious/pkg-plist
+++ b/net/p5-Net-Delicious/pkg-plist
@@ -28,6 +28,3 @@
 %%SITE_PERL%%/Net/Delicious/Subscription.pm
 %%SITE_PERL%%/Net/Delicious/Tag.pm
 %%SITE_PERL%%/Net/Delicious/User.pm
-@dirrmtry %%SITE_PERL%%/Net/Delicious/Constants
-@dirrmtry %%SITE_PERL%%/Net/Delicious
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Dict/Makefile b/net/p5-Net-Dict/Makefile
index a8ca7f861913..c2e959032ee4 100644
--- a/net/p5-Net-Dict/Makefile
+++ b/net/p5-Net-Dict/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Dict
 PORTVERSION=	2.18
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEILB
diff --git a/net/p5-Net-Dict/pkg-plist b/net/p5-Net-Dict/pkg-plist
index c4c1dfbfd0e1..11b93574940a 100644
--- a/net/p5-Net-Dict/pkg-plist
+++ b/net/p5-Net-Dict/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Net/Dict.pm
 %%SITE_PERL%%/Net/Dict.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dict/.packlist
 %%PERL5_MAN3%%/Net::Dict.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dict
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Divert/Makefile b/net/p5-Net-Divert/Makefile
index ef6700dadbff..8dda5f66869a 100644
--- a/net/p5-Net-Divert/Makefile
+++ b/net/p5-Net-Divert/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Net-Divert
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Divert/pkg-plist b/net/p5-Net-Divert/pkg-plist
index 5cf857cc5435..95f0853c4cd1 100644
--- a/net/p5-Net-Divert/pkg-plist
+++ b/net/p5-Net-Divert/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert/.packlist
 %%SITE_PERL%%/Net/Divert.pm
 %%SITE_PERL%%/auto/Net/Divert/autosplit.ix
 %%PERL5_MAN3%%/Net::Divert.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/auto/Net/Divert
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Dropbox-API/Makefile b/net/p5-Net-Dropbox-API/Makefile
index 04ac780e3aa5..435905347a4e 100644
--- a/net/p5-Net-Dropbox-API/Makefile
+++ b/net/p5-Net-Dropbox-API/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Dropbox-API
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Dropbox-API/pkg-plist b/net/p5-Net-Dropbox-API/pkg-plist
index 6595292dbeba..4036c5d0aab1 100644
--- a/net/p5-Net-Dropbox-API/pkg-plist
+++ b/net/p5-Net-Dropbox-API/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::Dropbox::API.3.gz
 %%SITE_PERL%%/Net/Dropbox/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dropbox/API/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dropbox/API
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dropbox
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Dropbox
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-EPP-Proxy/Makefile b/net/p5-Net-EPP-Proxy/Makefile
index b17bf804965f..9442e26295c4 100644
--- a/net/p5-Net-EPP-Proxy/Makefile
+++ b/net/p5-Net-EPP-Proxy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-EPP-Proxy
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-EPP-Proxy/pkg-plist b/net/p5-Net-EPP-Proxy/pkg-plist
index 8ae87152bd30..48a7a180fe45 100644
--- a/net/p5-Net-EPP-Proxy/pkg-plist
+++ b/net/p5-Net-EPP-Proxy/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::EPP::Proxy.3.gz
 %%SITE_PERL%%/Net/EPP/Proxy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP/Proxy/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP/Proxy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/EPP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-EPP/Makefile b/net/p5-Net-EPP/Makefile
index 70c4656d64d7..7b85a556c875 100644
--- a/net/p5-Net-EPP/Makefile
+++ b/net/p5-Net-EPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-EPP
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-EPP/pkg-plist b/net/p5-Net-EPP/pkg-plist
index 402e98ce764f..5d901c375f3d 100644
--- a/net/p5-Net-EPP/pkg-plist
+++ b/net/p5-Net-EPP/pkg-plist
@@ -39,7 +39,6 @@
 %%SITE_PERL%%/Net/EPP/Protocol.pm
 %%SITE_PERL%%/Net/EPP/ResponseCodes.pm
 %%SITE_PERL%%/Net/EPP/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP/.packlist
 %%PERL5_MAN3%%/Net::EPP.3.gz
 %%PERL5_MAN3%%/Net::EPP::Client.3.gz
 %%PERL5_MAN3%%/Net::EPP::Frame.3.gz
@@ -81,17 +80,3 @@
 %%PERL5_MAN3%%/Net::EPP::Frame::Command::Transfer::Domain.3.gz
 %%PERL5_MAN3%%/Net::EPP::Frame::Command::Transfer::Contact.3.gz
 %%PERL5_MAN3%%/Net::EPP::Frame::Command::Poll::Ack.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Update
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Transfer
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Renew
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Poll
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Info
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Delete
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Create
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command/Check
-@dirrm %%SITE_PERL%%/Net/EPP/Frame/Command
-@dirrm %%SITE_PERL%%/Net/EPP/Frame
-@dirrmtry %%SITE_PERL%%/Net/EPP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-FS-Flickr/Makefile b/net/p5-Net-FS-Flickr/Makefile
index 3f825a3bbfe6..619190cfed29 100644
--- a/net/p5-Net-FS-Flickr/Makefile
+++ b/net/p5-Net-FS-Flickr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-FS-Flickr
 PORTVERSION=	0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-FS-Flickr/pkg-plist b/net/p5-Net-FS-Flickr/pkg-plist
index ace9ebe5e293..2d8a7cd5ed6a 100644
--- a/net/p5-Net-FS-Flickr/pkg-plist
+++ b/net/p5-Net-FS-Flickr/pkg-plist
@@ -5,6 +5,3 @@ bin/flickrfs
 %%PERL5_MAN3%%/Net::FS::Flickr.3.gz
 %%PERL5_MAN3%%/Net::FS::Flickr::Access.3.gz
 man/man1/flickrfs.1.gz
-@dirrmtry %%SITE_PERL%%/Net/FS/Flickr
-@dirrmtry %%SITE_PERL%%/Net/FS
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-FS-Gmail/Makefile b/net/p5-Net-FS-Gmail/Makefile
index 5d6addde5090..1bad6eb4a5cc 100644
--- a/net/p5-Net-FS-Gmail/Makefile
+++ b/net/p5-Net-FS-Gmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-FS-Gmail
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-FS-Gmail/pkg-plist b/net/p5-Net-FS-Gmail/pkg-plist
index d1d9100acef3..665ddb3861d4 100644
--- a/net/p5-Net-FS-Gmail/pkg-plist
+++ b/net/p5-Net-FS-Gmail/pkg-plist
@@ -2,7 +2,3 @@ bin/gmailfs
 man/man1/gmailfs.1.gz
 %%PERL5_MAN3%%/Net::FS::Gmail.3.gz
 %%SITE_PERL%%/Net/FS/Gmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FS/Gmail/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FS/Gmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FS
-@dirrmtry %%SITE_PERL%%/Net/FS
diff --git a/net/p5-Net-FTP-AutoReconnect/Makefile b/net/p5-Net-FTP-AutoReconnect/Makefile
index 1e84277b0ebd..07b7bfeb8d75 100644
--- a/net/p5-Net-FTP-AutoReconnect/Makefile
+++ b/net/p5-Net-FTP-AutoReconnect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-FTP-AutoReconnect
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GIFF
diff --git a/net/p5-Net-FTP-AutoReconnect/pkg-plist b/net/p5-Net-FTP-AutoReconnect/pkg-plist
index 15a8d36b82ce..e6e4660f8373 100644
--- a/net/p5-Net-FTP-AutoReconnect/pkg-plist
+++ b/net/p5-Net-FTP-AutoReconnect/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/FTP/AutoReconnect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/AutoReconnect/.packlist
 %%PERL5_MAN3%%/Net::FTP::AutoReconnect.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/AutoReconnect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/FTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-FTP-File/Makefile b/net/p5-Net-FTP-File/Makefile
index 3a03d6c88884..49e3963dd715 100644
--- a/net/p5-Net-FTP-File/Makefile
+++ b/net/p5-Net-FTP-File/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-FTP-File
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-FTP-File/pkg-plist b/net/p5-Net-FTP-File/pkg-plist
index be84776c67ce..acb1b32f781f 100644
--- a/net/p5-Net-FTP-File/pkg-plist
+++ b/net/p5-Net-FTP-File/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::FTP::File.3.gz
 %%SITE_PERL%%/Net/FTP/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/File/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/FTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Finger/Makefile b/net/p5-Net-Finger/Makefile
index e94dc640c509..7a9e2633285d 100644
--- a/net/p5-Net-Finger/Makefile
+++ b/net/p5-Net-Finger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Finger
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Finger/pkg-plist b/net/p5-Net-Finger/pkg-plist
index 7d747f233db0..345240bf0ec9 100644
--- a/net/p5-Net-Finger/pkg-plist
+++ b/net/p5-Net-Finger/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::Finger.3.gz
 %%SITE_PERL%%/Net/Finger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Flow/Makefile b/net/p5-Net-Flow/Makefile
index 14c5b901d7e2..f88c6156be77 100644
--- a/net/p5-Net-Flow/Makefile
+++ b/net/p5-Net-Flow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Flow
 PORTVERSION=	1.000
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Flow/pkg-plist b/net/p5-Net-Flow/pkg-plist
index e46608ede871..1dcc477105b1 100644
--- a/net/p5-Net-Flow/pkg-plist
+++ b/net/p5-Net-Flow/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Flow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flow/.packlist
 %%PERL5_MAN3%%/Net::Flow.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flow
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Frame-Dump/Makefile b/net/p5-Net-Frame-Dump/Makefile
index a40018ddb2f4..ee3f2eadb062 100644
--- a/net/p5-Net-Frame-Dump/Makefile
+++ b/net/p5-Net-Frame-Dump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Frame-Dump
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Frame-Dump/pkg-plist b/net/p5-Net-Frame-Dump/pkg-plist
index d282344968a3..60c9b3aa4f10 100644
--- a/net/p5-Net-Frame-Dump/pkg-plist
+++ b/net/p5-Net-Frame-Dump/pkg-plist
@@ -8,10 +8,3 @@
 %%SITE_PERL%%/Net/Frame/Dump/Online.pm
 %%SITE_PERL%%/Net/Frame/Dump/Online2.pm
 %%SITE_PERL%%/Net/Frame/Dump/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Dump/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Dump
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Frame/Dump
-@dirrmtry %%SITE_PERL%%/Net/Frame
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Frame-Layer-ICMPv6/Makefile b/net/p5-Net-Frame-Layer-ICMPv6/Makefile
index a91c0ddbb396..463f69b6e8d2 100644
--- a/net/p5-Net-Frame-Layer-ICMPv6/Makefile
+++ b/net/p5-Net-Frame-Layer-ICMPv6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Frame-Layer-ICMPv6
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Frame-Layer-ICMPv6/pkg-plist b/net/p5-Net-Frame-Layer-ICMPv6/pkg-plist
index e404505a1ecc..022882c6bc35 100644
--- a/net/p5-Net-Frame-Layer-ICMPv6/pkg-plist
+++ b/net/p5-Net-Frame-Layer-ICMPv6/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Layer/ICMPv6/.packlist
 %%SITE_PERL%%/Net/Frame/Layer/ICMPv6.pm
 %%SITE_PERL%%/Net/Frame/Layer/ICMPv6/DestUnreach.pm
 %%SITE_PERL%%/Net/Frame/Layer/ICMPv6/Echo.pm
@@ -21,6 +20,3 @@
 %%PERL5_MAN3%%/Net::Frame::Layer::ICMPv6::RouterSolicitation.3.gz
 %%PERL5_MAN3%%/Net::Frame::Layer::ICMPv6::TimeExceed.3.gz
 %%PERL5_MAN3%%/Net::Frame::Layer::ICMPv6::TooBig.3.gz
-@dirrm %%SITE_PERL%%/Net/Frame/Layer/ICMPv6
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Layer/ICMPv6
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Layer
diff --git a/net/p5-Net-Frame-Layer-IPv6/Makefile b/net/p5-Net-Frame-Layer-IPv6/Makefile
index 335aa424f57f..bad7a204d544 100644
--- a/net/p5-Net-Frame-Layer-IPv6/Makefile
+++ b/net/p5-Net-Frame-Layer-IPv6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Frame-Layer-IPv6
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Frame-Layer-IPv6/pkg-plist b/net/p5-Net-Frame-Layer-IPv6/pkg-plist
index 1249e40cc0f3..470dc2f7b58e 100644
--- a/net/p5-Net-Frame-Layer-IPv6/pkg-plist
+++ b/net/p5-Net-Frame-Layer-IPv6/pkg-plist
@@ -4,16 +4,9 @@
 %%SITE_PERL%%/Net/Frame/Layer/IPv6/Destination.pm
 %%SITE_PERL%%/Net/Frame/Layer/IPv6/Option.pm
 %%SITE_PERL%%/Net/Frame/Layer/IPv6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Layer/IPv6/.packlist
 %%PERL5_MAN3%%/Net::Frame::Layer::IPv6.3.gz
 %%PERL5_MAN3%%/Net::Frame::Layer::IPv6::Fragment.3.gz
 %%PERL5_MAN3%%/Net::Frame::Layer::IPv6::Routing.3.gz
 %%PERL5_MAN3%%/Net::Frame::Layer::IPv6::HopByHop.3.gz
 %%PERL5_MAN3%%/Net::Frame::Layer::IPv6::Option.3.gz
 %%PERL5_MAN3%%/Net::Frame::Layer::IPv6::Destination.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Layer/IPv6
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/Layer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame
-@dirrmtry %%SITE_PERL%%/Net/Frame/Layer/IPv6
-@dirrmtry %%SITE_PERL%%/Net/Frame/Layer
-@dirrmtry %%SITE_PERL%%/Net/Frame
diff --git a/net/p5-Net-Frame/Makefile b/net/p5-Net-Frame/Makefile
index aecc82c25d23..875d94c0f911 100644
--- a/net/p5-Net-Frame/Makefile
+++ b/net/p5-Net-Frame/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Frame
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Frame/pkg-plist b/net/p5-Net-Frame/pkg-plist
index 815fac4880a1..6110f2a89a4d 100644
--- a/net/p5-Net-Frame/pkg-plist
+++ b/net/p5-Net-Frame/pkg-plist
@@ -20,9 +20,3 @@
 %%SITE_PERL%%/Net/Frame/Layer/SLL.pm
 %%SITE_PERL%%/Net/Frame/Layer/TCP.pm
 %%SITE_PERL%%/Net/Frame/Layer/UDP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Frame
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Frame/Layer
-@dirrmtry %%SITE_PERL%%/Net/Frame
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-GitHub/Makefile b/net/p5-Net-GitHub/Makefile
index 65debf983ab0..06b41c37c128 100644
--- a/net/p5-Net-GitHub/Makefile
+++ b/net/p5-Net-GitHub/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-GitHub
 DISTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FAYLAND
diff --git a/net/p5-Net-GitHub/pkg-plist b/net/p5-Net-GitHub/pkg-plist
index b8f262692086..9524fd2837f6 100644
--- a/net/p5-Net-GitHub/pkg-plist
+++ b/net/p5-Net-GitHub/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/Net/GitHub/V3/Repos.pm
 %%SITE_PERL%%/Net/GitHub/V3/Search.pm
 %%SITE_PERL%%/Net/GitHub/V3/Users.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/GitHub/.packlist
 %%PERL5_MAN3%%/Net::GitHub.3.gz
 %%PERL5_MAN3%%/Net::GitHub::V3.3.gz
 %%PERL5_MAN3%%/Net::GitHub::V3::Events.3.gz
@@ -25,8 +24,3 @@
 %%PERL5_MAN3%%/Net::GitHub::V3::Repos.3.gz
 %%PERL5_MAN3%%/Net::GitHub::V3::Search.3.gz
 %%PERL5_MAN3%%/Net::GitHub::V3::Users.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/GitHub
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/GitHub/V3
-@dirrm %%SITE_PERL%%/Net/GitHub
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Gnats/Makefile b/net/p5-Net-Gnats/Makefile
index 410673ee77a0..fab034c78f78 100644
--- a/net/p5-Net-Gnats/Makefile
+++ b/net/p5-Net-Gnats/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Gnats
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net databases perl5
 MASTER_SITES=	SF/gnatsperl/gnatsperl/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Gnats/pkg-plist b/net/p5-Net-Gnats/pkg-plist
index 237c7bb04dcb..eae22683565e 100644
--- a/net/p5-Net-Gnats/pkg-plist
+++ b/net/p5-Net-Gnats/pkg-plist
@@ -4,11 +4,3 @@
 %%SITE_PERL%%/Net/Gnats/PR.pm
 %%SITE_PERL%%/auto/Net/Gnats/PR/autosplit.ix
 %%SITE_PERL%%/auto/Net/Gnats/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gnats/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gnats
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/Gnats/PR
-@dirrmtry %%SITE_PERL%%/auto/Net/Gnats
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Gnats
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google-Analytics/Makefile b/net/p5-Net-Google-Analytics/Makefile
index a936a7ee1d97..625ef28f3b64 100644
--- a/net/p5-Net-Google-Analytics/Makefile
+++ b/net/p5-Net-Google-Analytics/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-Google-Analytics
 PORTVERSION=	3.02
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-Analytics/pkg-plist b/net/p5-Net-Google-Analytics/pkg-plist
index 7f62c121c0f3..1bb865dd7915 100644
--- a/net/p5-Net-Google-Analytics/pkg-plist
+++ b/net/p5-Net-Google-Analytics/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/Analytics/.packlist
 %%SITE_PERL%%/Net/Google/Analytics.pm
 %%SITE_PERL%%/Net/Google/Analytics/OAuth2.pm
 %%SITE_PERL%%/Net/Google/Analytics/Request.pm
@@ -9,7 +8,3 @@
 %%PERL5_MAN3%%/Net::Google::Analytics::Request.3.gz
 %%PERL5_MAN3%%/Net::Google::Analytics::Response.3.gz
 %%PERL5_MAN3%%/Net::Google::Analytics::Row.3.gz
-@dirrm %%SITE_PERL%%/Net/Google/Analytics
-@dirrm %%SITE_PERL%%/Net/Google
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/Analytics
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
diff --git a/net/p5-Net-Google-AuthSub/Makefile b/net/p5-Net-Google-AuthSub/Makefile
index bd12f3d74bab..79b2cf2d12de 100644
--- a/net/p5-Net-Google-AuthSub/Makefile
+++ b/net/p5-Net-Google-AuthSub/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Google-AuthSub
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-AuthSub/pkg-plist b/net/p5-Net-Google-AuthSub/pkg-plist
index cf2ca837a5bf..fba8f8ece767 100644
--- a/net/p5-Net-Google-AuthSub/pkg-plist
+++ b/net/p5-Net-Google-AuthSub/pkg-plist
@@ -1,11 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/AuthSub/.packlist
 %%SITE_PERL%%/Net/Google/AuthSub.pm
 %%SITE_PERL%%/Net/Google/AuthSub/Response.pm
 %%PERL5_MAN3%%/Net::Google::AuthSub::Response.3.gz
 %%PERL5_MAN3%%/Net::Google::AuthSub.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/AuthSub
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Google/AuthSub
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google-Calendar/Makefile b/net/p5-Net-Google-Calendar/Makefile
index ffc540a44612..3be20fd40e0b 100644
--- a/net/p5-Net-Google-Calendar/Makefile
+++ b/net/p5-Net-Google-Calendar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Google-Calendar
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-Calendar/pkg-plist b/net/p5-Net-Google-Calendar/pkg-plist
index a56165276b96..529ef3fad394 100644
--- a/net/p5-Net-Google-Calendar/pkg-plist
+++ b/net/p5-Net-Google-Calendar/pkg-plist
@@ -14,6 +14,3 @@
 %%PERL5_MAN3%%/Net::Google::Calendar::FeedLink.3.gz
 %%PERL5_MAN3%%/Net::Google::Calendar::Person.3.gz
 %%PERL5_MAN3%%/Net::Google::Calendar::WebContent.3.gz
-@dirrm %%SITE_PERL%%/Net/Google/Calendar
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google-Code/Makefile b/net/p5-Net-Google-Code/Makefile
index cb1767aa1195..212392b2d39f 100644
--- a/net/p5-Net-Google-Code/Makefile
+++ b/net/p5-Net-Google-Code/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Google-Code
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-Code/pkg-plist b/net/p5-Net-Google-Code/pkg-plist
index aa6f0a9978e9..44d0c4ee394a 100644
--- a/net/p5-Net-Google-Code/pkg-plist
+++ b/net/p5-Net-Google-Code/pkg-plist
@@ -17,7 +17,6 @@
 %%SITE_PERL%%/Net/Google/Code/TypicalRoles.pm
 %%SITE_PERL%%/Net/Google/Code/Wiki.pm
 %%SITE_PERL%%/Net/Google/Code/Wiki/Comment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/Code/.packlist
 %%PERL5_MAN3%%/Net::Google::Code.3.gz
 %%PERL5_MAN3%%/Net::Google::Code::AtomParser.3.gz
 %%PERL5_MAN3%%/Net::Google::Code::DateTime.3.gz
@@ -37,12 +36,3 @@
 %%PERL5_MAN3%%/Net::Google::Code::TypicalRoles.3.gz
 %%PERL5_MAN3%%/Net::Google::Code::Wiki.3.gz
 %%PERL5_MAN3%%/Net::Google::Code::Wiki::Comment.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/Code
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Google/Code/Issue
-@dirrmtry %%SITE_PERL%%/Net/Google/Code/Role
-@dirrmtry %%SITE_PERL%%/Net/Google/Code/Wiki
-@dirrmtry %%SITE_PERL%%/Net/Google/Code
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google-DataAPI/Makefile b/net/p5-Net-Google-DataAPI/Makefile
index fb2dff3121ad..f500a800ba0d 100644
--- a/net/p5-Net-Google-DataAPI/Makefile
+++ b/net/p5-Net-Google-DataAPI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Google-DataAPI
 PORTVERSION=	0.28.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-DataAPI/pkg-plist b/net/p5-Net-Google-DataAPI/pkg-plist
index 2e098ef64635..1a9d9143f64b 100644
--- a/net/p5-Net-Google-DataAPI/pkg-plist
+++ b/net/p5-Net-Google-DataAPI/pkg-plist
@@ -9,7 +9,6 @@
 %%SITE_PERL%%/Net/Google/DataAPI/Role/HasContent.pm
 %%SITE_PERL%%/Net/Google/DataAPI/Role/Service.pm
 %%SITE_PERL%%/Net/Google/DataAPI/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/DataAPI/.packlist
 %%PERL5_MAN3%%/Net::Google::DataAPI.3.gz
 %%PERL5_MAN3%%/Net::Google::DataAPI::Auth::ClientLogin::Multiple.3.gz
 %%PERL5_MAN3%%/Net::Google::DataAPI::Auth::OAuth.3.gz
@@ -17,12 +16,3 @@
 %%PERL5_MAN3%%/Net::Google::DataAPI::Role::Entry.3.gz
 %%PERL5_MAN3%%/Net::Google::DataAPI::Role::HasContent.3.gz
 %%PERL5_MAN3%%/Net::Google::DataAPI::Role::Service.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/DataAPI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Google/DataAPI/Role
-@dirrmtry %%SITE_PERL%%/Net/Google/DataAPI/Auth/ClientLogin
-@dirrmtry %%SITE_PERL%%/Net/Google/DataAPI/Auth
-@dirrmtry %%SITE_PERL%%/Net/Google/DataAPI
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google-PicasaWeb/Makefile b/net/p5-Net-Google-PicasaWeb/Makefile
index 429ffcd02499..8de15856ef58 100644
--- a/net/p5-Net-Google-PicasaWeb/Makefile
+++ b/net/p5-Net-Google-PicasaWeb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Google-PicasaWeb
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-PicasaWeb/pkg-plist b/net/p5-Net-Google-PicasaWeb/pkg-plist
index 8863ec9d0417..5b9c15c9754f 100644
--- a/net/p5-Net-Google-PicasaWeb/pkg-plist
+++ b/net/p5-Net-Google-PicasaWeb/pkg-plist
@@ -9,7 +9,6 @@ bin/picasa-list
 %%SITE_PERL%%/Net/Google/PicasaWeb/Media.pm
 %%SITE_PERL%%/Net/Google/PicasaWeb/MediaEntry.pm
 %%SITE_PERL%%/Net/Google/PicasaWeb/MediaFeed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/PicasaWeb/.packlist
 %%PERL5_MAN3%%/Net::Google::PicasaWeb.3.gz
 %%PERL5_MAN3%%/Net::Google::PicasaWeb::Album.3.gz
 %%PERL5_MAN3%%/Net::Google::PicasaWeb::Base.3.gz
@@ -21,9 +20,3 @@ bin/picasa-list
 man/man1/picasa.1.gz
 man/man1/picasa-get.1.gz
 man/man1/picasa-list.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/PicasaWeb
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Google/PicasaWeb
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google-SafeBrowsing2/Makefile b/net/p5-Net-Google-SafeBrowsing2/Makefile
index 2057c55ba371..9bb0e4b7bc02 100644
--- a/net/p5-Net-Google-SafeBrowsing2/Makefile
+++ b/net/p5-Net-Google-SafeBrowsing2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Google-SafeBrowsing2
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-SafeBrowsing2/pkg-plist b/net/p5-Net-Google-SafeBrowsing2/pkg-plist
index dcd41668da58..6df3d461417b 100644
--- a/net/p5-Net-Google-SafeBrowsing2/pkg-plist
+++ b/net/p5-Net-Google-SafeBrowsing2/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Net/Google/SafeBrowsing2/DBI.pm
 %%SITE_PERL%%/Net/Google/SafeBrowsing2/Sqlite.pm
 %%SITE_PERL%%/Net/Google/SafeBrowsing2/MySQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/SafeBrowsing2/.packlist
 %%PERL5_MAN3%%/Net::Google::SafeBrowsing2.3.gz
 %%PERL5_MAN3%%/Net::Google::SafeBrowsing2::DBI.3.gz
 %%PERL5_MAN3%%/Net::Google::SafeBrowsing2::Lookup.3.gz
@@ -13,9 +12,3 @@
 %%PERL5_MAN3%%/Net::Google::SafeBrowsing2::Postgres.3.gz
 %%PERL5_MAN3%%/Net::Google::SafeBrowsing2::Sqlite.3.gz
 %%PERL5_MAN3%%/Net::Google::SafeBrowsing2::Storage.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/SafeBrowsing2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/Google/SafeBrowsing2
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google-Spreadsheets/Makefile b/net/p5-Net-Google-Spreadsheets/Makefile
index 4dc248109756..49b9faef55f0 100644
--- a/net/p5-Net-Google-Spreadsheets/Makefile
+++ b/net/p5-Net-Google-Spreadsheets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Google-Spreadsheets
 PORTVERSION=	0.15.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google-Spreadsheets/pkg-plist b/net/p5-Net-Google-Spreadsheets/pkg-plist
index ce27655cbe5d..f1307210a928 100644
--- a/net/p5-Net-Google-Spreadsheets/pkg-plist
+++ b/net/p5-Net-Google-Spreadsheets/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Net/Google/Spreadsheets/Spreadsheet.pm
 %%SITE_PERL%%/Net/Google/Spreadsheets/Table.pm
 %%SITE_PERL%%/Net/Google/Spreadsheets/Worksheet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/Spreadsheets/.packlist
 %%PERL5_MAN3%%/Net::Google::Spreadsheets.3.gz
 %%PERL5_MAN3%%/Net::Google::Spreadsheets::Cell.3.gz
 %%PERL5_MAN3%%/Net::Google::Spreadsheets::Record.3.gz
@@ -13,9 +12,3 @@
 %%PERL5_MAN3%%/Net::Google::Spreadsheets::Spreadsheet.3.gz
 %%PERL5_MAN3%%/Net::Google::Spreadsheets::Table.3.gz
 %%PERL5_MAN3%%/Net::Google::Spreadsheets::Worksheet.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/Spreadsheets
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Google/Spreadsheets
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index b68467904b93..9e5c99d9088c 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Google
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Google/pkg-plist b/net/p5-Net-Google/pkg-plist
index bc1fd0997df1..0aedf3c17b59 100644
--- a/net/p5-Net-Google/pkg-plist
+++ b/net/p5-Net-Google/pkg-plist
@@ -13,6 +13,3 @@
 %%SITE_PERL%%/Net/Google/Services/GoogleSearch.wsdl
 %%SITE_PERL%%/Net/Google/Spelling.pm
 %%SITE_PERL%%/Net/Google/tool.pm
-@dirrmtry %%SITE_PERL%%/Net/Google/Services
-@dirrmtry %%SITE_PERL%%/Net/Google
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Growl/Makefile b/net/p5-Net-Growl/Makefile
index 2d25b84bb52f..5fd40c51725c 100644
--- a/net/p5-Net-Growl/Makefile
+++ b/net/p5-Net-Growl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Growl
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Growl/pkg-plist b/net/p5-Net-Growl/pkg-plist
index 4d793278d535..fdf328a189f6 100644
--- a/net/p5-Net-Growl/pkg-plist
+++ b/net/p5-Net-Growl/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Growl/.packlist
 %%SITE_PERL%%/Net/Growl.pm
 %%PERL5_MAN3%%/Net::Growl.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Growl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-GrowlClient/Makefile b/net/p5-Net-GrowlClient/Makefile
index 9c0cc9d6f652..f69a58c48e83 100644
--- a/net/p5-Net-GrowlClient/Makefile
+++ b/net/p5-Net-GrowlClient/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-GrowlClient
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net-GrowlClient/pkg-plist b/net/p5-Net-GrowlClient/pkg-plist
index 3536f2a07da7..34f79a12a356 100644
--- a/net/p5-Net-GrowlClient/pkg-plist
+++ b/net/p5-Net-GrowlClient/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/GrowlClient/.packlist
 %%SITE_PERL%%/Net/GrowlClient.pm
 %%PERL5_MAN3%%/Net::GrowlClient.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/GrowlClient
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-HL7/Makefile b/net/p5-Net-HL7/Makefile
index 984739fcab0d..fc852c879fdc 100644
--- a/net/p5-Net-HL7/Makefile
+++ b/net/p5-Net-HL7/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-HL7
 PORTVERSION=	0.75
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	SF/hl7toolkit/hl7api/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-HL7/pkg-plist b/net/p5-Net-HL7/pkg-plist
index 5003bef2c171..38547b3abdf3 100644
--- a/net/p5-Net-HL7/pkg-plist
+++ b/net/p5-Net-HL7/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/Net/HL7/Daemon.pm
 %%SITE_PERL%%/Net/HL7/Messages/ACK.pm
 %%SITE_PERL%%/Net/HL7/Segments/MSH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net-HL7/.packlist
 %%PERL5_MAN3%%/Net::HL7.3.gz
 %%PERL5_MAN3%%/Net::HL7::Connection.3.gz
 %%PERL5_MAN3%%/Net::HL7::Daemon.3.gz
@@ -17,8 +16,3 @@
 %%PERL5_MAN3%%/Net::HL7::Response.3.gz
 %%PERL5_MAN3%%/Net::HL7::Segment.3.gz
 %%PERL5_MAN3%%/Net::HL7::Segments::MSH.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net-HL7/
-@dirrm %%SITE_PERL%%/Net/HL7/Segments
-@dirrm %%SITE_PERL%%/Net/HL7/Messages
-@dirrmtry %%SITE_PERL%%/Net/HL7
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile b/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
index 64ca6b16cf62..4acbfb2dcaa8 100644
--- a/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
+++ b/net/p5-Net-HTTP-Spore-Middleware-Header/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-HTTP-Spore-Middleware-Header
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-HTTP-Spore/Makefile b/net/p5-Net-HTTP-Spore/Makefile
index 47181e035b13..39a965f01a79 100644
--- a/net/p5-Net-HTTP-Spore/Makefile
+++ b/net/p5-Net-HTTP-Spore/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-HTTP-Spore
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-HTTP-Spore/pkg-plist b/net/p5-Net-HTTP-Spore/pkg-plist
index 15fde8bd2cde..02d340613b76 100644
--- a/net/p5-Net-HTTP-Spore/pkg-plist
+++ b/net/p5-Net-HTTP-Spore/pkg-plist
@@ -29,7 +29,6 @@
 %%SITE_PERL%%/Net/HTTP/Spore/Role/Middleware.pm
 %%SITE_PERL%%/Net/HTTP/Spore/Role/Request.pm
 %%SITE_PERL%%/Net/HTTP/Spore/Role/UserAgent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTP/Spore/.packlist
 %%PERL5_MAN3%%/Net::HTTP::Spore.3.gz
 %%PERL5_MAN3%%/Net::HTTP::Spore::Core.3.gz
 %%PERL5_MAN3%%/Net::HTTP::Spore::Meta.3.gz
@@ -61,14 +60,3 @@
 %%PERL5_MAN3%%/Net::HTTP::Spore::Role::Middleware.3.gz
 %%PERL5_MAN3%%/Net::HTTP::Spore::Role::Request.3.gz
 %%PERL5_MAN3%%/Net::HTTP::Spore::Role::UserAgent.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTP/Spore
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/HTTP/Spore/Role
-@dirrm %%SITE_PERL%%/Net/HTTP/Spore/Middleware/Format
-@dirrm %%SITE_PERL%%/Net/HTTP/Spore/Middleware/Auth
-@dirrm %%SITE_PERL%%/Net/HTTP/Spore/Middleware
-@dirrm %%SITE_PERL%%/Net/HTTP/Spore/Meta/Method
-@dirrm %%SITE_PERL%%/Net/HTTP/Spore/Meta
-@dirrm %%SITE_PERL%%/Net/HTTP/Spore
-@dirrmtry %%SITE_PERL%%/Net/HTTP
diff --git a/net/p5-Net-HTTP/Makefile b/net/p5-Net-HTTP/Makefile
index 591bb09b4db6..d7b48afd3c8a 100644
--- a/net/p5-Net-HTTP/Makefile
+++ b/net/p5-Net-HTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-HTTP
 PORTVERSION=	6.07
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-HTTP/pkg-plist b/net/p5-Net-HTTP/pkg-plist
index ad8b99ae4b41..d771325e41ab 100644
--- a/net/p5-Net-HTTP/pkg-plist
+++ b/net/p5-Net-HTTP/pkg-plist
@@ -5,8 +5,3 @@
 %%SITE_PERL%%/Net/HTTP/Methods.pm
 %%SITE_PERL%%/Net/HTTP/NB.pm
 %%SITE_PERL%%/Net/HTTPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/HTTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-HTTPS-Any/Makefile b/net/p5-Net-HTTPS-Any/Makefile
index 11d9a5adc641..d9b05388ce5a 100644
--- a/net/p5-Net-HTTPS-Any/Makefile
+++ b/net/p5-Net-HTTPS-Any/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-HTTPS-Any
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	net perl5 www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-HTTPS-Any/pkg-plist b/net/p5-Net-HTTPS-Any/pkg-plist
index 2acf1bd33063..0f3cbeccaa96 100644
--- a/net/p5-Net-HTTPS-Any/pkg-plist
+++ b/net/p5-Net-HTTPS-Any/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/HTTPS/Any.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTPS/Any/.packlist
 %%PERL5_MAN3%%/Net::HTTPS::Any.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTPS/Any
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/HTTPS
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-HTTPS-NB/Makefile b/net/p5-Net-HTTPS-NB/Makefile
index 3fe4c882786f..84b83bcafe05 100644
--- a/net/p5-Net-HTTPS-NB/Makefile
+++ b/net/p5-Net-HTTPS-NB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-HTTPS-NB
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-HTTPS-NB/pkg-plist b/net/p5-Net-HTTPS-NB/pkg-plist
index 28383a470520..66c9fafd0af6 100644
--- a/net/p5-Net-HTTPS-NB/pkg-plist
+++ b/net/p5-Net-HTTPS-NB/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/HTTPS/NB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTPS/NB/.packlist
 %%PERL5_MAN3%%/Net::HTTPS::NB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTPS/NB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/HTTPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/HTTPS
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Hiveminder/Makefile b/net/p5-Net-Hiveminder/Makefile
index f2ecebbc70d0..c996a11d012a 100644
--- a/net/p5-Net-Hiveminder/Makefile
+++ b/net/p5-Net-Hiveminder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Hiveminder
 PORTVERSION=	0.08
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Hiveminder/pkg-plist b/net/p5-Net-Hiveminder/pkg-plist
index 255be8cde17d..71a3ccef0115 100644
--- a/net/p5-Net-Hiveminder/pkg-plist
+++ b/net/p5-Net-Hiveminder/pkg-plist
@@ -6,7 +6,3 @@ bin/hm-sync
 bin/hm-todo
 %%PERL5_MAN3%%/Net::Hiveminder.3.gz
 %%SITE_PERL%%/Net/Hiveminder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Hiveminder/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Hiveminder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-INET6Glue/Makefile b/net/p5-Net-INET6Glue/Makefile
index d7b68bf29086..728f9e189e33 100644
--- a/net/p5-Net-INET6Glue/Makefile
+++ b/net/p5-Net-INET6Glue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-INET6Glue
 PORTVERSION=	0.6
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	net perl5 ipv6
 MASTER_SITES=	CPAN
diff --git a/net/p5-Net-INET6Glue/pkg-plist b/net/p5-Net-INET6Glue/pkg-plist
index 9036afe31d4c..639086e149f4 100644
--- a/net/p5-Net-INET6Glue/pkg-plist
+++ b/net/p5-Net-INET6Glue/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Net/INET6Glue.pm
 %%SITE_PERL%%/Net/INET6Glue/FTP.pm
 %%SITE_PERL%%/Net/INET6Glue/INET_is_INET6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/INET6Glue/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/INET6Glue
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/INET6Glue
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-IP-Minimal/Makefile b/net/p5-Net-IP-Minimal/Makefile
index eef8f545d821..4276209c3b68 100644
--- a/net/p5-Net-IP-Minimal/Makefile
+++ b/net/p5-Net-IP-Minimal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IP-Minimal
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-IP-Minimal/pkg-plist b/net/p5-Net-IP-Minimal/pkg-plist
index a8ef2c951e9a..b15883ba693e 100644
--- a/net/p5-Net-IP-Minimal/pkg-plist
+++ b/net/p5-Net-IP-Minimal/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::IP::Minimal.3.gz
 %%SITE_PERL%%/Net/IP/Minimal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Minimal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/Minimal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-IP-RangeCompare/Makefile b/net/p5-Net-IP-RangeCompare/Makefile
index 1e435242109c..7b6fbe1f4a67 100644
--- a/net/p5-Net-IP-RangeCompare/Makefile
+++ b/net/p5-Net-IP-RangeCompare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IP-RangeCompare
 PORTVERSION=	4.025
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-IP-RangeCompare/pkg-plist b/net/p5-Net-IP-RangeCompare/pkg-plist
index 44c8f1cfd30b..dcdcd69f236c 100644
--- a/net/p5-Net-IP-RangeCompare/pkg-plist
+++ b/net/p5-Net-IP-RangeCompare/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Net/IP/RangeCompare.pm
 %%SITE_PERL%%/Net/IP/RangeCompare.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/RangeCompare/.packlist
 %%PERL5_MAN3%%/Net::IP::RangeCompare.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/RangeCompare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-IPTrie/Makefile b/net/p5-Net-IPTrie/Makefile
index 835e13722e5d..b9cf8d496566 100644
--- a/net/p5-Net-IPTrie/Makefile
+++ b/net/p5-Net-IPTrie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IPTrie
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-IPTrie/pkg-plist b/net/p5-Net-IPTrie/pkg-plist
index bd8185a7fb44..9e7965fecdba 100644
--- a/net/p5-Net-IPTrie/pkg-plist
+++ b/net/p5-Net-IPTrie/pkg-plist
@@ -2,5 +2,3 @@
 %%SITE_PERL%%/Net/IPTrie/Node.pm
 %%PERL5_MAN3%%/Net::IPTrie.3.gz
 %%PERL5_MAN3%%/Net::IPTrie::Node.3.gz
-@dirrm %%SITE_PERL%%/Net/IPTrie
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-IRR/Makefile b/net/p5-Net-IRR/Makefile
index 68684d6d19e9..ce563c38025a 100644
--- a/net/p5-Net-IRR/Makefile
+++ b/net/p5-Net-IRR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IRR
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net-IRR/pkg-plist b/net/p5-Net-IRR/pkg-plist
index f5433bbde12b..41961986fda2 100644
--- a/net/p5-Net-IRR/pkg-plist
+++ b/net/p5-Net-IRR/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::IRR.3.gz
 %%SITE_PERL%%/Net/IRR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IRR/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IRR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Ident/Makefile b/net/p5-Net-Ident/Makefile
index 5bbc0c1f7c76..ae55ad29acc8 100644
--- a/net/p5-Net-Ident/Makefile
+++ b/net/p5-Net-Ident/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Ident
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Ident/pkg-plist b/net/p5-Net-Ident/pkg-plist
index 898868301a6a..579316b483dc 100644
--- a/net/p5-Net-Ident/pkg-plist
+++ b/net/p5-Net-Ident/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Ident.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ident/.packlist
 %%PERL5_MAN3%%/Net::Ident.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ident
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Ifconfig-Wrapper/Makefile b/net/p5-Net-Ifconfig-Wrapper/Makefile
index 8e84fef32715..2da9b4cecd0d 100644
--- a/net/p5-Net-Ifconfig-Wrapper/Makefile
+++ b/net/p5-Net-Ifconfig-Wrapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Ifconfig-Wrapper
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Ifconfig-Wrapper/pkg-plist b/net/p5-Net-Ifconfig-Wrapper/pkg-plist
index 83d0066b8f3e..7f25db338d4c 100644
--- a/net/p5-Net-Ifconfig-Wrapper/pkg-plist
+++ b/net/p5-Net-Ifconfig-Wrapper/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::Ifconfig::Wrapper.3.gz
 %%SITE_PERL%%/Net/Ifconfig/Wrapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ifconfig/Wrapper/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ifconfig/Wrapper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ifconfig
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Ifconfig
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Interface/Makefile b/net/p5-Net-Interface/Makefile
index d29dc44f8278..da617bd24661 100644
--- a/net/p5-Net-Interface/Makefile
+++ b/net/p5-Net-Interface/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Interface
 PORTVERSION=	1.012
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Interface/pkg-plist b/net/p5-Net-Interface/pkg-plist
index 370e139d9206..835483848e1b 100644
--- a/net/p5-Net-Interface/pkg-plist
+++ b/net/p5-Net-Interface/pkg-plist
@@ -1,12 +1,7 @@
 %%PERL5_MAN3%%/Net::Interface.3.gz
 %%PERL5_MAN3%%/Net::Interface::Developer.3.gz
 %%PERL5_MAN3%%/Net::Interface::NetSymbols.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Interface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Interface/Developer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Interface/NetSymbols.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Interface/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Interface/Interface.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Interface
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/Interface
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+%%SITE_ARCH%%/Net/Interface.pm
+%%SITE_ARCH%%/Net/Interface/Developer.pm
+%%SITE_ARCH%%/Net/Interface/NetSymbols.pm
+%%SITE_ARCH%%/auto/Net/Interface/Interface.so
diff --git a/net/p5-Net-Jaiku/Makefile b/net/p5-Net-Jaiku/Makefile
index d9f89e64f1a4..93887c462905 100644
--- a/net/p5-Net-Jaiku/Makefile
+++ b/net/p5-Net-Jaiku/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Jaiku
 PORTVERSION=	0.0501
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Jaiku/pkg-plist b/net/p5-Net-Jaiku/pkg-plist
index 977af9e1951f..df32fe54614c 100644
--- a/net/p5-Net-Jaiku/pkg-plist
+++ b/net/p5-Net-Jaiku/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jaiku/.packlist
 %%PERL5_MAN3%%/Net::Jaiku.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jaiku
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 %%SITE_PERL%%/Net/Jaiku.pm
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Jifty/Makefile b/net/p5-Net-Jifty/Makefile
index d47a8a9c612e..38815dd9b6b0 100644
--- a/net/p5-Net-Jifty/Makefile
+++ b/net/p5-Net-Jifty/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Jifty
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Jifty/pkg-plist b/net/p5-Net-Jifty/pkg-plist
index c6849ad20661..d0c6976aab16 100644
--- a/net/p5-Net-Jifty/pkg-plist
+++ b/net/p5-Net-Jifty/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::Jifty.3.gz
 %%SITE_PERL%%/Net/Jifty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jifty/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jifty
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-AutoDNs/Makefile b/net/p5-Net-LDAP-AutoDNs/Makefile
index c4117a5b9fe1..a73e8eb66318 100644
--- a/net/p5-Net-LDAP-AutoDNs/Makefile
+++ b/net/p5-Net-LDAP-AutoDNs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-AutoDNs
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-Net-LDAP-AutoDNs/pkg-plist b/net/p5-Net-LDAP-AutoDNs/pkg-plist
index 97a9e639f0f2..e02aa95ab6d4 100644
--- a/net/p5-Net-LDAP-AutoDNs/pkg-plist
+++ b/net/p5-Net-LDAP-AutoDNs/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/AutoDNs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/AutoDNs/.packlist
 %%PERL5_MAN3%%/Net::LDAP::AutoDNs.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/AutoDNs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-AutoServer/Makefile b/net/p5-Net-LDAP-AutoServer/Makefile
index a235539d1567..d071cce0e3ad 100644
--- a/net/p5-Net-LDAP-AutoServer/Makefile
+++ b/net/p5-Net-LDAP-AutoServer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-AutoServer
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-Net-LDAP-AutoServer/pkg-plist b/net/p5-Net-LDAP-AutoServer/pkg-plist
index fbe77172428b..351cd22073e3 100644
--- a/net/p5-Net-LDAP-AutoServer/pkg-plist
+++ b/net/p5-Net-LDAP-AutoServer/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/AutoServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/AutoServer/.packlist
 %%PERL5_MAN3%%/Net::LDAP::AutoServer.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/AutoServer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-Express/Makefile b/net/p5-Net-LDAP-Express/Makefile
index fff3dae055ae..8f80e7993670 100644
--- a/net/p5-Net-LDAP-Express/Makefile
+++ b/net/p5-Net-LDAP-Express/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-Express
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-LDAP-Express/pkg-plist b/net/p5-Net-LDAP-Express/pkg-plist
index a13ae5c78468..58de90408a28 100644
--- a/net/p5-Net-LDAP-Express/pkg-plist
+++ b/net/p5-Net-LDAP-Express/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/Express.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Express/.packlist
 %%PERL5_MAN3%%/Net::LDAP::Express.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Express
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-LDAPhash/Makefile b/net/p5-Net-LDAP-LDAPhash/Makefile
index 86c030d06f1a..099e5d8c4831 100644
--- a/net/p5-Net-LDAP-LDAPhash/Makefile
+++ b/net/p5-Net-LDAP-LDAPhash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-LDAPhash
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-Net-LDAP-LDAPhash/pkg-plist b/net/p5-Net-LDAP-LDAPhash/pkg-plist
index 2b0effa21f59..27616fc98da6 100644
--- a/net/p5-Net-LDAP-LDAPhash/pkg-plist
+++ b/net/p5-Net-LDAP-LDAPhash/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/LDAPhash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/LDAPhash/.packlist
 %%PERL5_MAN3%%/Net::LDAP::LDAPhash.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/LDAPhash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-Makepath/Makefile b/net/p5-Net-LDAP-Makepath/Makefile
index 1634df0d520c..e6e4ef3e32ba 100644
--- a/net/p5-Net-LDAP-Makepath/Makefile
+++ b/net/p5-Net-LDAP-Makepath/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-LDAP-Makepath
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-Net-LDAP-Makepath/pkg-plist b/net/p5-Net-LDAP-Makepath/pkg-plist
index 6202c4c336e5..82d090142b5f 100644
--- a/net/p5-Net-LDAP-Makepath/pkg-plist
+++ b/net/p5-Net-LDAP-Makepath/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/Makepath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Makepath/.packlist
 %%PERL5_MAN3%%/Net::LDAP::Makepath.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Makepath
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-Server-Test/Makefile b/net/p5-Net-LDAP-Server-Test/Makefile
index a4b8326fb6c8..1019af28a432 100644
--- a/net/p5-Net-LDAP-Server-Test/Makefile
+++ b/net/p5-Net-LDAP-Server-Test/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-Server-Test
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-LDAP-Server-Test/pkg-plist b/net/p5-Net-LDAP-Server-Test/pkg-plist
index 0527b2d4ec1f..574a1a033cc0 100644
--- a/net/p5-Net-LDAP-Server-Test/pkg-plist
+++ b/net/p5-Net-LDAP-Server-Test/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Net::LDAP::Server::Test.3.gz
 %%SITE_PERL%%/Net/LDAP/Server/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Server/Test/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Server/Test
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP/Server
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-Server/Makefile b/net/p5-Net-LDAP-Server/Makefile
index 91ced65ed8b9..fcbc128e15cb 100644
--- a/net/p5-Net-LDAP-Server/Makefile
+++ b/net/p5-Net-LDAP-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-Server
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-LDAP-Server/pkg-plist b/net/p5-Net-LDAP-Server/pkg-plist
index 73e7db436178..d21d868992b2 100644
--- a/net/p5-Net-LDAP-Server/pkg-plist
+++ b/net/p5-Net-LDAP-Server/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Server/.packlist
 %%PERL5_MAN3%%/Net::LDAP::Server.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-LDAP-posixAccount/Makefile b/net/p5-Net-LDAP-posixAccount/Makefile
index 0d81c0111690..f85ecea33b9c 100644
--- a/net/p5-Net-LDAP-posixAccount/Makefile
+++ b/net/p5-Net-LDAP-posixAccount/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-posixAccount
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-Net-LDAP-posixAccount/pkg-plist b/net/p5-Net-LDAP-posixAccount/pkg-plist
index ba8d8c44008b..a6486d63e50a 100644
--- a/net/p5-Net-LDAP-posixAccount/pkg-plist
+++ b/net/p5-Net-LDAP-posixAccount/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/posixAccount.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/posixAccount/.packlist
 %%PERL5_MAN3%%/Net::LDAP::posixAccount.3.gz
-@dirrmtry %%SITE_PERL%%/Net/LDAP/
-@dirrmtry %%SITE_PERL%%/Net/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/posixAccount/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/
diff --git a/net/p5-Net-LDAP-posixGroup/Makefile b/net/p5-Net-LDAP-posixGroup/Makefile
index 9d408eb3adc8..982d0f5d0abf 100644
--- a/net/p5-Net-LDAP-posixGroup/Makefile
+++ b/net/p5-Net-LDAP-posixGroup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LDAP-posixGroup
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-Net-LDAP-posixGroup/pkg-plist b/net/p5-Net-LDAP-posixGroup/pkg-plist
index 4115fd98c4ce..458a01d41bfb 100644
--- a/net/p5-Net-LDAP-posixGroup/pkg-plist
+++ b/net/p5-Net-LDAP-posixGroup/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/LDAP/posixGroup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/posixGroup/.packlist
 %%PERL5_MAN3%%/Net::LDAP::posixGroup.3.gz
-@dirrmtry %%SITE_PERL%%/Net/LDAP/
-@dirrmtry %%SITE_PERL%%/Net/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/posixGroup/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/
diff --git a/net/p5-Net-Libdnet/Makefile b/net/p5-Net-Libdnet/Makefile
index 5c7ce4b58a44..a7eda18436dc 100644
--- a/net/p5-Net-Libdnet/Makefile
+++ b/net/p5-Net-Libdnet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Libdnet
 PORTVERSION=	0.98
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Libdnet/pkg-plist b/net/p5-Net-Libdnet/pkg-plist
index 0178c11d9956..ee1b9217433c 100644
--- a/net/p5-Net-Libdnet/pkg-plist
+++ b/net/p5-Net-Libdnet/pkg-plist
@@ -1,15 +1,14 @@
 bin/dnet.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Intf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Ip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Eth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Tun.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Route.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Fw.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Arp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Entry/Intf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libdnet/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libdnet/Libdnet.so
+%%SITE_ARCH%%/Net/Libdnet.pm
+%%SITE_ARCH%%/Net/Libdnet/Intf.pm
+%%SITE_ARCH%%/Net/Libdnet/Ip.pm
+%%SITE_ARCH%%/Net/Libdnet/Eth.pm
+%%SITE_ARCH%%/Net/Libdnet/Tun.pm
+%%SITE_ARCH%%/Net/Libdnet/Route.pm
+%%SITE_ARCH%%/Net/Libdnet/Fw.pm
+%%SITE_ARCH%%/Net/Libdnet/Arp.pm
+%%SITE_ARCH%%/Net/Libdnet/Entry/Intf.pm
+%%SITE_ARCH%%/auto/Net/Libdnet/Libdnet.so
 %%PERL5_MAN3%%/Net::Libdnet.3.gz
 %%PERL5_MAN3%%/Net::Libdnet::Entry::Intf.3.gz
 %%PERL5_MAN3%%/Net::Libdnet::Intf.3.gz
@@ -19,8 +18,3 @@ bin/dnet.pl
 %%PERL5_MAN3%%/Net::Libdnet::Route.3.gz
 %%PERL5_MAN3%%/Net::Libdnet::Fw.3.gz
 %%PERL5_MAN3%%/Net::Libdnet::Arp.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libdnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet/Entry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/Libdnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-LimeLight-Purge/Makefile b/net/p5-Net-LimeLight-Purge/Makefile
index 67c9c5d1ae40..fc5749bf3db0 100644
--- a/net/p5-Net-LimeLight-Purge/Makefile
+++ b/net/p5-Net-LimeLight-Purge/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-LimeLight-Purge
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-LimeLight-Purge/pkg-plist b/net/p5-Net-LimeLight-Purge/pkg-plist
index 9af3a6858fe3..1267623e498a 100644
--- a/net/p5-Net-LimeLight-Purge/pkg-plist
+++ b/net/p5-Net-LimeLight-Purge/pkg-plist
@@ -1,13 +1,6 @@
 %%SITE_PERL%%/Net/LimeLight/Purge.pm
 %%SITE_PERL%%/Net/LimeLight/Purge/Request.pm
 %%SITE_PERL%%/Net/LimeLight/Purge/StatusResponse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LimeLight/Purge/.packlist
 %%PERL5_MAN3%%/Net::LimeLight::Purge.3.gz
 %%PERL5_MAN3%%/Net::LimeLight::Purge::Request.3.gz
 %%PERL5_MAN3%%/Net::LimeLight::Purge::StatusResponse.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LimeLight/Purge
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LimeLight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/LimeLight/Purge
-@dirrmtry %%SITE_PERL%%/Net/LimeLight
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-MAC-Vendor/Makefile b/net/p5-Net-MAC-Vendor/Makefile
index b55733865d2f..54052f193d1d 100644
--- a/net/p5-Net-MAC-Vendor/Makefile
+++ b/net/p5-Net-MAC-Vendor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-MAC-Vendor
 PORTVERSION=	1.2000
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-MAC-Vendor/pkg-plist b/net/p5-Net-MAC-Vendor/pkg-plist
index d58447fb762b..9adf90c531d0 100644
--- a/net/p5-Net-MAC-Vendor/pkg-plist
+++ b/net/p5-Net-MAC-Vendor/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/MAC/Vendor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MAC/Vendor/.packlist
 %%PERL5_MAN3%%/Net::MAC::Vendor.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MAC/Vendor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/MAC
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-MAC/Makefile b/net/p5-Net-MAC/Makefile
index d19386450d93..4c5c26e59b30 100644
--- a/net/p5-Net-MAC/Makefile
+++ b/net/p5-Net-MAC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-MAC
 PORTVERSION=	2.103622
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-MAC/pkg-plist b/net/p5-Net-MAC/pkg-plist
index 2ef33a697e8d..dc093a96161d 100644
--- a/net/p5-Net-MAC/pkg-plist
+++ b/net/p5-Net-MAC/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/Net/MAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MAC/.packlist
 %%PERL5_MAN3%%/Net::MAC.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Mosso-CloudFiles/Makefile b/net/p5-Net-Mosso-CloudFiles/Makefile
index 2a7b13159cdf..ad4f124a583e 100644
--- a/net/p5-Net-Mosso-CloudFiles/Makefile
+++ b/net/p5-Net-Mosso-CloudFiles/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Mosso-CloudFiles
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Mosso-CloudFiles/pkg-plist b/net/p5-Net-Mosso-CloudFiles/pkg-plist
index 7e4deffcf2c4..517b7b3afa78 100644
--- a/net/p5-Net-Mosso-CloudFiles/pkg-plist
+++ b/net/p5-Net-Mosso-CloudFiles/pkg-plist
@@ -1,13 +1,6 @@
 %%SITE_PERL%%/Net/Mosso/CloudFiles/Object.pm
 %%SITE_PERL%%/Net/Mosso/CloudFiles.pm
 %%SITE_PERL%%/Net/Mosso/CloudFiles/Container.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Mosso/CloudFiles/.packlist
 %%PERL5_MAN3%%/Net::Mosso::CloudFiles.3.gz
 %%PERL5_MAN3%%/Net::Mosso::CloudFiles::Container.3.gz
 %%PERL5_MAN3%%/Net::Mosso::CloudFiles::Object.3.gz
-@dirrm %%SITE_PERL%%/Net/Mosso/CloudFiles
-@dirrm %%SITE_PERL%%/Net/Mosso
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Mosso/CloudFiles
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Mosso
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-MovableType/Makefile b/net/p5-Net-MovableType/Makefile
index 2a7b51658429..e00eeb730239 100644
--- a/net/p5-Net-MovableType/Makefile
+++ b/net/p5-Net-MovableType/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-MovableType
 PORTVERSION=	1.74
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-MovableType/pkg-plist b/net/p5-Net-MovableType/pkg-plist
index 6516e2750f67..a5850fbb523e 100644
--- a/net/p5-Net-MovableType/pkg-plist
+++ b/net/p5-Net-MovableType/pkg-plist
@@ -2,7 +2,3 @@ bin/mt
 bin/mt-upload
 %%PERL5_MAN3%%/Net::MovableType.3.gz
 %%SITE_PERL%%/Net/MovableType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MovableType/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MovableType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-NBName/Makefile b/net/p5-Net-NBName/Makefile
index c44b2ba02430..92649f830c77 100644
--- a/net/p5-Net-NBName/Makefile
+++ b/net/p5-Net-NBName/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-NBName
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-NBName/pkg-plist b/net/p5-Net-NBName/pkg-plist
index 87f0a0e422f8..dc24200070b2 100644
--- a/net/p5-Net-NBName/pkg-plist
+++ b/net/p5-Net-NBName/pkg-plist
@@ -11,10 +11,3 @@ bin/nodestat.pl
 %%SITE_PERL%%/Net/NBName/NameQuery/RR.pm
 %%SITE_PERL%%/Net/NBName/NodeStatus.pm
 %%SITE_PERL%%/Net/NBName/NodeStatus/RR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NBName/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NBName
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/NBName/NodeStatus
-@dirrmtry %%SITE_PERL%%/Net/NBName/NameQuery
-@dirrmtry %%SITE_PERL%%/Net/NBName
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-NBsocket/Makefile b/net/p5-Net-NBsocket/Makefile
index 359e7ca06494..2811bde41557 100644
--- a/net/p5-Net-NBsocket/Makefile
+++ b/net/p5-Net-NBsocket/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-NBsocket
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-NBsocket/pkg-plist b/net/p5-Net-NBsocket/pkg-plist
index 9f2f2fccbfb4..f5b195181a68 100644
--- a/net/p5-Net-NBsocket/pkg-plist
+++ b/net/p5-Net-NBsocket/pkg-plist
@@ -9,9 +9,3 @@
 %%SITE_PERL%%/auto/Net/NBsocket/open_UDP.al
 %%SITE_PERL%%/auto/Net/NBsocket/open_udpNB.al
 %%SITE_PERL%%/auto/Net/NBsocket/set_NB.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NBsocket/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NBsocket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/NBsocket
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-NIS-Listgroup/Makefile b/net/p5-Net-NIS-Listgroup/Makefile
index 394f73c0b04c..be3284fe261d 100644
--- a/net/p5-Net-NIS-Listgroup/Makefile
+++ b/net/p5-Net-NIS-Listgroup/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-NIS-Listgroup
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-NIS-Listgroup/pkg-plist b/net/p5-Net-NIS-Listgroup/pkg-plist
index f470e6057514..6beb66cfb3fc 100644
--- a/net/p5-Net-NIS-Listgroup/pkg-plist
+++ b/net/p5-Net-NIS-Listgroup/pkg-plist
@@ -1,11 +1,5 @@
 %%PERL5_MAN3%%/Net::NIS::Listgroup.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NIS/Listgroup/.packlist
 %%SITE_PERL%%/Net/NIS/Listgroup.pm
 bin/listgroup
 bin/make_cron
 man/man1/listgroup.1.gz
-@dirrmtry %%SITE_PERL%%/Net/NIS
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NIS/Listgroup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NIS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-NIS/Makefile b/net/p5-Net-NIS/Makefile
index bde89b47f85a..25978327ec46 100644
--- a/net/p5-Net-NIS/Makefile
+++ b/net/p5-Net-NIS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-NIS
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-NIS/pkg-plist b/net/p5-Net-NIS/pkg-plist
index af56e809c8f4..63d95b3da43f 100644
--- a/net/p5-Net-NIS/pkg-plist
+++ b/net/p5-Net-NIS/pkg-plist
@@ -1,13 +1,8 @@
 %%PERL5_MAN3%%/Net::NIS.3.gz
 %%PERL5_MAN3%%/Net::NISTable.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/NIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/NIS.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/NIS/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/NISTable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NIS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NIS/NIS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NIS/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NIS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/NIS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+%%SITE_ARCH%%/Net/NIS.pm
+%%SITE_ARCH%%/Net/NIS.pod
+%%SITE_ARCH%%/Net/NIS/Table.pm
+%%SITE_ARCH%%/Net/NISTable.pod
+%%SITE_ARCH%%/auto/Net/NIS/NIS.so
+%%SITE_ARCH%%/auto/Net/NIS/autosplit.ix
diff --git a/net/p5-Net-Nessus-XMLRPC/Makefile b/net/p5-Net-Nessus-XMLRPC/Makefile
index 20a6b762de79..ce34c4492ad4 100644
--- a/net/p5-Net-Nessus-XMLRPC/Makefile
+++ b/net/p5-Net-Nessus-XMLRPC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Nessus-XMLRPC
 PORTVERSION=	0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KOST
diff --git a/net/p5-Net-Nessus-XMLRPC/pkg-plist b/net/p5-Net-Nessus-XMLRPC/pkg-plist
index fbca35237f7f..4eda11814193 100644
--- a/net/p5-Net-Nessus-XMLRPC/pkg-plist
+++ b/net/p5-Net-Nessus-XMLRPC/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/Nessus/XMLRPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nessus/XMLRPC/.packlist
 %%PERL5_MAN3%%/Net::Nessus::XMLRPC.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nessus/XMLRPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nessus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Nessus
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Nmsg/Makefile b/net/p5-Net-Nmsg/Makefile
index d2d29243515b..6627be4166b8 100644
--- a/net/p5-Net-Nmsg/Makefile
+++ b/net/p5-Net-Nmsg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-Nmsg
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	https://tools.netsa.cert.org/confluence/download/attachments/12320770/ \
 		http://tools.netsa.cert.org/confluence/download/attachments/12320770/
@@ -27,7 +28,7 @@ PORTEXAMPLES=	*
 .include <bsd.port.options.mk>
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/Nmsg/Nmsg.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/Nmsg/Nmsg.so
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
diff --git a/net/p5-Net-Nmsg/pkg-plist b/net/p5-Net-Nmsg/pkg-plist
index d67db748edf8..5c46c70360ac 100644
--- a/net/p5-Net-Nmsg/pkg-plist
+++ b/net/p5-Net-Nmsg/pkg-plist
@@ -4,14 +4,13 @@
 %%PERL5_MAN3%%/Net::Nmsg::Msg.3.gz
 %%PERL5_MAN3%%/Net::Nmsg::Output.3.gz
 %%PERL5_MAN3%%/Net::Nmsg::Util.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/IO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/Input.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/Layer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/Msg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/Output.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/Typemap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Nmsg/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nmsg/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nmsg/Nmsg.so
+%%SITE_ARCH%%/Net/Nmsg.pm
+%%SITE_ARCH%%/Net/Nmsg/Handle.pm
+%%SITE_ARCH%%/Net/Nmsg/IO.pm
+%%SITE_ARCH%%/Net/Nmsg/Input.pm
+%%SITE_ARCH%%/Net/Nmsg/Layer.pm
+%%SITE_ARCH%%/Net/Nmsg/Msg.pm
+%%SITE_ARCH%%/Net/Nmsg/Output.pm
+%%SITE_ARCH%%/Net/Nmsg/Typemap.pm
+%%SITE_ARCH%%/Net/Nmsg/Util.pm
+%%SITE_ARCH%%/auto/Net/Nmsg/Nmsg.so
diff --git a/net/p5-Net-OAuth-Simple/Makefile b/net/p5-Net-OAuth-Simple/Makefile
index e464fb057500..3e3a96490058 100644
--- a/net/p5-Net-OAuth-Simple/Makefile
+++ b/net/p5-Net-OAuth-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OAuth-Simple
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-OAuth-Simple/pkg-plist b/net/p5-Net-OAuth-Simple/pkg-plist
index 1984cdd19695..243ca32a73c5 100644
--- a/net/p5-Net-OAuth-Simple/pkg-plist
+++ b/net/p5-Net-OAuth-Simple/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/OAuth/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAuth/Simple/.packlist
 %%PERL5_MAN3%%/Net::OAuth::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/Net/OAuth
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAuth/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAuth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-OAuth/Makefile b/net/p5-Net-OAuth/Makefile
index 759ec47f9bee..35676adfdf30 100644
--- a/net/p5-Net-OAuth/Makefile
+++ b/net/p5-Net-OAuth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OAuth
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-OAuth/pkg-plist b/net/p5-Net-OAuth/pkg-plist
index 575e5ee4f074..a02c5ba37ad2 100644
--- a/net/p5-Net-OAuth/pkg-plist
+++ b/net/p5-Net-OAuth/pkg-plist
@@ -46,7 +46,3 @@
 %%PERL5_MAN3%%/Net::OAuth::V1_0A::UserAuthResponse.3.gz
 %%PERL5_MAN3%%/Net::OAuth::XauthAccessTokenRequest.3.gz
 %%PERL5_MAN3%%/Net::OAuth::YahooAccessTokenRefreshRequest.3.gz
-@dirrm %%SITE_PERL%%/Net/OAuth/V1_0A
-@dirrm %%SITE_PERL%%/Net/OAuth/SignatureMethod
-@dirrm %%SITE_PERL%%/Net/OAuth
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-OAuth2/Makefile b/net/p5-Net-OAuth2/Makefile
index b39478963ab6..0605e116845f 100644
--- a/net/p5-Net-OAuth2/Makefile
+++ b/net/p5-Net-OAuth2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OAuth2
 PORTVERSION=	0.61
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-OAuth2/pkg-plist b/net/p5-Net-OAuth2/pkg-plist
index af0fecd68c47..5bff22832af1 100644
--- a/net/p5-Net-OAuth2/pkg-plist
+++ b/net/p5-Net-OAuth2/pkg-plist
@@ -10,15 +10,9 @@
 %%SITE_PERL%%/Net/OAuth2/Profile/Password.pod
 %%SITE_PERL%%/Net/OAuth2/Profile/WebServer.pm
 %%SITE_PERL%%/Net/OAuth2/Profile/WebServer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAuth2/.packlist
 %%PERL5_MAN3%%/Net::OAuth2.3.gz
 %%PERL5_MAN3%%/Net::OAuth2::AccessToken.3.gz
 %%PERL5_MAN3%%/Net::OAuth2::Client.3.gz
 %%PERL5_MAN3%%/Net::OAuth2::Profile.3.gz
 %%PERL5_MAN3%%/Net::OAuth2::Profile::Password.3.gz
 %%PERL5_MAN3%%/Net::OAuth2::Profile::WebServer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAuth2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/OAuth2/Profile
-@dirrm %%SITE_PERL%%/Net/OAuth2
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-OpenID-Consumer/Makefile b/net/p5-Net-OpenID-Consumer/Makefile
index d33b8d024884..9299b06640dc 100644
--- a/net/p5-Net-OpenID-Consumer/Makefile
+++ b/net/p5-Net-OpenID-Consumer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OpenID-Consumer
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	net security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-OpenID-Consumer/pkg-plist b/net/p5-Net-OpenID-Consumer/pkg-plist
index 2f30f8736abf..8f48a55f2b82 100644
--- a/net/p5-Net-OpenID-Consumer/pkg-plist
+++ b/net/p5-Net-OpenID-Consumer/pkg-plist
@@ -6,9 +6,3 @@
 %%SITE_PERL%%/Net/OpenID/ClaimedIdentity.pm
 %%SITE_PERL%%/Net/OpenID/Consumer.pm
 %%SITE_PERL%%/Net/OpenID/VerifiedIdentity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Consumer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Consumer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/OpenID
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-OpenSSH-Parallel/Makefile b/net/p5-Net-OpenSSH-Parallel/Makefile
index 4758a7ccd6c3..7af2f81a2125 100644
--- a/net/p5-Net-OpenSSH-Parallel/Makefile
+++ b/net/p5-Net-OpenSSH-Parallel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OpenSSH-Parallel
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-OpenSSH-Parallel/pkg-plist b/net/p5-Net-OpenSSH-Parallel/pkg-plist
index 28d70e5d3608..2f3cb66e142e 100644
--- a/net/p5-Net-OpenSSH-Parallel/pkg-plist
+++ b/net/p5-Net-OpenSSH-Parallel/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/Net/OpenSSH/Parallel.pm
 %%SITE_PERL%%/Net/OpenSSH/Parallel/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenSSH/Parallel/.packlist
 %%PERL5_MAN3%%/Net::OpenSSH::Parallel.3.gz
 %%PERL5_MAN3%%/Net::OpenSSH::Parallel::Constants.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenSSH/Parallel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenSSH
-@dirrmtry %%SITE_PERL%%/Net/OpenSSH/Parallel
-@dirrmtry %%SITE_PERL%%/Net/OpenSSH
diff --git a/net/p5-Net-OpenSSH/Makefile b/net/p5-Net-OpenSSH/Makefile
index a63f99290a9f..3ce0018d4d84 100644
--- a/net/p5-Net-OpenSSH/Makefile
+++ b/net/p5-Net-OpenSSH/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-OpenSSH
 PORTVERSION=	0.62
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SALVA
diff --git a/net/p5-Net-OpenSSH/pkg-plist b/net/p5-Net-OpenSSH/pkg-plist
index 52bc9503d91a..13e10a75775e 100644
--- a/net/p5-Net-OpenSSH/pkg-plist
+++ b/net/p5-Net-OpenSSH/pkg-plist
@@ -17,9 +17,3 @@
 %%SITE_PERL%%/Net/OpenSSH/ShellQuoter/MSWin.pm
 %%SITE_PERL%%/Net/OpenSSH/ShellQuoter/POSIX.pm
 %%SITE_PERL%%/Net/OpenSSH/ShellQuoter/csh.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenSSH/.packlist
-@dirrmtry %%SITE_PERL%%/Net/OpenSSH/ShellQuoter
-@dirrmtry %%SITE_PERL%%/Net/OpenSSH
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenSSH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-OpenStack-Attack/Makefile b/net/p5-Net-OpenStack-Attack/Makefile
index 7ddef0bf4476..06f591123017 100644
--- a/net/p5-Net-OpenStack-Attack/Makefile
+++ b/net/p5-Net-OpenStack-Attack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-OpenStack-Attack
 PORTVERSION=	1.0500
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-OpenStack-Attack/pkg-plist b/net/p5-Net-OpenStack-Attack/pkg-plist
index 7123fa1be8ea..5dc01e837180 100644
--- a/net/p5-Net-OpenStack-Attack/pkg-plist
+++ b/net/p5-Net-OpenStack-Attack/pkg-plist
@@ -1,10 +1,4 @@
 bin/stackattack
 %%SITE_PERL%%/Net/OpenStack/Attack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenStack/Attack/.packlist
 %%PERL5_MAN3%%/Net::OpenStack::Attack.3.gz
 man/man1/stackattack.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenStack/Attack
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenStack
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/OpenStack
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Packet-Target/Makefile b/net/p5-Net-Packet-Target/Makefile
index 95fd1e42c4aa..73b32b6c5f02 100644
--- a/net/p5-Net-Packet-Target/Makefile
+++ b/net/p5-Net-Packet-Target/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Packet-Target
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	net perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Packet-Target/pkg-plist b/net/p5-Net-Packet-Target/pkg-plist
index 3739c69e0406..ab60ff84e8b0 100644
--- a/net/p5-Net-Packet-Target/pkg-plist
+++ b/net/p5-Net-Packet-Target/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::Packet::Target.3.gz
 %%SITE_PERL%%/Net/Packet/Target.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/Target/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/Target
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Packet
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Packet/Makefile b/net/p5-Net-Packet/Makefile
index 17dbc060a2d0..6769f4441a55 100644
--- a/net/p5-Net-Packet/Makefile
+++ b/net/p5-Net-Packet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Packet
 DISTVERSION=	3.27
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Packet/pkg-plist b/net/p5-Net-Packet/pkg-plist
index 6a31da001b83..0c2a48148876 100644
--- a/net/p5-Net-Packet/pkg-plist
+++ b/net/p5-Net-Packet/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/.packlist
 %%SITE_PERL%%/Net/Packet.pm
 %%SITE_PERL%%/Net/Packet/ARP.pm
 %%SITE_PERL%%/Net/Packet/CDP.pm
@@ -81,8 +80,3 @@
 %%PERL5_MAN3%%/Net::Packet::UDP.3.gz
 %%PERL5_MAN3%%/Net::Packet::Utils.3.gz
 %%PERL5_MAN3%%/Net::Packet::VLAN.3.gz
-@dirrmtry %%SITE_PERL%%/Net/Packet/CDP
-@dirrmtry %%SITE_PERL%%/Net/Packet
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-ParseWhois/Makefile b/net/p5-Net-ParseWhois/Makefile
index 32d995a4ce6d..847049fdcceb 100644
--- a/net/p5-Net-ParseWhois/Makefile
+++ b/net/p5-Net-ParseWhois/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-ParseWhois
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-ParseWhois/pkg-plist b/net/p5-Net-ParseWhois/pkg-plist
index f5922f86be06..40c13b7a300d 100644
--- a/net/p5-Net-ParseWhois/pkg-plist
+++ b/net/p5-Net-ParseWhois/pkg-plist
@@ -21,10 +21,3 @@
 %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Registrars.pm
 %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/SRSPlus.pm
 %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Unknown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar
-@dirrmtry %%SITE_PERL%%/Net/ParseWhois/Domain
-@dirrmtry %%SITE_PERL%%/Net/ParseWhois
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Patricia/Makefile b/net/p5-Net-Patricia/Makefile
index d286f414230a..90b589ff9578 100644
--- a/net/p5-Net-Patricia/Makefile
+++ b/net/p5-Net-Patricia/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Patricia
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Patricia/pkg-plist b/net/p5-Net-Patricia/pkg-plist
index 843d50eaf40e..f5c395475190 100644
--- a/net/p5-Net-Patricia/pkg-plist
+++ b/net/p5-Net-Patricia/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Patricia.pm
+%%SITE_ARCH%%/auto/Net/Patricia/Patricia.so
+%%SITE_ARCH%%/Net/Patricia.pm
 %%PERL5_MAN3%%/Net::Patricia.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 12945613ae86..c843d31e50da 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Pcap
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Pcap/pkg-plist b/net/p5-Net-Pcap/pkg-plist
index 033a7fca8e52..1f009058f5fd 100644
--- a/net/p5-Net-Pcap/pkg-plist
+++ b/net/p5-Net-Pcap/pkg-plist
@@ -1,9 +1,5 @@
 bin/pcapinfo
 %%PERL5_MAN3%%/Net::Pcap.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Pcap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.so
+%%SITE_ARCH%%/Net/Pcap.pm
+%%SITE_ARCH%%/auto/Net/Pcap/Pcap.so
 man/man1/pcapinfo.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-PcapUtils/Makefile b/net/p5-Net-PcapUtils/Makefile
index c1777f5a6a4b..e89a63ff3714 100644
--- a/net/p5-Net-PcapUtils/Makefile
+++ b/net/p5-Net-PcapUtils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-PcapUtils
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-PcapUtils/pkg-plist b/net/p5-Net-PcapUtils/pkg-plist
index 92b1ef7d0594..89512041f3d5 100644
--- a/net/p5-Net-PcapUtils/pkg-plist
+++ b/net/p5-Net-PcapUtils/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::PcapUtils.3.gz
 %%SITE_PERL%%/Net/PcapUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PcapUtils/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PcapUtils
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Ping-External/Makefile b/net/p5-Net-Ping-External/Makefile
index 0ba6967e9cb9..7f9d31a08c40 100644
--- a/net/p5-Net-Ping-External/Makefile
+++ b/net/p5-Net-Ping-External/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Ping-External
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Ping-External/pkg-plist b/net/p5-Net-Ping-External/pkg-plist
index 2488e5f3ae63..39e91eced226 100644
--- a/net/p5-Net-Ping-External/pkg-plist
+++ b/net/p5-Net-Ping-External/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/Ping/External.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping/External/.packlist
 %%PERL5_MAN3%%/Net::Ping::External.3.gz
-@dirrmtry %%SITE_PERL%%/Net/Ping
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping/External
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Ping/Makefile b/net/p5-Net-Ping/Makefile
index 7eef9be33a6d..b1eb5514e08b 100644
--- a/net/p5-Net-Ping/Makefile
+++ b/net/p5-Net-Ping/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Ping
 PORTVERSION=	2.40
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Ping/pkg-plist b/net/p5-Net-Ping/pkg-plist
index eac770cc491a..312683c28d64 100644
--- a/net/p5-Net-Ping/pkg-plist
+++ b/net/p5-Net-Ping/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Ping.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping/.packlist
 %%PERL5_MAN3%%/Net::Ping.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Proxy/Makefile b/net/p5-Net-Proxy/Makefile
index 90e69bcb93d8..6026869bd572 100644
--- a/net/p5-Net-Proxy/Makefile
+++ b/net/p5-Net-Proxy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Proxy
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net-Proxy/pkg-plist b/net/p5-Net-Proxy/pkg-plist
index 2487c11d7304..700c69139f7f 100644
--- a/net/p5-Net-Proxy/pkg-plist
+++ b/net/p5-Net-Proxy/pkg-plist
@@ -11,7 +11,6 @@ man/man1/sslh.1.gz
 %%SITE_PERL%%/Net/Proxy/Connector/ssl.pm
 %%SITE_PERL%%/Net/Proxy/Connector/tcp.pm
 %%SITE_PERL%%/Net/Proxy/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Proxy/.packlist
 %%PERL5_MAN3%%/Net::Proxy.3.gz
 %%PERL5_MAN3%%/Net::Proxy::Connector.3.gz
 %%PERL5_MAN3%%/Net::Proxy::Connector::connect.3.gz
@@ -21,8 +20,3 @@ man/man1/sslh.1.gz
 %%PERL5_MAN3%%/Net::Proxy::Connector::ssl.3.gz
 %%PERL5_MAN3%%/Net::Proxy::Connector::tcp.3.gz
 %%PERL5_MAN3%%/Net::Proxy::Tutorial.3.gz
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Proxy
-@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dir %%SITE_PERL%%/Net/Proxy/Connector
-@dir %%SITE_PERL%%/Net/Proxy
-@dir %%SITE_PERL%%/Net
diff --git a/net/p5-Net-PubSubHubbub-Publisher/Makefile b/net/p5-Net-PubSubHubbub-Publisher/Makefile
index 38342424925d..a358bf3bc9f9 100644
--- a/net/p5-Net-PubSubHubbub-Publisher/Makefile
+++ b/net/p5-Net-PubSubHubbub-Publisher/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-PubSubHubbub-Publisher
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-PubSubHubbub-Publisher/pkg-plist b/net/p5-Net-PubSubHubbub-Publisher/pkg-plist
index d67858fe8030..1a9bdd0568f8 100644
--- a/net/p5-Net-PubSubHubbub-Publisher/pkg-plist
+++ b/net/p5-Net-PubSubHubbub-Publisher/pkg-plist
@@ -1,9 +1,3 @@
 bin/pubsubhubbub-publish
 %%SITE_PERL%%/Net/PubSubHubbub/Publisher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PubSubHubbub/Publisher/.packlist
 %%PERL5_MAN3%%/Net::PubSubHubbub::Publisher.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PubSubHubbub/Publisher
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PubSubHubbub
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/PubSubHubbub
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-RTP/Makefile b/net/p5-Net-RTP/Makefile
index 741c56645bd3..04a69fbc0577 100644
--- a/net/p5-Net-RTP/Makefile
+++ b/net/p5-Net-RTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-RTP
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-RTP/pkg-plist b/net/p5-Net-RTP/pkg-plist
index a7c2739e0b5b..278037a9863a 100644
--- a/net/p5-Net-RTP/pkg-plist
+++ b/net/p5-Net-RTP/pkg-plist
@@ -12,5 +12,3 @@ man/man1/rtplosslog.pl.1.gz
 man/man1/rtpsend-pcmu.pl.1.gz
 man/man1/rtpstats.pl.1.gz
 man/man1/rtptimer.pl.1.gz
-@dirrmtry %%SITE_PERL%%/Net/RTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-RabbitFoot/Makefile b/net/p5-Net-RabbitFoot/Makefile
index cf2e3a9a15f4..777f5cbcd91a 100644
--- a/net/p5-Net-RabbitFoot/Makefile
+++ b/net/p5-Net-RabbitFoot/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-RabbitFoot
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:IKUTA
diff --git a/net/p5-Net-RabbitFoot/pkg-plist b/net/p5-Net-RabbitFoot/pkg-plist
index 8cab874b22fb..721d2edabf02 100644
--- a/net/p5-Net-RabbitFoot/pkg-plist
+++ b/net/p5-Net-RabbitFoot/pkg-plist
@@ -13,11 +13,3 @@ bin/rabbit_foot
 %%SITE_PERL%%/Net/RabbitFoot/Cmd/Role/Command.pm
 %%SITE_PERL%%/Net/RabbitFoot/Cmd/Role/Config.pm
 %%SITE_PERL%%/auto/share/dist/Net-RabbitFoot/fixed_amqp0-8.xml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitFoot/.packlist
-@dirrmtry %%SITE_PERL%%/Net/RabbitFoot/Cmd/Command
-@dirrmtry %%SITE_PERL%%/Net/RabbitFoot/Cmd/Role
-@dirrmtry %%SITE_PERL%%/Net/RabbitFoot/Cmd
-@dirrmtry %%SITE_PERL%%/Net/RabbitFoot
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Net-RabbitFoot
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitFoot
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-RabbitMQ/Makefile b/net/p5-Net-RabbitMQ/Makefile
index 7d19f42685bb..a9bfe14d8204 100644
--- a/net/p5-Net-RabbitMQ/Makefile
+++ b/net/p5-Net-RabbitMQ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-RabbitMQ
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JESUS
diff --git a/net/p5-Net-RabbitMQ/pkg-plist b/net/p5-Net-RabbitMQ/pkg-plist
index 62ee52723aa3..a324bf3ffafb 100644
--- a/net/p5-Net-RabbitMQ/pkg-plist
+++ b/net/p5-Net-RabbitMQ/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RabbitMQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitMQ/RabbitMQ.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitMQ/.packlist
+%%SITE_ARCH%%/Net/RabbitMQ.pm
+%%SITE_ARCH%%/auto/Net/RabbitMQ/RabbitMQ.so
 %%PERL5_MAN3%%/Net::RabbitMQ.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitMQ
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index 07d69d9e5b9e..a4c7c5f7693d 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Radius
 PORTVERSION=	2.103
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Radius/pkg-plist b/net/p5-Net-Radius/pkg-plist
index 3eeefda2400c..c9c603dc412a 100644
--- a/net/p5-Net-Radius/pkg-plist
+++ b/net/p5-Net-Radius/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Net::Radius::Packet.3.gz
 %%SITE_PERL%%/Net/Radius/Dictionary.pm
 %%SITE_PERL%%/Net/Radius/Packet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Radius
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Random/Makefile b/net/p5-Net-Random/Makefile
index ae40ce08493b..a6d5e45b3060 100644
--- a/net/p5-Net-Random/Makefile
+++ b/net/p5-Net-Random/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Random
 PORTVERSION=	2.31
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Random/pkg-plist b/net/p5-Net-Random/pkg-plist
index 24048deec2e7..666870e03d84 100644
--- a/net/p5-Net-Random/pkg-plist
+++ b/net/p5-Net-Random/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::Random.3.gz
 %%SITE_PERL%%/Net/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Random/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index b3daa2cb11ce..e410ef1f2fde 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-RawIP
 PORTVERSION=	0.25
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
diff --git a/net/p5-Net-RawIP/pkg-plist b/net/p5-Net-RawIP/pkg-plist
index 57b3d842256e..9426a6724f01 100644
--- a/net/p5-Net-RawIP/pkg-plist
+++ b/net/p5-Net-RawIP/pkg-plist
@@ -1,18 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/libpcap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/iphdr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/udphdr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/icmphdr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/generichdr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/opt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/ethhdr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/tcphdr.pm
+%%SITE_ARCH%%/auto/Net/RawIP/autosplit.ix
+%%SITE_ARCH%%/auto/Net/RawIP/RawIP.so
+%%SITE_ARCH%%/Net/RawIP.pm
+%%SITE_ARCH%%/Net/RawIP/libpcap.pod
+%%SITE_ARCH%%/Net/RawIP/iphdr.pm
+%%SITE_ARCH%%/Net/RawIP/udphdr.pm
+%%SITE_ARCH%%/Net/RawIP/icmphdr.pm
+%%SITE_ARCH%%/Net/RawIP/generichdr.pm
+%%SITE_ARCH%%/Net/RawIP/opt.pm
+%%SITE_ARCH%%/Net/RawIP/ethhdr.pm
+%%SITE_ARCH%%/Net/RawIP/tcphdr.pm
 %%PERL5_MAN3%%/Net::RawIP.3.gz
 %%PERL5_MAN3%%/Net::RawIP::libpcap.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-RawSock/Makefile b/net/p5-Net-RawSock/Makefile
index 923550cdf79b..7c18c80354b7 100644
--- a/net/p5-Net-RawSock/Makefile
+++ b/net/p5-Net-RawSock/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-RawSock
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	http://www.hsc.fr/ressources/outils/rawsock/download/
 PKGNAMEPREFIX=	p5-
@@ -25,7 +26,7 @@ post-patch:
 		${WRKSRC}/RawSock.pm
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/RawSock/RawSock.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/RawSock/RawSock.so
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
diff --git a/net/p5-Net-RawSock/pkg-plist b/net/p5-Net-RawSock/pkg-plist
index f970d73f79a4..66fda4a119c0 100644
--- a/net/p5-Net-RawSock/pkg-plist
+++ b/net/p5-Net-RawSock/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawSock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.so
+%%SITE_ARCH%%/Net/RawSock.pm
+%%SITE_ARCH%%/auto/Net/RawSock/RawSock.so
 %%PERL5_MAN3%%/Net::RawSock.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-Rendezvous-Publish/Makefile b/net/p5-Net-Rendezvous-Publish/Makefile
index 9ff248710f18..d44f0d2aab18 100644
--- a/net/p5-Net-Rendezvous-Publish/Makefile
+++ b/net/p5-Net-Rendezvous-Publish/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Rendezvous-Publish
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Rendezvous-Publish/pkg-plist b/net/p5-Net-Rendezvous-Publish/pkg-plist
index 7c38fbff3880..61b88570deef 100644
--- a/net/p5-Net-Rendezvous-Publish/pkg-plist
+++ b/net/p5-Net-Rendezvous-Publish/pkg-plist
@@ -1,13 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rendezvous/Publish/.packlist
 %%SITE_PERL%%/Net/Rendezvous/Publish/Backend/Null.pm
 %%SITE_PERL%%/Net/Rendezvous/Publish/Service.pm
 %%SITE_PERL%%/Net/Rendezvous/Publish.pm
 %%PERL5_MAN3%%/Net::Rendezvous::Publish.3.gz
 %%PERL5_MAN3%%/Net::Rendezvous::Publish::Service.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rendezvous/Publish
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rendezvous
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Rendezvous/Publish/Backend
-@dirrmtry %%SITE_PERL%%/Net/Rendezvous/Publish
-@dirrmtry %%SITE_PERL%%/Net/Rendezvous
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Riak/Makefile b/net/p5-Net-Riak/Makefile
index 7e5ed1be92f4..38f92f7a1802 100644
--- a/net/p5-Net-Riak/Makefile
+++ b/net/p5-Net-Riak/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Riak
 PORTVERSION=	0.17.02
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RGE
diff --git a/net/p5-Net-Riak/pkg-plist b/net/p5-Net-Riak/pkg-plist
index cb45ed9c4f58..19cb5b354a16 100644
--- a/net/p5-Net-Riak/pkg-plist
+++ b/net/p5-Net-Riak/pkg-plist
@@ -64,13 +64,3 @@
 %%SITE_PERL%%/Net/Riak/Transport/PBC/Transport.pm
 %%SITE_PERL%%/Net/Riak/Transport/REST.pm
 %%SITE_PERL%%/Net/Riak/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Riak/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Riak
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Riak/Transport/PBC
-@dirrmtry %%SITE_PERL%%/Net/Riak/Transport
-@dirrmtry %%SITE_PERL%%/Net/Riak/Role/REST
-@dirrmtry %%SITE_PERL%%/Net/Riak/Role/PBC
-@dirrmtry %%SITE_PERL%%/Net/Riak/Role
-@dirrmtry %%SITE_PERL%%/Net/Riak
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Rsh/Makefile b/net/p5-Net-Rsh/Makefile
index a2643482d9c2..66bb855999dd 100644
--- a/net/p5-Net-Rsh/Makefile
+++ b/net/p5-Net-Rsh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Rsh
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Rsh/pkg-plist b/net/p5-Net-Rsh/pkg-plist
index c36f8ca53fe8..8cbbbb32341a 100644
--- a/net/p5-Net-Rsh/pkg-plist
+++ b/net/p5-Net-Rsh/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Rsh.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rsh/.packlist
 %%PERL5_MAN3%%/Net::Rsh.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rsh
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SAP/Makefile b/net/p5-Net-SAP/Makefile
index 680db085f15a..108d3755fc5b 100644
--- a/net/p5-Net-SAP/Makefile
+++ b/net/p5-Net-SAP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SAP
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SAP/pkg-plist b/net/p5-Net-SAP/pkg-plist
index dd17237dc6be..f03c1e9f4415 100644
--- a/net/p5-Net-SAP/pkg-plist
+++ b/net/p5-Net-SAP/pkg-plist
@@ -4,5 +4,3 @@ bin/psapd
 %%SITE_PERL%%/Net/SAP.pm
 %%SITE_PERL%%/Net/SAP/Packet.pm
 man/man1/psapd.1.gz
-@dirrmtry %%SITE_PERL%%/Net/SAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SCP-Expect/Makefile b/net/p5-Net-SCP-Expect/Makefile
index 5e6086570f13..c960af63e446 100644
--- a/net/p5-Net-SCP-Expect/Makefile
+++ b/net/p5-Net-SCP-Expect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SCP-Expect
 PORTVERSION=	0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SCP-Expect/pkg-plist b/net/p5-Net-SCP-Expect/pkg-plist
index 97e7f3570816..74e94164dd95 100644
--- a/net/p5-Net-SCP-Expect/pkg-plist
+++ b/net/p5-Net-SCP-Expect/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/SCP/Expect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP/Expect/.packlist
 %%PERL5_MAN3%%/Net::SCP::Expect.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP/Expect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SCP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SCP/Makefile b/net/p5-Net-SCP/Makefile
index ec019a4cf0d3..c326b2a3a3ee 100644
--- a/net/p5-Net-SCP/Makefile
+++ b/net/p5-Net-SCP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SCP
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SCP/pkg-plist b/net/p5-Net-SCP/pkg-plist
index f7f4052b650f..1ed0fbc437a8 100644
--- a/net/p5-Net-SCP/pkg-plist
+++ b/net/p5-Net-SCP/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::SCP.3.gz
 %%SITE_PERL%%/Net/SCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SDP/Makefile b/net/p5-Net-SDP/Makefile
index ded9b737def6..5139f56e07cb 100644
--- a/net/p5-Net-SDP/Makefile
+++ b/net/p5-Net-SDP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SDP
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SDP/pkg-plist b/net/p5-Net-SDP/pkg-plist
index 7cd587f398d9..27f31efab29e 100644
--- a/net/p5-Net-SDP/pkg-plist
+++ b/net/p5-Net-SDP/pkg-plist
@@ -6,5 +6,3 @@ bin/sdp2rat
 %%SITE_PERL%%/Net/SDP/Media.pm
 %%SITE_PERL%%/Net/SDP/Time.pm
 man/man1/sdp2rat.1.gz
-@dirrmtry %%SITE_PERL%%/Net/SDP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SFTP-Foreign/Makefile b/net/p5-Net-SFTP-Foreign/Makefile
index 7163fc05d0fd..1309c28e8f0d 100644
--- a/net/p5-Net-SFTP-Foreign/Makefile
+++ b/net/p5-Net-SFTP-Foreign/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SFTP-Foreign
 PORTVERSION=	1.73
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SFTP-Foreign/pkg-plist b/net/p5-Net-SFTP-Foreign/pkg-plist
index 58c068cfa4f3..b4fb5d2ccf87 100644
--- a/net/p5-Net-SFTP-Foreign/pkg-plist
+++ b/net/p5-Net-SFTP-Foreign/pkg-plist
@@ -9,7 +9,6 @@
 %%SITE_PERL%%/Net/SFTP/Foreign/Constants.pm
 %%SITE_PERL%%/Net/SFTP/Foreign/Helpers.pm
 %%SITE_PERL%%/Net/SFTP/Foreign/Local.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP/Foreign/.packlist
 %%PERL5_MAN3%%/Net::SFTP::Foreign.3.gz
 %%PERL5_MAN3%%/Net::SFTP::Foreign::Attributes.3.gz
 %%PERL5_MAN3%%/Net::SFTP::Foreign::Attributes::Compat.3.gz
@@ -17,11 +16,3 @@
 %%PERL5_MAN3%%/Net::SFTP::Foreign::Compat.3.gz
 %%PERL5_MAN3%%/Net::SFTP::Foreign::Constants.3.gz
 %%PERL5_MAN3%%/Net::SFTP::Foreign::Local.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP/Foreign
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/SFTP/Foreign/Attributes
-@dirrm %%SITE_PERL%%/Net/SFTP/Foreign/Backend
-@dirrm %%SITE_PERL%%/Net/SFTP/Foreign
-@dirrmtry %%SITE_PERL%%/Net/SFTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SFTP/Makefile b/net/p5-Net-SFTP/Makefile
index ea600b04b25d..0cf848711ba5 100644
--- a/net/p5-Net-SFTP/Makefile
+++ b/net/p5-Net-SFTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SFTP
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SFTP/pkg-plist b/net/p5-Net-SFTP/pkg-plist
index 139327a27404..edc8827a2ec2 100644
--- a/net/p5-Net-SFTP/pkg-plist
+++ b/net/p5-Net-SFTP/pkg-plist
@@ -8,8 +8,3 @@
 %%SITE_PERL%%/Net/SFTP/Buffer.pm
 %%SITE_PERL%%/Net/SFTP/Constants.pm
 %%SITE_PERL%%/Net/SFTP/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SFTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SIP/Makefile b/net/p5-Net-SIP/Makefile
index 2d9d32b95cfb..bc7610e5f714 100644
--- a/net/p5-Net-SIP/Makefile
+++ b/net/p5-Net-SIP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SIP
 PORTVERSION=	0.68.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SIP/pkg-plist b/net/p5-Net-SIP/pkg-plist
index c11113ac150e..949a9388baa9 100644
--- a/net/p5-Net-SIP/pkg-plist
+++ b/net/p5-Net-SIP/pkg-plist
@@ -82,13 +82,3 @@
 %%SITE_PERL%%/Net/SIP/StatelessProxy.pod
 %%SITE_PERL%%/Net/SIP/Util.pm
 %%SITE_PERL%%/Net/SIP/Util.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SIP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SIP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SIP/Simple
-@dirrmtry %%SITE_PERL%%/Net/SIP/NATHelper
-@dirrmtry %%SITE_PERL%%/Net/SIP/Endpoint
-@dirrmtry %%SITE_PERL%%/Net/SIP/Dropper
-@dirrmtry %%SITE_PERL%%/Net/SIP/Dispatcher
-@dirrmtry %%SITE_PERL%%/Net/SIP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SMPP/Makefile b/net/p5-Net-SMPP/Makefile
index 52c4695938e4..e049c5426dc0 100644
--- a/net/p5-Net-SMPP/Makefile
+++ b/net/p5-Net-SMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SMPP
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SMPP/pkg-plist b/net/p5-Net-SMPP/pkg-plist
index 5b4894c7e36c..a0901136c273 100644
--- a/net/p5-Net-SMPP/pkg-plist
+++ b/net/p5-Net-SMPP/pkg-plist
@@ -5,8 +5,4 @@
 %%SITE_PERL%%/Net/esme.pl
 %%SITE_PERL%%/Net/sendmessage.pl
 %%SITE_PERL%%/Net/smsc.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP/.packlist
 %%PERL5_MAN3%%/Net::SMPP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SMS-Clickatell/Makefile b/net/p5-Net-SMS-Clickatell/Makefile
index 09269cf9bb51..1f526f4a366e 100644
--- a/net/p5-Net-SMS-Clickatell/Makefile
+++ b/net/p5-Net-SMS-Clickatell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SMS-Clickatell
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SMS-Clickatell/pkg-plist b/net/p5-Net-SMS-Clickatell/pkg-plist
index 5d31e2156946..8797deedaedf 100644
--- a/net/p5-Net-SMS-Clickatell/pkg-plist
+++ b/net/p5-Net-SMS-Clickatell/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/SMS/Clickatell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS/Clickatell/.packlist
 %%PERL5_MAN3%%/Net::SMS::Clickatell.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS/Clickatell
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMS
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SMS-Mollie/Makefile b/net/p5-Net-SMS-Mollie/Makefile
index de20eb0976e2..8fee3d625582 100644
--- a/net/p5-Net-SMS-Mollie/Makefile
+++ b/net/p5-Net-SMS-Mollie/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Net-SMS-Mollie
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SMS-Mollie/pkg-plist b/net/p5-Net-SMS-Mollie/pkg-plist
index 287f4b352721..f4f60b82960b 100644
--- a/net/p5-Net-SMS-Mollie/pkg-plist
+++ b/net/p5-Net-SMS-Mollie/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/SMS/Mollie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS/Mollie/.packlist
 %%PERL5_MAN3%%/Net::SMS::Mollie.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS/Mollie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMS
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SMS-PChome/Makefile b/net/p5-Net-SMS-PChome/Makefile
index 4b29431e733e..a1deba11bcd8 100644
--- a/net/p5-Net-SMS-PChome/Makefile
+++ b/net/p5-Net-SMS-PChome/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SMS-PChome
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SMS-PChome/pkg-plist b/net/p5-Net-SMS-PChome/pkg-plist
index 0dd12ef59d54..47ba6db93a2c 100644
--- a/net/p5-Net-SMS-PChome/pkg-plist
+++ b/net/p5-Net-SMS-PChome/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/SMS/PChome.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS/PChome/.packlist
 %%PERL5_MAN3%%/Net::SMS::PChome.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS/PChome
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMS
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SNPP/Makefile b/net/p5-Net-SNPP/Makefile
index 57d0d2a85bed..cf98045cd00e 100644
--- a/net/p5-Net-SNPP/Makefile
+++ b/net/p5-Net-SNPP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SNPP
 PORTVERSION=	1.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SNPP/pkg-plist b/net/p5-Net-SNPP/pkg-plist
index 2f4414ffe48e..fa9e79c8e4f4 100644
--- a/net/p5-Net-SNPP/pkg-plist
+++ b/net/p5-Net-SNPP/pkg-plist
@@ -3,8 +3,3 @@
 %%SITE_PERL%%/Net/SNPP.pm
 %%SITE_PERL%%/Net/SNPP/HylaFAX.pm
 %%SITE_PERL%%/Net/SNPP/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SNPP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SPDY/Makefile b/net/p5-Net-SPDY/Makefile
index b0630b11d8dd..4a9e577ca706 100644
--- a/net/p5-Net-SPDY/Makefile
+++ b/net/p5-Net-SPDY/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SPDY
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LKUNDRAK
diff --git a/net/p5-Net-SPDY/pkg-plist b/net/p5-Net-SPDY/pkg-plist
index 0dbfa9eaf078..916b084b469a 100644
--- a/net/p5-Net-SPDY/pkg-plist
+++ b/net/p5-Net-SPDY/pkg-plist
@@ -10,5 +10,3 @@ bin/spdy-server.pl
 %%PERL5_MAN3%%/Net::SPDY::Session.3.gz
 man/man1/spdy-client.pl.1.gz
 man/man1/spdy-server.pl.1.gz
-@dirrm %%SITE_PERL%%/Net/SPDY
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SSH-Expect/Makefile b/net/p5-Net-SSH-Expect/Makefile
index 0b8b21995b63..5a3e07c32706 100644
--- a/net/p5-Net-SSH-Expect/Makefile
+++ b/net/p5-Net-SSH-Expect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SSH-Expect
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SSH-Expect/pkg-plist b/net/p5-Net-SSH-Expect/pkg-plist
index c69e1e336d64..3ec9294a4760 100644
--- a/net/p5-Net-SSH-Expect/pkg-plist
+++ b/net/p5-Net-SSH-Expect/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Net/SSH/Expect.pm
 %%SITE_PERL%%/Net/SSH/Expect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Expect/.packlist
 %%PERL5_MAN3%%/Net::SSH::Expect.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Expect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SSH
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SSH-Mechanize/Makefile b/net/p5-Net-SSH-Mechanize/Makefile
index 660757d90526..8cba44916619 100644
--- a/net/p5-Net-SSH-Mechanize/Makefile
+++ b/net/p5-Net-SSH-Mechanize/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-SSH-Mechanize
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SSH-Mechanize/pkg-plist b/net/p5-Net-SSH-Mechanize/pkg-plist
index 1927dc8e64dc..91cc4cd56d6e 100644
--- a/net/p5-Net-SSH-Mechanize/pkg-plist
+++ b/net/p5-Net-SSH-Mechanize/pkg-plist
@@ -6,6 +6,3 @@
 %%PERL5_MAN3%%/Net::SSH::Mechanize::ConnectParams.3.gz
 %%PERL5_MAN3%%/Net::SSH::Mechanize::Multi.3.gz
 %%PERL5_MAN3%%/Net::SSH::Mechanize::Session.3.gz
-@dirrm %%SITE_PERL%%/Net/SSH/Mechanize
-@dirrmtry %%SITE_PERL%%/Net/SSH
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index e53402f76af8..9db6bde67b49 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SSH-Perl
 PORTVERSION=	1.37
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SSH-Perl/pkg-plist b/net/p5-Net-SSH-Perl/pkg-plist
index 91d04126c740..f9fb994666db 100644
--- a/net/p5-Net-SSH-Perl/pkg-plist
+++ b/net/p5-Net-SSH-Perl/pkg-plist
@@ -87,18 +87,3 @@
 %%SITE_PERL%%/Net/SSH/Perl/Util/SSH1Misc.pm
 %%SITE_PERL%%/Net/SSH/Perl/Util/SSH2MP.pm
 %%SITE_PERL%%/Net/SSH/Perl/Util/Term.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Util
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Subsystem
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Key
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Kex
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Handle
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Comp
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Cipher
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl/Auth
-@dirrmtry %%SITE_PERL%%/Net/SSH/Perl
-@dirrmtry %%SITE_PERL%%/Net/SSH
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SSH/Makefile b/net/p5-Net-SSH/Makefile
index f7ec5d791080..7d91c806a4fb 100644
--- a/net/p5-Net-SSH/Makefile
+++ b/net/p5-Net-SSH/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SSH
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SSH/pkg-plist b/net/p5-Net-SSH/pkg-plist
index fcdc1a45c0d9..37914cb0bf0e 100644
--- a/net/p5-Net-SSH/pkg-plist
+++ b/net/p5-Net-SSH/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/SSH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/.packlist
 %%PERL5_MAN3%%/Net::SSH.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SSH2/Makefile b/net/p5-Net-SSH2/Makefile
index 3d61649ee2d3..089e5ffff4ae 100644
--- a/net/p5-Net-SSH2/Makefile
+++ b/net/p5-Net-SSH2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SSH2
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SSH2/pkg-plist b/net/p5-Net-SSH2/pkg-plist
index a1f3dc740038..4d54cc5ccdcf 100644
--- a/net/p5-Net-SSH2/pkg-plist
+++ b/net/p5-Net-SSH2/pkg-plist
@@ -5,17 +5,12 @@
 %%PERL5_MAN3%%/Net::SSH2::Listener.3.gz
 %%PERL5_MAN3%%/Net::SSH2::PublicKey.3.gz
 %%PERL5_MAN3%%/Net::SSH2::SFTP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/Channel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/Dir.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/Listener.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/PublicKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/SFTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH2/SSH2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH2/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+%%SITE_ARCH%%/Net/SSH2.pm
+%%SITE_ARCH%%/Net/SSH2/Channel.pm
+%%SITE_ARCH%%/Net/SSH2/Dir.pm
+%%SITE_ARCH%%/Net/SSH2/File.pm
+%%SITE_ARCH%%/Net/SSH2/Listener.pm
+%%SITE_ARCH%%/Net/SSH2/PublicKey.pm
+%%SITE_ARCH%%/Net/SSH2/SFTP.pm
+%%SITE_ARCH%%/auto/Net/SSH2/SSH2.so
+%%SITE_ARCH%%/auto/Net/SSH2/autosplit.ix
diff --git a/net/p5-Net-STOMP-Client/Makefile b/net/p5-Net-STOMP-Client/Makefile
index 4829665b7113..5107967abe57 100644
--- a/net/p5-Net-STOMP-Client/Makefile
+++ b/net/p5-Net-STOMP-Client/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-STOMP-Client
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-STOMP-Client/pkg-plist b/net/p5-Net-STOMP-Client/pkg-plist
index afd56a2e3db5..0925210bef37 100644
--- a/net/p5-Net-STOMP-Client/pkg-plist
+++ b/net/p5-Net-STOMP-Client/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/Net/STOMP/Client/Receipt.pm
 %%SITE_PERL%%/Net/STOMP/Client/Tutorial.pod
 %%SITE_PERL%%/Net/STOMP/Client/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/STOMP/Client/.packlist
 %%PERL5_MAN3%%/Net::STOMP::Client.3.gz
 %%PERL5_MAN3%%/Net::STOMP::Client::Auth.3.gz
 %%PERL5_MAN3%%/Net::STOMP::Client::Connection.3.gz
@@ -19,9 +18,3 @@
 %%PERL5_MAN3%%/Net::STOMP::Client::Receipt.3.gz
 %%PERL5_MAN3%%/Net::STOMP::Client::Tutorial.3.gz
 %%PERL5_MAN3%%/Net::STOMP::Client::Version.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/STOMP/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/STOMP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/STOMP/Client
-@dirrmtry %%SITE_PERL%%/Net/STOMP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Server-Coro/Makefile b/net/p5-Net-Server-Coro/Makefile
index 29076d82ae78..9db6ad80d56c 100644
--- a/net/p5-Net-Server-Coro/Makefile
+++ b/net/p5-Net-Server-Coro/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-Server-Coro
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Server-Coro/pkg-plist b/net/p5-Net-Server-Coro/pkg-plist
index 0c76de787653..e554b1bd05b5 100644
--- a/net/p5-Net-Server-Coro/pkg-plist
+++ b/net/p5-Net-Server-Coro/pkg-plist
@@ -1,10 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Coro/.packlist
 %%SITE_PERL%%/Net/Server/Coro.pm
 %%SITE_PERL%%/Net/Server/Proto/Coro.pm
 %%PERL5_MAN3%%/Net::Server::Coro.3.gz
-@dirrmtry %%SITE_PERL%%/Net/Server/Proto
-@dirrmtry %%SITE_PERL%%/Net/Server
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Coro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Server-SS-PreFork/Makefile b/net/p5-Net-Server-SS-PreFork/Makefile
index 557fa14680a7..c7ac9ab2aaa6 100644
--- a/net/p5-Net-Server-SS-PreFork/Makefile
+++ b/net/p5-Net-Server-SS-PreFork/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Server-SS-PreFork
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Server-SS-PreFork/pkg-plist b/net/p5-Net-Server-SS-PreFork/pkg-plist
index fc46a2614d35..f44d3429d0e4 100644
--- a/net/p5-Net-Server-SS-PreFork/pkg-plist
+++ b/net/p5-Net-Server-SS-PreFork/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Net/Server/SS/PreFork.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/SS/PreFork/.packlist
 %%PERL5_MAN3%%/Net::Server::SS::PreFork.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/SS/PreFork
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/SS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Server/SS
-@dirrmtry %%SITE_PERL%%/Net/Server
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index ecc331898145..712b945aa1fa 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Server
 PORTVERSION=	2.008
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Server/pkg-plist b/net/p5-Net-Server/pkg-plist
index 179116277c9c..54add2fa9d9f 100644
--- a/net/p5-Net-Server/pkg-plist
+++ b/net/p5-Net-Server/pkg-plist
@@ -42,13 +42,4 @@ bin/net-server
 %%SITE_PERL%%/Net/Server/Proto/UNIXDGRAM.pm
 %%SITE_PERL%%/Net/Server/SIG.pm
 %%SITE_PERL%%/Net/Server/Single.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/.packlist
 man/man1/net-server.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Server/Proto
-@dirrmtry %%SITE_PERL%%/Net/Server/Log/Sys
-@dirrmtry %%SITE_PERL%%/Net/Server/Log/Log
-@dirrmtry %%SITE_PERL%%/Net/Server/Log
-@dirrmtry %%SITE_PERL%%/Net/Server
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Subnet/Makefile b/net/p5-Net-Subnet/Makefile
index e1d572a37634..77b250bb1185 100644
--- a/net/p5-Net-Subnet/Makefile
+++ b/net/p5-Net-Subnet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Subnet
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Subnet/pkg-plist b/net/p5-Net-Subnet/pkg-plist
index e307181a8824..12c1fbe528ec 100644
--- a/net/p5-Net-Subnet/pkg-plist
+++ b/net/p5-Net-Subnet/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::Subnet.3.gz
 %%SITE_PERL%%/Net/Subnet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Subnet/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Subnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Syslog/Makefile b/net/p5-Net-Syslog/Makefile
index 04325615d588..c95abdfeca57 100644
--- a/net/p5-Net-Syslog/Makefile
+++ b/net/p5-Net-Syslog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Syslog
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Syslog/pkg-plist b/net/p5-Net-Syslog/pkg-plist
index 7ee6184cc4b3..a544442ed37f 100644
--- a/net/p5-Net-Syslog/pkg-plist
+++ b/net/p5-Net-Syslog/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Syslog/.packlist
 %%PERL5_MAN3%%/Net::Syslog.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Syslog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-TCLink/Makefile b/net/p5-Net-TCLink/Makefile
index 4d4b1536d635..57cf3be33bee 100644
--- a/net/p5-Net-TCLink/Makefile
+++ b/net/p5-Net-TCLink/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-TCLink
 PORTVERSION=	3.4
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-TCLink/pkg-plist b/net/p5-Net-TCLink/pkg-plist
index 3ff5a670f4df..9b02c544773b 100644
--- a/net/p5-Net-TCLink/pkg-plist
+++ b/net/p5-Net-TCLink/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/Net::TCLink.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCLink.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink/TCLink.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+%%SITE_ARCH%%/Net/TCLink.pm
+%%SITE_ARCH%%/auto/Net/TCLink/TCLink.so
+%%SITE_ARCH%%/auto/Net/TCLink/autosplit.ix
diff --git a/net/p5-Net-TcpDumpLog/Makefile b/net/p5-Net-TcpDumpLog/Makefile
index 59b5b08697ab..c902bb184b2d 100644
--- a/net/p5-Net-TcpDumpLog/Makefile
+++ b/net/p5-Net-TcpDumpLog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-TcpDumpLog
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-TcpDumpLog/pkg-plist b/net/p5-Net-TcpDumpLog/pkg-plist
index ab996267ecc6..3857b80003ee 100644
--- a/net/p5-Net-TcpDumpLog/pkg-plist
+++ b/net/p5-Net-TcpDumpLog/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/TcpDumpLog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TcpDumpLog/.packlist
 %%PERL5_MAN3%%/Net::TcpDumpLog.3.gz
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TcpDumpLog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Telnet-Netscreen/Makefile b/net/p5-Net-Telnet-Netscreen/Makefile
index d362133ecbfe..dde3e63d66a9 100644
--- a/net/p5-Net-Telnet-Netscreen/Makefile
+++ b/net/p5-Net-Telnet-Netscreen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Telnet-Netscreen
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Telnet-Netscreen/pkg-plist b/net/p5-Net-Telnet-Netscreen/pkg-plist
index a3ae188ef110..735a8e2192f8 100644
--- a/net/p5-Net-Telnet-Netscreen/pkg-plist
+++ b/net/p5-Net-Telnet-Netscreen/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/Telnet/Netscreen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Netscreen/.packlist
 %%PERL5_MAN3%%/Net::Telnet::Netscreen.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Netscreen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Telnet
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index cd97fc53f05a..f02c0144d0de 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-Telnet
 PORTVERSION=	3.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Telnet/pkg-plist b/net/p5-Net-Telnet/pkg-plist
index c5ee1a4c2bd8..51c463a7fa04 100644
--- a/net/p5-Net-Telnet/pkg-plist
+++ b/net/p5-Net-Telnet/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Telnet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/.packlist
 %%PERL5_MAN3%%/Net::Telnet.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-TiVo/Makefile b/net/p5-Net-TiVo/Makefile
index d556903e3c70..f06fdfd3c052 100644
--- a/net/p5-Net-TiVo/Makefile
+++ b/net/p5-Net-TiVo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-TiVo
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-TiVo/pkg-plist b/net/p5-Net-TiVo/pkg-plist
index 59dd2762c3e9..61b551417d7b 100644
--- a/net/p5-Net-TiVo/pkg-plist
+++ b/net/p5-Net-TiVo/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/Net/TiVo.pm
 %%SITE_PERL%%/Net/TiVo/Folder.pm
 %%SITE_PERL%%/Net/TiVo/Show.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TiVo/.packlist
 %%PERL5_MAN3%%/Net::TiVo.3.gz
 %%PERL5_MAN3%%/Net::TiVo::Show.3.gz
 %%PERL5_MAN3%%/Net::TiVo::Folder.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TiVo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/TiVo
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Todoist/Makefile b/net/p5-Net-Todoist/Makefile
index b4e049db7bf3..6e0539890efd 100644
--- a/net/p5-Net-Todoist/Makefile
+++ b/net/p5-Net-Todoist/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Todoist
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Todoist/pkg-plist b/net/p5-Net-Todoist/pkg-plist
index 7255f4c1187f..601c10d6ecd0 100644
--- a/net/p5-Net-Todoist/pkg-plist
+++ b/net/p5-Net-Todoist/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Todoist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Todoist/.packlist
 %%PERL5_MAN3%%/Net::Todoist.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Todoist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Traceroute-PurePerl/Makefile b/net/p5-Net-Traceroute-PurePerl/Makefile
index 9ababa5179ed..9973e6e1f3aa 100644
--- a/net/p5-Net-Traceroute-PurePerl/Makefile
+++ b/net/p5-Net-Traceroute-PurePerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Traceroute-PurePerl
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Traceroute-PurePerl/pkg-plist b/net/p5-Net-Traceroute-PurePerl/pkg-plist
index a1f25abd9497..5b7399b45959 100644
--- a/net/p5-Net-Traceroute-PurePerl/pkg-plist
+++ b/net/p5-Net-Traceroute-PurePerl/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::Traceroute::PurePerl.3.gz
 %%SITE_PERL%%/Net/Traceroute/PurePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute/PurePerl/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute/PurePerl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Traceroute
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile
index 4a1c52c0c027..b8ecff852778 100644
--- a/net/p5-Net-Traceroute/Makefile
+++ b/net/p5-Net-Traceroute/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Traceroute
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAG
diff --git a/net/p5-Net-Traceroute/pkg-plist b/net/p5-Net-Traceroute/pkg-plist
index 88f5e86577a8..f4d35cc565c9 100644
--- a/net/p5-Net-Traceroute/pkg-plist
+++ b/net/p5-Net-Traceroute/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/Traceroute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute/.packlist
 %%PERL5_MAN3%%/Net::Traceroute.3.gz
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index b0f6fec80290..acd982adaac1 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Traceroute6
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5 ipv6
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Traceroute6/pkg-plist b/net/p5-Net-Traceroute6/pkg-plist
index 6ac4175a4de2..f99db4b09702 100644
--- a/net/p5-Net-Traceroute6/pkg-plist
+++ b/net/p5-Net-Traceroute6/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::Traceroute6.3.gz
 %%SITE_PERL%%/Net/Traceroute6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Trackback/Makefile b/net/p5-Net-Trackback/Makefile
index 076d44c26a4b..2ca11c00a401 100644
--- a/net/p5-Net-Trackback/Makefile
+++ b/net/p5-Net-Trackback/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Trackback
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net-Trackback/pkg-plist b/net/p5-Net-Trackback/pkg-plist
index 505a86f1bc9c..66436d281cc3 100644
--- a/net/p5-Net-Trackback/pkg-plist
+++ b/net/p5-Net-Trackback/pkg-plist
@@ -4,14 +4,9 @@
 %%SITE_PERL%%/Net/Trackback/Message.pm
 %%SITE_PERL%%/Net/Trackback/Ping.pm
 %%SITE_PERL%%/Net/Trackback/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Trackback/.packlist
 %%PERL5_MAN3%%/Net::Trackback.3.gz
 %%PERL5_MAN3%%/Net::Trackback::Client.3.gz
 %%PERL5_MAN3%%/Net::Trackback::Data.3.gz
 %%PERL5_MAN3%%/Net::Trackback::Message.3.gz
 %%PERL5_MAN3%%/Net::Trackback::Ping.3.gz
 %%PERL5_MAN3%%/Net::Trackback::Server.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Trackback
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/Trackback
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Twitter-Lite/Makefile b/net/p5-Net-Twitter-Lite/Makefile
index 212a14f8341b..dd8b2db06964 100644
--- a/net/p5-Net-Twitter-Lite/Makefile
+++ b/net/p5-Net-Twitter-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Twitter-Lite
 PORTVERSION=	0.12006
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Twitter-Lite/pkg-plist b/net/p5-Net-Twitter-Lite/pkg-plist
index 44772628202c..06ff2ad0caae 100644
--- a/net/p5-Net-Twitter-Lite/pkg-plist
+++ b/net/p5-Net-Twitter-Lite/pkg-plist
@@ -12,6 +12,3 @@
 %%SITE_PERL%%/Net/Twitter/Lite/WithAPIv1_1.pm
 %%SITE_PERL%%/Net/Twitter/Lite/WithAPIv1_1.pod
 %%SITE_PERL%%/Net/Twitter/Lite/WrapResult.pm
-@dirrmtry %%SITE_PERL%%/Net/Twitter/Lite/API
-@dirrmtry %%SITE_PERL%%/Net/Twitter/Lite
-@dirrmtry %%SITE_PERL%%/Net/Twitter
diff --git a/net/p5-Net-Twitter/Makefile b/net/p5-Net-Twitter/Makefile
index 85dfd3e4a529..47bb264b7d4c 100644
--- a/net/p5-Net-Twitter/Makefile
+++ b/net/p5-Net-Twitter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Twitter
 PORTVERSION=	4.01002
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Twitter/pkg-plist b/net/p5-Net-Twitter/pkg-plist
index 69e1f4796847..4aa63a84ad91 100644
--- a/net/p5-Net-Twitter/pkg-plist
+++ b/net/p5-Net-Twitter/pkg-plist
@@ -45,9 +45,3 @@
 %%SITE_PERL%%/Net/Twitter/Role/SimulateCursors.pm
 %%SITE_PERL%%/Net/Twitter/Role/WrapError.pm
 %%SITE_PERL%%/Net/Twitter/Search.pm
-@dirrmtry %%SITE_PERL%%/Net/Twitter/Role/API/Search
-@dirrmtry %%SITE_PERL%%/Net/Twitter/Role/API
-@dirrmtry %%SITE_PERL%%/Net/Twitter/Role
-@dirrmtry %%SITE_PERL%%/Net/Twitter/Manual
-@dirrmtry %%SITE_PERL%%/Net/Twitter
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-VNC/Makefile b/net/p5-Net-VNC/Makefile
index 1f251a38f40f..41b8e4da17ad 100644
--- a/net/p5-Net-VNC/Makefile
+++ b/net/p5-Net-VNC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-VNC
 PORTVERSION=	0.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-VNC/pkg-plist b/net/p5-Net-VNC/pkg-plist
index f7d766fda7e8..9fcb86d6d168 100644
--- a/net/p5-Net-VNC/pkg-plist
+++ b/net/p5-Net-VNC/pkg-plist
@@ -2,4 +2,3 @@ bin/vnccapture
 %%PERL5_MAN3%%/Net::VNC.3.gz
 %%SITE_PERL%%/Net/VNC.pm
 man/man1/vnccapture.1.gz
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Wake/Makefile b/net/p5-Net-Wake/Makefile
index 344a3de115c6..a7323220f884 100644
--- a/net/p5-Net-Wake/Makefile
+++ b/net/p5-Net-Wake/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Wake
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Wake/pkg-plist b/net/p5-Net-Wake/pkg-plist
index 2f2ec93b3f3f..c7ab094fecc6 100644
--- a/net/p5-Net-Wake/pkg-plist
+++ b/net/p5-Net-Wake/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Wake.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake/.packlist
 %%PERL5_MAN3%%/Net::Wake.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-WhitePages/Makefile b/net/p5-Net-WhitePages/Makefile
index 3d9e3f61cc4b..c7dd24286636 100644
--- a/net/p5-Net-WhitePages/Makefile
+++ b/net/p5-Net-WhitePages/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-WhitePages
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-WhitePages/pkg-plist b/net/p5-Net-WhitePages/pkg-plist
index 4a9729c2882e..e4171ff2a6ba 100644
--- a/net/p5-Net-WhitePages/pkg-plist
+++ b/net/p5-Net-WhitePages/pkg-plist
@@ -1,7 +1,3 @@
 bin/wpfind
 %%SITE_PERL%%/Net/WhitePages.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/WhitePages/.packlist
 %%PERL5_MAN3%%/Net::WhitePages.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/WhitePages
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Whois-ARIN/Makefile b/net/p5-Net-Whois-ARIN/Makefile
index 72884db4c621..b7632d872669 100644
--- a/net/p5-Net-Whois-ARIN/Makefile
+++ b/net/p5-Net-Whois-ARIN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Whois-ARIN
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Whois-ARIN/pkg-plist b/net/p5-Net-Whois-ARIN/pkg-plist
index 43191fed388f..6368361692d4 100644
--- a/net/p5-Net-Whois-ARIN/pkg-plist
+++ b/net/p5-Net-Whois-ARIN/pkg-plist
@@ -10,10 +10,3 @@
 %%SITE_PERL%%/Net/Whois/ARIN/Customer.pm
 %%SITE_PERL%%/Net/Whois/ARIN/Network.pm
 %%SITE_PERL%%/Net/Whois/ARIN/Organization.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/ARIN/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/ARIN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Whois/ARIN
-@dirrmtry %%SITE_PERL%%/Net/Whois
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Whois-IP/Makefile b/net/p5-Net-Whois-IP/Makefile
index 469e34e17647..8719c39daa72 100644
--- a/net/p5-Net-Whois-IP/Makefile
+++ b/net/p5-Net-Whois-IP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Whois-IP
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Whois-IP/pkg-plist b/net/p5-Net-Whois-IP/pkg-plist
index 1161c465fb8a..cfe81e4ac9d8 100644
--- a/net/p5-Net-Whois-IP/pkg-plist
+++ b/net/p5-Net-Whois-IP/pkg-plist
@@ -1,12 +1,3 @@
 %%SITE_PERL%%/Net/Whois/IP.pm
 %%SITE_PERL%%/auto/Net/Whois/IP/autosplit.ix
 %%PERL5_MAN3%%/Net::Whois::IP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/IP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/auto/Net/Whois/IP
-@dirrmtry %%SITE_PERL%%/auto/Net/Whois
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Whois
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 284345e8c70b..285f3fcd3780 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Whois-RIPE
 PORTVERSION=	2.001
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AASSAD
diff --git a/net/p5-Net-Whois-RIPE/pkg-plist b/net/p5-Net-Whois-RIPE/pkg-plist
index 3cd2c6ee01ac..501c6c2c3117 100644
--- a/net/p5-Net-Whois-RIPE/pkg-plist
+++ b/net/p5-Net-Whois-RIPE/pkg-plist
@@ -24,7 +24,6 @@
 %%SITE_PERL%%/Net/Whois/Object/RouteSet.pm
 %%SITE_PERL%%/Net/Whois/Object/RtrSet.pm
 %%SITE_PERL%%/Net/Whois/RIPE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE/.packlist
 %%PERL5_MAN3%%/Net::Whois::Object.3.gz
 %%PERL5_MAN3%%/Net::Whois::Object::AsBlock.3.gz
 %%PERL5_MAN3%%/Net::Whois::Object::AsSet.3.gz
@@ -51,9 +50,3 @@
 %%PERL5_MAN3%%/Net::Whois::Object::RouteSet.3.gz
 %%PERL5_MAN3%%/Net::Whois::Object::RtrSet.3.gz
 %%PERL5_MAN3%%/Net::Whois::RIPE.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Whois/Object
-@dirrmtry %%SITE_PERL%%/Net/Whois
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Whois-Raw/Makefile b/net/p5-Net-Whois-Raw/Makefile
index 217c6fd68787..582af57ec1be 100644
--- a/net/p5-Net-Whois-Raw/Makefile
+++ b/net/p5-Net-Whois-Raw/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Whois-Raw
 PORTVERSION=	2.79
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NALOBIN
diff --git a/net/p5-Net-Whois-Raw/pkg-plist b/net/p5-Net-Whois-Raw/pkg-plist
index 71cc3c760551..66099a863999 100644
--- a/net/p5-Net-Whois-Raw/pkg-plist
+++ b/net/p5-Net-Whois-Raw/pkg-plist
@@ -3,11 +3,4 @@ bin/pwhois
 %%SITE_PERL%%/Net/Whois/Raw.pm
 %%SITE_PERL%%/Net/Whois/Raw/Common.pm
 %%SITE_PERL%%/Net/Whois/Raw/Data.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw/.packlist
 man/man1/pwhois.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Whois/Raw
-@dirrmtry %%SITE_PERL%%/Net/Whois
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index 3bcb17290f92..52c37c412940 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Whois
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Whois/pkg-plist b/net/p5-Net-Whois/pkg-plist
index 0cbe7e793c9e..19e1496e1c0c 100644
--- a/net/p5-Net-Whois/pkg-plist
+++ b/net/p5-Net-Whois/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Whois.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/.packlist
 %%PERL5_MAN3%%/Net::Whois.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Works/Makefile b/net/p5-Net-Works/Makefile
index 981a3b039923..b0dc6d2c763f 100644
--- a/net/p5-Net-Works/Makefile
+++ b/net/p5-Net-Works/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-Works
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/net/p5-Net-Works/pkg-plist b/net/p5-Net-Works/pkg-plist
index 473d365db4e1..56c235b8a363 100644
--- a/net/p5-Net-Works/pkg-plist
+++ b/net/p5-Net-Works/pkg-plist
@@ -4,16 +4,8 @@
 %%SITE_PERL%%/Net/Works/Role/IP.pm
 %%SITE_PERL%%/Net/Works/Types.pm
 %%SITE_PERL%%/Net/Works/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Works/.packlist
 %%PERL5_MAN3%%/Net::Works.3.gz
 %%PERL5_MAN3%%/Net::Works::Address.3.gz
 %%PERL5_MAN3%%/Net::Works::Network.3.gz
 %%PERL5_MAN3%%/Net::Works::Util.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Works
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrmtry %%PERL5_MAN3%%
-@dirrm %%SITE_PERL%%/Net/Works/Role
-@dirrm %%SITE_PERL%%/Net/Works
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Write/Makefile b/net/p5-Net-Write/Makefile
index 10d735cf10d7..e584740efd59 100644
--- a/net/p5-Net-Write/Makefile
+++ b/net/p5-Net-Write/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Write
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Write/pkg-plist b/net/p5-Net-Write/pkg-plist
index 56528063b1ec..a7aa77f110a7 100644
--- a/net/p5-Net-Write/pkg-plist
+++ b/net/p5-Net-Write/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/Net/Write/Layer2.pm
 %%SITE_PERL%%/Net/Write/Layer3.pm
 %%SITE_PERL%%/Net/Write/Layer4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Write/.packlist
 %%PERL5_MAN3%%/Net::Write.3.gz
 %%PERL5_MAN3%%/Net::Write::Layer.3.gz
 %%PERL5_MAN3%%/Net::Write::Layer2.3.gz
 %%PERL5_MAN3%%/Net::Write::Layer3.3.gz
 %%PERL5_MAN3%%/Net::Write::Layer4.3.gz
-@dirrmtry %%SITE_PERL%%/Net/Write
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Write
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-XWhois/Makefile b/net/p5-Net-XWhois/Makefile
index fe605e6316ba..b222ed430360 100644
--- a/net/p5-Net-XWhois/Makefile
+++ b/net/p5-Net-XWhois/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-XWhois
 PORTVERSION=	0.90
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-XWhois/pkg-plist b/net/p5-Net-XWhois/pkg-plist
index 7ec44fbf7d3b..f9c7ba4ece9f 100644
--- a/net/p5-Net-XWhois/pkg-plist
+++ b/net/p5-Net-XWhois/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::XWhois.3.gz
 %%SITE_PERL%%/Net/XWhois.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XWhois/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XWhois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Yadis/Makefile b/net/p5-Net-Yadis/Makefile
index e5b6c76ebd38..c886f970c954 100644
--- a/net/p5-Net-Yadis/Makefile
+++ b/net/p5-Net-Yadis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Yadis
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Yadis/pkg-plist b/net/p5-Net-Yadis/pkg-plist
index d969478c8b65..5a89d68ee102 100644
--- a/net/p5-Net-Yadis/pkg-plist
+++ b/net/p5-Net-Yadis/pkg-plist
@@ -1,8 +1,3 @@
 %%PERL5_MAN3%%/Net::Yadis.3.gz
 %%SITE_PERL%%/Net/Yadis.pm
 %%SITE_PERL%%/Net/Yadis/HTMLParse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Yadis/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Yadis
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Yadis
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Z3950-SimpleServer/Makefile b/net/p5-Net-Z3950-SimpleServer/Makefile
index 152ebbf78679..b3b2b6675c59 100644
--- a/net/p5-Net-Z3950-SimpleServer/Makefile
+++ b/net/p5-Net-Z3950-SimpleServer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Z3950-SimpleServer
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Z3950-SimpleServer/pkg-plist b/net/p5-Net-Z3950-SimpleServer/pkg-plist
index c1c55a3e95f3..c912823c8add 100644
--- a/net/p5-Net-Z3950-SimpleServer/pkg-plist
+++ b/net/p5-Net-Z3950-SimpleServer/pkg-plist
@@ -1,16 +1,10 @@
 %%PERL5_MAN3%%/Net::Z3950::GRS1.3.gz
 %%PERL5_MAN3%%/Net::Z3950::SimpleServer.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/GRS1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/OID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/SimpleServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/grs_test.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/logging-server.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/ztest.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+%%SITE_ARCH%%/Net/Z3950/GRS1.pm
+%%SITE_ARCH%%/Net/Z3950/OID.pm
+%%SITE_ARCH%%/Net/Z3950/SimpleServer.pm
+%%SITE_ARCH%%/Net/Z3950/grs_test.pl
+%%SITE_ARCH%%/Net/Z3950/logging-server.pl
+%%SITE_ARCH%%/Net/Z3950/ztest.pl
+%%SITE_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.so
+%%SITE_ARCH%%/auto/Net/Z3950/SimpleServer/autosplit.ix
diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile
index a59ce3942c0c..1a4fca5af303 100644
--- a/net/p5-Net-Z3950-ZOOM/Makefile
+++ b/net/p5-Net-Z3950-ZOOM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Z3950-ZOOM
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-Z3950-ZOOM/pkg-plist b/net/p5-Net-Z3950-ZOOM/pkg-plist
index beb753df0592..b86010b6c314 100644
--- a/net/p5-Net-Z3950-ZOOM/pkg-plist
+++ b/net/p5-Net-Z3950-ZOOM/pkg-plist
@@ -1,15 +1,9 @@
 bin/zoomdump
 bin/zselect
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/ZOOM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZOOM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZOOM.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/ZOOM/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/ZOOM/ZOOM.so
+%%SITE_ARCH%%/Net/Z3950.pm
+%%SITE_ARCH%%/Net/Z3950/ZOOM.pm
+%%SITE_ARCH%%/ZOOM.pm
+%%SITE_ARCH%%/ZOOM.pod
+%%SITE_ARCH%%/auto/Net/Z3950/ZOOM/ZOOM.so
 %%PERL5_MAN3%%/Net::Z3950::ZOOM.3.gz
 %%PERL5_MAN3%%/ZOOM.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/ZOOM
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-ext/Makefile b/net/p5-Net-ext/Makefile
index 414b7263f76c..1fea18a51d9c 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-ext
 PORTVERSION=	1.011
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-ext/pkg-plist b/net/p5-Net-ext/pkg-plist
index c1c860a60ed2..a0c41d8055cb 100644
--- a/net/p5-Net-ext/pkg-plist
+++ b/net/p5-Net-ext/pkg-plist
@@ -5,75 +5,66 @@
 %%PERL5_MAN3%%/Net::UDP.3.gz
 %%PERL5_MAN3%%/Net::UNIX.3.gz
 %%PERL5_MAN3%%/Net::UNIX::Server.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Gen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Inet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/UDP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/BINMODE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/EOF.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FETCH.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FILENO.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/GETC.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/PRINTF.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READ.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READLINE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/RECV.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/STORE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIEHANDLE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIESCALAR.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/WRITE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_findxopt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_getxopt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_setxopt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/accept.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/bind.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/delparam.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/didlisten.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fcntl.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fhvec.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fileno.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_addr.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_local_addr.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_remote_addr.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getfh.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getlines.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getropt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getsopt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/ioctl.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/listen.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/new_from_fh.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/select.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/sendto.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setdebug.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setparam.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setropt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setsopt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/unbind.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/bind.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/setdebug.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/unbind.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/PRINT.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/READLINE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/PRINT.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/READLINE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+%%SITE_ARCH%%/Net/Gen.pm
+%%SITE_ARCH%%/Net/Inet.pm
+%%SITE_ARCH%%/Net/TCP.pm
+%%SITE_ARCH%%/Net/TCP/Server.pm
+%%SITE_ARCH%%/Net/UDP.pm
+%%SITE_ARCH%%/Net/UNIX.pm
+%%SITE_ARCH%%/Net/UNIX/Server.pm
+%%SITE_ARCH%%/auto/Net/Gen/BINMODE.al
+%%SITE_ARCH%%/auto/Net/Gen/EOF.al
+%%SITE_ARCH%%/auto/Net/Gen/FETCH.al
+%%SITE_ARCH%%/auto/Net/Gen/FILENO.al
+%%SITE_ARCH%%/auto/Net/Gen/GETC.al
+%%SITE_ARCH%%/auto/Net/Gen/Gen.so
+%%SITE_ARCH%%/auto/Net/Gen/PRINTF.al
+%%SITE_ARCH%%/auto/Net/Gen/READ.al
+%%SITE_ARCH%%/auto/Net/Gen/READLINE.al
+%%SITE_ARCH%%/auto/Net/Gen/RECV.al
+%%SITE_ARCH%%/auto/Net/Gen/STORE.al
+%%SITE_ARCH%%/auto/Net/Gen/TIEHANDLE.al
+%%SITE_ARCH%%/auto/Net/Gen/TIESCALAR.al
+%%SITE_ARCH%%/auto/Net/Gen/WRITE.al
+%%SITE_ARCH%%/auto/Net/Gen/_findxopt.al
+%%SITE_ARCH%%/auto/Net/Gen/_getxopt.al
+%%SITE_ARCH%%/auto/Net/Gen/_setxopt.al
+%%SITE_ARCH%%/auto/Net/Gen/accept.al
+%%SITE_ARCH%%/auto/Net/Gen/autosplit.ix
+%%SITE_ARCH%%/auto/Net/Gen/bind.al
+%%SITE_ARCH%%/auto/Net/Gen/delparam.al
+%%SITE_ARCH%%/auto/Net/Gen/didlisten.al
+%%SITE_ARCH%%/auto/Net/Gen/fcntl.al
+%%SITE_ARCH%%/auto/Net/Gen/fhvec.al
+%%SITE_ARCH%%/auto/Net/Gen/fileno.al
+%%SITE_ARCH%%/auto/Net/Gen/format_addr.al
+%%SITE_ARCH%%/auto/Net/Gen/format_local_addr.al
+%%SITE_ARCH%%/auto/Net/Gen/format_remote_addr.al
+%%SITE_ARCH%%/auto/Net/Gen/getfh.al
+%%SITE_ARCH%%/auto/Net/Gen/getlines.al
+%%SITE_ARCH%%/auto/Net/Gen/getropt.al
+%%SITE_ARCH%%/auto/Net/Gen/getsopt.al
+%%SITE_ARCH%%/auto/Net/Gen/ioctl.al
+%%SITE_ARCH%%/auto/Net/Gen/listen.al
+%%SITE_ARCH%%/auto/Net/Gen/new_from_fh.al
+%%SITE_ARCH%%/auto/Net/Gen/select.al
+%%SITE_ARCH%%/auto/Net/Gen/sendto.al
+%%SITE_ARCH%%/auto/Net/Gen/setdebug.al
+%%SITE_ARCH%%/auto/Net/Gen/setparam.al
+%%SITE_ARCH%%/auto/Net/Gen/setropt.al
+%%SITE_ARCH%%/auto/Net/Gen/setsopt.al
+%%SITE_ARCH%%/auto/Net/Gen/unbind.al
+%%SITE_ARCH%%/auto/Net/Inet/autosplit.ix
+%%SITE_ARCH%%/auto/Net/Inet/bind.al
+%%SITE_ARCH%%/auto/Net/Inet/setdebug.al
+%%SITE_ARCH%%/auto/Net/Inet/unbind.al
+%%SITE_ARCH%%/auto/Net/UDP/PRINT.al
+%%SITE_ARCH%%/auto/Net/UDP/READLINE.al
+%%SITE_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
+%%SITE_ARCH%%/auto/Net/UDP/autosplit.ix
+%%SITE_ARCH%%/auto/Net/UNIX/PRINT.al
+%%SITE_ARCH%%/auto/Net/UNIX/READLINE.al
+%%SITE_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
+%%SITE_ARCH%%/auto/Net/UNIX/autosplit.ix
+%%SITE_ARCH%%/auto/Net/UNIX/bind.al
+%%SITE_ARCH%%/auto/Net/UNIX/setdebug.al
diff --git a/net/p5-Net-sFlow/Makefile b/net/p5-Net-sFlow/Makefile
index 357bf09b638c..18c99d5ec400 100644
--- a/net/p5-Net-sFlow/Makefile
+++ b/net/p5-Net-sFlow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-sFlow
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-sFlow/pkg-plist b/net/p5-Net-sFlow/pkg-plist
index 5bee88c18c39..77d921a25d83 100644
--- a/net/p5-Net-sFlow/pkg-plist
+++ b/net/p5-Net-sFlow/pkg-plist
@@ -1,7 +1,3 @@
 bin/sFluxDebug.pl
 %%SITE_PERL%%/Net/sFlow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/sFlow/.packlist
 %%PERL5_MAN3%%/Net::sFlow.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/sFlow
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-uFTP/Makefile b/net/p5-Net-uFTP/Makefile
index a1738c19f870..762ea8a464c4 100644
--- a/net/p5-Net-uFTP/Makefile
+++ b/net/p5-Net-uFTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-uFTP
 PORTVERSION=	0.161
+PORTREVISION=	1
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STRZELEC
diff --git a/net/p5-Net-uFTP/pkg-plist b/net/p5-Net-uFTP/pkg-plist
index ff625ee5a32f..d2b40d9bdea0 100644
--- a/net/p5-Net-uFTP/pkg-plist
+++ b/net/p5-Net-uFTP/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/Net/uFTP.pm
 %%SITE_PERL%%/Net/uFTP/FTP.pm
 %%SITE_PERL%%/Net/uFTP/SFTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/uFTP/.packlist
 %%PERL5_MAN3%%/Net::uFTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/uFTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/uFTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 9b9e04071ae3..43cc520715aa 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net
 PORTVERSION=	1.27
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
diff --git a/net/p5-Net/pkg-plist b/net/p5-Net/pkg-plist
index 9ae9eff615d3..6970814fdf0c 100644
--- a/net/p5-Net/pkg-plist
+++ b/net/p5-Net/pkg-plist
@@ -24,7 +24,3 @@
 %%SITE_PERL%%/Net/Time.pm
 %%SITE_PERL%%/Net/libnet.cfg
 %%SITE_PERL%%/Net/libnetFAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/FTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index bf3f97da38a9..ac8adca0119a 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NetAddr-IP-Count
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-NetAddr-IP-Count/pkg-plist b/net/p5-NetAddr-IP-Count/pkg-plist
index 4c068a4fb1d1..2bd59bae08c3 100644
--- a/net/p5-NetAddr-IP-Count/pkg-plist
+++ b/net/p5-NetAddr-IP-Count/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count/.packlist
 %%SITE_PERL%%/NetAddr/IP/sample.pl
 %%SITE_PERL%%/NetAddr/IP/Count.pm
 %%PERL5_MAN3%%/NetAddr::IP::Count.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count
-@dirrmtry %%SITE_PERL%%/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/NetAddr
diff --git a/net/p5-NetPacket/Makefile b/net/p5-NetPacket/Makefile
index d8cb2d83860c..0e25a3a6ab3d 100644
--- a/net/p5-NetPacket/Makefile
+++ b/net/p5-NetPacket/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NetPacket
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-NetPacket/pkg-plist b/net/p5-NetPacket/pkg-plist
index 1d64b1de1efb..985a31f1e314 100644
--- a/net/p5-NetPacket/pkg-plist
+++ b/net/p5-NetPacket/pkg-plist
@@ -16,4 +16,3 @@
 %%PERL5_MAN3%%/NetPacket::TCP.3.gz
 %%PERL5_MAN3%%/NetPacket::UDP.3.gz
 %%PERL5_MAN3%%/NetPacket::USBMon.3.gz
-@dirrm %%SITE_PERL%%/NetPacket
diff --git a/net/p5-OAI-Harvester/Makefile b/net/p5-OAI-Harvester/Makefile
index da3a2e74455e..204cc634bfd0 100644
--- a/net/p5-OAI-Harvester/Makefile
+++ b/net/p5-OAI-Harvester/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	OAI-Harvester
 PORTVERSION=	1.15
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
diff --git a/net/p5-OAI-Harvester/pkg-plist b/net/p5-OAI-Harvester/pkg-plist
index b14ac3b89339..96874776a86f 100644
--- a/net/p5-OAI-Harvester/pkg-plist
+++ b/net/p5-OAI-Harvester/pkg-plist
@@ -14,7 +14,6 @@ bin/oai-listsets
 %%SITE_PERL%%/Net/OAI/Record/Header.pm
 %%SITE_PERL%%/Net/OAI/Record/OAI_DC.pm
 %%SITE_PERL%%/Net/OAI/ResumptionToken.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAI/Harvester/.packlist
 %%PERL5_MAN3%%/Net::OAI::Base.3.gz
 %%PERL5_MAN3%%/Net::OAI::Error.3.gz
 %%PERL5_MAN3%%/Net::OAI::GetRecord.3.gz
@@ -30,9 +29,3 @@ bin/oai-listsets
 %%PERL5_MAN3%%/Net::OAI::ResumptionToken.3.gz
 man/man1/oai-listrecords.1.gz
 man/man1/oai-listsets.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAI/Harvester
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OAI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/OAI/Record
-@dirrmtry %%SITE_PERL%%/Net/OAI
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-OurNet-BBS/Makefile b/net/p5-OurNet-BBS/Makefile
index 150a77dcdd2d..3e541ffdfbf0 100644
--- a/net/p5-OurNet-BBS/Makefile
+++ b/net/p5-OurNet-BBS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	OurNet-BBS
 PORTVERSION=	1.66
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-OurNet-BBS/pkg-plist b/net/p5-OurNet-BBS/pkg-plist
index dc9bc29fa341..bd75cd9b8ffd 100644
--- a/net/p5-OurNet-BBS/pkg-plist
+++ b/net/p5-OurNet-BBS/pkg-plist
@@ -1,7 +1,6 @@
 bin/bbsboard
 bin/bbscomd
 bin/bbsmail
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OurNet/BBS/.packlist
 %%SITE_PERL%%/OurNet/BBS.pm
 %%SITE_PERL%%/OurNet/BBS.pod
 %%SITE_PERL%%/OurNet/BBS/Authen.pm
@@ -122,20 +121,3 @@ bin/bbsmail
 man/man1/bbsboard.1.gz
 man/man1/bbscomd.1.gz
 man/man1/bbsmail.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OurNet/BBS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OurNet
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/BBSAgent
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/CVIC
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/Cola
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/External
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/Firebird3
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/MAPLE2
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/MAPLE3
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/MELIX
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/MailBox
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/NNTP
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/OurNet
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/PTT
-@dirrmtry %%SITE_PERL%%/OurNet/BBS/RAM
-@dirrmtry %%SITE_PERL%%/OurNet/BBS
-@dirrmtry %%SITE_PERL%%/OurNet
diff --git a/net/p5-OurNet-BBSAgent/Makefile b/net/p5-OurNet-BBSAgent/Makefile
index 099790756e15..afa86bd88bee 100644
--- a/net/p5-OurNet-BBSAgent/Makefile
+++ b/net/p5-OurNet-BBSAgent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OurNet-BBSAgent
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-OurNet-BBSAgent/pkg-plist b/net/p5-OurNet-BBSAgent/pkg-plist
index 6b9f383c3bc5..c7f3c70be11d 100644
--- a/net/p5-OurNet-BBSAgent/pkg-plist
+++ b/net/p5-OurNet-BBSAgent/pkg-plist
@@ -53,14 +53,4 @@
 %%SITE_PERL%%/OurNet/BBSAgent/ufo.bbs
 %%SITE_PERL%%/OurNet/BBSAgent/wretch.bbs
 %%SITE_PERL%%/OurNet/BBSAgent/zoo.bbs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OurNet/BBSAgent/.packlist
 %%PERL5_MAN3%%/OurNet::BBSAgent.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OurNet/BBSAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OurNet
-@dirrm %%SITE_PERL%%/OurNet/BBSAgent/melix
-@dirrm %%SITE_PERL%%/OurNet/BBSAgent/maple3
-@dirrm %%SITE_PERL%%/OurNet/BBSAgent/maple2
-@dirrm %%SITE_PERL%%/OurNet/BBSAgent/firebird3
-@dirrm %%SITE_PERL%%/OurNet/BBSAgent/firebird2
-@dirrm %%SITE_PERL%%/OurNet/BBSAgent
-@dirrmtry %%SITE_PERL%%/OurNet
diff --git a/net/p5-POE-Component-Client-Ident/Makefile b/net/p5-POE-Component-Client-Ident/Makefile
index 63ad6534f4b8..ef44c3645a88 100644
--- a/net/p5-POE-Component-Client-Ident/Makefile
+++ b/net/p5-POE-Component-Client-Ident/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-Ident
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	net perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Client-Ident/pkg-plist b/net/p5-POE-Component-Client-Ident/pkg-plist
index c9d45567557a..89e942f818af 100644
--- a/net/p5-POE-Component-Client-Ident/pkg-plist
+++ b/net/p5-POE-Component-Client-Ident/pkg-plist
@@ -1,16 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ident/.packlist
 %%SITE_PERL%%/POE/Component/Client/Ident.pm
 %%SITE_PERL%%/POE/Component/Client/Ident/Agent.pm
 %%SITE_PERL%%/POE/Filter/Ident.pm
 %%PERL5_MAN3%%/POE::Component::Client::Ident.3.gz
 %%PERL5_MAN3%%/POE::Component::Client::Ident::Agent.3.gz
 %%PERL5_MAN3%%/POE::Filter::Ident.3.gz
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE/Component/Client/Ident
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ident
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/net/p5-POE-Component-Client-Keepalive/Makefile b/net/p5-POE-Component-Client-Keepalive/Makefile
index 6b49390f2cbb..b934ee47fe36 100644
--- a/net/p5-POE-Component-Client-Keepalive/Makefile
+++ b/net/p5-POE-Component-Client-Keepalive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-Keepalive
 PORTVERSION=	0.2710
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RCAPUTO
diff --git a/net/p5-POE-Component-Client-Keepalive/pkg-plist b/net/p5-POE-Component-Client-Keepalive/pkg-plist
index e14cf937b074..3dafaecef211 100644
--- a/net/p5-POE-Component-Client-Keepalive/pkg-plist
+++ b/net/p5-POE-Component-Client-Keepalive/pkg-plist
@@ -2,12 +2,3 @@
 %%PERL5_MAN3%%/POE::Component::Connection::Keepalive.3.gz
 %%SITE_PERL%%/POE/Component/Client/Keepalive.pm
 %%SITE_PERL%%/POE/Component/Connection/Keepalive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Keepalive/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Keepalive
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Connection
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Client-Ping/Makefile b/net/p5-POE-Component-Client-Ping/Makefile
index a0ef87b3d309..ae9bbbd2adc0 100644
--- a/net/p5-POE-Component-Client-Ping/Makefile
+++ b/net/p5-POE-Component-Client-Ping/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-Ping
 PORTVERSION=	1.174
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Client-Ping/pkg-plist b/net/p5-POE-Component-Client-Ping/pkg-plist
index 56ce18a37149..0bf279e6a469 100644
--- a/net/p5-POE-Component-Client-Ping/pkg-plist
+++ b/net/p5-POE-Component-Client-Ping/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Client::Ping.3.gz
 %%SITE_PERL%%/POE/Component/Client/Ping.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Client-Telnet/Makefile b/net/p5-POE-Component-Client-Telnet/Makefile
index f881b88d145e..77066d01d13e 100644
--- a/net/p5-POE-Component-Client-Telnet/Makefile
+++ b/net/p5-POE-Component-Client-Telnet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-Client-Telnet
 PORTVERSION=	0.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Client-Telnet/pkg-plist b/net/p5-POE-Component-Client-Telnet/pkg-plist
index a6be4b202ba4..4f4505cc6504 100644
--- a/net/p5-POE-Component-Client-Telnet/pkg-plist
+++ b/net/p5-POE-Component-Client-Telnet/pkg-plist
@@ -1,10 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Telnet/.packlist
 %%SITE_PERL%%/POE/Component/Client/Telnet.pm
 %%PERL5_MAN3%%/POE::Component::Client::Telnet.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Telnet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Client-Traceroute/Makefile b/net/p5-POE-Component-Client-Traceroute/Makefile
index f0050de81d18..fcba16e461e1 100644
--- a/net/p5-POE-Component-Client-Traceroute/Makefile
+++ b/net/p5-POE-Component-Client-Traceroute/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-Traceroute
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Client-Traceroute/pkg-plist b/net/p5-POE-Component-Client-Traceroute/pkg-plist
index 1d878e879bf8..334bfba1b10f 100644
--- a/net/p5-POE-Component-Client-Traceroute/pkg-plist
+++ b/net/p5-POE-Component-Client-Traceroute/pkg-plist
@@ -1,10 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Traceroute/.packlist
 %%SITE_PERL%%/POE/Component/Client/Traceroute.pm
 %%PERL5_MAN3%%/POE::Component::Client::Traceroute.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Traceroute
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Client-Twitter/Makefile b/net/p5-POE-Component-Client-Twitter/Makefile
index ae1ba00a43b3..b89ebb1a72ff 100644
--- a/net/p5-POE-Component-Client-Twitter/Makefile
+++ b/net/p5-POE-Component-Client-Twitter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-Client-Twitter
 PORTVERSION=	0.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Client-Twitter/pkg-plist b/net/p5-POE-Component-Client-Twitter/pkg-plist
index b9d4a4a6520b..17f8609c0605 100644
--- a/net/p5-POE-Component-Client-Twitter/pkg-plist
+++ b/net/p5-POE-Component-Client-Twitter/pkg-plist
@@ -1,10 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Twitter/.packlist
 %%SITE_PERL%%/POE/Component/Client/Twitter.pm
 %%PERL5_MAN3%%/POE::Component::Client::Twitter.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Twitter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Client-Whois/Makefile b/net/p5-POE-Component-Client-Whois/Makefile
index 1a13e921e881..d6d0082a25a3 100644
--- a/net/p5-POE-Component-Client-Whois/Makefile
+++ b/net/p5-POE-Component-Client-Whois/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-Whois
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Client-Whois/pkg-plist b/net/p5-POE-Component-Client-Whois/pkg-plist
index ceff78b4dc09..b392fba0b96f 100644
--- a/net/p5-POE-Component-Client-Whois/pkg-plist
+++ b/net/p5-POE-Component-Client-Whois/pkg-plist
@@ -1,15 +1,6 @@
 %%SITE_PERL%%/POE/Component/Client/Whois.pm
 %%SITE_PERL%%/POE/Component/Client/Whois/IPBlks.pm
 %%SITE_PERL%%/POE/Component/Client/Whois/TLDList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Whois/.packlist
 %%PERL5_MAN3%%/POE::Component::Client::Whois.3.gz
 %%PERL5_MAN3%%/POE::Component::Client::Whois::IPBlks.3.gz
 %%PERL5_MAN3%%/POE::Component::Client::Whois::TLDList.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Whois
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrm %%SITE_PERL%%/POE/Component/Client/Whois
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-ControlPort/Makefile b/net/p5-POE-Component-ControlPort/Makefile
index 90d2ca21eb1b..a5e77cf55865 100644
--- a/net/p5-POE-Component-ControlPort/Makefile
+++ b/net/p5-POE-Component-ControlPort/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-ControlPort
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-ControlPort/pkg-plist b/net/p5-POE-Component-ControlPort/pkg-plist
index 4d880f8963eb..131ec36c9445 100644
--- a/net/p5-POE-Component-ControlPort/pkg-plist
+++ b/net/p5-POE-Component-ControlPort/pkg-plist
@@ -4,10 +4,3 @@
 %%SITE_PERL%%/POE/Component/ControlPort.pm
 %%SITE_PERL%%/POE/Component/ControlPort/Command.pm
 %%SITE_PERL%%/POE/Component/ControlPort/DefaultCommands.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/ControlPort/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/ControlPort
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/ControlPort
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Generic/Makefile b/net/p5-POE-Component-Generic/Makefile
index 3e6fb6a4959e..01d6a3efdbaa 100644
--- a/net/p5-POE-Component-Generic/Makefile
+++ b/net/p5-POE-Component-Generic/Makefile
@@ -3,7 +3,9 @@
 
 PORTNAME=	POE-Component-Generic
 PORTVERSION=	0.14.03
+PORTREVISION=	1
 DISTVERSION=	${PORTVERSION:C/\.(..)$/\1/}
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Generic/pkg-plist b/net/p5-POE-Component-Generic/pkg-plist
index 66f844701ec8..7ad6b4c37736 100644
--- a/net/p5-POE-Component-Generic/pkg-plist
+++ b/net/p5-POE-Component-Generic/pkg-plist
@@ -6,11 +6,3 @@
 %%SITE_PERL%%/POE/Component/Generic/Child.pm
 %%SITE_PERL%%/POE/Component/Generic/Net/SSH2.pm
 %%SITE_PERL%%/POE/Component/Generic/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Generic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Generic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Generic/Net
-@dirrmtry %%SITE_PERL%%/POE/Component/Generic
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index 0698c6cf07fa..5a59d9686bb9 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-Jabber
 PORTVERSION=	3.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Jabber/pkg-plist b/net/p5-POE-Component-Jabber/pkg-plist
index dff71bd024d2..41263503a228 100644
--- a/net/p5-POE-Component-Jabber/pkg-plist
+++ b/net/p5-POE-Component-Jabber/pkg-plist
@@ -14,6 +14,3 @@
 %%SITE_PERL%%/POE/Component/Jabber/Protocol.pm
 %%SITE_PERL%%/POE/Component/Jabber/ProtocolFactory.pm
 %%SITE_PERL%%/POE/Component/Jabber/XMPP.pm
-@dirrmtry %%SITE_PERL%%/POE/Component/Jabber
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
index 7ee6a2b5c7bc..058f7da8e4c2 100644
--- a/net/p5-POE-Component-Pcap/Makefile
+++ b/net/p5-POE-Component-Pcap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Pcap
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Pcap/pkg-plist b/net/p5-POE-Component-Pcap/pkg-plist
index 94ab2f7f4534..549d9090cfd1 100644
--- a/net/p5-POE-Component-Pcap/pkg-plist
+++ b/net/p5-POE-Component-Pcap/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::Pcap.3.gz
 %%SITE_PERL%%/POE/Component/Pcap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-PubSub/Makefile b/net/p5-POE-Component-PubSub/Makefile
index eb05f13c7577..cb5451c6ad37 100644
--- a/net/p5-POE-Component-PubSub/Makefile
+++ b/net/p5-POE-Component-PubSub/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-PubSub
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:nperez
diff --git a/net/p5-POE-Component-PubSub/pkg-plist b/net/p5-POE-Component-PubSub/pkg-plist
index c8fbf7f810cb..7cbd8a2a5eb3 100644
--- a/net/p5-POE-Component-PubSub/pkg-plist
+++ b/net/p5-POE-Component-PubSub/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/POE::Component::PubSub.3.gz
 %%SITE_PERL%%/POE/Component/PubSub.pm
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Server-Twirc/Makefile b/net/p5-POE-Component-Server-Twirc/Makefile
index efdbd08f23d7..e76eb61ab677 100644
--- a/net/p5-POE-Component-Server-Twirc/Makefile
+++ b/net/p5-POE-Component-Server-Twirc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Server-Twirc
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MMIMS
diff --git a/net/p5-POE-Component-Server-Twirc/pkg-plist b/net/p5-POE-Component-Server-Twirc/pkg-plist
index 7320c7dc7600..9554c59fc714 100644
--- a/net/p5-POE-Component-Server-Twirc/pkg-plist
+++ b/net/p5-POE-Component-Server-Twirc/pkg-plist
@@ -13,15 +13,3 @@ bin/twirc
 %%SITE_PERL%%/POE/Component/Server/Twirc.pm
 %%SITE_PERL%%/POE/Component/Server/Twirc/LogAppender.pm
 %%SITE_PERL%%/POE/Component/Server/Twirc/State.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/Twirc/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/Twirc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Server/Twirc
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
-@dirrmtry %%SITE_PERL%%/App/Twirc/Plugin
-@dirrmtry %%SITE_PERL%%/App/Twirc
-@dirrmtry %%SITE_PERL%%/App
diff --git a/net/p5-POEx-Role-TCPServer/Makefile b/net/p5-POEx-Role-TCPServer/Makefile
index 89d95fe87feb..97e734dd06ae 100644
--- a/net/p5-POEx-Role-TCPServer/Makefile
+++ b/net/p5-POEx-Role-TCPServer/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POEx-Role-TCPServer
 PORTVERSION=	1.102740
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
diff --git a/net/p5-POEx-Role-TCPServer/pkg-plist b/net/p5-POEx-Role-TCPServer/pkg-plist
index fc61088d6b82..3bcaf5b86b22 100644
--- a/net/p5-POEx-Role-TCPServer/pkg-plist
+++ b/net/p5-POEx-Role-TCPServer/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Role/TCPServer/.packlist
 %%SITE_PERL%%/POEx/Role/TCPServer.pm
 %%PERL5_MAN3%%/POEx::Role::TCPServer.3.gz
-@dirrmtry %%SITE_PERL%%/POEx/Role
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Role/TCPServer
diff --git a/net/p5-POSIX-Socket/Makefile b/net/p5-POSIX-Socket/Makefile
index e5484a910186..555450a109ab 100644
--- a/net/p5-POSIX-Socket/Makefile
+++ b/net/p5-POSIX-Socket/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POSIX-Socket
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POSIX-Socket/pkg-plist b/net/p5-POSIX-Socket/pkg-plist
index 284d7e592bbc..7a9b47eb0c0f 100644
--- a/net/p5-POSIX-Socket/pkg-plist
+++ b/net/p5-POSIX-Socket/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/Socket/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/POSIX/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/Socket/Socket.so
+%%SITE_ARCH%%/POSIX/Socket.pm
+%%SITE_ARCH%%/auto/POSIX/Socket/Socket.so
 %%PERL5_MAN3%%/POSIX::Socket.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POSIX
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX
diff --git a/net/p5-POSIX-getpeername/Makefile b/net/p5-POSIX-getpeername/Makefile
index 756fce4b1019..270a5fb3cdf2 100644
--- a/net/p5-POSIX-getpeername/Makefile
+++ b/net/p5-POSIX-getpeername/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POSIX-getpeername
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POSIX-getpeername/pkg-plist b/net/p5-POSIX-getpeername/pkg-plist
index 3659152b41f7..135bfb3e3c6a 100644
--- a/net/p5-POSIX-getpeername/pkg-plist
+++ b/net/p5-POSIX-getpeername/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/getpeername/getpeername.so
-%%SITE_PERL%%/%%PERL_ARCH%%/POSIX/getpeername.pm
+%%SITE_ARCH%%/auto/POSIX/getpeername/getpeername.so
+%%SITE_ARCH%%/POSIX/getpeername.pm
 %%PERL5_MAN3%%/POSIX::getpeername.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POSIX
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/getpeername
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX
diff --git a/net/p5-Parallel-Pvm/Makefile b/net/p5-Parallel-Pvm/Makefile
index e35cab3c6268..8e5b1a8a333e 100644
--- a/net/p5-Parallel-Pvm/Makefile
+++ b/net/p5-Parallel-Pvm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Parallel-Pvm
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Parallel-Pvm/pkg-plist b/net/p5-Parallel-Pvm/pkg-plist
index 8d94f12989f1..1e6e67e2ec79 100644
--- a/net/p5-Parallel-Pvm/pkg-plist
+++ b/net/p5-Parallel-Pvm/pkg-plist
@@ -1,10 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Parallel/Pvm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/Pvm.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/code2symbol.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/code2text.al
+%%SITE_ARCH%%/Parallel/Pvm.pm
+%%SITE_ARCH%%/auto/Parallel/Pvm/Pvm.so
+%%SITE_ARCH%%/auto/Parallel/Pvm/autosplit.ix
+%%SITE_ARCH%%/auto/Parallel/Pvm/code2symbol.al
+%%SITE_ARCH%%/auto/Parallel/Pvm/code2text.al
 %%PERL5_MAN3%%/Parallel::Pvm.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Parallel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel
diff --git a/net/p5-Phone-Info/Makefile b/net/p5-Phone-Info/Makefile
index ce16091bd23b..62a655607105 100644
--- a/net/p5-Phone-Info/Makefile
+++ b/net/p5-Phone-Info/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Phone-Info
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-Phone-Info/pkg-plist b/net/p5-Phone-Info/pkg-plist
index a56d7778ac62..baf2c252ceb4 100644
--- a/net/p5-Phone-Info/pkg-plist
+++ b/net/p5-Phone-Info/pkg-plist
@@ -1,7 +1,3 @@
 bin/phoneinfo
 %%SITE_PERL%%/Phone/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Phone/Info/.packlist
 %%PERL5_MAN3%%/Phone::Info.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Phone/Info
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Phone
-@dirrmtry %%SITE_PERL%%/Phone
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index e6536e2fbd46..9e2b2fe35efa 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PlRPC
 PORTVERSION=	0.2020
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	RPC
diff --git a/net/p5-PlRPC/pkg-plist b/net/p5-PlRPC/pkg-plist
index aae12c905e51..cbe044af1f7b 100644
--- a/net/p5-PlRPC/pkg-plist
+++ b/net/p5-PlRPC/pkg-plist
@@ -7,10 +7,3 @@
 %%SITE_PERL%%/RPC/PlServer.pm
 %%SITE_PERL%%/RPC/PlServer/Comm.pm
 %%SITE_PERL%%/RPC/PlServer/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC
-@dirrmtry %%SITE_PERL%%/RPC/PlServer
-@dirrmtry %%SITE_PERL%%/RPC/PlClient
-@dirrmtry %%SITE_PERL%%/RPC
-@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/net/p5-Queue-Beanstalk/Makefile b/net/p5-Queue-Beanstalk/Makefile
index f2c3e157fb8d..a11b39f85f77 100644
--- a/net/p5-Queue-Beanstalk/Makefile
+++ b/net/p5-Queue-Beanstalk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Queue-Beanstalk
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Queue-Beanstalk/pkg-plist b/net/p5-Queue-Beanstalk/pkg-plist
index 8992d751b337..ba766ab550ad 100644
--- a/net/p5-Queue-Beanstalk/pkg-plist
+++ b/net/p5-Queue-Beanstalk/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Queue::Beanstalk.3.gz
 %%SITE_PERL%%/Queue/Beanstalk.pm
-@dirrmtry %%SITE_PERL%%/Queue
diff --git a/net/p5-REST-Application/Makefile b/net/p5-REST-Application/Makefile
index 3bd21d49c39c..8ea22295bcc3 100644
--- a/net/p5-REST-Application/Makefile
+++ b/net/p5-REST-Application/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	REST-Application
 PORTVERSION=	0.992
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MOCONNOR
diff --git a/net/p5-REST-Application/pkg-plist b/net/p5-REST-Application/pkg-plist
index 289cbb2a5449..a47b01bac56a 100644
--- a/net/p5-REST-Application/pkg-plist
+++ b/net/p5-REST-Application/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/REST::Application::Routes.3.gz
 %%SITE_PERL%%/REST/Application.pm
 %%SITE_PERL%%/REST/Application/Routes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Application/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST
-@dirrmtry %%SITE_PERL%%/REST/Application
-@dirrmtry %%SITE_PERL%%/REST
diff --git a/net/p5-REST-Google/Makefile b/net/p5-REST-Google/Makefile
index 383c227c727d..98cfd596b3f4 100644
--- a/net/p5-REST-Google/Makefile
+++ b/net/p5-REST-Google/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	REST-Google
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EJS
diff --git a/net/p5-REST-Google/pkg-plist b/net/p5-REST-Google/pkg-plist
index a3e382bfc17c..0ecbab41f952 100644
--- a/net/p5-REST-Google/pkg-plist
+++ b/net/p5-REST-Google/pkg-plist
@@ -34,6 +34,3 @@
 %%SITE_PERL%%/REST/Google/Search/Web.pod
 %%SITE_PERL%%/REST/Google/Translate.pm
 %%SITE_PERL%%/REST/Google/Translate.pod
-@dirrmtry %%SITE_PERL%%/REST/Google/Search
-@dirrmtry %%SITE_PERL%%/REST/Google
-@dirrmtry %%SITE_PERL%%/REST
diff --git a/net/p5-RPC-EPC-Service/Makefile b/net/p5-RPC-EPC-Service/Makefile
index b9eab1df41fb..8ae1e156028e 100644
--- a/net/p5-RPC-EPC-Service/Makefile
+++ b/net/p5-RPC-EPC-Service/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	RPC-EPC-Service
 PORTVERSION=	0.0.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-RPC-Simple/Makefile b/net/p5-RPC-Simple/Makefile
index d2dc816082db..71deee813d1d 100644
--- a/net/p5-RPC-Simple/Makefile
+++ b/net/p5-RPC-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RPC-Simple
 PORTVERSION=	1.002
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-RPC-Simple/pkg-plist b/net/p5-RPC-Simple/pkg-plist
index db541181faa3..0e1f3c83b16e 100644
--- a/net/p5-RPC-Simple/pkg-plist
+++ b/net/p5-RPC-Simple/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/RPC/Simple/Factory.pm
 %%SITE_PERL%%/RPC/Simple/ObjectHandler.pm
 %%SITE_PERL%%/RPC/Simple/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/Simple/.packlist
 %%PERL5_MAN3%%/RPC::Simple.3.gz
 %%PERL5_MAN3%%/RPC::Simple::Agent.3.gz
 %%PERL5_MAN3%%/RPC::Simple::AnyLocal.3.gz
@@ -17,7 +16,3 @@
 %%PERL5_MAN3%%/RPC::Simple::Factory.3.gz
 %%PERL5_MAN3%%/RPC::Simple::ObjectHandler.3.gz
 %%PERL5_MAN3%%/RPC::Simple::Server.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC
-@dirrm %%SITE_PERL%%/RPC/Simple
-@dirrmtry %%SITE_PERL%%/RPC
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index 349682f4f703..6b7602882f0e 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RPC-XML
 PORTVERSION=	0.78
+PORTREVISION=	1
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-RPC-XML/pkg-plist b/net/p5-RPC-XML/pkg-plist
index 02cb1d9232b7..dc56bc4897c0 100644
--- a/net/p5-RPC-XML/pkg-plist
+++ b/net/p5-RPC-XML/pkg-plist
@@ -27,12 +27,4 @@ bin/make_method
 %%SITE_PERL%%/RPC/XML/methodSignature.xpl
 %%SITE_PERL%%/RPC/XML/multicall.xpl
 %%SITE_PERL%%/RPC/XML/status.xpl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/XML/.packlist
 man/man1/make_method.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC
-@dirrmtry %%SITE_PERL%%/RPC/XML/Parser
-@dirrmtry %%SITE_PERL%%/RPC/XML
-@dirrmtry %%SITE_PERL%%/RPC
-@dirrmtry %%SITE_PERL%%/Apache/RPC
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index cdc8b032d580..268c63927fbf 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ResourcePool-Resource-Net-LDAP
 PORTVERSION=	1.0002
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
index fb556f8d2ffb..087ecba3f52e 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
@@ -4,13 +4,3 @@
 %%SITE_PERL%%/ResourcePool/Factory/Net/LDAP.pod
 %%SITE_PERL%%/ResourcePool/Resource/Net/LDAP.pm
 %%SITE_PERL%%/ResourcePool/Resource/Net/LDAP.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool
-@dirrmtry %%SITE_PERL%%/ResourcePool/Resource/Net
-@dirrmtry %%SITE_PERL%%/ResourcePool/Resource
-@dirrmtry %%SITE_PERL%%/ResourcePool/Factory/Net
-@dirrmtry %%SITE_PERL%%/ResourcePool/Factory
-@dirrmtry %%SITE_PERL%%/ResourcePool
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
index a2215c013a21..4f8a737ec89e 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ResourcePool-Resource-SOAP-Lite
 PORTVERSION=	1.0103
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
index b5e8d04cec29..50b0f10cae46 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
@@ -5,16 +5,3 @@
 %%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pm
 %%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pod
 %%SITE_PERL%%/ResourcePool/Resource/SOAP/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool
-@dirrmtry %%SITE_PERL%%/ResourcePool/Resource/SOAP
-@dirrmtry %%SITE_PERL%%/ResourcePool/Resource
-@dirrmtry %%SITE_PERL%%/ResourcePool/Factory/SOAP
-@dirrmtry %%SITE_PERL%%/ResourcePool/Factory
-@dirrmtry %%SITE_PERL%%/ResourcePool/Command/SOAP/Lite
-@dirrmtry %%SITE_PERL%%/ResourcePool/Command/SOAP
-@dirrmtry %%SITE_PERL%%/ResourcePool/Command
-@dirrmtry %%SITE_PERL%%/ResourcePool
diff --git a/net/p5-Rose-URI/Makefile b/net/p5-Rose-URI/Makefile
index 1ca8b200af47..74cc813af75c 100644
--- a/net/p5-Rose-URI/Makefile
+++ b/net/p5-Rose-URI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-URI
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Rose-URI/pkg-plist b/net/p5-Rose-URI/pkg-plist
index fcd15c664f71..a7f3ad9f8acc 100644
--- a/net/p5-Rose-URI/pkg-plist
+++ b/net/p5-Rose-URI/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Rose/URI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/URI/.packlist
 %%PERL5_MAN3%%/Rose::URI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/URI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose
-@dirrmtry %%SITE_PERL%%/Rose
diff --git a/net/p5-S3/Makefile b/net/p5-S3/Makefile
index 7da5b5fa4985..a55bfab87512 100644
--- a/net/p5-S3/Makefile
+++ b/net/p5-S3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	S3
 PORTVERSION=	20071102
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	http://s3.amazonaws.com/doc/s3-example-code/
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-S3/pkg-plist b/net/p5-S3/pkg-plist
index 46c74d3110e9..bb7492a62ed8 100644
--- a/net/p5-S3/pkg-plist
+++ b/net/p5-S3/pkg-plist
@@ -9,4 +9,3 @@ bin/s3-test.pl
 %%SITE_PERL%%/S3/QueryStringAuthGenerator.pm
 %%SITE_PERL%%/S3/Response.pm
 %%SITE_PERL%%/S3/S3Object.pm
-@dirrmtry %%SITE_PERL%%/S3
diff --git a/net/p5-SOAP-Amazon-S3/Makefile b/net/p5-SOAP-Amazon-S3/Makefile
index 727c6142243a..eb84e9580919 100644
--- a/net/p5-SOAP-Amazon-S3/Makefile
+++ b/net/p5-SOAP-Amazon-S3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP-Amazon-S3
 PORTVERSION=	0.040.1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-SOAP-Amazon-S3/pkg-plist b/net/p5-SOAP-Amazon-S3/pkg-plist
index c9e73825d904..b2df010bb386 100644
--- a/net/p5-SOAP-Amazon-S3/pkg-plist
+++ b/net/p5-SOAP-Amazon-S3/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/SOAP::Amazon::S3.3.gz
 %%SITE_PERL%%/SOAP/Amazon/S3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Amazon/S3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Amazon/S3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
-@dirrmtry %%SITE_PERL%%/SOAP/Amazon
-@dirrmtry %%SITE_PERL%%/SOAP
diff --git a/net/p5-SOAP-Data-Builder/Makefile b/net/p5-SOAP-Data-Builder/Makefile
index e2a8303184a8..e54d30477f34 100644
--- a/net/p5-SOAP-Data-Builder/Makefile
+++ b/net/p5-SOAP-Data-Builder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP-Data-Builder
 PORTVERSION=	1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-SOAP-Data-Builder/pkg-plist b/net/p5-SOAP-Data-Builder/pkg-plist
index 14dcb2efae17..6e7ed9eb5d85 100644
--- a/net/p5-SOAP-Data-Builder/pkg-plist
+++ b/net/p5-SOAP-Data-Builder/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/SOAP::Data::Builder::Element.3.gz
 %%SITE_PERL%%/SOAP/Data/Builder.pm
 %%SITE_PERL%%/SOAP/Data/Builder/Element.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data/Builder/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data/Builder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
-@dirrmtry %%SITE_PERL%%/SOAP/Data/Builder
-@dirrmtry %%SITE_PERL%%/SOAP/Data
-@dirrmtry %%SITE_PERL%%/SOAP
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 9e5ecc8134ea..659f91ad0e2f 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP-Lite
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-SOAP-Lite/pkg-plist b/net/p5-SOAP-Lite/pkg-plist
index 7e1761e79fa4..11f6857fb333 100644
--- a/net/p5-SOAP-Lite/pkg-plist
+++ b/net/p5-SOAP-Lite/pkg-plist
@@ -51,6 +51,5 @@ bin/stubmaker.pl
 %%SITE_PERL%%/SOAP/Transport/POP3.pm
 %%SITE_PERL%%/SOAP/Transport/TCP.pm
 %%SITE_PERL%%/SOAP/Utils.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite/.packlist
 man/man1/SOAPsh.pl.1.gz
 man/man1/stubmaker.pl.1.gz
diff --git a/net/p5-SOAP-MySOAP/Makefile b/net/p5-SOAP-MySOAP/Makefile
index 770d4c97139f..7367ee8dfe7a 100644
--- a/net/p5-SOAP-MySOAP/Makefile
+++ b/net/p5-SOAP-MySOAP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SOAP-MySOAP
 PORTVERSION=	0.023
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-SOAP-MySOAP/pkg-plist b/net/p5-SOAP-MySOAP/pkg-plist
index 0c43753def56..9a9e64e6e0fb 100644
--- a/net/p5-SOAP-MySOAP/pkg-plist
+++ b/net/p5-SOAP-MySOAP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/SOAP/MySOAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/MySOAP/.packlist
 %%PERL5_MAN3%%/SOAP::MySOAP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/MySOAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
-@dirrmtry %%SITE_PERL%%/SOAP
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index d40d694eee8f..53bd802e5967 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-SOAP/pkg-plist b/net/p5-SOAP/pkg-plist
index 4a6125f5d21a..31c2c0b3dc62 100644
--- a/net/p5-SOAP/pkg-plist
+++ b/net/p5-SOAP/pkg-plist
@@ -40,8 +40,3 @@
 %%SITE_PERL%%/SOAP/TypeMapper.pm
 %%SITE_PERL%%/SOAP/TypedPrimitive.pm
 %%SITE_PERL%%/SOAP/TypedPrimitiveSerializer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
-@dirrmtry %%SITE_PERL%%/SOAP/Transport/HTTP
-@dirrmtry %%SITE_PERL%%/SOAP/Transport
-@dirrmtry %%SITE_PERL%%/SOAP
diff --git a/net/p5-Samba-LDAP/Makefile b/net/p5-Samba-LDAP/Makefile
index 2717a7c68631..9d6b26320fc6 100644
--- a/net/p5-Samba-LDAP/Makefile
+++ b/net/p5-Samba-LDAP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Samba-LDAP
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Samba
diff --git a/net/p5-Samba-LDAP/pkg-plist b/net/p5-Samba-LDAP/pkg-plist
index 4fdef0b38edf..f328f3df9db4 100644
--- a/net/p5-Samba-LDAP/pkg-plist
+++ b/net/p5-Samba-LDAP/pkg-plist
@@ -10,8 +10,3 @@
 %%SITE_PERL%%/Samba/LDAP/Group.pm
 %%SITE_PERL%%/Samba/LDAP/Machine.pm
 %%SITE_PERL%%/Samba/LDAP/User.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Samba/LDAP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Samba/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Samba
-@dirrmtry %%SITE_PERL%%/Samba/LDAP
-@dirrmtry %%SITE_PERL%%/Samba
diff --git a/net/p5-Server-Starter/Makefile b/net/p5-Server-Starter/Makefile
index c58a4c95fc71..856f6544b328 100644
--- a/net/p5-Server-Starter/Makefile
+++ b/net/p5-Server-Starter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Server-Starter
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZUHO
diff --git a/net/p5-Server-Starter/pkg-plist b/net/p5-Server-Starter/pkg-plist
index 957dcd5b85b5..97260c6972ca 100644
--- a/net/p5-Server-Starter/pkg-plist
+++ b/net/p5-Server-Starter/pkg-plist
@@ -1,8 +1,4 @@
 bin/start_server
 man/man1/start_server.1.gz
 %%PERL5_MAN3%%/Server::Starter.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Server/Starter/.packlist
 %%SITE_PERL%%/Server/Starter.pm
-@dirrmtry %%SITE_PERL%%/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Server/Starter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Server
diff --git a/net/p5-Socket-Class/Makefile b/net/p5-Socket-Class/Makefile
index 1862db0d9d6b..517b7a762199 100644
--- a/net/p5-Socket-Class/Makefile
+++ b/net/p5-Socket-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Socket-Class
 PORTVERSION=	2.258
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Socket-Class/pkg-plist b/net/p5-Socket-Class/pkg-plist
index 011b25a0dc06..8c583682f7e3 100644
--- a/net/p5-Socket-Class/pkg-plist
+++ b/net/p5-Socket-Class/pkg-plist
@@ -2,21 +2,14 @@
 %%PERL5_MAN3%%/Socket::Class::CTX.3.gz
 %%PERL5_MAN3%%/Socket::Class::Const.3.gz
 %%PERL5_MAN3%%/Socket::Class::SSL.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class/CTX.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class/Const.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class/SSL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class/Class.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class/Const/Const.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class/SSL/SSL.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class/mod_sc.h
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class/Const
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Socket/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Socket
+%%SITE_ARCH%%/Socket/Class.pm
+%%SITE_ARCH%%/Socket/Class.pod
+%%SITE_ARCH%%/Socket/Class/CTX.pod
+%%SITE_ARCH%%/Socket/Class/Const.pm
+%%SITE_ARCH%%/Socket/Class/Const.pod
+%%SITE_ARCH%%/Socket/Class/SSL.pm
+%%SITE_ARCH%%/Socket/Class/SSL.pod
+%%SITE_ARCH%%/auto/Socket/Class/Class.so
+%%SITE_ARCH%%/auto/Socket/Class/Const/Const.so
+%%SITE_ARCH%%/auto/Socket/Class/SSL/SSL.so
+%%SITE_ARCH%%/auto/Socket/Class/mod_sc.h
diff --git a/net/p5-Socket-GetAddrInfo/Makefile b/net/p5-Socket-GetAddrInfo/Makefile
index 149415b43523..7a89fd60df70 100644
--- a/net/p5-Socket-GetAddrInfo/Makefile
+++ b/net/p5-Socket-GetAddrInfo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Socket-GetAddrInfo
 PORTVERSION=	0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Socket-GetAddrInfo/pkg-plist b/net/p5-Socket-GetAddrInfo/pkg-plist
index 190e6433d3d7..af1b5a64853c 100644
--- a/net/p5-Socket-GetAddrInfo/pkg-plist
+++ b/net/p5-Socket-GetAddrInfo/pkg-plist
@@ -1,16 +1,12 @@
 bin/getaddrinfo
 bin/getnameinfo
-%%OLD_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Socket/GetAddrInfo.pm
-%%OLD_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Socket/GetAddrInfo/Core.pm
-%%OLD_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Socket/GetAddrInfo/Emul.pm
-%%OLD_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Socket/GetAddrInfo/Socket6api.pm
-%%OLD_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Socket/GetAddrInfo/Strict.pm
-%%OLD_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Socket/GetAddrInfo/XS.pm
-%%OLD_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/GetAddrInfo/GetAddrInfo.so
-%%OLD_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/GetAddrInfo
-%%OLD_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket
-%%OLD_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Socket/GetAddrInfo
-%%OLD_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Socket
+%%OLD_PERL%%%%SITE_ARCH%%/Socket/GetAddrInfo.pm
+%%OLD_PERL%%%%SITE_ARCH%%/Socket/GetAddrInfo/Core.pm
+%%OLD_PERL%%%%SITE_ARCH%%/Socket/GetAddrInfo/Emul.pm
+%%OLD_PERL%%%%SITE_ARCH%%/Socket/GetAddrInfo/Socket6api.pm
+%%OLD_PERL%%%%SITE_ARCH%%/Socket/GetAddrInfo/Strict.pm
+%%OLD_PERL%%%%SITE_ARCH%%/Socket/GetAddrInfo/XS.pm
+%%OLD_PERL%%%%SITE_ARCH%%/auto/Socket/GetAddrInfo/GetAddrInfo.so
 %%PERL5_MAN3%%/Socket::GetAddrInfo.3.gz
 %%PERL5_MAN3%%/Socket::GetAddrInfo::Emul.3.gz
 %%PERL5_MAN3%%/Socket::GetAddrInfo::Socket6api.3.gz
@@ -23,5 +19,3 @@ man/man1/getnameinfo.1.gz
 %%NEW_PERL%%%%SITE_PERL%%/Socket/GetAddrInfo/Socket6api.pm
 %%NEW_PERL%%%%SITE_PERL%%/Socket/GetAddrInfo/Strict.pm
 %%NEW_PERL%%%%SITE_PERL%%/Socket/GetAddrInfo/XS.pm
-%%NEW_PERL%%@dirrmtry %%SITE_PERL%%/Socket/GetAddrInfo
-%%NEW_PERL%%@dirrmtry %%SITE_PERL%%/Socket
diff --git a/net/p5-Socket-Multicast6/Makefile b/net/p5-Socket-Multicast6/Makefile
index 3421ce24dc55..aaafde3709d9 100644
--- a/net/p5-Socket-Multicast6/Makefile
+++ b/net/p5-Socket-Multicast6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Socket-Multicast6
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Socket-Multicast6/pkg-plist b/net/p5-Socket-Multicast6/pkg-plist
index 3e2e00396ec9..8d79ce5ec3a7 100644
--- a/net/p5-Socket-Multicast6/pkg-plist
+++ b/net/p5-Socket-Multicast6/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/Socket::Multicast6.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket/Multicast6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Multicast6/Multicast6.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Multicast6
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Socket
+%%SITE_ARCH%%/Socket/Multicast6.pm
+%%SITE_ARCH%%/auto/Socket/Multicast6/Multicast6.so
diff --git a/net/p5-Socket/Makefile b/net/p5-Socket/Makefile
index 12b89fe0aa6a..76976b515c88 100644
--- a/net/p5-Socket/Makefile
+++ b/net/p5-Socket/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Socket
 PORTVERSION=	2.016
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/net/p5-Socket/pkg-plist b/net/p5-Socket/pkg-plist
index 511d50f793ad..f3825aec658f 100644
--- a/net/p5-Socket/pkg-plist
+++ b/net/p5-Socket/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket/Socket.so
+%%SITE_ARCH%%/Socket.pm
+%%SITE_ARCH%%/auto/Socket/Socket.so
 %%PERL5_MAN3%%/Socket.3.gz
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 787de12816c5..9c9640524f22 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Socket6
 PORTVERSION=	0.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5 ipv6
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=CPAN:UMEMOTO
@@ -19,9 +19,7 @@ USE_PERL5=	configure
 CONFIGURE_ENV+=	CC="${CC}"
 
 PLIST_FILES=	%%PERL5_MAN3%%/Socket6.3.gz \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Socket6.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/.packlist \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/Socket6.so
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6
+		%%SITE_ARCH%%/Socket6.pm \
+		%%SITE_ARCH%%/auto/Socket6/Socket6.so
 
 .include <bsd.port.mk>
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 4eabb7d06753..480401bed75a 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOCKS
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Socks/pkg-plist b/net/p5-Socks/pkg-plist
index 09cda5234d45..7bca578bf0ba 100644
--- a/net/p5-Socks/pkg-plist
+++ b/net/p5-Socks/pkg-plist
@@ -18,9 +18,3 @@
 %%SITE_PERL%%/auto/Net/SOCKS/connect.al
 %%SITE_PERL%%/auto/Net/SOCKS/new.al
 %%SITE_PERL%%/auto/Net/SOCKS/param.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/SOCKS
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Sort-Key-IPv4/Makefile b/net/p5-Sort-Key-IPv4/Makefile
index 01fc7dd1dee2..f804d144839f 100644
--- a/net/p5-Sort-Key-IPv4/Makefile
+++ b/net/p5-Sort-Key-IPv4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Key-IPv4
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Sort-Key-IPv4/pkg-plist b/net/p5-Sort-Key-IPv4/pkg-plist
index 888cecd228b0..3dc55a4ff5b6 100644
--- a/net/p5-Sort-Key-IPv4/pkg-plist
+++ b/net/p5-Sort-Key-IPv4/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/IPv4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/IPv4/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/IPv4/IPv4.so
+%%SITE_ARCH%%/Sort/Key/IPv4.pm
+%%SITE_ARCH%%/auto/Sort/Key/IPv4/IPv4.so
 %%PERL5_MAN3%%/Sort::Key::IPv4.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/IPv4
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
diff --git a/net/p5-Test-URI/Makefile b/net/p5-Test-URI/Makefile
index 1160e9b120cd..cbd30e0eddad 100644
--- a/net/p5-Test-URI/Makefile
+++ b/net/p5-Test-URI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-URI
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Test-URI/pkg-plist b/net/p5-Test-URI/pkg-plist
index e6d58102ad93..afd1cb93bae3 100644
--- a/net/p5-Test-URI/pkg-plist
+++ b/net/p5-Test-URI/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/URI/.packlist
 %%SITE_PERL%%/Test/URI.pm
 %%PERL5_MAN3%%/Test::URI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/URI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/net/p5-URI-FromHash/Makefile b/net/p5-URI-FromHash/Makefile
index bab7c3e09614..7641986a1bcc 100644
--- a/net/p5-URI-FromHash/Makefile
+++ b/net/p5-URI-FromHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-FromHash
 DISTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-URI-FromHash/pkg-plist b/net/p5-URI-FromHash/pkg-plist
index d90f7ab70ded..22e9caefe85a 100644
--- a/net/p5-URI-FromHash/pkg-plist
+++ b/net/p5-URI-FromHash/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/FromHash/.packlist
 %%SITE_PERL%%/URI/FromHash.pm
 %%PERL5_MAN3%%/URI::FromHash.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/FromHash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/net/p5-URI-Match/Makefile b/net/p5-URI-Match/Makefile
index a626c558bc28..bf15e2b082f7 100644
--- a/net/p5-URI-Match/Makefile
+++ b/net/p5-URI-Match/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	URI-Match
 PORTVERSION=	0.00001
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-URI-Match/pkg-plist b/net/p5-URI-Match/pkg-plist
index 68b35c64c50a..1a3772d852bb 100644
--- a/net/p5-URI-Match/pkg-plist
+++ b/net/p5-URI-Match/pkg-plist
@@ -1,4 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Match/.packlist
 %%SITE_PERL%%/URI/Match.pm
 %%PERL5_MAN3%%/URI::Match.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Match
diff --git a/net/p5-URI-OpenURL/Makefile b/net/p5-URI-OpenURL/Makefile
index 06e5f1e29da8..62de5025f7cb 100644
--- a/net/p5-URI-OpenURL/Makefile
+++ b/net/p5-URI-OpenURL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-OpenURL
 PORTVERSION=	0.4.6
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-URI-OpenURL/pkg-plist b/net/p5-URI-OpenURL/pkg-plist
index 3e1ffad4a493..f8e87176111d 100644
--- a/net/p5-URI-OpenURL/pkg-plist
+++ b/net/p5-URI-OpenURL/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/URI::OpenURL.3.gz
 %%SITE_PERL%%/URI/OpenURL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/OpenURL/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/OpenURL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/net/p5-URI-Query/Makefile b/net/p5-URI-Query/Makefile
index ec56df256375..8b3f8dcf7fd7 100644
--- a/net/p5-URI-Query/Makefile
+++ b/net/p5-URI-Query/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Query
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-URI-Query/pkg-plist b/net/p5-URI-Query/pkg-plist
index bf4bcfef7fc5..18c986f0d7f2 100644
--- a/net/p5-URI-Query/pkg-plist
+++ b/net/p5-URI-Query/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/URI/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Query/.packlist
 %%PERL5_MAN3%%/URI::Query.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Query
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/net/p5-URI-SmartURI/Makefile b/net/p5-URI-SmartURI/Makefile
index 4e4265ebc881..1defaaaa7ba4 100644
--- a/net/p5-URI-SmartURI/Makefile
+++ b/net/p5-URI-SmartURI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-SmartURI
 PORTVERSION=	0.032
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-URI-SmartURI/pkg-plist b/net/p5-URI-SmartURI/pkg-plist
index 60486476bf6d..d5cfd3a89a44 100644
--- a/net/p5-URI-SmartURI/pkg-plist
+++ b/net/p5-URI-SmartURI/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/URI/SmartURI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/SmartURI/.packlist
 %%PERL5_MAN3%%/URI::SmartURI.3.gz
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/SmartURI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/net/p5-URI-Template-Restrict/Makefile b/net/p5-URI-Template-Restrict/Makefile
index c624fa80b4e9..6fe031527e31 100644
--- a/net/p5-URI-Template-Restrict/Makefile
+++ b/net/p5-URI-Template-Restrict/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	URI-Template-Restrict
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-URI-Template-Restrict/pkg-plist b/net/p5-URI-Template-Restrict/pkg-plist
index 79c8e18b94e9..27ef6a14a868 100644
--- a/net/p5-URI-Template-Restrict/pkg-plist
+++ b/net/p5-URI-Template-Restrict/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/URI/Template/Restrict/Expansion.pm
 %%SITE_PERL%%/URI/Template/Restrict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Template/Restrict/.packlist
 %%PERL5_MAN3%%/URI::Template::Restrict.3.gz
 %%PERL5_MAN3%%/URI::Template::Restrict::Expansion.3.gz
-@dirrm %%SITE_PERL%%/URI/Template/Restrict
-@dirrmtry %%SITE_PERL%%/URI/Template
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Template/Restrict
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Template
diff --git a/net/p5-URI-Template/Makefile b/net/p5-URI-Template/Makefile
index 4246c801d1b5..4ae07ffa64d0 100644
--- a/net/p5-URI-Template/Makefile
+++ b/net/p5-URI-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Template
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-URI-Template/pkg-plist b/net/p5-URI-Template/pkg-plist
index 84a510f44047..d39e22380617 100644
--- a/net/p5-URI-Template/pkg-plist
+++ b/net/p5-URI-Template/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/URI::Template.3.gz
 %%SITE_PERL%%/URI/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Template/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index c99147519f9b..4b9fb386d6e6 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI
 PORTVERSION=	1.64
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/net/p5-URI/pkg-plist b/net/p5-URI/pkg-plist
index 4f7b0ad80ba9..17b436e9c57c 100644
--- a/net/p5-URI/pkg-plist
+++ b/net/p5-URI/pkg-plist
@@ -61,8 +61,3 @@
 %%SITE_PERL%%/URI/urn.pm
 %%SITE_PERL%%/URI/urn/isbn.pm
 %%SITE_PERL%%/URI/urn/oid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI/urn
-@dirrmtry %%SITE_PERL%%/URI/file
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/net/p5-Validate-Net/Makefile b/net/p5-Validate-Net/Makefile
index 5bbb31b850c3..fc057addb556 100644
--- a/net/p5-Validate-Net/Makefile
+++ b/net/p5-Validate-Net/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Validate-Net
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/net/p5-Validate-Net/pkg-plist b/net/p5-Validate-Net/pkg-plist
index a1a8cb4c541c..902f37dbef74 100644
--- a/net/p5-Validate-Net/pkg-plist
+++ b/net/p5-Validate-Net/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Validate::Net.3.gz
 %%SITE_PERL%%/Validate/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate/Net/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate
-@dirrmtry %%SITE_PERL%%/Validate
diff --git a/net/p5-WebService-Dropbox/Makefile b/net/p5-WebService-Dropbox/Makefile
index acd976a767fe..fd6bb04e910d 100644
--- a/net/p5-WebService-Dropbox/Makefile
+++ b/net/p5-WebService-Dropbox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Dropbox
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ASKADNA
diff --git a/net/p5-WebService-Dropbox/pkg-plist b/net/p5-WebService-Dropbox/pkg-plist
index 9cbcaa6d9bb7..66c542a4eb70 100644
--- a/net/p5-WebService-Dropbox/pkg-plist
+++ b/net/p5-WebService-Dropbox/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/WebService/Dropbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService-Dropbox/.packlist
 %%PERL5_MAN3%%/WebService::Dropbox.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService-Dropbox
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/net/p5-WebService-Prowl/Makefile b/net/p5-WebService-Prowl/Makefile
index fbae321b6c7b..baa44259a3ca 100644
--- a/net/p5-WebService-Prowl/Makefile
+++ b/net/p5-WebService-Prowl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WebService-Prowl
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-WebService-Prowl/pkg-plist b/net/p5-WebService-Prowl/pkg-plist
index 81ea92c75908..4b84027899f7 100644
--- a/net/p5-WebService-Prowl/pkg-plist
+++ b/net/p5-WebService-Prowl/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Prowl/.packlist
 %%SITE_PERL%%/WebService/Prowl.pm
 %%SITE_PERL%%/WebService/Prowl/AnyEventHTTP.pm
 %%PERL5_MAN3%%/WebService::Prowl.3.gz
 %%PERL5_MAN3%%/WebService::Prowl::AnyEventHTTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Prowl
-@dirrm %%SITE_PERL%%/WebService/Prowl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/net/p5-What/Makefile b/net/p5-What/Makefile
index f9b56edf69d6..3582b6c61a91 100644
--- a/net/p5-What/Makefile
+++ b/net/p5-What/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	What
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TPG
diff --git a/net/p5-What/pkg-plist b/net/p5-What/pkg-plist
index f2c65d1625cd..8e883b73ae56 100644
--- a/net/p5-What/pkg-plist
+++ b/net/p5-What/pkg-plist
@@ -1,7 +1,4 @@
 %%SITE_PERL%%/What.pm
 %%SITE_PERL%%/What/MTA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/What/.packlist
 %%PERL5_MAN3%%/What.3.gz
 %%PERL5_MAN3%%/What::MTA.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/What
-@dirrm %%SITE_PERL%%/What
diff --git a/net/p5-X500-DN/Makefile b/net/p5-X500-DN/Makefile
index 43c890a4384d..5d58016ae89a 100644
--- a/net/p5-X500-DN/Makefile
+++ b/net/p5-X500-DN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	X500-DN
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-X500-DN/pkg-plist b/net/p5-X500-DN/pkg-plist
index 2c8e4a03156f..3611c31849a4 100644
--- a/net/p5-X500-DN/pkg-plist
+++ b/net/p5-X500-DN/pkg-plist
@@ -4,7 +4,3 @@
 %%SITE_PERL%%/X500/DN.pod
 %%SITE_PERL%%/X500/RDN.pm
 %%SITE_PERL%%/X500/RDN.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X500/DN/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X500/DN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X500
-@dirrmtry %%SITE_PERL%%/X500
diff --git a/net/p5-XML-Compile-SOAP-AnyEvent/Makefile b/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
index 08b3645fd837..73fa507a3d36 100644
--- a/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
+++ b/net/p5-XML-Compile-SOAP-AnyEvent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Compile-SOAP-AnyEvent
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-XML-Compile-SOAP-AnyEvent/pkg-plist b/net/p5-XML-Compile-SOAP-AnyEvent/pkg-plist
index d86677154736..953d93b9e21b 100644
--- a/net/p5-XML-Compile-SOAP-AnyEvent/pkg-plist
+++ b/net/p5-XML-Compile-SOAP-AnyEvent/pkg-plist
@@ -1,11 +1,3 @@
 %%PERL5_MAN3%%/XML::Compile::Transfer::SOAPHTTP_AnyEvent.3.gz
 %%SITE_PERL%%/XML/Compile/Transfer/SOAPHTTP_AnyEvent.pm
 %%SITE_PERL%%/XML/Compile/Transfer/SOAPHTTP_AnyEvent.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/AnyEvent/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/AnyEvent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Compile/Transfer
-@dirrmtry %%SITE_PERL%%/XML/Compile
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/net/p5-XML-Compile-SOAP-Daemon/Makefile b/net/p5-XML-Compile-SOAP-Daemon/Makefile
index 7fcc6c018c8e..536f3c078bbe 100644
--- a/net/p5-XML-Compile-SOAP-Daemon/Makefile
+++ b/net/p5-XML-Compile-SOAP-Daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Compile-SOAP-Daemon
 PORTVERSION=	3.06
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-XML-Compile-SOAP-Daemon/pkg-plist b/net/p5-XML-Compile-SOAP-Daemon/pkg-plist
index ee21c799d8e2..8a337640138e 100644
--- a/net/p5-XML-Compile-SOAP-Daemon/pkg-plist
+++ b/net/p5-XML-Compile-SOAP-Daemon/pkg-plist
@@ -17,12 +17,3 @@
 %%SITE_PERL%%/XML/Compile/SOAP/Daemon/PSGI.pm
 %%SITE_PERL%%/XML/Compile/SOAP/Daemon/PSGI.pod
 %%SITE_PERL%%/XML/Compile/SOAP/HTTPDaemon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/Daemon/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/Daemon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP/Daemon
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP
-@dirrmtry %%SITE_PERL%%/XML/Compile
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/net/p5-XML-Compile-SOAP-WSA/Makefile b/net/p5-XML-Compile-SOAP-WSA/Makefile
index ff8574bb2ded..199a4c87e5b9 100644
--- a/net/p5-XML-Compile-SOAP-WSA/Makefile
+++ b/net/p5-XML-Compile-SOAP-WSA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Compile-SOAP-WSA
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-XML-Compile-SOAP-WSA/pkg-plist b/net/p5-XML-Compile-SOAP-WSA/pkg-plist
index f11df500a4a3..54fd0dd02675 100644
--- a/net/p5-XML-Compile-SOAP-WSA/pkg-plist
+++ b/net/p5-XML-Compile-SOAP-WSA/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/WSA/.packlist
 %%SITE_PERL%%/XML/Compile/SOAP/WSA.pm
 %%SITE_PERL%%/XML/Compile/SOAP/WSA.pod
 %%SITE_PERL%%/XML/Compile/SOAP/WSA/Util.pm
@@ -9,12 +8,3 @@
 %%SITE_PERL%%/XML/Compile/SOAP/WSA/xsd/20080723-wsa10.xsd
 %%PERL5_MAN3%%/XML::Compile::SOAP::WSA.3.gz
 %%PERL5_MAN3%%/XML::Compile::SOAP::WSA::Util.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/WSA/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP/WSA/xsd
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP/WSA
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP
-@dirrmtry %%SITE_PERL%%/XML/Compile
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/net/p5-XML-Compile-SOAP/Makefile b/net/p5-XML-Compile-SOAP/Makefile
index 5e8b9d939a7b..f8b80c478adf 100644
--- a/net/p5-XML-Compile-SOAP/Makefile
+++ b/net/p5-XML-Compile-SOAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Compile-SOAP
 PORTVERSION=	2.38
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-XML-Compile-SOAP/pkg-plist b/net/p5-XML-Compile-SOAP/pkg-plist
index b05c73b431d0..f86449907ad5 100644
--- a/net/p5-XML-Compile-SOAP/pkg-plist
+++ b/net/p5-XML-Compile-SOAP/pkg-plist
@@ -67,18 +67,3 @@
 %%SITE_PERL%%/XML/Compile/XOP/Include.pod
 %%SITE_PERL%%/XML/Compile/XOP/xsd/200411-xmlmime.xsd
 %%SITE_PERL%%/XML/Compile/XOP/xsd/200505-xmlmime.xsd
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Compile/XOP/xsd
-@dirrmtry %%SITE_PERL%%/XML/Compile/XOP
-@dirrmtry %%SITE_PERL%%/XML/Compile/WSDL11/xsd
-@dirrmtry %%SITE_PERL%%/XML/Compile/WSDL11
-@dirrmtry %%SITE_PERL%%/XML/Compile/Transport
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP11/xsd
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP11
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP10
-@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP
-@dirrmtry %%SITE_PERL%%/XML/Compile
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/net/p5-XML-Fast/Makefile b/net/p5-XML-Fast/Makefile
index d20a52bac95f..79677e5b0a32 100644
--- a/net/p5-XML-Fast/Makefile
+++ b/net/p5-XML-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Fast
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-XML-Fast/pkg-plist b/net/p5-XML-Fast/pkg-plist
index 68632f56a2fb..d78964636d7d 100644
--- a/net/p5-XML-Fast/pkg-plist
+++ b/net/p5-XML-Fast/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Fast/Fast.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Fast/.packlist
+%%SITE_ARCH%%/XML/Fast.pm
+%%SITE_ARCH%%/auto/XML/Fast/Fast.so
 %%PERL5_MAN3%%/XML::Fast.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Fast
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/net/p5-XML-RPC-Fast/Makefile b/net/p5-XML-RPC-Fast/Makefile
index 50eea10fe727..2af5535f002d 100644
--- a/net/p5-XML-RPC-Fast/Makefile
+++ b/net/p5-XML-RPC-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RPC-Fast
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-XML-RPC-Fast/pkg-plist b/net/p5-XML-RPC-Fast/pkg-plist
index acf4baadbcdc..5a0c8ee63e69 100644
--- a/net/p5-XML-RPC-Fast/pkg-plist
+++ b/net/p5-XML-RPC-Fast/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/XML/RPC/UA/AnyEventSync.pm
 %%SITE_PERL%%/XML/RPC/Fast.pm
 %%SITE_PERL%%/XML/RPC/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RPC/Fast/.packlist
 %%PERL5_MAN3%%/XML::RPC::Enc.3.gz
 %%PERL5_MAN3%%/XML::RPC::Enc::LibXML.3.gz
 %%PERL5_MAN3%%/XML::RPC::Fast.3.gz
@@ -17,10 +16,3 @@
 %%PERL5_MAN3%%/XML::RPC::UA::AnyEventSync.3.gz
 %%PERL5_MAN3%%/XML::RPC::UA::Curl.3.gz
 %%PERL5_MAN3%%/XML::RPC::UA::LWP.3.gz
-@dirrmtry %%SITE_PERL%%/XML/RPC/UA
-@dirrmtry %%SITE_PERL%%/XML/RPC/Enc
-@dirrmtry %%SITE_PERL%%/XML/RPC
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RPC/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/net/p5-XML-RPC/Makefile b/net/p5-XML-RPC/Makefile
index a65df69a273e..4f93158a16d9 100644
--- a/net/p5-XML-RPC/Makefile
+++ b/net/p5-XML-RPC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-RPC
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-XML-RPC/pkg-plist b/net/p5-XML-RPC/pkg-plist
index b83502bd9b68..483301416729 100644
--- a/net/p5-XML-RPC/pkg-plist
+++ b/net/p5-XML-RPC/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/XML/RPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-RPC/.packlist
 %%PERL5_MAN3%%/XML::RPC.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-RPC
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index 2ae104f17ab3..f9ca121df787 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XPC
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GREGOR
diff --git a/net/p5-XPC/pkg-plist b/net/p5-XPC/pkg-plist
index 11aa642e1ae7..e382808d751b 100644
--- a/net/p5-XPC/pkg-plist
+++ b/net/p5-XPC/pkg-plist
@@ -6,6 +6,3 @@ bin/xpcd
 %%SITE_PERL%%/XPC.pm
 %%SITE_PERL%%/XPC/Agent.pm
 %%SITE_PERL%%/XPC/Daemon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XPC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XPC
-@dirrmtry %%SITE_PERL%%/XPC
diff --git a/net/p5-ZConf-Bookmarks/Makefile b/net/p5-ZConf-Bookmarks/Makefile
index 75a8b1bb31c0..039f5c5c4ec2 100644
--- a/net/p5-ZConf-Bookmarks/Makefile
+++ b/net/p5-ZConf-Bookmarks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ZConf-Bookmarks
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-ZConf-Bookmarks/pkg-plist b/net/p5-ZConf-Bookmarks/pkg-plist
index fec58168b0b9..32faa02f260a 100644
--- a/net/p5-ZConf-Bookmarks/pkg-plist
+++ b/net/p5-ZConf-Bookmarks/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/ZConf/Bookmarks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Bookmarks/.packlist
 %%PERL5_MAN3%%/ZConf::Bookmarks.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Bookmarks
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
-@dirrmtry %%SITE_PERL%%/ZConf/
diff --git a/net/p5-ZConf/Makefile b/net/p5-ZConf/Makefile
index aa013075fddb..f7ba170970c8 100644
--- a/net/p5-ZConf/Makefile
+++ b/net/p5-ZConf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ZConf
 PORTVERSION=	6.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/net/p5-ZConf/pkg-plist b/net/p5-ZConf/pkg-plist
index b5c2cddf9e46..953ea880c318 100644
--- a/net/p5-ZConf/pkg-plist
+++ b/net/p5-ZConf/pkg-plist
@@ -1,7 +1,6 @@
 %%SITE_PERL%%/ZConf.pm
 %%SITE_PERL%%/ZConf/backends/ldap.pm
 %%SITE_PERL%%/ZConf/backends/file.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/.packlist
 %%PERL5_MAN3%%/ZConf.3.gz
 %%PERL5_MAN3%%/ZConf::backends::file.3.gz
 %%PERL5_MAN3%%/ZConf::backends::ldap.3.gz
diff --git a/net/p5-ZeroMQ/Makefile b/net/p5-ZeroMQ/Makefile
index 595f37c5523d..f09e8736d189 100644
--- a/net/p5-ZeroMQ/Makefile
+++ b/net/p5-ZeroMQ/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ZeroMQ
 PORTVERSION=	0.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/net/p5-ZeroMQ/pkg-plist b/net/p5-ZeroMQ/pkg-plist
index c0cefe073d3b..deddfa570bd0 100644
--- a/net/p5-ZeroMQ/pkg-plist
+++ b/net/p5-ZeroMQ/pkg-plist
@@ -1,12 +1,11 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ/Message.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ/Poller.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ/Raw.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZeroMQ/ZeroMQ.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZeroMQ/.packlist
+%%SITE_ARCH%%/ZeroMQ.pm
+%%SITE_ARCH%%/ZeroMQ/Context.pm
+%%SITE_ARCH%%/ZeroMQ/Message.pm
+%%SITE_ARCH%%/ZeroMQ/Constants.pm
+%%SITE_ARCH%%/ZeroMQ/Poller.pm
+%%SITE_ARCH%%/ZeroMQ/Raw.pm
+%%SITE_ARCH%%/ZeroMQ/Socket.pm
+%%SITE_ARCH%%/auto/ZeroMQ/ZeroMQ.so
 %%PERL5_MAN3%%/ZeroMQ.3.gz
 %%PERL5_MAN3%%/ZeroMQ::Constants.3.gz
 %%PERL5_MAN3%%/ZeroMQ::Context.3.gz
@@ -14,5 +13,3 @@
 %%PERL5_MAN3%%/ZeroMQ::Poller.3.gz
 %%PERL5_MAN3%%/ZeroMQ::Raw.3.gz
 %%PERL5_MAN3%%/ZeroMQ::Socket.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZeroMQ
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/ZeroMQ
diff --git a/net/p5-perl-ldap/Makefile b/net/p5-perl-ldap/Makefile
index dbec65652230..baeea10fee2b 100644
--- a/net/p5-perl-ldap/Makefile
+++ b/net/p5-perl-ldap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	perl-ldap
 PORTVERSION=	0.5800
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARSCHAP
diff --git a/net/p5-perl-ldap/pkg-plist b/net/p5-perl-ldap/pkg-plist
index ce1b23628781..d01e04417977 100644
--- a/net/p5-perl-ldap/pkg-plist
+++ b/net/p5-perl-ldap/pkg-plist
@@ -110,16 +110,3 @@
 %%SITE_PERL%%/Net/LDAP/Util.pm
 %%SITE_PERL%%/Net/LDAPI.pm
 %%SITE_PERL%%/Net/LDAPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/LDAP/Intermediate
-@dirrmtry %%SITE_PERL%%/Net/LDAP/Extra
-@dirrmtry %%SITE_PERL%%/Net/LDAP/Extension
-@dirrmtry %%SITE_PERL%%/Net/LDAP/Control
-@dirrmtry %%SITE_PERL%%/Net/LDAP
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/LWP/Protocol
-@dirrmtry %%SITE_PERL%%/LWP
-@dirrmtry %%SITE_PERL%%/Bundle/Net
-@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/net/radiator/Makefile b/net/radiator/Makefile
index d35cefcaa8fd..a11230c63110 100644
--- a/net/radiator/Makefile
+++ b/net/radiator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Radiator
 PORTVERSION=	4.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	# fetch manually
 DIST_SUBDIR=	${PORTNAME}
diff --git a/net/radiator/pkg-plist b/net/radiator/pkg-plist
index 7d44fedf9cc9..12564bf185d2 100644
--- a/net/radiator/pkg-plist
+++ b/net/radiator/pkg-plist
@@ -229,8 +229,3 @@ bin/radpwtst
 %%SITE_PERL%%/Radius/StatsLogGeneric.pm
 %%SITE_PERL%%/Radius/AuthGeneric.pm
 %%SITE_PERL%%/radhostname.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Radius/.packlist
-@dirrm %%SITE_PERL%%/Radius/Nas
-@dirrm %%SITE_PERL%%/Radius/SMS
-@dirrm %%SITE_PERL%%/Radius
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Radius
diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index 77d13a53372b..0cec297d7ef7 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scribe
 DISTVERSION=	2.2.2013.04.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/facebookarchive/scribe/tarball/${GITVERSION}/
 DISTNAME=	facebook-scribe-${GITVERSION}
diff --git a/net/scribe/pkg-plist b/net/scribe/pkg-plist
index d70e6b36c0f5..2a4f39347f15 100644
--- a/net/scribe/pkg-plist
+++ b/net/scribe/pkg-plist
@@ -23,5 +23,3 @@ lib/libscribe.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scribe_ctrl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/scribe
-@dirrm %%SITE_PERL%%/Scribe/Thrift
-@dirrm %%SITE_PERL%%/Scribe
diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index 523833ec8a57..f8dd15e52e06 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smbldap-tools
 PORTVERSION=	0.9.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://download.gna.org/smbldap-tools/sources/${PORTVERSION}/
 
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 00275543a0ff..0799779a894e 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spread
 PORTVERSION=	3.17.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net perl5
 MASTER_SITES=	http://bsdforge.com/projects/source/net/spread/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
@@ -15,7 +15,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 USES=		perl5 tar:xz
-USE_PERL5=	build fixpacklist run
+USE_PERL5=	build run
 USE_RC_SUBR=	spread
 USE_LDCONFIG=	yes
 
@@ -74,6 +74,6 @@ post-install:
 	${INSTALL} -m 750 -d ${STAGEDIR}${RUNDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libspread.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtspread.so.1
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Spread/Spread.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Spread/Spread.so
 
 .include <bsd.port.post.mk>
diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist
index 44e73056ab71..a79a0a3312ea 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -33,13 +33,11 @@ man/man3/SP_receive.3.gz
 man/man3/SP_scat_multicast.3.gz
 man/man3/SP_scat_receive.3.gz
 %%PERL5_MAN3%%/Spread.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
+%%SITE_ARCH%%/Spread.pm
+%%SITE_ARCH%%/auto/Spread/Spread.so
+%%SITE_ARCH%%/auto/Spread/autosplit.ix
 sbin/spread
 %%EXAMPLESDIR%%/test.pl
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
 @exec install -m 750 -o %%USERS%% -g %%GROUPS%% -d %%RUNDIR%%
 @dirrmtry %%RUNDIR%%
diff --git a/net/vmware-vsphere-cli/Makefile b/net/vmware-vsphere-cli/Makefile
index 655dd7efe499..82b839fedd44 100644
--- a/net/vmware-vsphere-cli/Makefile
+++ b/net/vmware-vsphere-cli/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		vmware-vsphere-cli
 PORTVERSION=		5.5.0
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		net perl5
 MASTER_SITES=		#http://communities.vmware.com/community/vmtn/developer/downloads
 DISTNAME=		VMware-vSphere-Perl-SDK-${PORTVERSION}-${DISTREL}.i386
diff --git a/net/vmware-vsphere-cli/pkg-plist b/net/vmware-vsphere-cli/pkg-plist
index 67db42dbf234..8b1c390f192b 100644
--- a/net/vmware-vsphere-cli/pkg-plist
+++ b/net/vmware-vsphere-cli/pkg-plist
@@ -1055,7 +1055,6 @@ bin/vmware-cmd
 %%SITE_PERL%%/VMware/VIExt.pm
 %%SITE_PERL%%/VMware/VICredStore.pm
 %%SITE_PERL%%/VMware/VICommon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VIPerlToolkit/.packlist
 %%EXAMPLESDIR%%/vm/vmtemplate.pl
 %%EXAMPLESDIR%%/vm/vmsnapshot.pl
 %%EXAMPLESDIR%%/vm/vmregister.pl
@@ -1094,10 +1093,6 @@ bin/vmware-cmd
 %%EXAMPLESDIR%%/AppUtil/XMLInputUtil.pm
 %%EXAMPLESDIR%%/AppUtil/VMUtil.pm
 %%EXAMPLESDIR%%/AppUtil/HostUtil.pm
-@dirrmtry %%SITE_PERL%%/WSMan/Stubs
-@dirrmtry %%SITE_PERL%%/WSMan
-@dirrmtry %%SITE_PERL%%/VMware
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VIPerlToolkit
 @dirrmtry %%EXAMPLESDIR%%/vm
 @dirrmtry %%EXAMPLESDIR%%/session
 @dirrmtry %%EXAMPLESDIR%%/schema
diff --git a/net/wakeonlan/Makefile b/net/wakeonlan/Makefile
index e524ec9b4144..581304b88f28 100644
--- a/net/wakeonlan/Makefile
+++ b/net/wakeonlan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wakeonlan
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/
 
diff --git a/net/wakeonlan/pkg-plist b/net/wakeonlan/pkg-plist
index b06df64fd0a9..2941638b429f 100644
--- a/net/wakeonlan/pkg-plist
+++ b/net/wakeonlan/pkg-plist
@@ -1,6 +1,4 @@
 bin/wakeonlan
 man/man1/wakeonlan.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lab001.wol
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/news/p5-NNTPClient/Makefile b/news/p5-NNTPClient/Makefile
index 59b5c66ac9fc..e4a133d320d0 100644
--- a/news/p5-NNTPClient/Makefile
+++ b/news/p5-NNTPClient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NNTPClient
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	news perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	News
diff --git a/news/p5-NNTPClient/pkg-plist b/news/p5-NNTPClient/pkg-plist
index 960ab6acb581..8bf85e845c8b 100644
--- a/news/p5-NNTPClient/pkg-plist
+++ b/news/p5-NNTPClient/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/News/NNTPClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient/.packlist
 %%PERL5_MAN3%%/News::NNTPClient.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News
-@dirrmtry %%SITE_PERL%%/News
diff --git a/news/p5-News-Article-NoCeM/Makefile b/news/p5-News-Article-NoCeM/Makefile
index 47ef085169fe..6c108c113bcd 100644
--- a/news/p5-News-Article-NoCeM/Makefile
+++ b/news/p5-News-Article-NoCeM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	News-Article-NoCeM
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	news perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/news/p5-News-Article-NoCeM/pkg-plist b/news/p5-News-Article-NoCeM/pkg-plist
index 4c4b3fe36c1c..43b3a14ae4e1 100644
--- a/news/p5-News-Article-NoCeM/pkg-plist
+++ b/news/p5-News-Article-NoCeM/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/News/Article/NoCeM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/NoCeM/.packlist
 %%PERL5_MAN3%%/News::Article::NoCeM.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/NoCeM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article
-@dirrmtry %%SITE_PERL%%/News/Article
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 0d43053b6c39..1fdf442228c2 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	News-Article
 PORTVERSION=	1.27
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/news/p5-News-Article/pkg-plist b/news/p5-News-Article/pkg-plist
index 450e65aafbc8..3e65da2188d1 100644
--- a/news/p5-News-Article/pkg-plist
+++ b/news/p5-News-Article/pkg-plist
@@ -6,7 +6,3 @@
 %%SITE_PERL%%/News/AutoReply.pm
 %%SITE_PERL%%/News/FormArticle.pm
 %%SITE_PERL%%/News/FormReply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News
-@dirrmtry %%SITE_PERL%%/News
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index c04704a7d024..880e9cf9e6ea 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	News-Newsrc
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	news perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/news/p5-News-Newsrc/pkg-plist b/news/p5-News-Newsrc/pkg-plist
index 320f8c3cc087..4d82dd5e2c77 100644
--- a/news/p5-News-Newsrc/pkg-plist
+++ b/news/p5-News-Newsrc/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/News/Newsrc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc/.packlist
 %%PERL5_MAN3%%/News::Newsrc.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News
-@dirrmtry %%SITE_PERL%%/News
diff --git a/news/p5-POE-Component-Client-NNTP/Makefile b/news/p5-POE-Component-Client-NNTP/Makefile
index 0adb5487569e..b95f1162dccc 100644
--- a/news/p5-POE-Component-Client-NNTP/Makefile
+++ b/news/p5-POE-Component-Client-NNTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-NNTP
 PORTVERSION=	2.22
+PORTREVISION=	1
 CATEGORIES=	news perl5 devel
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/news/p5-POE-Component-Client-NNTP/pkg-plist b/news/p5-POE-Component-Client-NNTP/pkg-plist
index 6b2712b18bd1..5e58d166af5e 100644
--- a/news/p5-POE-Component-Client-NNTP/pkg-plist
+++ b/news/p5-POE-Component-Client-NNTP/pkg-plist
@@ -1,13 +1,4 @@
 %%SITE_PERL%%/POE/Component/Client/NNTP.pm
 %%SITE_PERL%%/POE/Component/Client/NNTP/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/NNTP/.packlist
 %%PERL5_MAN3%%/POE::Component::Client::NNTP.3.gz
 %%PERL5_MAN3%%/POE::Component::Client::NNTP::Constants.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/NNTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client/NNTP
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/news/p5-POE-Component-Server-NNTP/Makefile b/news/p5-POE-Component-Server-NNTP/Makefile
index bbc5c24e1b93..df1d15812133 100644
--- a/news/p5-POE-Component-Server-NNTP/Makefile
+++ b/news/p5-POE-Component-Server-NNTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Server-NNTP
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	news perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/news/p5-POE-Component-Server-NNTP/pkg-plist b/news/p5-POE-Component-Server-NNTP/pkg-plist
index 0bc44178c55c..e822fa236d69 100644
--- a/news/p5-POE-Component-Server-NNTP/pkg-plist
+++ b/news/p5-POE-Component-Server-NNTP/pkg-plist
@@ -1,13 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/NNTP/.packlist
 %%SITE_PERL%%/POE/Component/Server/NNTP.pm
 %%SITE_PERL%%/POE/Component/Server/NNTP/Constants.pm
 %%PERL5_MAN3%%/POE::Component::Server::NNTP.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::NNTP::Constants.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/NNTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrm %%SITE_PERL%%/POE/Component/Server/NNTP
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/palm/p5-Palm-PalmDoc/Makefile b/palm/p5-Palm-PalmDoc/Makefile
index 385e772b4465..62b1f185d7d8 100644
--- a/palm/p5-Palm-PalmDoc/Makefile
+++ b/palm/p5-Palm-PalmDoc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Palm-PalmDoc
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	palm perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/palm/p5-Palm-PalmDoc/pkg-plist b/palm/p5-Palm-PalmDoc/pkg-plist
index 44975cf8fdd5..085df6f1f606 100644
--- a/palm/p5-Palm-PalmDoc/pkg-plist
+++ b/palm/p5-Palm-PalmDoc/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm/PalmDoc/.packlist
 %%SITE_PERL%%/Palm/PalmDoc.pm
 %%PERL5_MAN3%%/Palm::PalmDoc.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm/PalmDoc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm
-@dirrmtry %%SITE_PERL%%/Palm
diff --git a/palm/p5-Palm/Makefile b/palm/p5-Palm/Makefile
index 2ee88966612b..65a51dd8828e 100644
--- a/palm/p5-Palm/Makefile
+++ b/palm/p5-Palm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	p5-Palm
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	palm perl5
 MASTER_SITES=	http://www.coldsync.org/download/
 
diff --git a/palm/p5-Palm/pkg-plist b/palm/p5-Palm/pkg-plist
index 3b1cbad71c52..f98249e842d8 100644
--- a/palm/p5-Palm/pkg-plist
+++ b/palm/p5-Palm/pkg-plist
@@ -1,5 +1,4 @@
 bin/pdbdump
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm/.packlist
 %%SITE_PERL%%/Palm/Address.pm
 %%SITE_PERL%%/Palm/Datebook.pm
 %%SITE_PERL%%/Palm/Mail.pm
@@ -17,5 +16,3 @@ bin/pdbdump
 %%PERL5_MAN3%%/Palm::StdAppInfo.3.gz
 %%PERL5_MAN3%%/Palm::ToDo.3.gz
 man/man1/pdbdump.1.gz
-@dirrm %%SITE_PERL%%/Palm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index bf781964d06e..5e7d72975767 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ekg2
 PORTVERSION=	0.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	http://pl.ekg2.org/
diff --git a/polish/ekg2/pkg-plist b/polish/ekg2/pkg-plist
index ce15b7876704..2bdb9c75bc61 100644
--- a/polish/ekg2/pkg-plist
+++ b/polish/ekg2/pkg-plist
@@ -28,13 +28,10 @@ lib/ekg2/plugins/sim.so
 lib/ekg2/plugins/sms.so
 lib/ekg2/plugins/xmsg.so
 %%XOSD%%lib/ekg2/plugins/xosd.so
-%%PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2/Irc.pm
+%%PERL%%%%SITE_ARCH%%/auto/Ekg2/Ekg2.so
+%%PERL%%%%SITE_ARCH%%/auto/Ekg2/Irc/Irc.so
+%%PERL%%%%SITE_ARCH%%/Ekg2.pm
+%%PERL%%%%SITE_ARCH%%/Ekg2/Irc.pm
 libexec/ioctld
 %%DATADIR%%/commands-pl.txt
 %%DATADIR%%/plugins/autoresponder/vars-en.txt
diff --git a/ports-mgmt/distilator/Makefile b/ports-mgmt/distilator/Makefile
index db1b0b749cb5..7d0e9d65a377 100644
--- a/ports-mgmt/distilator/Makefile
+++ b/ports-mgmt/distilator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	distilator
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	CRITICAL
 
diff --git a/ports-mgmt/distilator/pkg-plist b/ports-mgmt/distilator/pkg-plist
index dde5d665842e..cf2d9c1fabab 100644
--- a/ports-mgmt/distilator/pkg-plist
+++ b/ports-mgmt/distilator/pkg-plist
@@ -3,4 +3,3 @@ bin/distilator
 %%SITE_PERL%%/FreeBSD/Ports/DistilatorCommon.pm
 %%SITE_PERL%%/FreeBSD/Ports/DistilatorSingle.pm
 %%SITE_PERL%%/FreeBSD/Ports/DistilatorThreaded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/Distilator/.packlist
diff --git a/ports-mgmt/p5-App-Pm2Port/Makefile b/ports-mgmt/p5-App-Pm2Port/Makefile
index d904f31b0d9c..7ab1369d3eaf 100644
--- a/ports-mgmt/p5-App-Pm2Port/Makefile
+++ b/ports-mgmt/p5-App-Pm2Port/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	App-Pm2Port
 PORTVERSION=	0.29
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-App-Pm2Port/pkg-plist b/ports-mgmt/p5-App-Pm2Port/pkg-plist
index 1ed1b2c37613..8879d845b05a 100644
--- a/ports-mgmt/p5-App-Pm2Port/pkg-plist
+++ b/ports-mgmt/p5-App-Pm2Port/pkg-plist
@@ -2,7 +2,3 @@ bin/pm2port
 man/man1/pm2port.1.gz
 %%PERL5_MAN3%%/App::Pm2Port.3.gz
 %%SITE_PERL%%/App/Pm2Port.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Pm2Port/.packlist
-@dirrmtry %%SITE_PERL%%/App
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Pm2Port
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
index 7c2f7d34e624..4871ea7782cc 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Pkgs-FindUpdates
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
index ed51135c8ea2..613895527725 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
@@ -1,9 +1,3 @@
 bin/pkg_findupdates
 %%SITE_PERL%%/FreeBSD/Pkgs/FindUpdates.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/FindUpdates/.packlist
 %%PERL5_MAN3%%/FreeBSD::Pkgs::FindUpdates.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/FindUpdates
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD/Pkgs
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
index ea5db318fafd..0821de57bfec 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Pkgs
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist b/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
index 1e646c98b980..aba4b47effdb 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/FreeBSD/Pkgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/.packlist
 %%PERL5_MAN3%%/FreeBSD::Pkgs.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/Makefile b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
index f5d713f64c0d..7c10ac0d2f43 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	FreeBSD-Portindex
 PORTVERSION=	3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	http://www.infracaninophile.co.uk/portindex/
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
index 875cd50f086c..050f8eb0c62a 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
@@ -23,8 +23,3 @@ etc/portindex.cfg.sample
 %%SITE_PERL%%/FreeBSD/Portindex/PortsTreeObject.pm
 %%SITE_PERL%%/FreeBSD/Portindex/Tree.pm
 %%SITE_PERL%%/FreeBSD/Portindex/TreeObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex/.packlist
-@dirrm %%SITE_PERL%%/FreeBSD/Portindex
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex
-@dirrmtry %%SITE_PERL%%/FreeBSD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
index 6af629e324dd..67e63d4603da 100644
--- a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Ports-INDEXhash
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
index 2a56efa6d5c9..091b08eb27c9 100644
--- a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/FreeBSD/Ports/INDEXhash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/INDEXhash/.packlist
 %%PERL5_MAN3%%/FreeBSD::Ports::INDEXhash.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/INDEXhash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Ports/Makefile b/ports-mgmt/p5-FreeBSD-Ports/Makefile
index d4ea6abf7a05..986b7d2f7cf5 100644
--- a/ports-mgmt/p5-FreeBSD-Ports/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Ports/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Ports
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	tom
diff --git a/ports-mgmt/p5-FreeBSD-Ports/pkg-plist b/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
index d5fc2b80a57e..7a4c042757b5 100644
--- a/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/FreeBSD::Ports::Port.3.gz
 %%SITE_PERL%%/FreeBSD/Ports.pm
 %%SITE_PERL%%/FreeBSD/Ports/Port.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 8a49a1fc22e6..e80a478a0484 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	portlint
 PORTVERSION=	2.16.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/portscout/Makefile b/ports-mgmt/portscout/Makefile
index 1f98e0fbd4dd..8d62802e1eb9 100644
--- a/ports-mgmt/portscout/Makefile
+++ b/ports-mgmt/portscout/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	portscout
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/	\
 		http://www.atarininja.org/~wxs/distfiles/		\
@@ -61,18 +61,18 @@ post-patch:
 	@${MV} ${WRKSRC}/docs/*.* ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout/DataSrc
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout/SiteHandler
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout/SQL
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/DataSrc/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/DataSrc/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SiteHandler/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/SiteHandler/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SQL/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/SQL/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout.pm ${STAGEDIR}${SITE_PERL}/Portscout.pm
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/DataSrc
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SiteHandler
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SQL
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/DataSrc/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/DataSrc/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SiteHandler/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SiteHandler/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SQL/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SQL/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout.pm
 	${INSTALL_SCRIPT} ${WRKSRC}/portscout.pl ${STAGEDIR}${PREFIX}/bin/portscout
 
-	${INSTALL_DATA} ${WRKSRC}/portscout.pod ${STAGEDIR}${SITE_PERL}
+	${INSTALL_DATA} ${WRKSRC}/portscout.pod ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 	pod2man ${WRKSRC}/portscout.pod ${WRKSRC}/portscout.1
 	${INSTALL_MAN} ${WRKSRC}/portscout.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
diff --git a/print/a2pdf/Makefile b/print/a2pdf/Makefile
index 08e33754e3a7..c3494aadbfe8 100644
--- a/print/a2pdf/Makefile
+++ b/print/a2pdf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	a2pdf
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JONALLEN
diff --git a/print/a2pdf/pkg-plist b/print/a2pdf/pkg-plist
index 7a66c7b7d0c7..7bd83baf54ac 100644
--- a/print/a2pdf/pkg-plist
+++ b/print/a2pdf/pkg-plist
@@ -1,6 +1,3 @@
 bin/a2pdf
 %%SITE_PERL%%/App/a2pdf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/a2pdf/.packlist
 man/man1/a2pdf.1.gz
-@dirrmtry %%SITE_PERL%%/App
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/a2pdf
diff --git a/print/axpoint/Makefile b/print/axpoint/Makefile
index 5aa32dc39004..bb0dff774761 100644
--- a/print/axpoint/Makefile
+++ b/print/axpoint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	axpoint
 PORTVERSION=	1.50
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
diff --git a/print/axpoint/pkg-plist b/print/axpoint/pkg-plist
index 58ba940e5d97..28b924862c5d 100644
--- a/print/axpoint/pkg-plist
+++ b/print/axpoint/pkg-plist
@@ -1,9 +1,3 @@
 bin/axpoint
 %%SITE_PERL%%/XML/Handler/AxPoint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint/.packlist
 %%PERL5_MAN3%%/XML::Handler::AxPoint.3.gz
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 2df327be8d91..fef34ec0113c 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	engine
 PORTVERSION=	4.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/ \
diff --git a/print/foomatic-db-engine/pkg-plist b/print/foomatic-db-engine/pkg-plist
index ed2d6ad2d001..539871ce0a07 100644
--- a/print/foomatic-db-engine/pkg-plist
+++ b/print/foomatic-db-engine/pkg-plist
@@ -8,7 +8,6 @@ bin/foomatic-ppd-to-xml
 bin/foomatic-ppdfile
 bin/foomatic-printjob
 bin/foomatic-searchprinter
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic/.packlist
 %%SITE_PERL%%/Foomatic/DB.pm
 %%SITE_PERL%%/Foomatic/Defaults.pm
 %%SITE_PERL%%/Foomatic/PPD.pm
@@ -42,7 +41,5 @@ share/foomatic/templates/pjl_num_option.xml
 @dirrmtry share/foomatic
 @dirrmtry libexec/cups/driver
 @dirrmtry libexec/cups
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic
-@dirrm %%SITE_PERL%%/Foomatic
 @dirrmtry etc/foomatic
 @exec mkdir -p %D/etc/foomatic
diff --git a/print/p5-Font-FreeType/Makefile b/print/p5-Font-FreeType/Makefile
index c55caea664ba..aa007ae098e8 100644
--- a/print/p5-Font-FreeType/Makefile
+++ b/print/p5-Font-FreeType/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Font-FreeType
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-Font-FreeType/pkg-plist b/print/p5-Font-FreeType/pkg-plist
index 1afecf1e5c95..142266074dda 100644
--- a/print/p5-Font-FreeType/pkg-plist
+++ b/print/p5-Font-FreeType/pkg-plist
@@ -1,12 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType/Face.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType/Glyph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/FreeType/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/FreeType/FreeType.so
+%%SITE_ARCH%%/Font/FreeType.pm
+%%SITE_ARCH%%/Font/FreeType/Face.pm
+%%SITE_ARCH%%/Font/FreeType/Glyph.pm
+%%SITE_ARCH%%/auto/Font/FreeType/FreeType.so
 %%PERL5_MAN3%%/Font::FreeType.3.gz
 %%PERL5_MAN3%%/Font::FreeType::Face.3.gz
 %%PERL5_MAN3%%/Font::FreeType::Glyph.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/FreeType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Font
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 28bfc5ac897c..6b22cf9fc78b 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-CUPS
 PORTVERSION=	0.61
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-Net-CUPS/pkg-plist b/print/p5-Net-CUPS/pkg-plist
index c9f1c20d9c1d..a84fc375c0bb 100644
--- a/print/p5-Net-CUPS/pkg-plist
+++ b/print/p5-Net-CUPS/pkg-plist
@@ -1,21 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS/Destination.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS/IPP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS/PPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/CUPS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/Destination/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/IPP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/PPD/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/autosplit.ix
+%%SITE_ARCH%%/Net/CUPS.pm
+%%SITE_ARCH%%/Net/CUPS/Destination.pm
+%%SITE_ARCH%%/Net/CUPS/IPP.pm
+%%SITE_ARCH%%/Net/CUPS/PPD.pm
+%%SITE_ARCH%%/auto/Net/CUPS/CUPS.so
+%%SITE_ARCH%%/auto/Net/CUPS/Destination/autosplit.ix
+%%SITE_ARCH%%/auto/Net/CUPS/IPP/autosplit.ix
+%%SITE_ARCH%%/auto/Net/CUPS/PPD/autosplit.ix
+%%SITE_ARCH%%/auto/Net/CUPS/autosplit.ix
 %%PERL5_MAN3%%/Net::CUPS.3.gz
 %%PERL5_MAN3%%/Net::CUPS::Destination.3.gz
 %%PERL5_MAN3%%/Net::CUPS::IPP.3.gz
 %%PERL5_MAN3%%/Net::CUPS::PPD.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/PPD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/IPP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/Destination
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/print/p5-Net-Printer/Makefile b/print/p5-Net-Printer/Makefile
index 353bd23b97b1..1c347b6d2024 100644
--- a/print/p5-Net-Printer/Makefile
+++ b/print/p5-Net-Printer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Printer
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-Net-Printer/pkg-plist b/print/p5-Net-Printer/pkg-plist
index 60923a2f26bb..5dcbea3d6913 100644
--- a/print/p5-Net-Printer/pkg-plist
+++ b/print/p5-Net-Printer/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Printer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Printer/.packlist
 %%PERL5_MAN3%%/Net::Printer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Printer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/print/p5-PDF-Template/Makefile b/print/p5-PDF-Template/Makefile
index 2cd621df1305..0ffea07514f1 100644
--- a/print/p5-PDF-Template/Makefile
+++ b/print/p5-PDF-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-Template
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PDF-Template/pkg-plist b/print/p5-PDF-Template/pkg-plist
index 0d9b7c114945..67b210c4aa64 100644
--- a/print/p5-PDF-Template/pkg-plist
+++ b/print/p5-PDF-Template/pkg-plist
@@ -28,7 +28,6 @@
 %%SITE_PERL%%/PDF/Template/Factory.pm
 %%SITE_PERL%%/PDF/Template/Iterator.pm
 %%SITE_PERL%%/PDF/Template/TextObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Template/.packlist
 %%PERL5_MAN3%%/PDF::Template::Element::Weblink.3.gz
 %%PERL5_MAN3%%/PDF::Template::Container::Scope.3.gz
 %%PERL5_MAN3%%/PDF::Template::Container::Margin.3.gz
@@ -52,9 +51,3 @@
 %%PERL5_MAN3%%/PDF::Template::Element.3.gz
 %%PERL5_MAN3%%/PDF::Template.3.gz
 %%PERL5_MAN3%%/PDF::Template::Element::Line.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
-@dirrm %%SITE_PERL%%/PDF/Template/Element
-@dirrm %%SITE_PERL%%/PDF/Template/Container
-@dirrm %%SITE_PERL%%/PDF/Template
-@dirrmtry %%SITE_PERL%%/PDF
diff --git a/print/p5-PDFLib/Makefile b/print/p5-PDFLib/Makefile
index 14485aa93b17..774dda0d09be 100644
--- a/print/p5-PDFLib/Makefile
+++ b/print/p5-PDFLib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDFLib
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PDFLib/pkg-plist b/print/p5-PDFLib/pkg-plist
index ef0958df3169..11a79b6eaf92 100644
--- a/print/p5-PDFLib/pkg-plist
+++ b/print/p5-PDFLib/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/PDFLib.3.gz
 %%SITE_PERL%%/PDFLib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFLib/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFLib
diff --git a/print/p5-PostScript-PPD/Makefile b/print/p5-PostScript-PPD/Makefile
index 3f1ef684223c..d2b1da1faf5e 100644
--- a/print/p5-PostScript-PPD/Makefile
+++ b/print/p5-PostScript-PPD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostScript-PPD
 PORTVERSION=	0.0206
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PostScript-PPD/pkg-plist b/print/p5-PostScript-PPD/pkg-plist
index e52d1cd49028..be6c8620e543 100644
--- a/print/p5-PostScript-PPD/pkg-plist
+++ b/print/p5-PostScript-PPD/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/PostScript/PPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/PPD/.packlist
 %%PERL5_MAN3%%/PostScript::PPD.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/PPD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript
-@dirrmtry %%SITE_PERL%%/PostScript
diff --git a/print/p5-PostScript-Simple/Makefile b/print/p5-PostScript-Simple/Makefile
index d550d1d4ce16..5dee21e26fde 100644
--- a/print/p5-PostScript-Simple/Makefile
+++ b/print/p5-PostScript-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostScript-Simple
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PostScript-Simple/pkg-plist b/print/p5-PostScript-Simple/pkg-plist
index 0e1a54d15512..0a390f3450f5 100644
--- a/print/p5-PostScript-Simple/pkg-plist
+++ b/print/p5-PostScript-Simple/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/PostScript::Simple::EPS.3.gz
 %%SITE_PERL%%/PostScript/Simple.pm
 %%SITE_PERL%%/PostScript/Simple/EPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript
-@dirrmtry %%SITE_PERL%%/PostScript/Simple
-@dirrmtry %%SITE_PERL%%/PostScript
diff --git a/print/p5-PostScript/Makefile b/print/p5-PostScript/Makefile
index e6ec6043bb9c..64ad3f52bf46 100644
--- a/print/p5-PostScript/Makefile
+++ b/print/p5-PostScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostScript
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PostScript/pkg-plist b/print/p5-PostScript/pkg-plist
index 1f01e2026428..f0cf5d1beada 100644
--- a/print/p5-PostScript/pkg-plist
+++ b/print/p5-PostScript/pkg-plist
@@ -6,7 +6,3 @@
 %%SITE_PERL%%/PostScript/Metrics.pm
 %%SITE_PERL%%/PostScript/TextBlock.pm
 %%SITE_PERL%%/PostScript/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Metrics/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Metrics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript
-@dirrmtry %%SITE_PERL%%/PostScript
diff --git a/print/p5-Text-PDF/Makefile b/print/p5-Text-PDF/Makefile
index 8d9a85541f75..791e5202912f 100644
--- a/print/p5-Text-PDF/Makefile
+++ b/print/p5-Text-PDF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-PDF
 PORTVERSION=	0.29a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,7 +20,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/pm_to_blib
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Text/PDF/examples
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${SITE_PERL}/Text/PDF/examples
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Text/PDF/examples
+	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Text/PDF/examples
 
 .include <bsd.port.mk>
diff --git a/print/p5-Text-PDF/pkg-plist b/print/p5-Text-PDF/pkg-plist
index 3c0c6bb62897..c37a256f3f46 100644
--- a/print/p5-Text-PDF/pkg-plist
+++ b/print/p5-Text-PDF/pkg-plist
@@ -1,7 +1,6 @@
 bin/pdfbklt
 bin/pdfrevert
 bin/pdfstamp
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF/.packlist
 %%SITE_PERL%%/Text/PDF.pm
 %%SITE_PERL%%/Text/PDF/Array.pm
 %%SITE_PERL%%/Text/PDF/Bool.pm
@@ -50,8 +49,3 @@ bin/pdfstamp
 %%PERL5_MAN3%%/Text::PDF::TTFont.3.gz
 %%PERL5_MAN3%%/Text::PDF::TTFont0.3.gz
 %%PERL5_MAN3%%/Text::PDF::Utils.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrm %%SITE_PERL%%/Text/PDF/examples
-@dirrm %%SITE_PERL%%/Text/PDF
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/print/p5-XML-ApacheFOP/Makefile b/print/p5-XML-ApacheFOP/Makefile
index 263f38c0e507..1630f8bece0a 100644
--- a/print/p5-XML-ApacheFOP/Makefile
+++ b/print/p5-XML-ApacheFOP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-ApacheFOP
 PORTVERSION=	0.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-XML-ApacheFOP/pkg-plist b/print/p5-XML-ApacheFOP/pkg-plist
index b7de164cddb6..866d040c844d 100644
--- a/print/p5-XML-ApacheFOP/pkg-plist
+++ b/print/p5-XML-ApacheFOP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/XML/ApacheFOP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/ApacheFOP/.packlist
 %%PERL5_MAN3%%/XML::ApacheFOP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/ApacheFOP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index f1ef76473288..beaedb661a2e 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdflib
 PORTVERSION=	7.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print perl5 java
 MASTER_SITES=	http://www.pdflib.com/binaries/PDFlib/${PORTVERSION:S/.//g}/
 DISTNAME=	PDFlib-Lite-${PORTVERSION}p3
diff --git a/print/pdflib/pkg-plist b/print/pdflib/pkg-plist
index dc9afea610ac..ce1e322f093c 100644
--- a/print/pdflib/pkg-plist
+++ b/print/pdflib/pkg-plist
@@ -6,11 +6,11 @@ lib/libpdf.a
 lib/libpdf.so
 lib/libpdf.so.6
 lib/libpdf.so.6.0.5
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.a
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0.0.0
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.a
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.pm
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.so
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.so.0
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.so.0.0.0
 %%JAVA%%lib/libpdf_java.a
 %%JAVA%%lib/libpdf_java.so
 %%JAVA%%lib/libpdf_java.so.0
diff --git a/print/texlive-infra/Makefile b/print/texlive-infra/Makefile
index 28b2d5983106..8a32fae238fa 100644
--- a/print/texlive-infra/Makefile
+++ b/print/texlive-infra/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	34227
+PORTREVISION=	1
 CATEGORIES=	print perl5
 #MASTER_SITES=	ftp://tug.org/tex-archive/systems/texlive/tlnet/archive/
 MASTER_SITES=	LOCAL/hrs
@@ -19,10 +20,10 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/TeXLive \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive \
 	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/
 	${INSTALL_DATA} ${WRKSRC}/tlpkg/TeXLive/*.pm \
-	    ${STAGEDIR}${SITE_PERL}/TeXLive
+	    ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive
 	${INSTALL_DATA} ${WRKSRC}/texmf-dist/web2c/fmtutil-hdr.cnf \
 	    ${WRKSRC}/texmf-dist/web2c/updmap-hdr.cfg \
 	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/
diff --git a/russian/p5-Convert-Cyrillic/Makefile b/russian/p5-Convert-Cyrillic/Makefile
index 861851830cef..ba73afb7166e 100644
--- a/russian/p5-Convert-Cyrillic/Makefile
+++ b/russian/p5-Convert-Cyrillic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Convert-Cyrillic
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	russian converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/russian/p5-Convert-Cyrillic/pkg-plist b/russian/p5-Convert-Cyrillic/pkg-plist
index 3ae3e215352a..a502772175f3 100644
--- a/russian/p5-Convert-Cyrillic/pkg-plist
+++ b/russian/p5-Convert-Cyrillic/pkg-plist
@@ -6,6 +6,5 @@
 %%SITE_PERL%%/Lingua/DetectCharset/StatKoi8u.pm
 %%SITE_PERL%%/Lingua/DetectCharset/StatUtf8.pm
 %%SITE_PERL%%/Lingua/DetectCharset/StatWin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cyrillic-suite/.packlist
 %%PERL5_MAN3%%/Convert::Cyrillic.3.gz
 %%PERL5_MAN3%%/Lingua::DetectCharset.3.gz
diff --git a/russian/p5-Lingua-DetectCyrillic/Makefile b/russian/p5-Lingua-DetectCyrillic/Makefile
index 3efb69fc7b91..591fda2d93fa 100644
--- a/russian/p5-Lingua-DetectCyrillic/Makefile
+++ b/russian/p5-Lingua-DetectCyrillic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-DetectCyrillic
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	russian perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/russian/p5-Lingua-DetectCyrillic/pkg-plist b/russian/p5-Lingua-DetectCyrillic/pkg-plist
index d1158d1d0806..d1728c8e7618 100644
--- a/russian/p5-Lingua-DetectCyrillic/pkg-plist
+++ b/russian/p5-Lingua-DetectCyrillic/pkg-plist
@@ -3,5 +3,4 @@
 %%SITE_PERL%%/Lingua/DetectCyrillic/DictUkr.pm
 %%SITE_PERL%%/Lingua/DetectCyrillic/WordHash2Rus.pm
 %%SITE_PERL%%/Lingua/DetectCyrillic/WordHash2Ukr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/DetectCyrillic/.packlist
 %%PERL5_MAN3%%/Lingua::DetectCyrillic.3.gz
diff --git a/russian/p5-Lingua-RU-Charset/Makefile b/russian/p5-Lingua-RU-Charset/Makefile
index f971eeddfcca..74955bbfb9bf 100644
--- a/russian/p5-Lingua-RU-Charset/Makefile
+++ b/russian/p5-Lingua-RU-Charset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-RU-Charset
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	russian perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/russian/p5-Lingua-RU-Charset/pkg-plist b/russian/p5-Lingua-RU-Charset/pkg-plist
index 085d609f0d33..c79a0be72442 100644
--- a/russian/p5-Lingua-RU-Charset/pkg-plist
+++ b/russian/p5-Lingua-RU-Charset/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/RU/Charset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset/.packlist
 %%PERL5_MAN3%%/Lingua::RU::Charset.3.gz
diff --git a/russian/p5-Text-Hyphen-RU/Makefile b/russian/p5-Text-Hyphen-RU/Makefile
index 79eff88ef896..32bcad570354 100644
--- a/russian/p5-Text-Hyphen-RU/Makefile
+++ b/russian/p5-Text-Hyphen-RU/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Hyphen-RU
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	russian perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/russian/p5-Text-Hyphen-RU/pkg-plist b/russian/p5-Text-Hyphen-RU/pkg-plist
index 33461dbca92d..d30d68959114 100644
--- a/russian/p5-Text-Hyphen-RU/pkg-plist
+++ b/russian/p5-Text-Hyphen-RU/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Text/Hyphen/RU.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Hyphen/RU/.packlist
 %%PERL5_MAN3%%/Text::Hyphen::RU.3.gz
diff --git a/russian/p5-XML-Parser-encodings/Makefile b/russian/p5-XML-Parser-encodings/Makefile
index 89bdc20216c3..e8d5f7cb3549 100644
--- a/russian/p5-XML-Parser-encodings/Makefile
+++ b/russian/p5-XML-Parser-encodings/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Parser-encodings
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	russian textproc perl5
 DISTFILES=
 
@@ -46,8 +47,8 @@ do-build:
 .endfor
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/XML/Parser/Encodings
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/XML/Parser/Encodings
 	${INSTALL_DATA} ${WRKSRC}/*.enc \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/XML/Parser/Encodings
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/XML/Parser/Encodings
 
 .include <bsd.port.post.mk>
diff --git a/russian/p5-XML-Parser-encodings/pkg-plist b/russian/p5-XML-Parser-encodings/pkg-plist
index 048b47767238..cd85f8cb8092 100644
--- a/russian/p5-XML-Parser-encodings/pkg-plist
+++ b/russian/p5-XML-Parser-encodings/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp1251.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp866.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/cp1251.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/cp866.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
diff --git a/russian/p5-cyrillic/Makefile b/russian/p5-cyrillic/Makefile
index 7db562992bed..b3fc79649ee1 100644
--- a/russian/p5-cyrillic/Makefile
+++ b/russian/p5-cyrillic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cyrillic
 PORTVERSION=	2.09
+PORTREVISION=	1
 CATEGORIES=	russian converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/russian/p5-cyrillic/pkg-plist b/russian/p5-cyrillic/pkg-plist
index 72d47556a1d7..3f60b0162d1e 100644
--- a/russian/p5-cyrillic/pkg-plist
+++ b/russian/p5-cyrillic/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/cyrillic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cyrillic/.packlist
 %%PERL5_MAN3%%/cyrillic.3.gz
diff --git a/science/metaf2xml/Makefile b/science/metaf2xml/Makefile
index 95c1af15d50a..f088e89933f1 100644
--- a/science/metaf2xml/Makefile
+++ b/science/metaf2xml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	metaf2xml
 PORTVERSION=	1.55
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
diff --git a/science/p5-Algorithm-SVMLight/Makefile b/science/p5-Algorithm-SVMLight/Makefile
index c9d733b3a299..2e0f52f0d1f0 100644
--- a/science/p5-Algorithm-SVMLight/Makefile
+++ b/science/p5-Algorithm-SVMLight/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-SVMLight
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Algorithm-SVMLight/pkg-plist b/science/p5-Algorithm-SVMLight/pkg-plist
index 0d8e65870f9d..f26cbf5385fe 100644
--- a/science/p5-Algorithm-SVMLight/pkg-plist
+++ b/science/p5-Algorithm-SVMLight/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/SVMLight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVMLight/SVMLight.so
+%%SITE_ARCH%%/Algorithm/SVMLight.pm
+%%SITE_ARCH%%/auto/Algorithm/SVMLight/SVMLight.so
 %%PERL5_MAN3%%/Algorithm::SVMLight.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVMLight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
diff --git a/science/p5-Chemistry-3DBuilder/Makefile b/science/p5-Chemistry-3DBuilder/Makefile
index c24cc6138221..3641f22f740f 100644
--- a/science/p5-Chemistry-3DBuilder/Makefile
+++ b/science/p5-Chemistry-3DBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-3DBuilder
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-3DBuilder/pkg-plist b/science/p5-Chemistry-3DBuilder/pkg-plist
index 7dcc6930b09c..1031a3dfd80d 100644
--- a/science/p5-Chemistry-3DBuilder/pkg-plist
+++ b/science/p5-Chemistry-3DBuilder/pkg-plist
@@ -1,4 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/3DBuilder/.packlist
 %%SITE_PERL%%/Chemistry/3DBuilder.pm
 %%PERL5_MAN3%%/Chemistry::3DBuilder.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/3DBuilder
diff --git a/science/p5-Chemistry-Bond-Find/Makefile b/science/p5-Chemistry-Bond-Find/Makefile
index 865352dad413..370e2f666400 100644
--- a/science/p5-Chemistry-Bond-Find/Makefile
+++ b/science/p5-Chemistry-Bond-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Bond-Find
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Bond-Find/pkg-plist b/science/p5-Chemistry-Bond-Find/pkg-plist
index f91a859b3fde..829bfda494d6 100644
--- a/science/p5-Chemistry-Bond-Find/pkg-plist
+++ b/science/p5-Chemistry-Bond-Find/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Chemistry/Bond/Find.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond/Find/.packlist
 %%PERL5_MAN3%%/Chemistry::Bond::Find.3.gz
-@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/Bond
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond/Find
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Canonicalize/Makefile b/science/p5-Chemistry-Canonicalize/Makefile
index ce77fa07e9c2..71b627b087f6 100644
--- a/science/p5-Chemistry-Canonicalize/Makefile
+++ b/science/p5-Chemistry-Canonicalize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Canonicalize
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Canonicalize/pkg-plist b/science/p5-Chemistry-Canonicalize/pkg-plist
index 6893531945fb..57e0047f7b3e 100644
--- a/science/p5-Chemistry-Canonicalize/pkg-plist
+++ b/science/p5-Chemistry-Canonicalize/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Chemistry/Canonicalize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Canonicalize/.packlist
 %%PERL5_MAN3%%/Chemistry::Canonicalize.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Canonicalize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Elements/Makefile b/science/p5-Chemistry-Elements/Makefile
index d623286a5a52..67af48a0472e 100644
--- a/science/p5-Chemistry-Elements/Makefile
+++ b/science/p5-Chemistry-Elements/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Elements
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-Elements/pkg-plist b/science/p5-Chemistry-Elements/pkg-plist
index e784994f1f8d..2260c9bb75bf 100644
--- a/science/p5-Chemistry-Elements/pkg-plist
+++ b/science/p5-Chemistry-Elements/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Chemistry::Elements.3.gz
 %%SITE_PERL%%/Chemistry/Elements.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-File-MDLMol/Makefile b/science/p5-Chemistry-File-MDLMol/Makefile
index 726beecbdd35..3593e153e4f5 100644
--- a/science/p5-Chemistry-File-MDLMol/Makefile
+++ b/science/p5-Chemistry-File-MDLMol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-MDLMol
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-MDLMol/pkg-plist b/science/p5-Chemistry-File-MDLMol/pkg-plist
index 5e0bc7dfc5f5..615e9beb9dee 100644
--- a/science/p5-Chemistry-File-MDLMol/pkg-plist
+++ b/science/p5-Chemistry-File-MDLMol/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/MDLMol/.packlist
 %%SITE_PERL%%/Chemistry/File/MDLMol.pm
 %%SITE_PERL%%/Chemistry/File/SDF.pm
 %%PERL5_MAN3%%/Chemistry::File::MDLMol.3.gz
 %%PERL5_MAN3%%/Chemistry::File::SDF.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/MDLMol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-Mopac/Makefile b/science/p5-Chemistry-File-Mopac/Makefile
index eb5c95ea2d5f..dd4fb03ea6e7 100644
--- a/science/p5-Chemistry-File-Mopac/Makefile
+++ b/science/p5-Chemistry-File-Mopac/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-Mopac
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-Mopac/pkg-plist b/science/p5-Chemistry-File-Mopac/pkg-plist
index ae7d2df3f7c9..6378086653bb 100644
--- a/science/p5-Chemistry-File-Mopac/pkg-plist
+++ b/science/p5-Chemistry-File-Mopac/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/Mopac/.packlist
 %%SITE_PERL%%/Chemistry/File/Mopac.pm
 %%PERL5_MAN3%%/Chemistry::File::Mopac.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/Mopac
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-PDB/Makefile b/science/p5-Chemistry-File-PDB/Makefile
index 921a414515aa..d68b6ce9b6ff 100644
--- a/science/p5-Chemistry-File-PDB/Makefile
+++ b/science/p5-Chemistry-File-PDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-PDB
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-File-PDB/pkg-plist b/science/p5-Chemistry-File-PDB/pkg-plist
index c31a5d20b9fa..5134a8e5c67b 100644
--- a/science/p5-Chemistry-File-PDB/pkg-plist
+++ b/science/p5-Chemistry-File-PDB/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Chemistry/File/PDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/PDB/.packlist
 %%PERL5_MAN3%%/Chemistry::File::PDB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/PDB
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-File-SLN/Makefile b/science/p5-Chemistry-File-SLN/Makefile
index 254ea94749f6..dfc5b9a7ade1 100644
--- a/science/p5-Chemistry-File-SLN/Makefile
+++ b/science/p5-Chemistry-File-SLN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-SLN
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-SLN/pkg-plist b/science/p5-Chemistry-File-SLN/pkg-plist
index 9f5f0a085749..1aea033891d1 100644
--- a/science/p5-Chemistry-File-SLN/pkg-plist
+++ b/science/p5-Chemistry-File-SLN/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SLN/.packlist
 %%SITE_PERL%%/Chemistry/File/SLN/Parser.pm
 %%SITE_PERL%%/Chemistry/File/SLN.pm
 %%PERL5_MAN3%%/Chemistry::File::SLN.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SLN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry/File/SLN
diff --git a/science/p5-Chemistry-File-SMARTS/Makefile b/science/p5-Chemistry-File-SMARTS/Makefile
index 2d08a8de9b3d..0c2b4c6f4efd 100644
--- a/science/p5-Chemistry-File-SMARTS/Makefile
+++ b/science/p5-Chemistry-File-SMARTS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-SMARTS
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-SMARTS/pkg-plist b/science/p5-Chemistry-File-SMARTS/pkg-plist
index 072646216f6d..55de5ab5ceda 100644
--- a/science/p5-Chemistry-File-SMARTS/pkg-plist
+++ b/science/p5-Chemistry-File-SMARTS/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMARTS/.packlist
 %%SITE_PERL%%/Chemistry/File/SMARTS.pm
 %%PERL5_MAN3%%/Chemistry::File::SMARTS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMARTS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
diff --git a/science/p5-Chemistry-File-SMILES/Makefile b/science/p5-Chemistry-File-SMILES/Makefile
index 9e96c17b0ed3..efcec0feed12 100644
--- a/science/p5-Chemistry-File-SMILES/Makefile
+++ b/science/p5-Chemistry-File-SMILES/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-SMILES
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-SMILES/pkg-plist b/science/p5-Chemistry-File-SMILES/pkg-plist
index 88d2d0922b41..02abd0154096 100644
--- a/science/p5-Chemistry-File-SMILES/pkg-plist
+++ b/science/p5-Chemistry-File-SMILES/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMILES/.packlist
 %%SITE_PERL%%/Chemistry/File/SMILES.pm
 %%SITE_PERL%%/Chemistry/File/write.pl
 %%PERL5_MAN3%%/Chemistry::File::SMILES.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMILES
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-VRML/Makefile b/science/p5-Chemistry-File-VRML/Makefile
index 57d90e1c0c9a..ebbea0770a22 100644
--- a/science/p5-Chemistry-File-VRML/Makefile
+++ b/science/p5-Chemistry-File-VRML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-VRML
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-VRML/pkg-plist b/science/p5-Chemistry-File-VRML/pkg-plist
index 700217923726..488635b7d04d 100644
--- a/science/p5-Chemistry-File-VRML/pkg-plist
+++ b/science/p5-Chemistry-File-VRML/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/VRML/.packlist
 %%SITE_PERL%%/Chemistry/File/VRML.pm
 %%PERL5_MAN3%%/Chemistry::File::VRML.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/VRML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
diff --git a/science/p5-Chemistry-File-XYZ/Makefile b/science/p5-Chemistry-File-XYZ/Makefile
index ed9163c8b9b0..ba4642f5acec 100644
--- a/science/p5-Chemistry-File-XYZ/Makefile
+++ b/science/p5-Chemistry-File-XYZ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-XYZ
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-XYZ/pkg-plist b/science/p5-Chemistry-File-XYZ/pkg-plist
index 5ec012fad7e5..aa785788405f 100644
--- a/science/p5-Chemistry-File-XYZ/pkg-plist
+++ b/science/p5-Chemistry-File-XYZ/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/XYZ/.packlist
 %%SITE_PERL%%/Chemistry/File/XYZ.pm
 %%PERL5_MAN3%%/Chemistry::File::XYZ.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/XYZ
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-FormulaPattern/Makefile b/science/p5-Chemistry-FormulaPattern/Makefile
index 8064f9b06636..828f6fba9fcb 100644
--- a/science/p5-Chemistry-FormulaPattern/Makefile
+++ b/science/p5-Chemistry-FormulaPattern/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-FormulaPattern
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-FormulaPattern/pkg-plist b/science/p5-Chemistry-FormulaPattern/pkg-plist
index dc65fa11211e..a3fbd2fde006 100644
--- a/science/p5-Chemistry-FormulaPattern/pkg-plist
+++ b/science/p5-Chemistry-FormulaPattern/pkg-plist
@@ -1,7 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/FormulaPattern/.packlist
 %%SITE_PERL%%/Chemistry/File/FormulaPattern.pm
 %%SITE_PERL%%/Chemistry/FormulaPattern.pm
 %%PERL5_MAN3%%/Chemistry::FormulaPattern.3.gz
 %%PERL5_MAN3%%/Chemistry::File::FormulaPattern.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/FormulaPattern
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-InternalCoords/Makefile b/science/p5-Chemistry-InternalCoords/Makefile
index bf7dc44f77e1..bfa405943e05 100644
--- a/science/p5-Chemistry-InternalCoords/Makefile
+++ b/science/p5-Chemistry-InternalCoords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-InternalCoords
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-InternalCoords/pkg-plist b/science/p5-Chemistry-InternalCoords/pkg-plist
index 7dfdb7245952..f0e3a1ec20bf 100644
--- a/science/p5-Chemistry-InternalCoords/pkg-plist
+++ b/science/p5-Chemistry-InternalCoords/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/InternalCoords/.packlist
 %%SITE_PERL%%/Chemistry/InternalCoords/Builder.pm
 %%SITE_PERL%%/Chemistry/InternalCoords.pm
 %%PERL5_MAN3%%/Chemistry::InternalCoords.3.gz
 %%PERL5_MAN3%%/Chemistry::InternalCoords::Builder.3.gz
-@dirrmtry %%SITE_PERL%%/Chemistry/InternalCoords
-@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/InternalCoords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Isotope/Makefile b/science/p5-Chemistry-Isotope/Makefile
index a22a183da36e..d694ce3e1472 100644
--- a/science/p5-Chemistry-Isotope/Makefile
+++ b/science/p5-Chemistry-Isotope/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Isotope
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Isotope/pkg-plist b/science/p5-Chemistry-Isotope/pkg-plist
index 304c7ee80c1a..2977581e6955 100644
--- a/science/p5-Chemistry-Isotope/pkg-plist
+++ b/science/p5-Chemistry-Isotope/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Isotope/.packlist
 %%SITE_PERL%%/Chemistry/Isotope.pm
 %%PERL5_MAN3%%/Chemistry::Isotope.3.gz
-@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Isotope
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-MacroMol/Makefile b/science/p5-Chemistry-MacroMol/Makefile
index 5b989e3cd2d2..0c488e246f6c 100644
--- a/science/p5-Chemistry-MacroMol/Makefile
+++ b/science/p5-Chemistry-MacroMol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-MacroMol
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-MacroMol/pkg-plist b/science/p5-Chemistry-MacroMol/pkg-plist
index 1aad1ee2cf8e..8c6e1bddf89a 100644
--- a/science/p5-Chemistry-MacroMol/pkg-plist
+++ b/science/p5-Chemistry-MacroMol/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Chemistry::MacroMol.3.gz
 %%SITE_PERL%%/Chemistry/Domain.pm
 %%SITE_PERL%%/Chemistry/MacroMol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MacroMol/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MacroMol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-MidasPattern/Makefile b/science/p5-Chemistry-MidasPattern/Makefile
index 440aa8c280c5..67e4d9ad08e1 100644
--- a/science/p5-Chemistry-MidasPattern/Makefile
+++ b/science/p5-Chemistry-MidasPattern/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-MidasPattern
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-MidasPattern/pkg-plist b/science/p5-Chemistry-MidasPattern/pkg-plist
index da4325a8dcfe..cc79059b2422 100644
--- a/science/p5-Chemistry-MidasPattern/pkg-plist
+++ b/science/p5-Chemistry-MidasPattern/pkg-plist
@@ -1,7 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MidasPattern/.packlist
 %%SITE_PERL%%/Chemistry/File/MidasPattern.pm
 %%SITE_PERL%%/Chemistry/MidasPattern.pm
 %%PERL5_MAN3%%/Chemistry::MidasPattern.3.gz
 %%PERL5_MAN3%%/Chemistry::File::MidasPattern.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MidasPattern
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Mok/Makefile b/science/p5-Chemistry-Mok/Makefile
index 364a493ad355..8e66b9e2aa01 100644
--- a/science/p5-Chemistry-Mok/Makefile
+++ b/science/p5-Chemistry-Mok/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Mok
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Mok/pkg-plist b/science/p5-Chemistry-Mok/pkg-plist
index 2f58adb5aded..df28d4d591ff 100644
--- a/science/p5-Chemistry-Mok/pkg-plist
+++ b/science/p5-Chemistry-Mok/pkg-plist
@@ -1,6 +1,4 @@
 bin/mok
 %%SITE_PERL%%/Chemistry/Mok.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mok/.packlist
 %%PERL5_MAN3%%/Chemistry::Mok.3.gz
 man/man1/mok.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mok
diff --git a/science/p5-Chemistry-Mol/Makefile b/science/p5-Chemistry-Mol/Makefile
index cd45bb53ccd8..b8d1b13ffa39 100644
--- a/science/p5-Chemistry-Mol/Makefile
+++ b/science/p5-Chemistry-Mol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Mol
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-Mol/pkg-plist b/science/p5-Chemistry-Mol/pkg-plist
index 2551becfe39a..6f7b55f4c4bd 100644
--- a/science/p5-Chemistry-Mol/pkg-plist
+++ b/science/p5-Chemistry-Mol/pkg-plist
@@ -14,8 +14,3 @@
 %%SITE_PERL%%/Chemistry/Mol.pm
 %%SITE_PERL%%/Chemistry/Obj.pm
 %%SITE_PERL%%/Chemistry/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mol/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-Pattern/Makefile b/science/p5-Chemistry-Pattern/Makefile
index 198d68646f58..3ecd055f5f3c 100644
--- a/science/p5-Chemistry-Pattern/Makefile
+++ b/science/p5-Chemistry-Pattern/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Pattern
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Pattern/pkg-plist b/science/p5-Chemistry-Pattern/pkg-plist
index a87d730179e1..8fcfe0775e2f 100644
--- a/science/p5-Chemistry-Pattern/pkg-plist
+++ b/science/p5-Chemistry-Pattern/pkg-plist
@@ -1,10 +1,6 @@
 %%SITE_PERL%%/Chemistry/Pattern/Atom.pm
 %%SITE_PERL%%/Chemistry/Pattern/Bond.pm
 %%SITE_PERL%%/Chemistry/Pattern.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Pattern/.packlist
 %%PERL5_MAN3%%/Chemistry::Pattern.3.gz
 %%PERL5_MAN3%%/Chemistry::Pattern::Atom.3.gz
 %%PERL5_MAN3%%/Chemistry::Pattern::Bond.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Pattern
-@dirrmtry %%SITE_PERL%%/Chemistry/Pattern
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-Reaction/Makefile b/science/p5-Chemistry-Reaction/Makefile
index 12d4490af405..2e28b7e84003 100644
--- a/science/p5-Chemistry-Reaction/Makefile
+++ b/science/p5-Chemistry-Reaction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Reaction
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Reaction/pkg-plist b/science/p5-Chemistry-Reaction/pkg-plist
index 14d56be4345d..e25de821e84b 100644
--- a/science/p5-Chemistry-Reaction/pkg-plist
+++ b/science/p5-Chemistry-Reaction/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Chemistry/Reaction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Reaction/.packlist
 %%PERL5_MAN3%%/Chemistry::Reaction.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Reaction
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Ring/Makefile b/science/p5-Chemistry-Ring/Makefile
index 3564f93064f4..917ad9a5aa1a 100644
--- a/science/p5-Chemistry-Ring/Makefile
+++ b/science/p5-Chemistry-Ring/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Ring
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Ring/pkg-plist b/science/p5-Chemistry-Ring/pkg-plist
index adcf3874c3e4..090f3f853a26 100644
--- a/science/p5-Chemistry-Ring/pkg-plist
+++ b/science/p5-Chemistry-Ring/pkg-plist
@@ -1,7 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Ring/.packlist
 %%SITE_PERL%%/Chemistry/Ring/Find.pm
 %%SITE_PERL%%/Chemistry/Ring.pm
 %%PERL5_MAN3%%/Chemistry::Ring.3.gz
 %%PERL5_MAN3%%/Chemistry::Ring::Find.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Ring
-@dirrmtry %%SITE_PERL%%/Chemistry/Ring
diff --git a/science/p5-Geo-BUFR/Makefile b/science/p5-Geo-BUFR/Makefile
index 77bb85577306..66e721a1f7b8 100644
--- a/science/p5-Geo-BUFR/Makefile
+++ b/science/p5-Geo-BUFR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-BUFR
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	science perl5 geography
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PSANNES
diff --git a/science/p5-Geo-BUFR/pkg-plist b/science/p5-Geo-BUFR/pkg-plist
index b785fd182a52..58f2105e7c2f 100644
--- a/science/p5-Geo-BUFR/pkg-plist
+++ b/science/p5-Geo-BUFR/pkg-plist
@@ -9,19 +9,15 @@ bin/bufrresolve.pl
 %%PERL5_MAN3%%/Geo::bufrencode.3.gz
 %%PERL5_MAN3%%/Geo::bufrread.3.gz
 %%PERL5_MAN3%%/Geo::bufrresolve.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/BUFR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufr_reencode.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufralter.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufrencode.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufrread.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufrresolve.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/BUFR/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/BUFR/BUFR.so
+%%SITE_ARCH%%/Geo/BUFR.pm
+%%SITE_ARCH%%/Geo/bufr_reencode.pl
+%%SITE_ARCH%%/Geo/bufralter.pl
+%%SITE_ARCH%%/Geo/bufrencode.pl
+%%SITE_ARCH%%/Geo/bufrread.pl
+%%SITE_ARCH%%/Geo/bufrresolve.pl
+%%SITE_ARCH%%/auto/Geo/BUFR/BUFR.so
 man/man1/bufr_reencode.pl.1.gz
 man/man1/bufralter.pl.1.gz
 man/man1/bufrencode.pl.1.gz
 man/man1/bufrread.pl.1.gz
 man/man1/bufrresolve.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/BUFR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Geo
diff --git a/science/p5-Geo-Coordinates-Converter-iArea/Makefile b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
index 269ae2c8bcad..6d3b563a41ec 100644
--- a/science/p5-Geo-Coordinates-Converter-iArea/Makefile
+++ b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coordinates-Converter-iArea
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	science geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist b/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist
index 2fdeafc916fe..00defafb1464 100644
--- a/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist
+++ b/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist
@@ -3,6 +3,5 @@
 %%SITE_PERL%%/auto/share/dist/Geo-Coordinates-Converter-iArea/areacode2center.cdb
 %%SITE_PERL%%/auto/share/dist/Geo-Coordinates-Converter-iArea/areacode2name.cdb
 %%SITE_PERL%%/auto/share/dist/Geo-Coordinates-Converter-iArea/meshcode2areacode.cdb
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/Converter/iArea/.packlist
 %%PERL5_MAN3%%/Geo::Coordinates::Converter::Format::IArea.3.gz
 %%PERL5_MAN3%%/Geo::Coordinates::Converter::iArea.3.gz
diff --git a/science/p5-Geo-Coordinates-Converter/Makefile b/science/p5-Geo-Coordinates-Converter/Makefile
index f3ad9fce3de3..f38f1df9798f 100644
--- a/science/p5-Geo-Coordinates-Converter/Makefile
+++ b/science/p5-Geo-Coordinates-Converter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coordinates-Converter
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	science geography perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:YAPPO
diff --git a/science/p5-Geo-Coordinates-Converter/pkg-plist b/science/p5-Geo-Coordinates-Converter/pkg-plist
index 32e2526f0fa9..03abd3bd665b 100644
--- a/science/p5-Geo-Coordinates-Converter/pkg-plist
+++ b/science/p5-Geo-Coordinates-Converter/pkg-plist
@@ -19,13 +19,3 @@
 %%SITE_PERL%%/Geo/Coordinates/Converter/Format/Milliseconds.pm
 %%SITE_PERL%%/Geo/Coordinates/Converter/Point.pm
 %%SITE_PERL%%/Geo/Coordinates/Converter/Point/ISO6709.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/Converter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/Converter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter/Point
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter/Format
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter/Datum
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/science/p5-Geo-ReadGRIB/Makefile b/science/p5-Geo-ReadGRIB/Makefile
index 4b9166c32961..80ec84a83c3b 100644
--- a/science/p5-Geo-ReadGRIB/Makefile
+++ b/science/p5-Geo-ReadGRIB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-ReadGRIB
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Geo-ReadGRIB/pkg-plist b/science/p5-Geo-ReadGRIB/pkg-plist
index f4120a4ee2a3..b82a241b79e4 100644
--- a/science/p5-Geo-ReadGRIB/pkg-plist
+++ b/science/p5-Geo-ReadGRIB/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/ReadGRIB/.packlist
 %%SITE_PERL%%/Geo/wgrib.exe
 %%SITE_PERL%%/Geo/ReadGRIB.pm
 %%SITE_PERL%%/Geo/Sample-GRIB/akw.HTSGW.grb
@@ -8,8 +7,3 @@
 %%PERL5_MAN3%%/Geo::ReadGRIB.3.gz
 %%PERL5_MAN3%%/Geo::ReadGRIB::Place.3.gz
 %%PERL5_MAN3%%/Geo::ReadGRIB::PlaceIterator.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/ReadGRIB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrm %%SITE_PERL%%/Geo/Sample-GRIB
-@dirrm %%SITE_PERL%%/Geo/ReadGRIB
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/science/p5-Geo-WebService-Elevation-USGS/Makefile b/science/p5-Geo-WebService-Elevation-USGS/Makefile
index 3faac10e06dc..9635e32cf096 100644
--- a/science/p5-Geo-WebService-Elevation-USGS/Makefile
+++ b/science/p5-Geo-WebService-Elevation-USGS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-WebService-Elevation-USGS
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/science/p5-Geo-WebService-Elevation-USGS/pkg-plist b/science/p5-Geo-WebService-Elevation-USGS/pkg-plist
index 83f5c8e80eed..7c5dc49ee924 100644
--- a/science/p5-Geo-WebService-Elevation-USGS/pkg-plist
+++ b/science/p5-Geo-WebService-Elevation-USGS/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Geo::WebService::Elevation::USGS.3.gz
 %%SITE_PERL%%/Geo/WebService/Elevation/USGS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService/Elevation/USGS/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService/Elevation/USGS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService/Elevation
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/WebService/Elevation
-@dirrmtry %%SITE_PERL%%/Geo/WebService
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/science/p5-PerlMol/Makefile b/science/p5-PerlMol/Makefile
index c1b16964b3ea..bd6d96b664c5 100644
--- a/science/p5-PerlMol/Makefile
+++ b/science/p5-PerlMol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlMol
 PORTVERSION=	0.3500
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-PerlMol/pkg-plist b/science/p5-PerlMol/pkg-plist
index ba6c1c3f2a70..0ef224722e3f 100644
--- a/science/p5-PerlMol/pkg-plist
+++ b/science/p5-PerlMol/pkg-plist
@@ -1,4 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlMol/.packlist
 %%SITE_PERL%%/PerlMol.pm
 %%PERL5_MAN3%%/PerlMol.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlMol
diff --git a/science/p5-Physics-Unit/Makefile b/science/p5-Physics-Unit/Makefile
index bd9c3f0d52b1..035c8b5ed874 100644
--- a/science/p5-Physics-Unit/Makefile
+++ b/science/p5-Physics-Unit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Physics-Unit
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Physics-Unit/pkg-plist b/science/p5-Physics-Unit/pkg-plist
index ff0d864f0e6a..18a8a5b17978 100644
--- a/science/p5-Physics-Unit/pkg-plist
+++ b/science/p5-Physics-Unit/pkg-plist
@@ -14,7 +14,3 @@ man/man1/physics-unit.1.gz
 %%PERL5_MAN3%%/Physics::Unit::Scalar::Implementation.3.gz
 %%PERL5_MAN3%%/Physics::Unit::UnitsByName.3.gz
 %%PERL5_MAN3%%/Physics::Unit::UnitsByType.3.gz
-@dirrm %%SITE_PERL%%/Physics/Unit/Scalar
-@dirrm %%SITE_PERL%%/Physics/Unit/Script
-@dirrm %%SITE_PERL%%/Physics/Unit
-@dirrmtry %%SITE_PERL%%/Physics
diff --git a/security/axTLS/Makefile b/security/axTLS/Makefile
index a90bf423c26f..c016142cc2d3 100644
--- a/security/axTLS/Makefile
+++ b/security/axTLS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	axTLS
 PORTVERSION=	1.4.9
+PORTREVISION=	1
 CATEGORIES=	security devel net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTVERSION}
@@ -114,10 +115,10 @@ do-install:
 	${INSTALL_PROGRAM} ${STAGE}/axtlswrap ${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MPERL}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto
 	${INSTALL_SCRIPT} ${STAGE}/axssl.pl ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${STAGE}/axtlsp.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}
-	${INSTALL_LIB} ${STAGE}/libaxtlsp.so ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
+	${INSTALL_SCRIPT} ${STAGE}/axtlsp.pm ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}
+	${INSTALL_LIB} ${STAGE}/libaxtlsp.so ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto
 .endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/axTLS
 	${INSTALL_DATA} ${WRKSRC}/crypto/*.h ${STAGEDIR}${PREFIX}/include/axTLS
diff --git a/security/axTLS/pkg-plist b/security/axTLS/pkg-plist
index 17560777d305..b909f6649ac1 100644
--- a/security/axTLS/pkg-plist
+++ b/security/axTLS/pkg-plist
@@ -16,5 +16,5 @@ lib/libaxtls.a
 lib/libaxtls.so
 lib/libaxtls.so.1
 lib/libaxtls.so.1.2
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/libaxtlsp.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/axtlsp.pm
+%%PERL%%%%SITE_ARCH%%/auto/libaxtlsp.so
+%%PERL%%%%SITE_ARCH%%/axtlsp.pm
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index af1f54d23906..425a0038ebd1 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clamtk
 PORTVERSION=	4.45
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/ClamTk/${PORTVERSION}
 
@@ -44,8 +44,8 @@ post-patch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/ClamTk
-	${INSTALL_DATA} ${WRKSRC}/lib/*.pm ${STAGEDIR}${SITE_PERL}/ClamTk
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ClamTk
+	${INSTALL_DATA} ${WRKSRC}/lib/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ClamTk
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/security/clusterssh/Makefile b/security/clusterssh/Makefile
index fcd02d73b096..84ae2b7a9c00 100644
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	clusterssh
 PORTVERSION=	4.02
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	SF/${PORTNAME}/2.%20ClusterSSH%20Series%204
 DISTNAME=	App-ClusterSSH-${PORTVERSION}_01
diff --git a/security/clusterssh/pkg-plist b/security/clusterssh/pkg-plist
index f88fd07f188c..59c6e0f73504 100644
--- a/security/clusterssh/pkg-plist
+++ b/security/clusterssh/pkg-plist
@@ -15,7 +15,6 @@ man/man1/ctel.1.gz
 %%SITE_PERL%%/App/ClusterSSH/Host.pm
 %%SITE_PERL%%/App/ClusterSSH/L10N.pm
 %%SITE_PERL%%/App/ClusterSSH/L10N/en.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/ClusterSSH/.packlist
 %%PERL5_MAN3%%/App::ClusterSSH.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Base.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Cluster.3.gz
@@ -24,8 +23,3 @@ man/man1/ctel.1.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Host.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::L10N.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::L10N::en.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/ClusterSSH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
-@dirrmtry %%SITE_PERL%%/App/ClusterSSH/L10N
-@dirrmtry %%SITE_PERL%%/App/ClusterSSH
-@dirrmtry %%SITE_PERL%%/App
diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile
index 0897a3109aa4..7ff52f7f39db 100644
--- a/security/ftimes/Makefile
+++ b/security/ftimes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		ftimes
 PORTVERSION=		3.11.0
+PORTREVISION=	1
 CATEGORIES=		security sysutils
 MASTER_SITES=		SF
 
@@ -126,7 +127,6 @@ CONFIGURE_ARGS+=	--disable-xmagic
 
 .if ${INSTALL_PERL5_LIBS}
 PLIST_SUB+=		FTIMES_PERL5_LIBS=""
-USE_PERL5+=		fixpacklist
 .else
 PLIST_SUB+=		FTIMES_PERL5_LIBS="@comment "
 .endif
diff --git a/security/ftimes/pkg-plist b/security/ftimes/pkg-plist
index 772cc986740a..3971f7f998ab 100644
--- a/security/ftimes/pkg-plist
+++ b/security/ftimes/pkg-plist
@@ -41,7 +41,6 @@ bin/ftimes
 etc/ftimes-dig.cfg.sample
 etc/ftimes-get.cfg.sample
 etc/ftimes-map.cfg.sample
-%%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes/.packlist
 %%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/FTimes/EadRoutines.pm
 %%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/FTimes/Properties.pm
 man/man1/ftimes.1.gz
@@ -85,5 +84,3 @@ man/man1/ftimes.1.gz
 %%MAP_TOOLS%%man/man1/zipmap.1.gz
 %%FTIMES_PERL5_LIBS%%man/man3/FTimes::EadRoutines.3.gz
 %%FTIMES_PERL5_LIBS%%man/man3/FTimes::Properties.3.gz
-%%FTIMES_PERL5_LIBS%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes
-%%FTIMES_PERL5_LIBS%%@dirrm %%SITE_PERL%%/FTimes
diff --git a/security/lasso/Makefile b/security/lasso/Makefile
index c0757e6546d9..d2642225cb7a 100644
--- a/security/lasso/Makefile
+++ b/security/lasso/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lasso
 PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/594/
 
@@ -59,7 +59,4 @@ CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
-post-install:
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
-
 .include <bsd.port.mk>
diff --git a/security/lasso/pkg-plist b/security/lasso/pkg-plist
index c1dce468cfdb..7b72a408ce6e 100644
--- a/security/lasso/pkg-plist
+++ b/security/lasso/pkg-plist
@@ -12,9 +12,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/writing-a-java-sp.txt
 %%PORTDOCS%%%%DOCSDIR%%/writing-a-php-sp.txt
 %%PORTDOCS%%%%DOCSDIR%%/writing-a-saml2-php-sp.txt
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/lasso/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/lasso/lasso.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/lasso.pm
+%%WITH_PERL%%%%SITE_ARCH%%/auto/lasso/lasso.so
+%%WITH_PERL%%%%SITE_ARCH%%/lasso.pm
 %%WITH_PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.a
 %%WITH_PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.la
 %%WITH_PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.so
@@ -318,5 +317,4 @@ libdata/pkgconfig/lasso.pc
 %%WITH_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
 %%WITH_PHP5%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
 %%WITH_PHP5%%@dirrmtry lib/php
-%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/lasso
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index e9184041a80e..febfdda11720 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libprelude
 PORTVERSION=	1.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/attachments/download/241/
 
@@ -70,10 +70,6 @@ post-install:
 	${RM} ${STAGEDIR}${ETCDIR}/default/${f}	# Remove files install-data-local installs
 .endfor
 
-.if ${PORT_OPTIONS:MPERL}
-	-@${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
-.endif
-
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${STAGEDIR}${DOCSDIR}
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index 6fe2bdd7c8e9..8e69686f221d 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -72,10 +72,8 @@ lib/libpreludecpp.so
 lib/libpreludecpp.so.0
 lib/libpreludecpp.so.0.3.0
 man/man1/prelude-admin.1.gz
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/.packlist
+%%PERL%%%%SITE_ARCH%%/Prelude.pm
+%%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc
@@ -86,8 +84,6 @@ man/man1/prelude-admin.1.gz
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
 libdata/pkgconfig/libprelude.pc
 share/aclocal/libprelude.m4
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude
 @dirrm include/libprelude
 @dirrmtry %%ETCDIR%%/default
 @dirrmtry %%ETCDIR%%/profile
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index db79eb430b9b..80efaeac5417 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libpreludedb
 PORTVERSION=	1.0.1p1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/287/
 
@@ -41,7 +41,7 @@ MYSQL_USE=		mysql=yes
 MYSQL_CONFIGURE_WITH=	mysql
 PERL_DESC=		Perl bindings
 PERL_USES=		perl5
-PERL_USE=		perl5=build,fixpacklist,run
+PERL_USE=		perl5=build,run
 PERL_CONFIGURE_WITH=	perl
 PGSQL_DESC=		PostgreSQL plugin
 PGSQL_USES=		pgsql
@@ -64,8 +64,6 @@ post-install:
 .if ${PORT_OPTIONS:MPERL}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
 		-name "*.so" | ${XARGS} ${STRIP_CMD}
-	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
-		-name "perllocal.pod*" -delete
 .endif
 .if ${PORT_OPTIONS:MPYTHON}
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index 53916e9c7bec..185e82582d1d 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -15,10 +15,8 @@ lib/libpreludedb/plugins/formats/classic.so
 %%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
 %%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
 %%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeDB.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/PreludeDB.so
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB
+%%PERL%%%%SITE_ARCH%%/PreludeDB.pm
+%%PERL%%%%SITE_ARCH%%/auto/PreludeDB/PreludeDB.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
diff --git a/security/libwhisker/Makefile b/security/libwhisker/Makefile
index 28dfc1dec7a2..2585c4e4f796 100644
--- a/security/libwhisker/Makefile
+++ b/security/libwhisker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libwhisker
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	SF/whisker/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
@@ -14,8 +15,7 @@ LICENSE=	BSD2CLAUSE
 
 NO_BUILD=	yes
 USES=		perl5
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
-PLIST_FILES=	${SITE_PERL_REL}/LW2.pm \
+PLIST_FILES=	%%SITE_PERL%%/LW2.pm \
 		%%PERL5_MAN3%%/LW2.3pm.gz
 
 OPTIONS_DEFINE=	DOCS
@@ -23,11 +23,8 @@ OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}
-	@${MKDIR} ${STAGEDIR}${MAN3PREFIX}/man/man3
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/man/man3
 	cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${PERL5} Makefile.pl install
-	@${CHMOD} 444 ${STAGEDIR}${SITE_PERL}/LW2.pm
-	@${CHMOD} 444 ${STAGEDIR}${MAN3PREFIX}/man/man3/LW2.3pm
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/scripts
 	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGES KNOWNBUGS ${STAGEDIR}${DOCSDIR}
diff --git a/security/log2timeline/Makefile b/security/log2timeline/Makefile
index 1dc3ea587413..ad437a51ce25 100644
--- a/security/log2timeline/Makefile
+++ b/security/log2timeline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	log2timeline
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://log2timeline.net/files/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/security/log2timeline/pkg-plist b/security/log2timeline/pkg-plist
index 83938d759a8a..097bd3cf0287 100644
--- a/security/log2timeline/pkg-plist
+++ b/security/log2timeline/pkg-plist
@@ -150,7 +150,6 @@ bin/timescanner
 %%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x92.pm
 %%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x94.pm
 %%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x95.pm
-%%SITE_PERL%%/mach/auto/Log2t/.packlist
 %%PERL5_MAN3%%/Log2Timeline.3.gz
 %%PERL5_MAN3%%/Log2t::BinRead.3.gz
 %%PERL5_MAN3%%/Log2t::Numbers.3.gz
@@ -190,13 +189,3 @@ bin/timescanner
 man/man1/l2t_process.1.gz
 man/man1/log2timeline.1.gz
 man/man1/timescanner.1.gz
-@dirrm %%SITE_PERL%%/Log2t/PreProc
-@dirrm %%SITE_PERL%%/Log2t/base
-@dirrm %%SITE_PERL%%/Log2t/input
-@dirrm %%SITE_PERL%%/Log2t/output
-@dirrm %%SITE_PERL%%/Log2t
-@dirrm %%SITE_PERL%%/Parse/Evtx2/BXmlNode
-@dirrm %%SITE_PERL%%/Parse/Evtx2/VariantType
-@dirrm %%SITE_PERL%%/Parse/Evtx2
-@dirrm %%SITE_PERL%%/mach/auto/Log2t
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/security/p5-Apache-Htpasswd/Makefile b/security/p5-Apache-Htpasswd/Makefile
index 8189c8dbcd23..20f2746ce18b 100644
--- a/security/p5-Apache-Htpasswd/Makefile
+++ b/security/p5-Apache-Htpasswd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Htpasswd
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	security perl5 www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Apache-Htpasswd/pkg-plist b/security/p5-Apache-Htpasswd/pkg-plist
index 21f5ed7355db..f95d1c6cc2af 100644
--- a/security/p5-Apache-Htpasswd/pkg-plist
+++ b/security/p5-Apache-Htpasswd/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Apache/Htpasswd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Htpasswd/.packlist
 %%PERL5_MAN3%%/Apache::Htpasswd.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Htpasswd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/security/p5-App-Genpass/Makefile b/security/p5-App-Genpass/Makefile
index 5f8d57ff05d8..9d70f5763318 100644
--- a/security/p5-App-Genpass/Makefile
+++ b/security/p5-App-Genpass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-Genpass
 PORTVERSION=	2.34
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:XSAWYERX
diff --git a/security/p5-App-Genpass/pkg-plist b/security/p5-App-Genpass/pkg-plist
index 05dcac8539ac..6a27a004c98e 100644
--- a/security/p5-App-Genpass/pkg-plist
+++ b/security/p5-App-Genpass/pkg-plist
@@ -1,8 +1,4 @@
 bin/genpass
 %%SITE_PERL%%/App/Genpass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Genpass/.packlist
 %%PERL5_MAN3%%/App::Genpass.3.gz
 man/man1/genpass.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Genpass
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
-@dirrmtry %%SITE_PERL%%/App
diff --git a/security/p5-App-TLSMe/Makefile b/security/p5-App-TLSMe/Makefile
index bf1b124907ae..002192708d9e 100644
--- a/security/p5-App-TLSMe/Makefile
+++ b/security/p5-App-TLSMe/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	App-TLSMe
 PORTVERSION=	0.110000
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-App-TLSMe/pkg-plist b/security/p5-App-TLSMe/pkg-plist
index 26089595417f..240226af1dab 100644
--- a/security/p5-App-TLSMe/pkg-plist
+++ b/security/p5-App-TLSMe/pkg-plist
@@ -5,15 +5,9 @@ man/man1/tlsme.1.gz
 %%PERL5_MAN3%%/App::TLSMe::Connection::raw.3.gz
 %%PERL5_MAN3%%/App::TLSMe::Pool.3.gz
 bin/tlsme
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/TLSMe/.packlist
 %%SITE_PERL%%/App/TLSMe.pm
 %%SITE_PERL%%/App/TLSMe/Connection.pm
 %%SITE_PERL%%/App/TLSMe/Connection/http.pm
 %%SITE_PERL%%/App/TLSMe/Connection/raw.pm
 %%SITE_PERL%%/App/TLSMe/Logger.pm
 %%SITE_PERL%%/App/TLSMe/Pool.pm
-@dirrm %%SITE_PERL%%/App/TLSMe/Connection
-@dirrm %%SITE_PERL%%/App/TLSMe
-@dirrmtry %%SITE_PERL%%/App
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/TLSMe
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
diff --git a/security/p5-Auth-YubikeyDecrypter/Makefile b/security/p5-Auth-YubikeyDecrypter/Makefile
index f681e9fb2093..1a0569fa14a6 100644
--- a/security/p5-Auth-YubikeyDecrypter/Makefile
+++ b/security/p5-Auth-YubikeyDecrypter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Auth-YubikeyDecrypter
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MASSYN
diff --git a/security/p5-Auth-YubikeyDecrypter/pkg-plist b/security/p5-Auth-YubikeyDecrypter/pkg-plist
index c605307c63ea..f0710feb7a6e 100644
--- a/security/p5-Auth-YubikeyDecrypter/pkg-plist
+++ b/security/p5-Auth-YubikeyDecrypter/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Auth/Yubikey_Decrypter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Auth/Yubikey_Decrypter/.packlist
 %%PERL5_MAN3%%/Auth::Yubikey_Decrypter.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Auth/Yubikey_Decrypter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Auth
-@dirrmtry %%SITE_PERL%%/Auth
diff --git a/security/p5-AuthCAS/Makefile b/security/p5-AuthCAS/Makefile
index 109ad52cc580..800824bd0bb5 100644
--- a/security/p5-AuthCAS/Makefile
+++ b/security/p5-AuthCAS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AuthCAS
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OSALAUN
diff --git a/security/p5-AuthCAS/pkg-plist b/security/p5-AuthCAS/pkg-plist
index 992f2613d63c..bdc5b704f1d8 100644
--- a/security/p5-AuthCAS/pkg-plist
+++ b/security/p5-AuthCAS/pkg-plist
@@ -1,5 +1,3 @@
 %%SITE_PERL%%/AuthCAS.pm
 %%SITE_PERL%%/sampleCasClient.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AuthCAS/.packlist
 %%PERL5_MAN3%%/AuthCAS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AuthCAS
diff --git a/security/p5-Authen-Bitcard/Makefile b/security/p5-Authen-Bitcard/Makefile
index 8091137f4840..3c562803d403 100644
--- a/security/p5-Authen-Bitcard/Makefile
+++ b/security/p5-Authen-Bitcard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Bitcard
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Bitcard/pkg-plist b/security/p5-Authen-Bitcard/pkg-plist
index 2308a7c11184..9f1b5c517685 100644
--- a/security/p5-Authen-Bitcard/pkg-plist
+++ b/security/p5-Authen-Bitcard/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Authen::Bitcard.3.gz
 %%SITE_PERL%%/Authen/Bitcard.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Bitcard/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Bitcard
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index aa5ecb037c79..7542e04e5340 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Authen-Captcha
 PORTVERSION=	1.023
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Captcha/pkg-plist b/security/p5-Authen-Captcha/pkg-plist
index 0df4443cd496..87d2b19d46f2 100644
--- a/security/p5-Authen-Captcha/pkg-plist
+++ b/security/p5-Authen-Captcha/pkg-plist
@@ -40,9 +40,3 @@
 %%SITE_PERL%%/Authen/Captcha/images/x.png
 %%SITE_PERL%%/Authen/Captcha/images/y.png
 %%SITE_PERL%%/Authen/Captcha/images/z.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Captcha/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Captcha
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen/Captcha/images
-@dirrmtry %%SITE_PERL%%/Authen/Captcha
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-CyrusSASL/Makefile b/security/p5-Authen-CyrusSASL/Makefile
index 042be91ecee6..0b5ea7d6c09c 100644
--- a/security/p5-Authen-CyrusSASL/Makefile
+++ b/security/p5-Authen-CyrusSASL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-CyrusSASL
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-CyrusSASL/pkg-plist b/security/p5-Authen-CyrusSASL/pkg-plist
index 808865b6b875..a7593597780c 100644
--- a/security/p5-Authen-CyrusSASL/pkg-plist
+++ b/security/p5-Authen-CyrusSASL/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Authen/CyrusSASL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/CyrusSASL/.packlist
 %%SITE_PERL%%/auto/Authen/CyrusSASL/autosplit.ix
 %%PERL5_MAN3%%/Authen::CyrusSASL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/CyrusSASL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrm %%SITE_PERL%%/auto/Authen/CyrusSASL
-@dirrmtry %%SITE_PERL%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-DecHpwd/Makefile b/security/p5-Authen-DecHpwd/Makefile
index f8474e4caff5..dca183502632 100644
--- a/security/p5-Authen-DecHpwd/Makefile
+++ b/security/p5-Authen-DecHpwd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-DecHpwd
 PORTVERSION=	2.006
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-DecHpwd/pkg-plist b/security/p5-Authen-DecHpwd/pkg-plist
index b90091359637..c8ff12b9602b 100644
--- a/security/p5-Authen-DecHpwd/pkg-plist
+++ b/security/p5-Authen-DecHpwd/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/DecHpwd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/DecHpwd/DecHpwd.so
+%%SITE_ARCH%%/Authen/DecHpwd.pm
+%%SITE_ARCH%%/auto/Authen/DecHpwd/DecHpwd.so
 %%PERL5_MAN3%%/Authen::DecHpwd.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/DecHpwd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
diff --git a/security/p5-Authen-Htpasswd/Makefile b/security/p5-Authen-Htpasswd/Makefile
index d9de51a2bf37..ffd7cf62c192 100644
--- a/security/p5-Authen-Htpasswd/Makefile
+++ b/security/p5-Authen-Htpasswd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Htpasswd
 PORTVERSION=	0.171
+PORTREVISION=	1
 CATEGORIES=	security perl5 www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Htpasswd/pkg-plist b/security/p5-Authen-Htpasswd/pkg-plist
index 077b44a7d62b..911688842b5b 100644
--- a/security/p5-Authen-Htpasswd/pkg-plist
+++ b/security/p5-Authen-Htpasswd/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/Authen/Htpasswd.pm
 %%SITE_PERL%%/Authen/Htpasswd/User.pm
 %%SITE_PERL%%/Authen/Htpasswd/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd/.packlist
 %%PERL5_MAN3%%/Authen::Htpasswd.3.gz
 %%PERL5_MAN3%%/Authen::Htpasswd::User.3.gz
 %%PERL5_MAN3%%/Authen::Htpasswd::Util.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen/Htpasswd
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Krb5/Makefile b/security/p5-Authen-Krb5/Makefile
index 90017d70cad5..f1ad46a57cc8 100644
--- a/security/p5-Authen-Krb5/Makefile
+++ b/security/p5-Authen-Krb5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Krb5
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Krb5/pkg-plist b/security/p5-Authen-Krb5/pkg-plist
index 0f1f0e416187..c77ad465a581 100644
--- a/security/p5-Authen-Krb5/pkg-plist
+++ b/security/p5-Authen-Krb5/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/Authen::Krb5.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/Krb5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5/Krb5.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
+%%SITE_ARCH%%/Authen/Krb5.pm
+%%SITE_ARCH%%/auto/Authen/Krb5/Krb5.so
+%%SITE_ARCH%%/auto/Authen/Krb5/autosplit.ix
diff --git a/security/p5-Authen-Libwrap/Makefile b/security/p5-Authen-Libwrap/Makefile
index c52468736358..d869768fb2c6 100644
--- a/security/p5-Authen-Libwrap/Makefile
+++ b/security/p5-Authen-Libwrap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Libwrap
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Libwrap/pkg-plist b/security/p5-Authen-Libwrap/pkg-plist
index 7c97341a577d..eefe7d5b932d 100644
--- a/security/p5-Authen-Libwrap/pkg-plist
+++ b/security/p5-Authen-Libwrap/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/Authen::Libwrap.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/Libwrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Libwrap/Libwrap.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Libwrap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
+%%SITE_ARCH%%/Authen/Libwrap.pm
+%%SITE_ARCH%%/auto/Authen/Libwrap/Libwrap.so
diff --git a/security/p5-Authen-NTLM/Makefile b/security/p5-Authen-NTLM/Makefile
index 271a602ffc4c..e71a6e6fbee0 100644
--- a/security/p5-Authen-NTLM/Makefile
+++ b/security/p5-Authen-NTLM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-NTLM
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-NTLM/pkg-plist b/security/p5-Authen-NTLM/pkg-plist
index 8051090e3526..3456faa16e52 100644
--- a/security/p5-Authen-NTLM/pkg-plist
+++ b/security/p5-Authen-NTLM/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/Authen/NTLM.pm
 %%SITE_PERL%%/Authen/NTLM/DES.pm
 %%SITE_PERL%%/Authen/NTLM/MD4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/NTLM/.packlist
 %%PERL5_MAN3%%/Authen::NTLM.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/NTLM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrm %%SITE_PERL%%/Authen/NTLM
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-OATH/Makefile b/security/p5-Authen-OATH/Makefile
index f7317c28f8a5..05ca017c9318 100644
--- a/security/p5-Authen-OATH/Makefile
+++ b/security/p5-Authen-OATH/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-OATH
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-OATH/pkg-plist b/security/p5-Authen-OATH/pkg-plist
index 06205e3aa808..4725a7745ca0 100644
--- a/security/p5-Authen-OATH/pkg-plist
+++ b/security/p5-Authen-OATH/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Authen/OATH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/OATH/.packlist
 %%PERL5_MAN3%%/Authen::OATH.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/OATH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-PAAS/Makefile b/security/p5-Authen-PAAS/Makefile
index e4db2fbc5b10..ac833764a3e5 100644
--- a/security/p5-Authen-PAAS/Makefile
+++ b/security/p5-Authen-PAAS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-PAAS
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-PAAS/pkg-plist b/security/p5-Authen-PAAS/pkg-plist
index 24c940e1d20d..e15900d0d00a 100644
--- a/security/p5-Authen-PAAS/pkg-plist
+++ b/security/p5-Authen-PAAS/pkg-plist
@@ -21,9 +21,4 @@ bin/authen-paas-passwd
 %%SITE_PERL%%/Authen/PAAS/Principal.pm
 %%SITE_PERL%%/Authen/PAAS/SimpleCallback.pm
 %%SITE_PERL%%/Authen/PAAS/Subject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAAS/.packlist
 man/man1/authen-paas-passwd.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAAS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen/PAAS
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index 8b013c33e67d..a97340fd9321 100644
--- a/security/p5-Authen-PAM/Makefile
+++ b/security/p5-Authen-PAM/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Authen-PAM
 PORTVERSION=	0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-PAM/pkg-plist b/security/p5-Authen-PAM/pkg-plist
index 1cd778c06d76..39927749a419 100644
--- a/security/p5-Authen-PAM/pkg-plist
+++ b/security/p5-Authen-PAM/pkg-plist
@@ -1,10 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/PAM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/PAM/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/PAM.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/.packlist
+%%SITE_ARCH%%/Authen/PAM.pm
+%%SITE_ARCH%%/Authen/PAM/FAQ.pod
+%%SITE_ARCH%%/auto/Authen/PAM/PAM.so
 %%PERL5_MAN3%%/Authen::PAM.3.gz
 %%PERL5_MAN3%%/Authen::PAM::FAQ.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Authen/PAM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
diff --git a/security/p5-Authen-Passphrase/Makefile b/security/p5-Authen-Passphrase/Makefile
index f78be4ae5380..002b0f763652 100644
--- a/security/p5-Authen-Passphrase/Makefile
+++ b/security/p5-Authen-Passphrase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Passphrase
 PORTVERSION=	0.008
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Passphrase/pkg-plist b/security/p5-Authen-Passphrase/pkg-plist
index 34c718a10a2e..2547badb4214 100644
--- a/security/p5-Authen-Passphrase/pkg-plist
+++ b/security/p5-Authen-Passphrase/pkg-plist
@@ -36,5 +36,3 @@
 %%PERL5_MAN3%%/Authen::Passphrase::RejectAll.3.gz
 %%PERL5_MAN3%%/Authen::Passphrase::SaltedDigest.3.gz
 %%PERL5_MAN3%%/Authen::Passphrase::VMSPurdy.3.gz
-@dirrm %%SITE_PERL%%/Authen/Passphrase
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-PluggableCaptcha/Makefile b/security/p5-Authen-PluggableCaptcha/Makefile
index fde3f02241c0..0d73f76d2d10 100644
--- a/security/p5-Authen-PluggableCaptcha/Makefile
+++ b/security/p5-Authen-PluggableCaptcha/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Authen-PluggableCaptcha
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-PluggableCaptcha/pkg-plist b/security/p5-Authen-PluggableCaptcha/pkg-plist
index 58cfdce7e99d..7ed763dd0b97 100644
--- a/security/p5-Authen-PluggableCaptcha/pkg-plist
+++ b/security/p5-Authen-PluggableCaptcha/pkg-plist
@@ -37,15 +37,3 @@
 %%SITE_PERL%%/Authen/PluggableCaptcha/StandardAttributesObject.pm
 %%SITE_PERL%%/Authen/PluggableCaptcha/Tutorial.pm
 %%SITE_PERL%%/Authen/PluggableCaptcha/ValidityObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PluggableCaptcha/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PluggableCaptcha
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha/Render/Text
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha/Render/Image/Imager/layers
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha/Render/Image/Imager/effects
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha/Render/Image/Imager
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha/Render/Image
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha/Render
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha/Challenge
-@dirrmtry %%SITE_PERL%%/Authen/PluggableCaptcha
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 23a99195e7eb..a933d6d9e00d 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Radius
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Radius/pkg-plist b/security/p5-Authen-Radius/pkg-plist
index ffa2eeef9583..2071db344222 100644
--- a/security/p5-Authen-Radius/pkg-plist
+++ b/security/p5-Authen-Radius/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Authen/Radius.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Radius/.packlist
 %%PERL5_MAN3%%/Authen::Radius.3.gz
 %%DATADIR%%/dictionary
 %%DATADIR%%/dictionary.ascend
@@ -14,6 +13,3 @@
 %%DATADIR%%/dictionary.versanet
 %%DATADIR%%/dictionary.xtradius
 @dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Radius
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-SASL-Cyrus/Makefile b/security/p5-Authen-SASL-Cyrus/Makefile
index e6cccb1afab1..0a7a349fcb73 100644
--- a/security/p5-Authen-SASL-Cyrus/Makefile
+++ b/security/p5-Authen-SASL-Cyrus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-SASL-Cyrus
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-SASL-Cyrus/pkg-plist b/security/p5-Authen-SASL-Cyrus/pkg-plist
index c5af87efefa2..c1ed65f8394a 100644
--- a/security/p5-Authen-SASL-Cyrus/pkg-plist
+++ b/security/p5-Authen-SASL-Cyrus/pkg-plist
@@ -1,12 +1,5 @@
 %%PERL5_MAN3%%/Authen::SASL::Cyrus.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL/Cyrus.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL/Cyrus.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL/Cyrus/Security.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus/Cyrus.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL/Cyrus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
+%%SITE_ARCH%%/Authen/SASL/Cyrus.pm
+%%SITE_ARCH%%/Authen/SASL/Cyrus.pod
+%%SITE_ARCH%%/Authen/SASL/Cyrus/Security.pm
+%%SITE_ARCH%%/auto/Authen/SASL/Cyrus/Cyrus.so
diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index c53b2bf67650..b96ea6b84741 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-SASL
 PORTVERSION=	2.16
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-SASL/pkg-plist b/security/p5-Authen-SASL/pkg-plist
index af605c0c02fe..a8c5648a12ab 100644
--- a/security/p5-Authen-SASL/pkg-plist
+++ b/security/p5-Authen-SASL/pkg-plist
@@ -20,9 +20,3 @@
 %%SITE_PERL%%/Authen/SASL/Perl/GSSAPI.pm
 %%SITE_PERL%%/Authen/SASL/Perl/LOGIN.pm
 %%SITE_PERL%%/Authen/SASL/Perl/PLAIN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen/SASL/Perl
-@dirrmtry %%SITE_PERL%%/Authen/SASL
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-DBI/Makefile b/security/p5-Authen-Simple-DBI/Makefile
index 079c7105d3d4..24fe18a5dbbf 100644
--- a/security/p5-Authen-Simple-DBI/Makefile
+++ b/security/p5-Authen-Simple-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-DBI
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-DBI/pkg-plist b/security/p5-Authen-Simple-DBI/pkg-plist
index e6e156cebba3..4ffe29ac7fcc 100644
--- a/security/p5-Authen-Simple-DBI/pkg-plist
+++ b/security/p5-Authen-Simple-DBI/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::DBI.3.gz
 %%SITE_PERL%%/Authen/Simple/DBI.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-DBM/Makefile b/security/p5-Authen-Simple-DBM/Makefile
index 48da15b506a7..8e9c9b0f0f55 100644
--- a/security/p5-Authen-Simple-DBM/Makefile
+++ b/security/p5-Authen-Simple-DBM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-DBM
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-DBM/pkg-plist b/security/p5-Authen-Simple-DBM/pkg-plist
index 1f9fd9e21d9b..fa9f76af50c3 100644
--- a/security/p5-Authen-Simple-DBM/pkg-plist
+++ b/security/p5-Authen-Simple-DBM/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::DBM.3.gz
 %%SITE_PERL%%/Authen/Simple/DBM.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-HTTP/Makefile b/security/p5-Authen-Simple-HTTP/Makefile
index 7f46f5a3f53b..0d43813297d8 100644
--- a/security/p5-Authen-Simple-HTTP/Makefile
+++ b/security/p5-Authen-Simple-HTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-HTTP
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-HTTP/pkg-plist b/security/p5-Authen-Simple-HTTP/pkg-plist
index 29b014821e7a..995138be8867 100644
--- a/security/p5-Authen-Simple-HTTP/pkg-plist
+++ b/security/p5-Authen-Simple-HTTP/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::HTTP.3.gz
 %%SITE_PERL%%/Authen/Simple/HTTP.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-LDAP/Makefile b/security/p5-Authen-Simple-LDAP/Makefile
index 0f4aa9f4412e..1d9714df11a1 100644
--- a/security/p5-Authen-Simple-LDAP/Makefile
+++ b/security/p5-Authen-Simple-LDAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-LDAP
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-LDAP/pkg-plist b/security/p5-Authen-Simple-LDAP/pkg-plist
index f9dd23fbbb7f..f148cfae7ace 100644
--- a/security/p5-Authen-Simple-LDAP/pkg-plist
+++ b/security/p5-Authen-Simple-LDAP/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Authen/Simple/ActiveDirectory.pm
 %%SITE_PERL%%/Authen/Simple/LDAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Simple/LDAP/.packlist
 %%PERL5_MAN3%%/Authen::Simple::ActiveDirectory.3.gz
 %%PERL5_MAN3%%/Authen::Simple::LDAP.3.gz
diff --git a/security/p5-Authen-Simple-Net/Makefile b/security/p5-Authen-Simple-Net/Makefile
index 0a61e3499b85..d9852d28658b 100644
--- a/security/p5-Authen-Simple-Net/Makefile
+++ b/security/p5-Authen-Simple-Net/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Authen-Simple-Net
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-Net/pkg-plist b/security/p5-Authen-Simple-Net/pkg-plist
index 9e954c6b9252..69f6607567d2 100644
--- a/security/p5-Authen-Simple-Net/pkg-plist
+++ b/security/p5-Authen-Simple-Net/pkg-plist
@@ -4,5 +4,3 @@
 %%SITE_PERL%%/Authen/Simple/FTP.pm
 %%SITE_PERL%%/Authen/Simple/POP3.pm
 %%SITE_PERL%%/Authen/Simple/SMTP.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-PAM/Makefile b/security/p5-Authen-Simple-PAM/Makefile
index d82b5a4cb48d..84900890a18f 100644
--- a/security/p5-Authen-Simple-PAM/Makefile
+++ b/security/p5-Authen-Simple-PAM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-PAM
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-PAM/pkg-plist b/security/p5-Authen-Simple-PAM/pkg-plist
index 69ebeabbd34f..c19c3499ca3d 100644
--- a/security/p5-Authen-Simple-PAM/pkg-plist
+++ b/security/p5-Authen-Simple-PAM/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::PAM.3.gz
 %%SITE_PERL%%/Authen/Simple/PAM.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-Passwd/Makefile b/security/p5-Authen-Simple-Passwd/Makefile
index 3b64ae345611..2e346b993736 100644
--- a/security/p5-Authen-Simple-Passwd/Makefile
+++ b/security/p5-Authen-Simple-Passwd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-Passwd
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-Passwd/pkg-plist b/security/p5-Authen-Simple-Passwd/pkg-plist
index 3169c3e44660..e465b83637ef 100644
--- a/security/p5-Authen-Simple-Passwd/pkg-plist
+++ b/security/p5-Authen-Simple-Passwd/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::Passwd.3.gz
 %%SITE_PERL%%/Authen/Simple/Passwd.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-RADIUS/Makefile b/security/p5-Authen-Simple-RADIUS/Makefile
index 2af0587566d3..476eef664ef0 100644
--- a/security/p5-Authen-Simple-RADIUS/Makefile
+++ b/security/p5-Authen-Simple-RADIUS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-RADIUS
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-RADIUS/pkg-plist b/security/p5-Authen-Simple-RADIUS/pkg-plist
index 895f4d21a29f..c448078e7d46 100644
--- a/security/p5-Authen-Simple-RADIUS/pkg-plist
+++ b/security/p5-Authen-Simple-RADIUS/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::RADIUS.3.gz
 %%SITE_PERL%%/Authen/Simple/RADIUS.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-SMB/Makefile b/security/p5-Authen-Simple-SMB/Makefile
index 4f078504726f..10ee5b8f59c7 100644
--- a/security/p5-Authen-Simple-SMB/Makefile
+++ b/security/p5-Authen-Simple-SMB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-SMB
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-SMB/pkg-plist b/security/p5-Authen-Simple-SMB/pkg-plist
index 8dcc6b7e5e18..82a3a08295b0 100644
--- a/security/p5-Authen-Simple-SMB/pkg-plist
+++ b/security/p5-Authen-Simple-SMB/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::SMB.3.gz
 %%SITE_PERL%%/Authen/Simple/SMB.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple-SSH/Makefile b/security/p5-Authen-Simple-SSH/Makefile
index cf5ee4ed78ae..37edb9155653 100644
--- a/security/p5-Authen-Simple-SSH/Makefile
+++ b/security/p5-Authen-Simple-SSH/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple-SSH
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple-SSH/pkg-plist b/security/p5-Authen-Simple-SSH/pkg-plist
index 3facd3101715..ee3a7d6e8267 100644
--- a/security/p5-Authen-Simple-SSH/pkg-plist
+++ b/security/p5-Authen-Simple-SSH/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Authen::Simple::SSH.3.gz
 %%SITE_PERL%%/Authen/Simple/SSH.pm
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Simple/Makefile b/security/p5-Authen-Simple/Makefile
index 983240844954..0718e5cdebf2 100644
--- a/security/p5-Authen-Simple/Makefile
+++ b/security/p5-Authen-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Simple
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Simple/pkg-plist b/security/p5-Authen-Simple/pkg-plist
index 57c180be037c..014e0da4e93b 100644
--- a/security/p5-Authen-Simple/pkg-plist
+++ b/security/p5-Authen-Simple/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/Authen/Simple/Apache.pm
 %%SITE_PERL%%/Authen/Simple/Log.pm
 %%SITE_PERL%%/Authen/Simple/Password.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Simple/.packlist
 %%PERL5_MAN3%%/Authen::Simple.3.gz
 %%PERL5_MAN3%%/Authen::Simple::Adapter.3.gz
 %%PERL5_MAN3%%/Authen::Simple::Apache.3.gz
 %%PERL5_MAN3%%/Authen::Simple::Log.3.gz
 %%PERL5_MAN3%%/Authen::Simple::Password.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen/Simple
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Smb/Makefile b/security/p5-Authen-Smb/Makefile
index 1625aa84092e..a960489d06e8 100644
--- a/security/p5-Authen-Smb/Makefile
+++ b/security/p5-Authen-Smb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Smb
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Smb/pkg-plist b/security/p5-Authen-Smb/pkg-plist
index cb10c265e680..785c21e6646a 100644
--- a/security/p5-Authen-Smb/pkg-plist
+++ b/security/p5-Authen-Smb/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/Smb.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.so
+%%SITE_ARCH%%/Authen/Smb.pm
+%%SITE_ARCH%%/auto/Authen/Smb/autosplit.ix
+%%SITE_ARCH%%/auto/Authen/Smb/Smb.so
 %%PERL5_MAN3%%/Authen::Smb.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
diff --git a/security/p5-Authen-TacacsPlus/Makefile b/security/p5-Authen-TacacsPlus/Makefile
index fda60c7bbb6a..3dbf7f080984 100644
--- a/security/p5-Authen-TacacsPlus/Makefile
+++ b/security/p5-Authen-TacacsPlus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-TacacsPlus
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIKEM/Authen-TacacsPlus
diff --git a/security/p5-Authen-TacacsPlus/pkg-plist b/security/p5-Authen-TacacsPlus/pkg-plist
index 0a29a8cbd161..1e3c7f05938b 100644
--- a/security/p5-Authen-TacacsPlus/pkg-plist
+++ b/security/p5-Authen-TacacsPlus/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Authen::TacacsPlus.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Authen/TacacsPlus.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
+%%SITE_ARCH%%/Authen/TacacsPlus.pm
+%%SITE_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.so
diff --git a/security/p5-Authen-Ticket/Makefile b/security/p5-Authen-Ticket/Makefile
index 552d31d0f492..5c42b34a7c82 100644
--- a/security/p5-Authen-Ticket/Makefile
+++ b/security/p5-Authen-Ticket/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Authen-Ticket
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-Ticket/pkg-plist b/security/p5-Authen-Ticket/pkg-plist
index ce58a2a7e871..3b48e40fbe39 100644
--- a/security/p5-Authen-Ticket/pkg-plist
+++ b/security/p5-Authen-Ticket/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/Authen/Ticket/Client.pm
 %%SITE_PERL%%/Authen/Ticket/Server.pm
 %%SITE_PERL%%/Authen/Ticket/Signature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen/Ticket
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-TypeKey/Makefile b/security/p5-Authen-TypeKey/Makefile
index eda141999c37..18d5c6450008 100644
--- a/security/p5-Authen-TypeKey/Makefile
+++ b/security/p5-Authen-TypeKey/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Authen-TypeKey
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Authen-TypeKey/pkg-plist b/security/p5-Authen-TypeKey/pkg-plist
index c78d681fa9d4..efce45d8e186 100644
--- a/security/p5-Authen-TypeKey/pkg-plist
+++ b/security/p5-Authen-TypeKey/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Authen/TypeKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TypeKey/.packlist
 %%PERL5_MAN3%%/Authen::TypeKey.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TypeKey
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
-@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Business-PayPal-EWP/Makefile b/security/p5-Business-PayPal-EWP/Makefile
index 158e6b752070..06e61866468c 100644
--- a/security/p5-Business-PayPal-EWP/Makefile
+++ b/security/p5-Business-PayPal-EWP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-PayPal-EWP
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Business-PayPal-EWP/pkg-plist b/security/p5-Business-PayPal-EWP/pkg-plist
index 23f98f146b5e..64a88c75defb 100644
--- a/security/p5-Business-PayPal-EWP/pkg-plist
+++ b/security/p5-Business-PayPal-EWP/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal/EWP/EWP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal/EWP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal/EWP.pm
+%%SITE_ARCH%%/auto/Business/PayPal/EWP/EWP.so
+%%SITE_ARCH%%/Business/PayPal/EWP.pm
 %%PERL5_MAN3%%/Business::PayPal::EWP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal/EWP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Business
diff --git a/security/p5-CACertOrg-CA/Makefile b/security/p5-CACertOrg-CA/Makefile
index c6f0c6857241..65e38537fa9e 100644
--- a/security/p5-CACertOrg-CA/Makefile
+++ b/security/p5-CACertOrg-CA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CACertOrg-CA
 PORTVERSION=	20110724.004
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BDFOY
diff --git a/security/p5-CACertOrg-CA/pkg-plist b/security/p5-CACertOrg-CA/pkg-plist
index 605a2a44043b..24f52e6af132 100644
--- a/security/p5-CACertOrg-CA/pkg-plist
+++ b/security/p5-CACertOrg-CA/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/CACertOrg/CA.pm
 %%SITE_PERL%%/CACertOrg/CA/root.crt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CACertOrg/CA/.packlist
 %%PERL5_MAN3%%/CACertOrg::CA.3.gz
diff --git a/security/p5-CSP/Makefile b/security/p5-CSP/Makefile
index 9ee76603a7fb..e5b0c64a71d2 100644
--- a/security/p5-CSP/Makefile
+++ b/security/p5-CSP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSP
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	ftp://ftp.it.su.se/pub/users/leifj/ \
 		http://redundancy.redundancy.org/mirror/
diff --git a/security/p5-CSP/pkg-plist b/security/p5-CSP/pkg-plist
index b57fc95afdbb..03e8a9f1ba27 100644
--- a/security/p5-CSP/pkg-plist
+++ b/security/p5-CSP/pkg-plist
@@ -1,7 +1,4 @@
 bin/csp
 %%SITE_PERL%%/CSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSP/.packlist
 %%SITE_PERL%%/auto/CSP/autosplit.ix
 %%PERL5_MAN3%%/CSP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSP
-@dirrm %%SITE_PERL%%/auto/CSP
diff --git a/security/p5-Cisco-Hash/Makefile b/security/p5-Cisco-Hash/Makefile
index 69d3f31ac466..8c5bb9387bc7 100644
--- a/security/p5-Cisco-Hash/Makefile
+++ b/security/p5-Cisco-Hash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Cisco-Hash
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Cisco-Hash/pkg-plist b/security/p5-Cisco-Hash/pkg-plist
index 81f39570eb61..77726b71a72d 100644
--- a/security/p5-Cisco-Hash/pkg-plist
+++ b/security/p5-Cisco-Hash/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Cisco/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/Hash/.packlist
 %%PERL5_MAN3%%/Cisco::Hash.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/Hash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco
-@dirrmtry %%SITE_PERL%%/Cisco
diff --git a/security/p5-Crypt-Anubis/Makefile b/security/p5-Crypt-Anubis/Makefile
index 3a2c7fc178ba..a9797950d7ca 100644
--- a/security/p5-Crypt-Anubis/Makefile
+++ b/security/p5-Crypt-Anubis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Anubis
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Anubis/pkg-plist b/security/p5-Crypt-Anubis/pkg-plist
index 52bf057a025f..da813694442d 100644
--- a/security/p5-Crypt-Anubis/pkg-plist
+++ b/security/p5-Crypt-Anubis/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Anubis/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Anubis/Anubis.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Anubis.pm
+%%SITE_ARCH%%/auto/Crypt/Anubis/Anubis.so
+%%SITE_ARCH%%/Crypt/Anubis.pm
 %%PERL5_MAN3%%/Crypt::Anubis.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Anubis
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-AppleTwoFish/Makefile b/security/p5-Crypt-AppleTwoFish/Makefile
index 3466a105433c..3192c0962463 100644
--- a/security/p5-Crypt-AppleTwoFish/Makefile
+++ b/security/p5-Crypt-AppleTwoFish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-AppleTwoFish
 PORTVERSION=	0.051
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-AppleTwoFish/pkg-plist b/security/p5-Crypt-AppleTwoFish/pkg-plist
index b7caa8b7ff0b..8aad4abded57 100644
--- a/security/p5-Crypt-AppleTwoFish/pkg-plist
+++ b/security/p5-Crypt-AppleTwoFish/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/AppleTwoFish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/AppleTwoFish/.packlist
 %%PERL5_MAN3%%/Crypt::AppleTwoFish.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/AppleTwoFish/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile
index 739a0fab89d7..156c87fa3560 100644
--- a/security/p5-Crypt-Blowfish/Makefile
+++ b/security/p5-Crypt-Blowfish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Blowfish
 PORTVERSION=	2.14
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Blowfish/pkg-plist b/security/p5-Crypt-Blowfish/pkg-plist
index a0992eafa02f..b817dfbbab36 100644
--- a/security/p5-Crypt-Blowfish/pkg-plist
+++ b/security/p5-Crypt-Blowfish/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Blowfish.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Blowfish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/Blowfish.pm
+%%SITE_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
diff --git a/security/p5-Crypt-Blowfish_PP/Makefile b/security/p5-Crypt-Blowfish_PP/Makefile
index c877556be62f..58978f03744a 100644
--- a/security/p5-Crypt-Blowfish_PP/Makefile
+++ b/security/p5-Crypt-Blowfish_PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Blowfish_PP
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Blowfish_PP/pkg-plist b/security/p5-Crypt-Blowfish_PP/pkg-plist
index 578817cd5a6a..57fd24b7d19a 100644
--- a/security/p5-Crypt-Blowfish_PP/pkg-plist
+++ b/security/p5-Crypt-Blowfish_PP/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::Blowfish_PP.3.gz
 %%SITE_PERL%%/Crypt/Blowfish_PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CAST5/Makefile b/security/p5-Crypt-CAST5/Makefile
index 47d54cd83943..b86c5192db2c 100644
--- a/security/p5-Crypt-CAST5/Makefile
+++ b/security/p5-Crypt-CAST5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-CAST5
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Crypt
diff --git a/security/p5-Crypt-CAST5/pkg-plist b/security/p5-Crypt-CAST5/pkg-plist
index 33937bb3a9ed..d00bd68213a4 100644
--- a/security/p5-Crypt-CAST5/pkg-plist
+++ b/security/p5-Crypt-CAST5/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::CAST5.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/CAST5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5/CAST5.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/CAST5.pm
+%%SITE_ARCH%%/auto/Crypt/CAST5/CAST5.so
diff --git a/security/p5-Crypt-CAST5_PP/Makefile b/security/p5-Crypt-CAST5_PP/Makefile
index 60828cd1ac3e..d86c71491f2b 100644
--- a/security/p5-Crypt-CAST5_PP/Makefile
+++ b/security/p5-Crypt-CAST5_PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-CAST5_PP
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-CAST5_PP/pkg-plist b/security/p5-Crypt-CAST5_PP/pkg-plist
index 246dfa696e26..8e192f9ca18d 100644
--- a/security/p5-Crypt-CAST5_PP/pkg-plist
+++ b/security/p5-Crypt-CAST5_PP/pkg-plist
@@ -5,10 +5,3 @@
 %%SITE_PERL%%/auto/Crypt/CAST5_PP/decrypt.al
 %%SITE_PERL%%/auto/Crypt/CAST5_PP/encrypt.al
 %%SITE_PERL%%/auto/Crypt/CAST5_PP/init.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/auto/Crypt/CAST5_PP
-@dirrmtry %%SITE_PERL%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt/CAST5_PP
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CBC/Makefile b/security/p5-Crypt-CBC/Makefile
index cf4872d54bd3..372fdaaa97b5 100644
--- a/security/p5-Crypt-CBC/Makefile
+++ b/security/p5-Crypt-CBC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-CBC
 PORTVERSION=	2.33
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-CBC/pkg-plist b/security/p5-Crypt-CBC/pkg-plist
index 5e8d3df1cc41..f1a44b359c7a 100644
--- a/security/p5-Crypt-CBC/pkg-plist
+++ b/security/p5-Crypt-CBC/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::CBC.3.gz
 %%SITE_PERL%%/Crypt/CBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CBCeasy/Makefile b/security/p5-Crypt-CBCeasy/Makefile
index 3a5c5e955014..91273e0ae808 100644
--- a/security/p5-Crypt-CBCeasy/Makefile
+++ b/security/p5-Crypt-CBCeasy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-CBCeasy
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-CBCeasy/pkg-plist b/security/p5-Crypt-CBCeasy/pkg-plist
index 41e9fdcb39da..fd0812fedf18 100644
--- a/security/p5-Crypt-CBCeasy/pkg-plist
+++ b/security/p5-Crypt-CBCeasy/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::CBCeasy.3.gz
 %%SITE_PERL%%/Crypt/CBCeasy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBCeasy/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBCeasy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CFB/Makefile b/security/p5-Crypt-CFB/Makefile
index f532480967cb..0d9853c3413d 100644
--- a/security/p5-Crypt-CFB/Makefile
+++ b/security/p5-Crypt-CFB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-CFB
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-CFB/pkg-plist b/security/p5-Crypt-CFB/pkg-plist
index 1899a6af5834..c2bcb51fa7a3 100644
--- a/security/p5-Crypt-CFB/pkg-plist
+++ b/security/p5-Crypt-CFB/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/CFB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CFB/.packlist
 %%PERL5_MAN3%%/Crypt::CFB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CFB/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Caesar/Makefile b/security/p5-Crypt-Caesar/Makefile
index 960ccf274d1d..31e961486975 100644
--- a/security/p5-Crypt-Caesar/Makefile
+++ b/security/p5-Crypt-Caesar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Caesar
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Caesar/pkg-plist b/security/p5-Crypt-Caesar/pkg-plist
index 580bcbefe6cd..30bc3b43e990 100644
--- a/security/p5-Crypt-Caesar/pkg-plist
+++ b/security/p5-Crypt-Caesar/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/Caesar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Caesar/.packlist
 %%PERL5_MAN3%%/Crypt::Caesar.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Caesar/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Camellia_PP/Makefile b/security/p5-Crypt-Camellia_PP/Makefile
index 743bd675b269..341127f5dd41 100644
--- a/security/p5-Crypt-Camellia_PP/Makefile
+++ b/security/p5-Crypt-Camellia_PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Camellia_PP
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Camellia_PP/pkg-plist b/security/p5-Crypt-Camellia_PP/pkg-plist
index 17eda134bfa9..ee792150d6ce 100644
--- a/security/p5-Crypt-Camellia_PP/pkg-plist
+++ b/security/p5-Crypt-Camellia_PP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/Camellia_PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Camellia_PP/.packlist
 %%PERL5_MAN3%%/Crypt::Camellia_PP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Camellia_PP/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Chimera/Makefile b/security/p5-Crypt-Chimera/Makefile
index e42178b5a4e1..e617c0906ae1 100644
--- a/security/p5-Crypt-Chimera/Makefile
+++ b/security/p5-Crypt-Chimera/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Chimera
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Chimera/pkg-plist b/security/p5-Crypt-Chimera/pkg-plist
index 4ba3b5fffa0b..ff6004a642ff 100644
--- a/security/p5-Crypt-Chimera/pkg-plist
+++ b/security/p5-Crypt-Chimera/pkg-plist
@@ -4,9 +4,4 @@
 %%SITE_PERL%%/Crypt/Chimera/Object.pm
 %%SITE_PERL%%/Crypt/Chimera/User.pm
 %%SITE_PERL%%/Crypt/Chimera/World.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Chimera/.packlist
 %%PERL5_MAN3%%/Crypt::Chimera.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Chimera/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrm %%SITE_PERL%%/Crypt/Chimera/
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CipherSaber/Makefile b/security/p5-Crypt-CipherSaber/Makefile
index 9a1ad35185d6..c27e47dcae28 100644
--- a/security/p5-Crypt-CipherSaber/Makefile
+++ b/security/p5-Crypt-CipherSaber/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-CipherSaber
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-CipherSaber/pkg-plist b/security/p5-Crypt-CipherSaber/pkg-plist
index 591c85fac597..c68056740336 100644
--- a/security/p5-Crypt-CipherSaber/pkg-plist
+++ b/security/p5-Crypt-CipherSaber/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::CipherSaber.3.gz
 %%SITE_PERL%%/Crypt/CipherSaber.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Cracklib/Makefile b/security/p5-Crypt-Cracklib/Makefile
index b1765020ef4b..29ab0105ffb1 100644
--- a/security/p5-Crypt-Cracklib/Makefile
+++ b/security/p5-Crypt-Cracklib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-Cracklib
 PORTVERSION=	1.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Cracklib/pkg-plist b/security/p5-Crypt-Cracklib/pkg-plist
index b8536982c830..7fb35a305bc3 100644
--- a/security/p5-Crypt-Cracklib/pkg-plist
+++ b/security/p5-Crypt-Cracklib/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Cracklib.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cracklib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/Cracklib.pm
+%%SITE_ARCH%%/auto/Crypt/Cracklib/Cracklib.so
diff --git a/security/p5-Crypt-Ctr/Makefile b/security/p5-Crypt-Ctr/Makefile
index 64fe722046b5..e71ce6733501 100644
--- a/security/p5-Crypt-Ctr/Makefile
+++ b/security/p5-Crypt-Ctr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-Ctr
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Ctr/pkg-plist b/security/p5-Crypt-Ctr/pkg-plist
index 5c087b9653d3..402cb32e0d7e 100644
--- a/security/p5-Crypt-Ctr/pkg-plist
+++ b/security/p5-Crypt-Ctr/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/Ctr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Ctr/.packlist
 %%PERL5_MAN3%%/Crypt::Ctr.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Ctr/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 067125b19d6b..a6f884ed8b8f 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-DES
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-DES/pkg-plist b/security/p5-Crypt-DES/pkg-plist
index ae89b0e4b514..227bde27b3c4 100644
--- a/security/p5-Crypt-DES/pkg-plist
+++ b/security/p5-Crypt-DES/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::DES.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DES.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/DES.pm
+%%SITE_ARCH%%/auto/Crypt/DES/DES.so
diff --git a/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index b29e33a31481..c6fd08588aca 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-DES_EDE3
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-DES_EDE3/pkg-plist b/security/p5-Crypt-DES_EDE3/pkg-plist
index 38fde6a258d5..3974beb88f0a 100644
--- a/security/p5-Crypt-DES_EDE3/pkg-plist
+++ b/security/p5-Crypt-DES_EDE3/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::DES_EDE3.3.gz
 %%SITE_PERL%%/Crypt/DES_EDE3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES_EDE3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES_EDE3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-DES_PP/Makefile b/security/p5-Crypt-DES_PP/Makefile
index 7ad7dc98fd22..39944f98a6fc 100644
--- a/security/p5-Crypt-DES_PP/Makefile
+++ b/security/p5-Crypt-DES_PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-DES_PP
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-DES_PP/pkg-plist b/security/p5-Crypt-DES_PP/pkg-plist
index 336c23790815..d45a8bcd998c 100644
--- a/security/p5-Crypt-DES_PP/pkg-plist
+++ b/security/p5-Crypt-DES_PP/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Crypt/DES_PP.pm
 %%SITE_PERL%%/Crypt/.cvsignore
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-DES_PP/.packlist
 %%PERL5_MAN3%%/Crypt::DES_PP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-DES_PP/
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-DH/Makefile b/security/p5-Crypt-DH/Makefile
index 493e08754fcc..7ddd5693fd2b 100644
--- a/security/p5-Crypt-DH/Makefile
+++ b/security/p5-Crypt-DH/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-DH
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-DH/pkg-plist b/security/p5-Crypt-DH/pkg-plist
index bab1b4500b03..dcab0e6e1a68 100644
--- a/security/p5-Crypt-DH/pkg-plist
+++ b/security/p5-Crypt-DH/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::DH.3.gz
 %%SITE_PERL%%/Crypt/DH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DH/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index ea089e9d19b5..e376e532f62e 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-DSA
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-DSA/pkg-plist b/security/p5-Crypt-DSA/pkg-plist
index 53f5a1d140e3..851cd330a11c 100644
--- a/security/p5-Crypt-DSA/pkg-plist
+++ b/security/p5-Crypt-DSA/pkg-plist
@@ -12,9 +12,3 @@
 %%SITE_PERL%%/Crypt/DSA/KeyChain.pm
 %%SITE_PERL%%/Crypt/DSA/Signature.pm
 %%SITE_PERL%%/Crypt/DSA/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DSA/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DSA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt/DSA/Key
-@dirrmtry %%SITE_PERL%%/Crypt/DSA
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Dining/Makefile b/security/p5-Crypt-Dining/Makefile
index a873ec256947..a06d9454ab0a 100644
--- a/security/p5-Crypt-Dining/Makefile
+++ b/security/p5-Crypt-Dining/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Dining
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Dining/pkg-plist b/security/p5-Crypt-Dining/pkg-plist
index 7489366c2836..b5ad7dd8d63e 100644
--- a/security/p5-Crypt-Dining/pkg-plist
+++ b/security/p5-Crypt-Dining/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::Dining.3.gz
 %%SITE_PERL%%/Crypt/Dining.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Dining/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Dining
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-ECB/Makefile b/security/p5-Crypt-ECB/Makefile
index d550a6d848a1..4dbdf5f67c1c 100644
--- a/security/p5-Crypt-ECB/Makefile
+++ b/security/p5-Crypt-ECB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-ECB
 PORTVERSION=	1.45
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-ECB/pkg-plist b/security/p5-Crypt-ECB/pkg-plist
index ec2ab5005c5a..df7791322c3f 100644
--- a/security/p5-Crypt-ECB/pkg-plist
+++ b/security/p5-Crypt-ECB/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/ECB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB/.packlist
 %%PERL5_MAN3%%/Crypt::ECB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Eksblowfish/Makefile b/security/p5-Crypt-Eksblowfish/Makefile
index 4ff09db845d2..3e9852cdc4dc 100644
--- a/security/p5-Crypt-Eksblowfish/Makefile
+++ b/security/p5-Crypt-Eksblowfish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Eksblowfish
 PORTVERSION=	0.009
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Eksblowfish/pkg-plist b/security/p5-Crypt-Eksblowfish/pkg-plist
index 36368a658e9a..4c348534d6df 100644
--- a/security/p5-Crypt-Eksblowfish/pkg-plist
+++ b/security/p5-Crypt-Eksblowfish/pkg-plist
@@ -1,17 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Eksblowfish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Eksblowfish/Bcrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Eksblowfish/Blowfish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Eksblowfish/Family.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Eksblowfish/Subkeyed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Eksblowfish/Uklblowfish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Eksblowfish/Eksblowfish.so
+%%SITE_ARCH%%/Crypt/Eksblowfish.pm
+%%SITE_ARCH%%/Crypt/Eksblowfish/Bcrypt.pm
+%%SITE_ARCH%%/Crypt/Eksblowfish/Blowfish.pm
+%%SITE_ARCH%%/Crypt/Eksblowfish/Family.pm
+%%SITE_ARCH%%/Crypt/Eksblowfish/Subkeyed.pm
+%%SITE_ARCH%%/Crypt/Eksblowfish/Uklblowfish.pm
+%%SITE_ARCH%%/auto/Crypt/Eksblowfish/Eksblowfish.so
 %%PERL5_MAN3%%/Crypt::Eksblowfish.3.gz
 %%PERL5_MAN3%%/Crypt::Eksblowfish::Bcrypt.3.gz
 %%PERL5_MAN3%%/Crypt::Eksblowfish::Blowfish.3.gz
 %%PERL5_MAN3%%/Crypt::Eksblowfish::Family.3.gz
 %%PERL5_MAN3%%/Crypt::Eksblowfish::Subkeyed.3.gz
 %%PERL5_MAN3%%/Crypt::Eksblowfish::Uklblowfish.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Eksblowfish
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Eksblowfish
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Enigma/Makefile b/security/p5-Crypt-Enigma/Makefile
index 24d9d9826ada..1184bfc86a75 100644
--- a/security/p5-Crypt-Enigma/Makefile
+++ b/security/p5-Crypt-Enigma/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Enigma
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Enigma/pkg-plist b/security/p5-Crypt-Enigma/pkg-plist
index bb0a5725cbee..a38db4d70a7e 100644
--- a/security/p5-Crypt-Enigma/pkg-plist
+++ b/security/p5-Crypt-Enigma/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/Enigma.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Enigma/.packlist
 %%PERL5_MAN3%%/Crypt::Enigma.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Enigma/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-GCrypt/Makefile b/security/p5-Crypt-GCrypt/Makefile
index cbc5933bdcc4..65b242c374e6 100644
--- a/security/p5-Crypt-GCrypt/Makefile
+++ b/security/p5-Crypt-GCrypt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-GCrypt
 PORTVERSION=	1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -22,6 +22,6 @@ USE_PERL5=	configure
 USES=		perl5
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Crypt/GCrypt/GCrypt.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Crypt/GCrypt/GCrypt.so
 
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-GCrypt/pkg-plist b/security/p5-Crypt-GCrypt/pkg-plist
index 8f3b74d94014..7ce00bdfd3a0 100644
--- a/security/p5-Crypt-GCrypt/pkg-plist
+++ b/security/p5-Crypt-GCrypt/pkg-plist
@@ -1,10 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/GCrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/GCrypt/MPI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GCrypt/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GCrypt/GCrypt.so
+%%SITE_ARCH%%/Crypt/GCrypt.pm
+%%SITE_ARCH%%/Crypt/GCrypt/MPI.pm
+%%SITE_ARCH%%/auto/Crypt/GCrypt/GCrypt.so
 %%PERL5_MAN3%%/Crypt::GCrypt.3.gz
 %%PERL5_MAN3%%/Crypt::GCrypt::MPI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/GCrypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GCrypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
diff --git a/security/p5-Crypt-GOST/Makefile b/security/p5-Crypt-GOST/Makefile
index f04e1f21a29c..52ff7bd9b806 100644
--- a/security/p5-Crypt-GOST/Makefile
+++ b/security/p5-Crypt-GOST/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-GOST
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-GOST/pkg-plist b/security/p5-Crypt-GOST/pkg-plist
index 3e7a298b82b2..d5b48233d6aa 100644
--- a/security/p5-Crypt-GOST/pkg-plist
+++ b/security/p5-Crypt-GOST/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/GOST.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/GOST.so
+%%SITE_ARCH%%/Crypt/GOST.pm
+%%SITE_ARCH%%/auto/Crypt/GOST/GOST.so
 %%PERL5_MAN3%%/Crypt::GOST.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-GOST_PP/Makefile b/security/p5-Crypt-GOST_PP/Makefile
index 18195f4a0eac..22e4b22ce513 100644
--- a/security/p5-Crypt-GOST_PP/Makefile
+++ b/security/p5-Crypt-GOST_PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-GOST_PP
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-GOST_PP/pkg-plist b/security/p5-Crypt-GOST_PP/pkg-plist
index 66d98e3877a5..6dca38475cf2 100644
--- a/security/p5-Crypt-GOST_PP/pkg-plist
+++ b/security/p5-Crypt-GOST_PP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/GOST_PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST_PP/.packlist
 %%PERL5_MAN3%%/Crypt::GOST_PP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST_PP/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-GPG/Makefile b/security/p5-Crypt-GPG/Makefile
index c42a91e4a20e..c19c5664ab52 100644
--- a/security/p5-Crypt-GPG/Makefile
+++ b/security/p5-Crypt-GPG/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-GPG
 PORTVERSION=	1.63
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-GPG/pkg-plist b/security/p5-Crypt-GPG/pkg-plist
index 599ab6848a48..98326740d1c5 100644
--- a/security/p5-Crypt-GPG/pkg-plist
+++ b/security/p5-Crypt-GPG/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/GPG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GPG/.packlist
 %%PERL5_MAN3%%/Crypt::GPG.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GPG/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-GeneratePassword/Makefile b/security/p5-Crypt-GeneratePassword/Makefile
index dc5b64ab8da3..250350eb8a72 100644
--- a/security/p5-Crypt-GeneratePassword/Makefile
+++ b/security/p5-Crypt-GeneratePassword/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-GeneratePassword
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-GeneratePassword/pkg-plist b/security/p5-Crypt-GeneratePassword/pkg-plist
index b1353170a598..51bc10d4b961 100644
--- a/security/p5-Crypt-GeneratePassword/pkg-plist
+++ b/security/p5-Crypt-GeneratePassword/pkg-plist
@@ -2,8 +2,3 @@
 %%SITE_PERL%%/Crypt/GeneratePassword.pm
 %%SITE_PERL%%/Crypt/GeneratePassword/de.pm
 %%SITE_PERL%%/Crypt/GeneratePassword/en.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GeneratePassword/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GeneratePassword
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt/GeneratePassword
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-HCE_MD5/Makefile b/security/p5-Crypt-HCE_MD5/Makefile
index f45ff94aa2e8..003522a483ac 100644
--- a/security/p5-Crypt-HCE_MD5/Makefile
+++ b/security/p5-Crypt-HCE_MD5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-HCE_MD5
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-HCE_MD5/pkg-plist b/security/p5-Crypt-HCE_MD5/pkg-plist
index 7dafe341b079..6a99a803a427 100644
--- a/security/p5-Crypt-HCE_MD5/pkg-plist
+++ b/security/p5-Crypt-HCE_MD5/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Crypt/HCE_MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_MD5/.packlist
 %%SITE_PERL%%/auto/Crypt/HCE_MD5/autosplit.ix
 %%PERL5_MAN3%%/Crypt::HCE_MD5.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_MD5/
-@dirrm %%SITE_PERL%%/auto/Crypt/HCE_MD5/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-HCE_SHA/Makefile b/security/p5-Crypt-HCE_SHA/Makefile
index 0ee436ea6140..4967f0a38110 100644
--- a/security/p5-Crypt-HCE_SHA/Makefile
+++ b/security/p5-Crypt-HCE_SHA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-HCE_SHA
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-HCE_SHA/pkg-plist b/security/p5-Crypt-HCE_SHA/pkg-plist
index e686146d20c3..b8a0109e57ea 100644
--- a/security/p5-Crypt-HCE_SHA/pkg-plist
+++ b/security/p5-Crypt-HCE_SHA/pkg-plist
@@ -1,11 +1,3 @@
 %%SITE_PERL%%/Crypt/HCE_SHA.pm
 %%SITE_PERL%%/auto/Crypt/HCE_SHA/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA/.packlist
 %%PERL5_MAN3%%/Crypt::HCE_SHA.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/auto/Crypt/HCE_SHA
-@dirrmtry %%SITE_PERL%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 64974f2df793..0fbbb05025f6 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-IDEA
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-IDEA/pkg-plist b/security/p5-Crypt-IDEA/pkg-plist
index 3c5f52f4b5d0..19499b2ca1f9 100644
--- a/security/p5-Crypt-IDEA/pkg-plist
+++ b/security/p5-Crypt-IDEA/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/Crypt::IDEA.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/IDEA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/IDEA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/IDEA.pm
+%%SITE_ARCH%%/Crypt/IDEA.pod
+%%SITE_ARCH%%/auto/Crypt/IDEA/IDEA.so
diff --git a/security/p5-Crypt-Imail/Makefile b/security/p5-Crypt-Imail/Makefile
index cc3bc5cde43b..45f234d95d5a 100644
--- a/security/p5-Crypt-Imail/Makefile
+++ b/security/p5-Crypt-Imail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Imail
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Imail/pkg-plist b/security/p5-Crypt-Imail/pkg-plist
index e72937f75796..46b78494d39a 100644
--- a/security/p5-Crypt-Imail/pkg-plist
+++ b/security/p5-Crypt-Imail/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/Imail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Imail/.packlist
 %%PERL5_MAN3%%/Crypt::Imail.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Imail/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Juniper/Makefile b/security/p5-Crypt-Juniper/Makefile
index 380c29c135a4..e66d18d9dd6b 100644
--- a/security/p5-Crypt-Juniper/Makefile
+++ b/security/p5-Crypt-Juniper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Juniper
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
diff --git a/security/p5-Crypt-Juniper/pkg-plist b/security/p5-Crypt-Juniper/pkg-plist
index 5456b3fad320..ceedc03e4cca 100644
--- a/security/p5-Crypt-Juniper/pkg-plist
+++ b/security/p5-Crypt-Juniper/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/Juniper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Juniper/.packlist
 %%PERL5_MAN3%%/Crypt::Juniper.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Juniper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Khazad/Makefile b/security/p5-Crypt-Khazad/Makefile
index 03f3a7ff382f..eb3ed182d87f 100644
--- a/security/p5-Crypt-Khazad/Makefile
+++ b/security/p5-Crypt-Khazad/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Khazad
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Khazad/pkg-plist b/security/p5-Crypt-Khazad/pkg-plist
index 3f81ec048992..2f7193a9416a 100644
--- a/security/p5-Crypt-Khazad/pkg-plist
+++ b/security/p5-Crypt-Khazad/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Khazad.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/Khazad.so
+%%SITE_ARCH%%/Crypt/Khazad.pm
+%%SITE_ARCH%%/auto/Crypt/Khazad/Khazad.so
 %%PERL5_MAN3%%/Crypt::Khazad.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-License/Makefile b/security/p5-Crypt-License/Makefile
index 8c5040a723f0..2c8a7de28d1c 100644
--- a/security/p5-Crypt-License/Makefile
+++ b/security/p5-Crypt-License/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-License
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-License/pkg-plist b/security/p5-Crypt-License/pkg-plist
index 84f692477ebc..577b74485204 100644
--- a/security/p5-Crypt-License/pkg-plist
+++ b/security/p5-Crypt-License/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/Crypt/License.pm
 %%SITE_PERL%%/Crypt/License/Notice.pm
 %%SITE_PERL%%/Crypt/License/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/License/.packlist
 %%PERL5_MAN3%%/Crypt::License.3.gz
 %%PERL5_MAN3%%/Crypt::License::Util.3.gz
 %%PERL5_MAN3%%/Crypt::License::Notice.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/License/
-@dirrm %%SITE_PERL%%/Crypt/License/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Lite/Makefile b/security/p5-Crypt-Lite/Makefile
index aec378bc89b4..b4cea1fc4f48 100644
--- a/security/p5-Crypt-Lite/Makefile
+++ b/security/p5-Crypt-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Lite
 PORTVERSION=	0.82.11
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Lite/pkg-plist b/security/p5-Crypt-Lite/pkg-plist
index 4a22a23c3b61..42713760e0a2 100644
--- a/security/p5-Crypt-Lite/pkg-plist
+++ b/security/p5-Crypt-Lite/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite/.packlist
 %%SITE_PERL%%/Crypt/Lite.pm
 %%PERL5_MAN3%%/Crypt::Lite.3.gz
-@dirrmtry %%SITE_PERL%%/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
diff --git a/security/p5-Crypt-Loki97/Makefile b/security/p5-Crypt-Loki97/Makefile
index 508d866b3f57..1992a8cdab0a 100644
--- a/security/p5-Crypt-Loki97/Makefile
+++ b/security/p5-Crypt-Loki97/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Loki97
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Loki97/pkg-plist b/security/p5-Crypt-Loki97/pkg-plist
index e42d9fcd4beb..4bb640586502 100644
--- a/security/p5-Crypt-Loki97/pkg-plist
+++ b/security/p5-Crypt-Loki97/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Loki97.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/Loki97.so
+%%SITE_ARCH%%/Crypt/Loki97.pm
+%%SITE_ARCH%%/auto/Crypt/Loki97/Loki97.so
 %%PERL5_MAN3%%/Crypt::Loki97.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-MySQL/Makefile b/security/p5-Crypt-MySQL/Makefile
index f7f60fedf849..1ee070695e5a 100644
--- a/security/p5-Crypt-MySQL/Makefile
+++ b/security/p5-Crypt-MySQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-MySQL
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-MySQL/pkg-plist b/security/p5-Crypt-MySQL/pkg-plist
index 2ffa20d147c3..06ad93255e02 100644
--- a/security/p5-Crypt-MySQL/pkg-plist
+++ b/security/p5-Crypt-MySQL/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/MySQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL/MySQL.so
+%%SITE_ARCH%%/Crypt/MySQL.pm
+%%SITE_ARCH%%/auto/Crypt/MySQL/MySQL.so
 %%PERL5_MAN3%%/Crypt::MySQL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-NULL/Makefile b/security/p5-Crypt-NULL/Makefile
index 202c1c2d1a4d..971ceb5fb8d1 100644
--- a/security/p5-Crypt-NULL/Makefile
+++ b/security/p5-Crypt-NULL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-NULL
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-NULL/pkg-plist b/security/p5-Crypt-NULL/pkg-plist
index 4fdccff52118..57f88c115dff 100644
--- a/security/p5-Crypt-NULL/pkg-plist
+++ b/security/p5-Crypt-NULL/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/NULL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/NULL/.packlist
 %%PERL5_MAN3%%/Crypt::NULL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/NULL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OFB/Makefile b/security/p5-Crypt-OFB/Makefile
index 3f62b710f966..c66ddb1f881f 100644
--- a/security/p5-Crypt-OFB/Makefile
+++ b/security/p5-Crypt-OFB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OFB
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OFB/pkg-plist b/security/p5-Crypt-OFB/pkg-plist
index 82cf396c0870..97f2f9969a5d 100644
--- a/security/p5-Crypt-OFB/pkg-plist
+++ b/security/p5-Crypt-OFB/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/OFB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OFB/.packlist
 %%PERL5_MAN3%%/Crypt::OFB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OFB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OICQ/Makefile b/security/p5-Crypt-OICQ/Makefile
index 1bfccd5a737e..3a80d299fefe 100644
--- a/security/p5-Crypt-OICQ/Makefile
+++ b/security/p5-Crypt-OICQ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OICQ
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OICQ/pkg-plist b/security/p5-Crypt-OICQ/pkg-plist
index e69aca0fe7c9..c37ddd8b05db 100644
--- a/security/p5-Crypt-OICQ/pkg-plist
+++ b/security/p5-Crypt-OICQ/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OICQ/.packlist
 %%SITE_PERL%%/Crypt/OICQ.pm
 %%PERL5_MAN3%%/Crypt::OICQ.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OICQ
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OTP/Makefile b/security/p5-Crypt-OTP/Makefile
index 2215f39ecacb..071df1334eb1 100644
--- a/security/p5-Crypt-OTP/Makefile
+++ b/security/p5-Crypt-OTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OTP
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OTP/pkg-plist b/security/p5-Crypt-OTP/pkg-plist
index 857edb4f1e89..102de79969a8 100644
--- a/security/p5-Crypt-OTP/pkg-plist
+++ b/security/p5-Crypt-OTP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/OTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP/.packlist
 %%PERL5_MAN3%%/Crypt::OTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 1698c4c77aa6..64de4f7fb142 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-OpenPGP
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OpenPGP/pkg-plist b/security/p5-Crypt-OpenPGP/pkg-plist
index d9d3e8fd06e8..59f468b07d3c 100644
--- a/security/p5-Crypt-OpenPGP/pkg-plist
+++ b/security/p5-Crypt-OpenPGP/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenPGP/.packlist
 %%SITE_PERL%%/Crypt/OpenPGP.pm
 %%SITE_PERL%%/Crypt/OpenPGP/Words.pm
 %%SITE_PERL%%/Crypt/OpenPGP/Digest.pm
@@ -67,10 +66,3 @@
 %%PERL5_MAN3%%/Crypt::OpenPGP::Certificate.3.gz
 %%PERL5_MAN3%%/Crypt::OpenPGP::Message.3.gz
 %%PERL5_MAN3%%/Crypt::OpenPGP::KeyServer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenPGP
-@dirrm %%SITE_PERL%%/Crypt/OpenPGP/Key/Secret
-@dirrm %%SITE_PERL%%/Crypt/OpenPGP/Key/Public
-@dirrm %%SITE_PERL%%/Crypt/OpenPGP/Key
-@dirrm %%SITE_PERL%%/Crypt/OpenPGP/Signature
-@dirrm %%SITE_PERL%%/Crypt/OpenPGP
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OpenSSL-AES/Makefile b/security/p5-Crypt-OpenSSL-AES/Makefile
index 66da6e7a4916..c921d7dc5ed9 100644
--- a/security/p5-Crypt-OpenSSL-AES/Makefile
+++ b/security/p5-Crypt-OpenSSL-AES/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-OpenSSL-AES
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OpenSSL-AES/pkg-plist b/security/p5-Crypt-OpenSSL-AES/pkg-plist
index fda8371c020b..4ffc0a736a37 100644
--- a/security/p5-Crypt-OpenSSL-AES/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-AES/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/AES.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/AES/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/AES/AES.so
+%%SITE_ARCH%%/Crypt/OpenSSL/AES.pm
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/AES/AES.so
 %%PERL5_MAN3%%/Crypt::OpenSSL::AES.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/AES
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-OpenSSL-Bignum/Makefile b/security/p5-Crypt-OpenSSL-Bignum/Makefile
index ba95071d3cb8..c2cdc99b2675 100644
--- a/security/p5-Crypt-OpenSSL-Bignum/Makefile
+++ b/security/p5-Crypt-OpenSSL-Bignum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OpenSSL-Bignum
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OpenSSL-Bignum/pkg-plist b/security/p5-Crypt-OpenSSL-Bignum/pkg-plist
index 630d5b40e4ad..53d15be038ec 100644
--- a/security/p5-Crypt-OpenSSL-Bignum/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-Bignum/pkg-plist
@@ -1,12 +1,5 @@
 %%PERL5_MAN3%%/Crypt::OpenSSL::Bignum.3.gz
 %%PERL5_MAN3%%/Crypt::OpenSSL::Bignum::CTX.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum/CTX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Bignum/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Bignum/Bignum.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Bignum
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/OpenSSL/Bignum.pm
+%%SITE_ARCH%%/Crypt/OpenSSL/Bignum/CTX.pm
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/Bignum/Bignum.so
diff --git a/security/p5-Crypt-OpenSSL-CA/Makefile b/security/p5-Crypt-OpenSSL-CA/Makefile
index 68fdff4a251f..663f8212a99f 100644
--- a/security/p5-Crypt-OpenSSL-CA/Makefile
+++ b/security/p5-Crypt-OpenSSL-CA/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-OpenSSL-CA
 PORTVERSION=	0.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OpenSSL-CA/pkg-plist b/security/p5-Crypt-OpenSSL-CA/pkg-plist
index d8e2bbfe8a50..f14d0de73400 100644
--- a/security/p5-Crypt-OpenSSL-CA/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-CA/pkg-plist
@@ -1,30 +1,15 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/CA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/CA/AlphabetSoup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/CA/Inline/C.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/CA/Resources.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/CONF/CONF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/PrivateKey/PrivateKey.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/PublicKey/PublicKey.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509/X509.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509V3_EXT/X509V3_EXT.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509_CRL/X509_CRL.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509_NAME/X509_NAME.so
+%%SITE_ARCH%%/Crypt/OpenSSL/CA.pm
+%%SITE_ARCH%%/Crypt/OpenSSL/CA/AlphabetSoup.pod
+%%SITE_ARCH%%/Crypt/OpenSSL/CA/Inline/C.pm
+%%SITE_ARCH%%/Crypt/OpenSSL/CA/Resources.pod
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/CA/CONF/CONF.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/CA/PrivateKey/PrivateKey.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/CA/PublicKey/PublicKey.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/CA/X509/X509.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/CA/X509V3_EXT/X509V3_EXT.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/CA/X509_CRL/X509_CRL.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/CA/X509_NAME/X509_NAME.so
 %%PERL5_MAN3%%/Crypt::OpenSSL::CA.3.gz
 %%PERL5_MAN3%%/Crypt::OpenSSL::CA::AlphabetSoup.3.gz
 %%PERL5_MAN3%%/Crypt::OpenSSL::CA::Inline::C.3.gz
 %%PERL5_MAN3%%/Crypt::OpenSSL::CA::Resources.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509_NAME
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509_CRL
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509V3_EXT
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/X509
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/PublicKey
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/PrivateKey
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA/CONF
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/CA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/CA/Inline
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/CA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-OpenSSL-DSA/Makefile b/security/p5-Crypt-OpenSSL-DSA/Makefile
index 47bf82e74c65..f740d5e08b42 100644
--- a/security/p5-Crypt-OpenSSL-DSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-DSA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OpenSSL-DSA
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OpenSSL-DSA/pkg-plist b/security/p5-Crypt-OpenSSL-DSA/pkg-plist
index 24060cd30c69..4dc5c03bca17 100644
--- a/security/p5-Crypt-OpenSSL-DSA/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-DSA/pkg-plist
@@ -1,12 +1,5 @@
 %%PERL5_MAN3%%/Crypt::OpenSSL::DSA.3.gz
 %%PERL5_MAN3%%/Crypt::OpenSSL::DSA::Signature.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA/Signature.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/OpenSSL/DSA.pm
+%%SITE_ARCH%%/Crypt/OpenSSL/DSA/Signature.pod
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.so
diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index 67edac6ce28c..933ecb5a30c3 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OpenSSL-RSA
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OpenSSL-RSA/pkg-plist b/security/p5-Crypt-OpenSSL-RSA/pkg-plist
index fdbaefbb78a5..528d81605f77 100644
--- a/security/p5-Crypt-OpenSSL-RSA/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-RSA/pkg-plist
@@ -1,14 +1,8 @@
 %%PERL5_MAN3%%/Crypt::OpenSSL::RSA.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/RSA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/RSA.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_key_parameters.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/import_random_seed.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_key_from_parameters.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_public_key.al
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/OpenSSL/RSA.pm
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/RSA/RSA.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/RSA/autosplit.ix
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/RSA/get_key_parameters.al
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/RSA/import_random_seed.al
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/RSA/new_key_from_parameters.al
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/RSA/new_public_key.al
diff --git a/security/p5-Crypt-OpenSSL-Random/Makefile b/security/p5-Crypt-OpenSSL-Random/Makefile
index c4a8c47c4bd6..314e6a6fb6d6 100644
--- a/security/p5-Crypt-OpenSSL-Random/Makefile
+++ b/security/p5-Crypt-OpenSSL-Random/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OpenSSL-Random
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RURBAN
diff --git a/security/p5-Crypt-OpenSSL-Random/pkg-plist b/security/p5-Crypt-OpenSSL-Random/pkg-plist
index 2fd8b1c66c19..afa8df7ca337 100644
--- a/security/p5-Crypt-OpenSSL-Random/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-Random/pkg-plist
@@ -1,10 +1,4 @@
 %%PERL5_MAN3%%/Crypt::OpenSSL::Random.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/OpenSSL/Random.pm
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/Random/Random.so
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/Random/autosplit.ix
diff --git a/security/p5-Crypt-OpenSSL-X509/Makefile b/security/p5-Crypt-OpenSSL-X509/Makefile
index b75d019c66b6..22a87f2d2b67 100644
--- a/security/p5-Crypt-OpenSSL-X509/Makefile
+++ b/security/p5-Crypt-OpenSSL-X509/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-OpenSSL-X509
 PORTVERSION=	1.8.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-OpenSSL-X509/pkg-plist b/security/p5-Crypt-OpenSSL-X509/pkg-plist
index 2d9b2f07c70f..38670e8478ff 100644
--- a/security/p5-Crypt-OpenSSL-X509/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-X509/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Crypt::OpenSSL::X509.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/X509.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/X509/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/X509/X509.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/X509
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/OpenSSL/X509.pm
+%%SITE_ARCH%%/auto/Crypt/OpenSSL/X509/X509.so
diff --git a/security/p5-Crypt-PBKDF2/Makefile b/security/p5-Crypt-PBKDF2/Makefile
index b7d1f392320f..a6a64b41f29b 100644
--- a/security/p5-Crypt-PBKDF2/Makefile
+++ b/security/p5-Crypt-PBKDF2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-PBKDF2
 PORTVERSION=	0.142390
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ARODLAND
diff --git a/security/p5-Crypt-PBKDF2/pkg-plist b/security/p5-Crypt-PBKDF2/pkg-plist
index 5521f3e461b7..d1850bd37eb3 100644
--- a/security/p5-Crypt-PBKDF2/pkg-plist
+++ b/security/p5-Crypt-PBKDF2/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/Crypt/PBKDF2/Hash/HMACSHA1.pm
 %%SITE_PERL%%/Crypt/PBKDF2/Hash/HMACSHA2.pm
 %%SITE_PERL%%/Crypt/PBKDF2/Hash/HMACSHA3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PBKDF2/.packlist
diff --git a/security/p5-Crypt-PGPSimple/Makefile b/security/p5-Crypt-PGPSimple/Makefile
index c8ced3dd2f36..33f2f585b8a6 100644
--- a/security/p5-Crypt-PGPSimple/Makefile
+++ b/security/p5-Crypt-PGPSimple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-PGPSimple
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-PGPSimple/pkg-plist b/security/p5-Crypt-PGPSimple/pkg-plist
index af09457d0d8c..1f3feddfa86a 100644
--- a/security/p5-Crypt-PGPSimple/pkg-plist
+++ b/security/p5-Crypt-PGPSimple/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::PGPSimple.3.gz
 %%SITE_PERL%%/Crypt/PGPSimple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-PassGen/Makefile b/security/p5-Crypt-PassGen/Makefile
index d79b6861d4dd..162121e84c28 100644
--- a/security/p5-Crypt-PassGen/Makefile
+++ b/security/p5-Crypt-PassGen/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Crypt-PassGen
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-PassGen/pkg-plist b/security/p5-Crypt-PassGen/pkg-plist
index 3dfa4685e25e..cfd3b5199452 100644
--- a/security/p5-Crypt-PassGen/pkg-plist
+++ b/security/p5-Crypt-PassGen/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PassGen/.packlist
 %%SITE_PERL%%/Crypt/PassGenWordFreq.dat
 %%SITE_PERL%%/Crypt/PassGen.pm
 %%PERL5_MAN3%%/Crypt::PassGen.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PassGen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Passwd-XS/Makefile b/security/p5-Crypt-Passwd-XS/Makefile
index 6a17c4a42862..027318a2b5fb 100644
--- a/security/p5-Crypt-Passwd-XS/Makefile
+++ b/security/p5-Crypt-Passwd-XS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Crypt-Passwd-XS
 PORTVERSION=	0.601
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Passwd-XS/pkg-plist b/security/p5-Crypt-Passwd-XS/pkg-plist
index 72f8a5890ab4..735360540404 100644
--- a/security/p5-Crypt-Passwd-XS/pkg-plist
+++ b/security/p5-Crypt-Passwd-XS/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Passwd::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Passwd/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Passwd/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Passwd/XS/XS.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Passwd/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Passwd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Passwd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/Passwd/XS.pm
+%%SITE_ARCH%%/auto/Crypt/Passwd/XS/XS.so
diff --git a/security/p5-Crypt-PasswdMD5/Makefile b/security/p5-Crypt-PasswdMD5/Makefile
index e0fdee9ad808..d063df32eb93 100644
--- a/security/p5-Crypt-PasswdMD5/Makefile
+++ b/security/p5-Crypt-PasswdMD5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-PasswdMD5
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-PasswdMD5/pkg-plist b/security/p5-Crypt-PasswdMD5/pkg-plist
index 81332eb0e81e..ec032e130692 100644
--- a/security/p5-Crypt-PasswdMD5/pkg-plist
+++ b/security/p5-Crypt-PasswdMD5/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::PasswdMD5.3.gz
 %%SITE_PERL%%/Crypt/PasswdMD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Password-Util/Makefile b/security/p5-Crypt-Password-Util/Makefile
index aea261fa3112..8e486626622f 100644
--- a/security/p5-Crypt-Password-Util/Makefile
+++ b/security/p5-Crypt-Password-Util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Password-Util
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Password-Util/pkg-plist b/security/p5-Crypt-Password-Util/pkg-plist
index 80c43cdb4402..64410810943a 100644
--- a/security/p5-Crypt-Password-Util/pkg-plist
+++ b/security/p5-Crypt-Password-Util/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Crypt/Password/Util.pm
 %%PERL5_MAN3%%/Crypt::Password::Util.3.gz
-@dirrmtry %%SITE_PERL%%/Crypt/Password
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index 6a5f4144977e..30cfae4f72ea 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Primes
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Primes/pkg-plist b/security/p5-Crypt-Primes/pkg-plist
index 1c799c5e0f23..ff38cf50cce3 100644
--- a/security/p5-Crypt-Primes/pkg-plist
+++ b/security/p5-Crypt-Primes/pkg-plist
@@ -1,8 +1,4 @@
 bin/largeprimes
 %%PERL5_MAN3%%/Crypt::Primes.3.gz
 %%SITE_PERL%%/Crypt/Primes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Primes/.packlist
 man/man1/largeprimes.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Primes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-RC4/Makefile b/security/p5-Crypt-RC4/Makefile
index 2d018556b83c..53a3877be7c8 100644
--- a/security/p5-Crypt-RC4/Makefile
+++ b/security/p5-Crypt-RC4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-RC4
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RC4/pkg-plist b/security/p5-Crypt-RC4/pkg-plist
index ff50ed32d40b..e7673ac56359 100644
--- a/security/p5-Crypt-RC4/pkg-plist
+++ b/security/p5-Crypt-RC4/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/RC4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4/.packlist
 %%PERL5_MAN3%%/Crypt::RC4.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-RC5/Makefile b/security/p5-Crypt-RC5/Makefile
index b2ce3735aa9d..efccc43aa87d 100644
--- a/security/p5-Crypt-RC5/Makefile
+++ b/security/p5-Crypt-RC5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-RC5
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RC5/pkg-plist b/security/p5-Crypt-RC5/pkg-plist
index ea6ccfb126bb..8a122f56efaa 100644
--- a/security/p5-Crypt-RC5/pkg-plist
+++ b/security/p5-Crypt-RC5/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::RC5.3.gz
 %%SITE_PERL%%/Crypt/RC5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-RC6/Makefile b/security/p5-Crypt-RC6/Makefile
index 56ec0674f29b..b07d3c26fb07 100644
--- a/security/p5-Crypt-RC6/Makefile
+++ b/security/p5-Crypt-RC6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-RC6
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RC6/pkg-plist b/security/p5-Crypt-RC6/pkg-plist
index fe3d80515596..47a4a2ac5f68 100644
--- a/security/p5-Crypt-RC6/pkg-plist
+++ b/security/p5-Crypt-RC6/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::RC6.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RC6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/RC6.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/RC6.pm
+%%SITE_ARCH%%/auto/Crypt/RC6/RC6.so
diff --git a/security/p5-Crypt-RHash/Makefile b/security/p5-Crypt-RHash/Makefile
index a712dd19d327..b58b58c46b25 100644
--- a/security/p5-Crypt-RHash/Makefile
+++ b/security/p5-Crypt-RHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-RHash
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,9 +14,9 @@ COMMENT=	Compute hash sums and magnet links
 LICENSE=	MIT
 
 USES=		perl5
-USE_PERL5=	configure fixpacklist
+USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Crypt/Rhash/Rhash.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Crypt/Rhash/Rhash.so
 
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-RHash/pkg-plist b/security/p5-Crypt-RHash/pkg-plist
index 5aea5bd3afb4..fd7972ac7feb 100644
--- a/security/p5-Crypt-RHash/pkg-plist
+++ b/security/p5-Crypt-RHash/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Rhash.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Rhash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rhash/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rhash/Rhash.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rhash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/Rhash.pm
+%%SITE_ARCH%%/auto/Crypt/Rhash/Rhash.so
diff --git a/security/p5-Crypt-RIPEMD160/Makefile b/security/p5-Crypt-RIPEMD160/Makefile
index 4d8204fac6a9..5976e9f08e0c 100644
--- a/security/p5-Crypt-RIPEMD160/Makefile
+++ b/security/p5-Crypt-RIPEMD160/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-RIPEMD160
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RIPEMD160/pkg-plist b/security/p5-Crypt-RIPEMD160/pkg-plist
index 53ce3acb436f..257d12af7688 100644
--- a/security/p5-Crypt-RIPEMD160/pkg-plist
+++ b/security/p5-Crypt-RIPEMD160/pkg-plist
@@ -1,11 +1,6 @@
 %%PERL5_MAN3%%/Crypt::RIPEMD160.3.gz
 %%PERL5_MAN3%%/Crypt::RIPEMD160::MAC.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160/MAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/RIPEMD160.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/RIPEMD160.pm
+%%SITE_ARCH%%/Crypt/RIPEMD160/MAC.pm
+%%SITE_ARCH%%/auto/Crypt/RIPEMD160/RIPEMD160.so
+%%SITE_ARCH%%/auto/Crypt/RIPEMD160/autosplit.ix
diff --git a/security/p5-Crypt-RSA-Yandex/Makefile b/security/p5-Crypt-RSA-Yandex/Makefile
index 0299ffd948b4..e7e53a68d2f3 100644
--- a/security/p5-Crypt-RSA-Yandex/Makefile
+++ b/security/p5-Crypt-RSA-Yandex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-RSA-Yandex
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RSA-Yandex/pkg-plist b/security/p5-Crypt-RSA-Yandex/pkg-plist
index b17ecf9f82cd..284884439326 100644
--- a/security/p5-Crypt-RSA-Yandex/pkg-plist
+++ b/security/p5-Crypt-RSA-Yandex/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Crypt::RSA::Yandex.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RSA/Yandex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA/Yandex/Yandex.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA/Yandex/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA/Yandex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RSA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/RSA/Yandex.pm
+%%SITE_ARCH%%/auto/Crypt/RSA/Yandex/Yandex.so
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index ae13c11fad21..17401179ad22 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-RSA
 PORTVERSION=	1.99
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RSA/pkg-plist b/security/p5-Crypt-RSA/pkg-plist
index cc43d1a1d975..4f3ec0ce0ddc 100644
--- a/security/p5-Crypt-RSA/pkg-plist
+++ b/security/p5-Crypt-RSA/pkg-plist
@@ -26,13 +26,3 @@
 %%SITE_PERL%%/Crypt/RSA/Primitives.pm
 %%SITE_PERL%%/Crypt/RSA/SS/PKCS1v15.pm
 %%SITE_PERL%%/Crypt/RSA/SS/PSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt/RSA/SS
-@dirrmtry %%SITE_PERL%%/Crypt/RSA/Key/Public
-@dirrmtry %%SITE_PERL%%/Crypt/RSA/Key/Private
-@dirrmtry %%SITE_PERL%%/Crypt/RSA/Key
-@dirrmtry %%SITE_PERL%%/Crypt/RSA/ES
-@dirrmtry %%SITE_PERL%%/Crypt/RSA
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Rabbit/Makefile b/security/p5-Crypt-Rabbit/Makefile
index aeeb5b1b3081..189e853f7e81 100644
--- a/security/p5-Crypt-Rabbit/Makefile
+++ b/security/p5-Crypt-Rabbit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Rabbit
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Rabbit/pkg-plist b/security/p5-Crypt-Rabbit/pkg-plist
index 46f0645a5a3c..6db7ea8b9bc2 100644
--- a/security/p5-Crypt-Rabbit/pkg-plist
+++ b/security/p5-Crypt-Rabbit/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Rabbit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/Rabbit.so
+%%SITE_ARCH%%/Crypt/Rabbit.pm
+%%SITE_ARCH%%/auto/Crypt/Rabbit/Rabbit.so
 %%PERL5_MAN3%%/Crypt::Rabbit.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-RandPasswd/Makefile b/security/p5-Crypt-RandPasswd/Makefile
index f6229d9af9fb..d35f86d9ce94 100644
--- a/security/p5-Crypt-RandPasswd/Makefile
+++ b/security/p5-Crypt-RandPasswd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-RandPasswd
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RandPasswd/pkg-plist b/security/p5-Crypt-RandPasswd/pkg-plist
index 7b9733b1ae41..f40b9c980f28 100644
--- a/security/p5-Crypt-RandPasswd/pkg-plist
+++ b/security/p5-Crypt-RandPasswd/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::RandPasswd.3.gz
 %%SITE_PERL%%/Crypt/RandPasswd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RandPasswd/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RandPasswd
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrm %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Random-Source/Makefile b/security/p5-Crypt-Random-Source/Makefile
index 159f43862b57..43e835799cdd 100644
--- a/security/p5-Crypt-Random-Source/Makefile
+++ b/security/p5-Crypt-Random-Source/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-Random-Source
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Random-Source/pkg-plist b/security/p5-Crypt-Random-Source/pkg-plist
index c41e2d52318a..d290fb546033 100644
--- a/security/p5-Crypt-Random-Source/pkg-plist
+++ b/security/p5-Crypt-Random-Source/pkg-plist
@@ -10,7 +10,6 @@
 %%SITE_PERL%%/Crypt/Random/Source/Weak.pm
 %%SITE_PERL%%/Crypt/Random/Source/Weak/devurandom.pm
 %%SITE_PERL%%/Crypt/Random/Source/Weak/rand.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random/Source/.packlist
 %%PERL5_MAN3%%/Crypt::Random::Source.3.gz
 %%PERL5_MAN3%%/Crypt::Random::Source::Base.3.gz
 %%PERL5_MAN3%%/Crypt::Random::Source::Base::File.3.gz
@@ -23,12 +22,3 @@
 %%PERL5_MAN3%%/Crypt::Random::Source::Weak.3.gz
 %%PERL5_MAN3%%/Crypt::Random::Source::Weak::devurandom.3.gz
 %%PERL5_MAN3%%/Crypt::Random::Source::Weak::rand.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random/Source
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrm %%SITE_PERL%%/Crypt/Random/Source/Weak
-@dirrm %%SITE_PERL%%/Crypt/Random/Source/Strong
-@dirrm %%SITE_PERL%%/Crypt/Random/Source/Base
-@dirrm %%SITE_PERL%%/Crypt/Random/Source
-@dirrmtry %%SITE_PERL%%/Crypt/Random
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index 6cfe114e7d86..2daa917434fc 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-Random
 PORTVERSION=	1.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Random/pkg-plist b/security/p5-Crypt-Random/pkg-plist
index d79f9808db98..e2ba5afd8385 100644
--- a/security/p5-Crypt-Random/pkg-plist
+++ b/security/p5-Crypt-Random/pkg-plist
@@ -7,9 +7,3 @@ bin/makerandom
 %%SITE_PERL%%/Crypt/Random/Provider/devurandom.pm
 %%SITE_PERL%%/Crypt/Random/Provider/egd.pm
 %%SITE_PERL%%/Crypt/Random/Provider/rand.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt/Random/Provider
-@dirrmtry %%SITE_PERL%%/Crypt/Random
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Rijndael/Makefile b/security/p5-Crypt-Rijndael/Makefile
index 6f7a02560d4c..4b68cbad43ce 100644
--- a/security/p5-Crypt-Rijndael/Makefile
+++ b/security/p5-Crypt-Rijndael/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Rijndael
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Crypt
diff --git a/security/p5-Crypt-Rijndael/pkg-plist b/security/p5-Crypt-Rijndael/pkg-plist
index 7f9894cc64a3..35e7bc7dde54 100644
--- a/security/p5-Crypt-Rijndael/pkg-plist
+++ b/security/p5-Crypt-Rijndael/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Rijndael.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.so
+%%SITE_ARCH%%/Crypt/Rijndael.pm
+%%SITE_ARCH%%/auto/Crypt/Rijndael/Rijndael.so
 %%PERL5_MAN3%%/Crypt::Rijndael.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Rijndael_PP/Makefile b/security/p5-Crypt-Rijndael_PP/Makefile
index b771c08c7bc4..3469a6158c32 100644
--- a/security/p5-Crypt-Rijndael_PP/Makefile
+++ b/security/p5-Crypt-Rijndael_PP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Rijndael_PP
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Rijndael_PP/pkg-plist b/security/p5-Crypt-Rijndael_PP/pkg-plist
index 6880a7a0c6b9..defe0e1befd4 100644
--- a/security/p5-Crypt-Rijndael_PP/pkg-plist
+++ b/security/p5-Crypt-Rijndael_PP/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Rijndael_PP.3.gz
 %%SITE_PERL%%/Crypt/Rijndael_PP.pm
 %%SITE_PERL%%/Crypt/comp.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael_PP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael_PP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-SKey/Makefile b/security/p5-Crypt-SKey/Makefile
index 1f3b32a3828d..27dbae576ddc 100644
--- a/security/p5-Crypt-SKey/Makefile
+++ b/security/p5-Crypt-SKey/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-SKey
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-SKey/pkg-plist b/security/p5-Crypt-SKey/pkg-plist
index be199587cc4a..1cb269b04eac 100644
--- a/security/p5-Crypt-SKey/pkg-plist
+++ b/security/p5-Crypt-SKey/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/SKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SKey/.packlist
 %%PERL5_MAN3%%/Crypt::SKey.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SKey/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-SMIME/Makefile b/security/p5-Crypt-SMIME/Makefile
index 52510ef82cd3..0fc5477215c0 100644
--- a/security/p5-Crypt-SMIME/Makefile
+++ b/security/p5-Crypt-SMIME/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Crypt-SMIME
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -22,6 +23,6 @@ USE_OPENSSL=	yes
 USE_PERL5=	configure
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Crypt/SMIME/SMIME.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Crypt/SMIME/SMIME.so
 
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-SMIME/pkg-plist b/security/p5-Crypt-SMIME/pkg-plist
index dec647a1cb2f..7d14ba69175c 100644
--- a/security/p5-Crypt-SMIME/pkg-plist
+++ b/security/p5-Crypt-SMIME/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SMIME/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SMIME/SMIME.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SMIME/JA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SMIME.pm
+%%SITE_ARCH%%/auto/Crypt/SMIME/SMIME.so
+%%SITE_ARCH%%/Crypt/SMIME/JA.pod
+%%SITE_ARCH%%/Crypt/SMIME.pm
 %%PERL5_MAN3%%/SMIME.3.gz
 %%PERL5_MAN3%%/SMIME::JA.3.gz
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile
index e89a1eb2f30f..be6df7b1e3e2 100644
--- a/security/p5-Crypt-SSLeay/Makefile
+++ b/security/p5-Crypt-SSLeay/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-SSLeay
 PORTVERSION=	0.72
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-SSLeay/pkg-plist b/security/p5-Crypt-SSLeay/pkg-plist
index 5f6f87a7dc57..d40d1748d780 100644
--- a/security/p5-Crypt-SSLeay/pkg-plist
+++ b/security/p5-Crypt-SSLeay/pkg-plist
@@ -1,17 +1,12 @@
 %%PERL5_MAN3%%/Crypt::SSLeay.3.gz
 %%PERL5_MAN3%%/Crypt::SSLeay::Version.3.gz
 %%PERL5_MAN3%%/Net::SSL.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/CTX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/Conn.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/Err.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/MainContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/X509.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+%%SITE_ARCH%%/Crypt/SSLeay.pm
+%%SITE_ARCH%%/Crypt/SSLeay/CTX.pm
+%%SITE_ARCH%%/Crypt/SSLeay/Conn.pm
+%%SITE_ARCH%%/Crypt/SSLeay/Err.pm
+%%SITE_ARCH%%/Crypt/SSLeay/MainContext.pm
+%%SITE_ARCH%%/Crypt/SSLeay/Version.pm
+%%SITE_ARCH%%/Crypt/SSLeay/X509.pm
+%%SITE_ARCH%%/Net/SSL.pm
+%%SITE_ARCH%%/auto/Crypt/SSLeay/SSLeay.so
diff --git a/security/p5-Crypt-Salt/Makefile b/security/p5-Crypt-Salt/Makefile
index 34f909e12d27..4443f2a916bd 100644
--- a/security/p5-Crypt-Salt/Makefile
+++ b/security/p5-Crypt-Salt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Salt
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Salt/pkg-plist b/security/p5-Crypt-Salt/pkg-plist
index ae4a05ee3da1..d652395ad1f6 100644
--- a/security/p5-Crypt-Salt/pkg-plist
+++ b/security/p5-Crypt-Salt/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/Salt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Salt/.packlist
 %%PERL5_MAN3%%/Crypt::Salt.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Salt/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-SaltedHash/Makefile b/security/p5-Crypt-SaltedHash/Makefile
index d21be9738121..c4e1bdc97150 100644
--- a/security/p5-Crypt-SaltedHash/Makefile
+++ b/security/p5-Crypt-SaltedHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-SaltedHash
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ESSKAR
diff --git a/security/p5-Crypt-SaltedHash/pkg-plist b/security/p5-Crypt-SaltedHash/pkg-plist
index 4f6914a94d99..535a250b8222 100644
--- a/security/p5-Crypt-SaltedHash/pkg-plist
+++ b/security/p5-Crypt-SaltedHash/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Crypt/SaltedHash.pm
 %%PERL5_MAN3%%/Crypt::SaltedHash.3.gz
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Serpent/Makefile b/security/p5-Crypt-Serpent/Makefile
index 8e77133ec0be..2925a797421b 100644
--- a/security/p5-Crypt-Serpent/Makefile
+++ b/security/p5-Crypt-Serpent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Serpent
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Serpent/pkg-plist b/security/p5-Crypt-Serpent/pkg-plist
index 3a9f59364272..0eca46ce9168 100644
--- a/security/p5-Crypt-Serpent/pkg-plist
+++ b/security/p5-Crypt-Serpent/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Serpent.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Serpent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/Serpent.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/Serpent.pm
+%%SITE_ARCH%%/auto/Crypt/Serpent/Serpent.so
diff --git a/security/p5-Crypt-Shark/Makefile b/security/p5-Crypt-Shark/Makefile
index f31c7d585866..c7178f621b1f 100644
--- a/security/p5-Crypt-Shark/Makefile
+++ b/security/p5-Crypt-Shark/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Shark
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Shark/pkg-plist b/security/p5-Crypt-Shark/pkg-plist
index eb1d964f83e1..ac19b713bac7 100644
--- a/security/p5-Crypt-Shark/pkg-plist
+++ b/security/p5-Crypt-Shark/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Shark.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/Shark.so
+%%SITE_ARCH%%/Crypt/Shark.pm
+%%SITE_ARCH%%/auto/Crypt/Shark/Shark.so
 %%PERL5_MAN3%%/Crypt::Shark.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Simple/Makefile b/security/p5-Crypt-Simple/Makefile
index b7618d5aaba7..41441da53cf7 100644
--- a/security/p5-Crypt-Simple/Makefile
+++ b/security/p5-Crypt-Simple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-Simple
 PORTVERSION=	0.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Simple/pkg-plist b/security/p5-Crypt-Simple/pkg-plist
index d9f0aa24363f..c09f66bd8bc7 100644
--- a/security/p5-Crypt-Simple/pkg-plist
+++ b/security/p5-Crypt-Simple/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Simple/.packlist
 %%SITE_PERL%%/Crypt/Simple.pm
 %%PERL5_MAN3%%/Crypt::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
diff --git a/security/p5-Crypt-SmbHash/Makefile b/security/p5-Crypt-SmbHash/Makefile
index 86838bb61a35..f502276343ed 100644
--- a/security/p5-Crypt-SmbHash/Makefile
+++ b/security/p5-Crypt-SmbHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-SmbHash
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-SmbHash/pkg-plist b/security/p5-Crypt-SmbHash/pkg-plist
index a080c2188605..b8e53fe9c6da 100644
--- a/security/p5-Crypt-SmbHash/pkg-plist
+++ b/security/p5-Crypt-SmbHash/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::SmbHash.3.gz
 %%SITE_PERL%%/Crypt/SmbHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SmbHash/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SmbHash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Solitaire/Makefile b/security/p5-Crypt-Solitaire/Makefile
index 0a2f056c315a..3c7efe41ee60 100644
--- a/security/p5-Crypt-Solitaire/Makefile
+++ b/security/p5-Crypt-Solitaire/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Crypt-Solitaire
 PORTVERSION=		2.0
+PORTREVISION=	1
 CATEGORIES=		security perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/security/p5-Crypt-Solitaire/pkg-plist b/security/p5-Crypt-Solitaire/pkg-plist
index f2baa0f4203c..b249bc72500e 100644
--- a/security/p5-Crypt-Solitaire/pkg-plist
+++ b/security/p5-Crypt-Solitaire/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Crypt/Solitaire.pm
 %%SITE_PERL%%/auto/Crypt/Solitaire/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire/.packlist
 %%PERL5_MAN3%%/Crypt::Solitaire.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrm %%SITE_PERL%%/auto/Crypt/Solitaire
-@dirrmtry %%SITE_PERL%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-TEA/Makefile b/security/p5-Crypt-TEA/Makefile
index d0e450a51e7a..527ec2a4ffe0 100644
--- a/security/p5-Crypt-TEA/Makefile
+++ b/security/p5-Crypt-TEA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-TEA
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-TEA/pkg-plist b/security/p5-Crypt-TEA/pkg-plist
index 50adbefee683..20f6bd562b3f 100644
--- a/security/p5-Crypt-TEA/pkg-plist
+++ b/security/p5-Crypt-TEA/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/TEA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/TEA.so
+%%SITE_ARCH%%/Crypt/TEA.pm
+%%SITE_ARCH%%/auto/Crypt/TEA/TEA.so
 %%PERL5_MAN3%%/Crypt::TEA.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-T_e_a/Makefile b/security/p5-Crypt-T_e_a/Makefile
index 4b4432990329..9d7e7bed15cc 100644
--- a/security/p5-Crypt-T_e_a/Makefile
+++ b/security/p5-Crypt-T_e_a/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-T_e_a
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PJB
diff --git a/security/p5-Crypt-T_e_a/pkg-plist b/security/p5-Crypt-T_e_a/pkg-plist
index 0b363e71f3e4..312d2232600b 100644
--- a/security/p5-Crypt-T_e_a/pkg-plist
+++ b/security/p5-Crypt-T_e_a/pkg-plist
@@ -1,8 +1,4 @@
 bin/tea
 %%SITE_PERL%%/Crypt/Tea.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Tea/.packlist
 %%PERL5_MAN3%%/Crypt::Tea.3.gz
 man/man1/tea.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Tea
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Tea_JS/Makefile b/security/p5-Crypt-Tea_JS/Makefile
index d06df29e5966..a2c90d9abe16 100644
--- a/security/p5-Crypt-Tea_JS/Makefile
+++ b/security/p5-Crypt-Tea_JS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Tea_JS
 PORTVERSION=	2.23
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Tea_JS/pkg-plist b/security/p5-Crypt-Tea_JS/pkg-plist
index 13ae4e9d6888..d802a21d0cc6 100644
--- a/security/p5-Crypt-Tea_JS/pkg-plist
+++ b/security/p5-Crypt-Tea_JS/pkg-plist
@@ -1,9 +1,5 @@
 bin/tea
 man/man1/tea.1.gz
 %%PERL5_MAN3%%/Crypt::Tea_JS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Tea_JS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Tea_JS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Tea_JS/Tea_JS.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Tea_JS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+%%SITE_ARCH%%/Crypt/Tea_JS.pm
+%%SITE_ARCH%%/auto/Crypt/Tea_JS/Tea_JS.so
diff --git a/security/p5-Crypt-TripleDES/Makefile b/security/p5-Crypt-TripleDES/Makefile
index 2f2ee0c19f38..743128c9f23b 100644
--- a/security/p5-Crypt-TripleDES/Makefile
+++ b/security/p5-Crypt-TripleDES/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-TripleDES
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-TripleDES/pkg-plist b/security/p5-Crypt-TripleDES/pkg-plist
index 7c9d6cf852ea..e1a9708bc72b 100644
--- a/security/p5-Crypt-TripleDES/pkg-plist
+++ b/security/p5-Crypt-TripleDES/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Crypt/PPDES.pm
 %%SITE_PERL%%/Crypt/TripleDES.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES/.packlist
 %%PERL5_MAN3%%/Crypt::TripleDES.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile
index 1ab04e98f107..942a86ca5b87 100644
--- a/security/p5-Crypt-Twofish/Makefile
+++ b/security/p5-Crypt-Twofish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Twofish
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Twofish/pkg-plist b/security/p5-Crypt-Twofish/pkg-plist
index b535d8b1bfad..d1517b7b1884 100644
--- a/security/p5-Crypt-Twofish/pkg-plist
+++ b/security/p5-Crypt-Twofish/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Twofish.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Twofish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/Twofish.pm
+%%SITE_ARCH%%/auto/Crypt/Twofish/Twofish.so
diff --git a/security/p5-Crypt-Twofish2/Makefile b/security/p5-Crypt-Twofish2/Makefile
index 2155b24f3ba2..05e0148422f8 100644
--- a/security/p5-Crypt-Twofish2/Makefile
+++ b/security/p5-Crypt-Twofish2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-Twofish2
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-Twofish2/pkg-plist b/security/p5-Crypt-Twofish2/pkg-plist
index 97d52e5bc2f6..3b9b90e9c4e4 100644
--- a/security/p5-Crypt-Twofish2/pkg-plist
+++ b/security/p5-Crypt-Twofish2/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::Twofish2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Twofish2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/Twofish2.pm
+%%SITE_ARCH%%/auto/Crypt/Twofish2/Twofish2.so
diff --git a/security/p5-Crypt-Twofish_PP/Makefile b/security/p5-Crypt-Twofish_PP/Makefile
index 840def4cdbe4..79e17d463048 100644
--- a/security/p5-Crypt-Twofish_PP/Makefile
+++ b/security/p5-Crypt-Twofish_PP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Crypt-Twofish_PP
 PORTVERSION=	0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN \
 		http://kostjn.spb.ru/freebsd/
diff --git a/security/p5-Crypt-Twofish_PP/pkg-plist b/security/p5-Crypt-Twofish_PP/pkg-plist
index 288026c9890f..ae8a42f6ba35 100644
--- a/security/p5-Crypt-Twofish_PP/pkg-plist
+++ b/security/p5-Crypt-Twofish_PP/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-Twofish_PP/.packlist
 %%SITE_PERL%%/Crypt/Twofish_PP.pm
 %%SITE_PERL%%/Crypt/Twofish_PP/Key16.pm
 %%SITE_PERL%%/Crypt/Twofish_PP/Key24.pm
@@ -8,9 +7,3 @@
 %%PERL5_MAN3%%/Crypt::Twofish_PP::Key16.3.gz
 %%PERL5_MAN3%%/Crypt::Twofish_PP::Key24.3.gz
 %%PERL5_MAN3%%/Crypt::Twofish_PP::Key32.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-Twofish_PP
-@dirrmtry %%SITE_PERL%%/Crypt/Twofish_PP
-@dirrmtry %%SITE_PERL%%/Crypt
-@dirrmtry %%SITE_PERL%%/LocaleData/de/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/de
-@dirrmtry %%SITE_PERL%%/LocaleData
diff --git a/security/p5-Crypt-URandom/Makefile b/security/p5-Crypt-URandom/Makefile
index 06c788ae56e2..69e1f68a1970 100644
--- a/security/p5-Crypt-URandom/Makefile
+++ b/security/p5-Crypt-URandom/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Crypt-URandom
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-URandom/pkg-plist b/security/p5-Crypt-URandom/pkg-plist
index afff1398b411..00b776f7e855 100644
--- a/security/p5-Crypt-URandom/pkg-plist
+++ b/security/p5-Crypt-URandom/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/URandom/.packlist
 %%SITE_PERL%%/Crypt/URandom.pm
 %%PERL5_MAN3%%/Crypt::URandom.3.gz
-@dirrmtry %%SITE_PERL%%/Crypt
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/URandom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
diff --git a/security/p5-Crypt-UnixCrypt/Makefile b/security/p5-Crypt-UnixCrypt/Makefile
index 1bb516acafc3..4b029b00b134 100644
--- a/security/p5-Crypt-UnixCrypt/Makefile
+++ b/security/p5-Crypt-UnixCrypt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-UnixCrypt
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-UnixCrypt/pkg-plist b/security/p5-Crypt-UnixCrypt/pkg-plist
index 8547d0281086..c565bee83a75 100644
--- a/security/p5-Crypt-UnixCrypt/pkg-plist
+++ b/security/p5-Crypt-UnixCrypt/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Crypt/UnixCrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt/.packlist
 %%PERL5_MAN3%%/Crypt::UnixCrypt.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-UnixCrypt_XS/Makefile b/security/p5-Crypt-UnixCrypt_XS/Makefile
index d24af764cffd..cea37461aeb6 100644
--- a/security/p5-Crypt-UnixCrypt_XS/Makefile
+++ b/security/p5-Crypt-UnixCrypt_XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-UnixCrypt_XS
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-UnixCrypt_XS/pkg-plist b/security/p5-Crypt-UnixCrypt_XS/pkg-plist
index 89fb13c81eb0..3a40dbf563c4 100644
--- a/security/p5-Crypt-UnixCrypt_XS/pkg-plist
+++ b/security/p5-Crypt-UnixCrypt_XS/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Crypt::UnixCrypt_XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt_XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt_XS/UnixCrypt_XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/UnixCrypt_XS.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt_XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/auto/Crypt/UnixCrypt_XS/UnixCrypt_XS.so
+%%SITE_ARCH%%/Crypt/UnixCrypt_XS.pm
diff --git a/security/p5-Crypt-X509/Makefile b/security/p5-Crypt-X509/Makefile
index 671802bec03a..d78471da6a37 100644
--- a/security/p5-Crypt-X509/Makefile
+++ b/security/p5-Crypt-X509/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-X509
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-X509/pkg-plist b/security/p5-Crypt-X509/pkg-plist
index 73f1ece11596..b64e0cc43fc0 100644
--- a/security/p5-Crypt-X509/pkg-plist
+++ b/security/p5-Crypt-X509/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::X509.3.gz
 %%SITE_PERL%%/Crypt/X509.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/X509/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/X509
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-xDBM_File/Makefile b/security/p5-Crypt-xDBM_File/Makefile
index 6173fd1a6b71..590b476a37a3 100644
--- a/security/p5-Crypt-xDBM_File/Makefile
+++ b/security/p5-Crypt-xDBM_File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Crypt-xDBM_File
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-xDBM_File/pkg-plist b/security/p5-Crypt-xDBM_File/pkg-plist
index c14b8e895bd2..cdafea0f38e0 100644
--- a/security/p5-Crypt-xDBM_File/pkg-plist
+++ b/security/p5-Crypt-xDBM_File/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Crypt::xDBM_File.3.gz
 %%SITE_PERL%%/Crypt/xDBM_File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/xDBM_File/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/xDBM_File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
-@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-CryptX/Makefile b/security/p5-CryptX/Makefile
index 615ca2bfa927..d40bc8e193fe 100644
--- a/security/p5-CryptX/Makefile
+++ b/security/p5-CryptX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CryptX
 PORTVERSION=	0.021
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Crypt
diff --git a/security/p5-CryptX/pkg-plist b/security/p5-CryptX/pkg-plist
index 0fbbe367e939..c6893afeaec1 100644
--- a/security/p5-CryptX/pkg-plist
+++ b/security/p5-CryptX/pkg-plist
@@ -68,83 +68,74 @@
 %%PERL5_MAN3%%/Crypt::PRNG::Sober128.3.gz
 %%PERL5_MAN3%%/Crypt::PRNG::Yarrow.3.gz
 %%PERL5_MAN3%%/CryptX.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/CCM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/EAX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/GCM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/OCB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/AES.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Anubis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Blowfish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/CAST5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Camellia.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/DES.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/DES_EDE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/KASUMI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Khazad.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/MULTI2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Noekeon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/RC2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/RC5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/RC6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/SAFERP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/SAFER_K128.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/SAFER_K64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/SAFER_SK128.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/SAFER_SK64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/SEED.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Skipjack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Twofish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/XTEA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/CHAES.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/MD2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/MD4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/RIPEMD128.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/RIPEMD160.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/RIPEMD256.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/RIPEMD320.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/SHA1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/SHA224.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/SHA256.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/SHA384.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/SHA512.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/Tiger192.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/Whirlpool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/KeyDerivation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/F9.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/HMAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/OMAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/PMAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/Pelican.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/XCBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/CBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/CFB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/CTR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/ECB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/OFB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/DH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/DSA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/ECC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/RSA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/Fortuna.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/RC4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/Sober128.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/Yarrow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CryptX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CryptX/CryptX.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CryptX
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+%%SITE_ARCH%%/Crypt/AuthEnc.pm
+%%SITE_ARCH%%/Crypt/AuthEnc/CCM.pm
+%%SITE_ARCH%%/Crypt/AuthEnc/EAX.pm
+%%SITE_ARCH%%/Crypt/AuthEnc/GCM.pm
+%%SITE_ARCH%%/Crypt/AuthEnc/OCB.pm
+%%SITE_ARCH%%/Crypt/Cipher.pm
+%%SITE_ARCH%%/Crypt/Cipher/AES.pm
+%%SITE_ARCH%%/Crypt/Cipher/Anubis.pm
+%%SITE_ARCH%%/Crypt/Cipher/Blowfish.pm
+%%SITE_ARCH%%/Crypt/Cipher/CAST5.pm
+%%SITE_ARCH%%/Crypt/Cipher/Camellia.pm
+%%SITE_ARCH%%/Crypt/Cipher/DES.pm
+%%SITE_ARCH%%/Crypt/Cipher/DES_EDE.pm
+%%SITE_ARCH%%/Crypt/Cipher/KASUMI.pm
+%%SITE_ARCH%%/Crypt/Cipher/Khazad.pm
+%%SITE_ARCH%%/Crypt/Cipher/MULTI2.pm
+%%SITE_ARCH%%/Crypt/Cipher/Noekeon.pm
+%%SITE_ARCH%%/Crypt/Cipher/RC2.pm
+%%SITE_ARCH%%/Crypt/Cipher/RC5.pm
+%%SITE_ARCH%%/Crypt/Cipher/RC6.pm
+%%SITE_ARCH%%/Crypt/Cipher/SAFERP.pm
+%%SITE_ARCH%%/Crypt/Cipher/SAFER_K128.pm
+%%SITE_ARCH%%/Crypt/Cipher/SAFER_K64.pm
+%%SITE_ARCH%%/Crypt/Cipher/SAFER_SK128.pm
+%%SITE_ARCH%%/Crypt/Cipher/SAFER_SK64.pm
+%%SITE_ARCH%%/Crypt/Cipher/SEED.pm
+%%SITE_ARCH%%/Crypt/Cipher/Skipjack.pm
+%%SITE_ARCH%%/Crypt/Cipher/Twofish.pm
+%%SITE_ARCH%%/Crypt/Cipher/XTEA.pm
+%%SITE_ARCH%%/Crypt/Digest.pm
+%%SITE_ARCH%%/Crypt/Digest/CHAES.pm
+%%SITE_ARCH%%/Crypt/Digest/MD2.pm
+%%SITE_ARCH%%/Crypt/Digest/MD4.pm
+%%SITE_ARCH%%/Crypt/Digest/MD5.pm
+%%SITE_ARCH%%/Crypt/Digest/RIPEMD128.pm
+%%SITE_ARCH%%/Crypt/Digest/RIPEMD160.pm
+%%SITE_ARCH%%/Crypt/Digest/RIPEMD256.pm
+%%SITE_ARCH%%/Crypt/Digest/RIPEMD320.pm
+%%SITE_ARCH%%/Crypt/Digest/SHA1.pm
+%%SITE_ARCH%%/Crypt/Digest/SHA224.pm
+%%SITE_ARCH%%/Crypt/Digest/SHA256.pm
+%%SITE_ARCH%%/Crypt/Digest/SHA384.pm
+%%SITE_ARCH%%/Crypt/Digest/SHA512.pm
+%%SITE_ARCH%%/Crypt/Digest/Tiger192.pm
+%%SITE_ARCH%%/Crypt/Digest/Whirlpool.pm
+%%SITE_ARCH%%/Crypt/KeyDerivation.pm
+%%SITE_ARCH%%/Crypt/Mac.pm
+%%SITE_ARCH%%/Crypt/Mac/F9.pm
+%%SITE_ARCH%%/Crypt/Mac/HMAC.pm
+%%SITE_ARCH%%/Crypt/Mac/OMAC.pm
+%%SITE_ARCH%%/Crypt/Mac/PMAC.pm
+%%SITE_ARCH%%/Crypt/Mac/Pelican.pm
+%%SITE_ARCH%%/Crypt/Mac/XCBC.pm
+%%SITE_ARCH%%/Crypt/Mode.pm
+%%SITE_ARCH%%/Crypt/Mode/CBC.pm
+%%SITE_ARCH%%/Crypt/Mode/CFB.pm
+%%SITE_ARCH%%/Crypt/Mode/CTR.pm
+%%SITE_ARCH%%/Crypt/Mode/ECB.pm
+%%SITE_ARCH%%/Crypt/Mode/OFB.pm
+%%SITE_ARCH%%/Crypt/PK.pm
+%%SITE_ARCH%%/Crypt/PK/DH.pm
+%%SITE_ARCH%%/Crypt/PK/DSA.pm
+%%SITE_ARCH%%/Crypt/PK/ECC.pm
+%%SITE_ARCH%%/Crypt/PK/RSA.pm
+%%SITE_ARCH%%/Crypt/PRNG.pm
+%%SITE_ARCH%%/Crypt/PRNG/Fortuna.pm
+%%SITE_ARCH%%/Crypt/PRNG/RC4.pm
+%%SITE_ARCH%%/Crypt/PRNG/Sober128.pm
+%%SITE_ARCH%%/Crypt/PRNG/Yarrow.pm
+%%SITE_ARCH%%/CryptX.pm
+%%SITE_ARCH%%/auto/CryptX/CryptX.so
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
index 01c12b3a7161..0b7d8283c73f 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
+++ b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Auth-Extensible-Provider-Usergroup
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/pkg-plist b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/pkg-plist
index 81bbbc67f27a..b8a29876bdfe 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/pkg-plist
+++ b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Dancer::Plugin::Auth::Extensible::Provider::Usergroup.3.gz
 %%SITE_PERL%%/Dancer/Plugin/Auth/Extensible/Provider/Usergroup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Auth/Extensible/Provider/Usergroup/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Auth/Extensible/Provider/Usergroup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Auth/Extensible/Provider
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible/Makefile b/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
index dfbce3dadaeb..230416b4db8f 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
+++ b/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Auth-Extensible
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible/pkg-plist b/security/p5-Dancer-Plugin-Auth-Extensible/pkg-plist
index c4a0e3d5134c..4e2785f33110 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible/pkg-plist
+++ b/security/p5-Dancer-Plugin-Auth-Extensible/pkg-plist
@@ -10,13 +10,3 @@
 %%SITE_PERL%%/Dancer/Plugin/Auth/Extensible/Provider/Database.pm
 %%SITE_PERL%%/Dancer/Plugin/Auth/Extensible/Provider/Example.pm
 %%SITE_PERL%%/Dancer/Plugin/Auth/Extensible/Provider/Unix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Auth/Extensible/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Auth/Extensible
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Auth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin/Auth/Extensible/Provider
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin/Auth/Extensible
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin/Auth
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/Dancer
diff --git a/security/p5-Dancer-Plugin-Passphrase/Makefile b/security/p5-Dancer-Plugin-Passphrase/Makefile
index 42b4a23ef516..0d22e3195694 100644
--- a/security/p5-Dancer-Plugin-Passphrase/Makefile
+++ b/security/p5-Dancer-Plugin-Passphrase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Passphrase
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JAITKEN
diff --git a/security/p5-Dancer-Plugin-Passphrase/pkg-plist b/security/p5-Dancer-Plugin-Passphrase/pkg-plist
index 2588fab4b56c..59e6cb2e5a92 100644
--- a/security/p5-Dancer-Plugin-Passphrase/pkg-plist
+++ b/security/p5-Dancer-Plugin-Passphrase/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Dancer/Plugin/Passphrase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Passphrase/.packlist
 %%PERL5_MAN3%%/Dancer::Plugin::Passphrase.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Passphrase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/Dancer
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile
index 7d6e387ddb5d..646aae286a5b 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer2-Plugin-Auth-Extensible
 PORTVERSION=	0.303
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible/pkg-plist b/security/p5-Dancer2-Plugin-Auth-Extensible/pkg-plist
index 88844e783d81..ab61761f2566 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible/pkg-plist
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible/pkg-plist
@@ -10,4 +10,3 @@
 %%SITE_PERL%%/Dancer2/Plugin/Auth/Extensible/Provider/Database.pm
 %%SITE_PERL%%/Dancer2/Plugin/Auth/Extensible/Provider/Example.pm
 %%SITE_PERL%%/Dancer2/Plugin/Auth/Extensible/Provider/Unix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer2/Plugin/Auth/Extensible/.packlist
diff --git a/security/p5-Dancer2-Plugin-Passphrase/Makefile b/security/p5-Dancer2-Plugin-Passphrase/Makefile
index f96a48fcea73..035632ddeb3e 100644
--- a/security/p5-Dancer2-Plugin-Passphrase/Makefile
+++ b/security/p5-Dancer2-Plugin-Passphrase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer2-Plugin-Passphrase
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Dancer2-Plugin-Passphrase/pkg-plist b/security/p5-Dancer2-Plugin-Passphrase/pkg-plist
index 3a9c9b6baaa0..e648a468ec38 100644
--- a/security/p5-Dancer2-Plugin-Passphrase/pkg-plist
+++ b/security/p5-Dancer2-Plugin-Passphrase/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Dancer2/Plugin/Passphrase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer2/Plugin/Passphrase/.packlist
 %%PERL5_MAN3%%/Dancer2::Plugin::Passphrase.3.gz
diff --git a/security/p5-Data-Entropy/Makefile b/security/p5-Data-Entropy/Makefile
index 05ece90e8e1f..9e10a41035a7 100644
--- a/security/p5-Data-Entropy/Makefile
+++ b/security/p5-Data-Entropy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Entropy
 PORTVERSION=	0.007
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Data-Entropy/pkg-plist b/security/p5-Data-Entropy/pkg-plist
index a08dfecb4850..8145073fe65d 100644
--- a/security/p5-Data-Entropy/pkg-plist
+++ b/security/p5-Data-Entropy/pkg-plist
@@ -12,6 +12,3 @@
 %%SITE_PERL%%/Data/Entropy/RawSource/RandomOrg.pm
 %%SITE_PERL%%/Data/Entropy/RawSource/RandomnumbersInfo.pm
 %%SITE_PERL%%/Data/Entropy/Source.pm
-@dirrmtry %%SITE_PERL%%/Data/Entropy/RawSource
-@dirrmtry %%SITE_PERL%%/Data/Entropy
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/security/p5-Data-Password/Makefile b/security/p5-Data-Password/Makefile
index 2c6165c058e5..fc2b6aabec21 100644
--- a/security/p5-Data-Password/Makefile
+++ b/security/p5-Data-Password/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Password
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Data-Password/pkg-plist b/security/p5-Data-Password/pkg-plist
index 49d5e302b771..1cc259faa77b 100644
--- a/security/p5-Data-Password/pkg-plist
+++ b/security/p5-Data-Password/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Data/Password.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Password/.packlist
 %%PERL5_MAN3%%/Data::Password.3.gz
-@dirrmtry %%SITE_PERL%%/Data
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Password
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/security/p5-Digest-Adler32/Makefile b/security/p5-Digest-Adler32/Makefile
index 05f2ee7c5346..e1acec4c5574 100644
--- a/security/p5-Digest-Adler32/Makefile
+++ b/security/p5-Digest-Adler32/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Digest-Adler32
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Adler32/pkg-plist b/security/p5-Digest-Adler32/pkg-plist
index dbd750dbf3fb..ae367571d03c 100644
--- a/security/p5-Digest-Adler32/pkg-plist
+++ b/security/p5-Digest-Adler32/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Digest/Adler32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Adler32/.packlist
 %%PERL5_MAN3%%/Digest::Adler32.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Adler32
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Bcrypt/Makefile b/security/p5-Digest-Bcrypt/Makefile
index e145d0cb32da..808b9e69ceb4 100644
--- a/security/p5-Digest-Bcrypt/Makefile
+++ b/security/p5-Digest-Bcrypt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Bcrypt
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Bcrypt/pkg-plist b/security/p5-Digest-Bcrypt/pkg-plist
index 28452cd10075..22ad25f713fa 100644
--- a/security/p5-Digest-Bcrypt/pkg-plist
+++ b/security/p5-Digest-Bcrypt/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Digest::Bcrypt.3.gz
 %%SITE_PERL%%/Digest/Bcrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Bcrypt/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Bcrypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/Digest
diff --git a/security/p5-Digest-BubbleBabble/Makefile b/security/p5-Digest-BubbleBabble/Makefile
index aed3e34d7263..475001cbafd0 100644
--- a/security/p5-Digest-BubbleBabble/Makefile
+++ b/security/p5-Digest-BubbleBabble/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-BubbleBabble
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-BubbleBabble/pkg-plist b/security/p5-Digest-BubbleBabble/pkg-plist
index cef15b96cc53..226f535f7afe 100644
--- a/security/p5-Digest-BubbleBabble/pkg-plist
+++ b/security/p5-Digest-BubbleBabble/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Digest::BubbleBabble.3.gz
 %%SITE_PERL%%/Digest/BubbleBabble.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/BubbleBabble/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/BubbleBabble
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/Digest
diff --git a/security/p5-Digest-CRC/Makefile b/security/p5-Digest-CRC/Makefile
index cca025fc218a..3384ba46b00a 100644
--- a/security/p5-Digest-CRC/Makefile
+++ b/security/p5-Digest-CRC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-CRC
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-CRC/pkg-plist b/security/p5-Digest-CRC/pkg-plist
index 54be25bbfc48..1e2ce0d11b25 100644
--- a/security/p5-Digest-CRC/pkg-plist
+++ b/security/p5-Digest-CRC/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/CRC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC/CRC.so
+%%SITE_ARCH%%/Digest/CRC.pm
+%%SITE_ARCH%%/auto/Digest/CRC/CRC.so
 %%PERL5_MAN3%%/Digest::CRC.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
diff --git a/security/p5-Digest-Crc32/Makefile b/security/p5-Digest-Crc32/Makefile
index 99da0ef92e00..a66dcd40c6ce 100644
--- a/security/p5-Digest-Crc32/Makefile
+++ b/security/p5-Digest-Crc32/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Crc32
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Crc32/pkg-plist b/security/p5-Digest-Crc32/pkg-plist
index 64a859cfcd9a..08d1cb566d93 100644
--- a/security/p5-Digest-Crc32/pkg-plist
+++ b/security/p5-Digest-Crc32/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Digest/Crc32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Crc32/.packlist
 %%PERL5_MAN3%%/Digest::Crc32.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Crc32/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-DJB/Makefile b/security/p5-Digest-DJB/Makefile
index c64e1a7b208b..178e545f58bc 100644
--- a/security/p5-Digest-DJB/Makefile
+++ b/security/p5-Digest-DJB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-DJB
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-DJB/pkg-plist b/security/p5-Digest-DJB/pkg-plist
index 638fece91ac1..c1d44dc39de7 100644
--- a/security/p5-Digest-DJB/pkg-plist
+++ b/security/p5-Digest-DJB/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/DJB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/DJB.so
+%%SITE_ARCH%%/Digest/DJB.pm
+%%SITE_ARCH%%/auto/Digest/DJB/DJB.so
 %%PERL5_MAN3%%/Digest::DJB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-DMAC/Makefile b/security/p5-Digest-DMAC/Makefile
index 1b395d8c2aa2..fabc830dce5b 100644
--- a/security/p5-Digest-DMAC/Makefile
+++ b/security/p5-Digest-DMAC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-DMAC
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-DMAC/pkg-plist b/security/p5-Digest-DMAC/pkg-plist
index 8915c1b995a4..6f367cef1654 100644
--- a/security/p5-Digest-DMAC/pkg-plist
+++ b/security/p5-Digest-DMAC/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Digest/DMAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DMAC/.packlist
 %%PERL5_MAN3%%/Digest::DMAC.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DMAC/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-EMAC/Makefile b/security/p5-Digest-EMAC/Makefile
index ceabfb3f438d..a78ea930c031 100644
--- a/security/p5-Digest-EMAC/Makefile
+++ b/security/p5-Digest-EMAC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-EMAC
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-EMAC/pkg-plist b/security/p5-Digest-EMAC/pkg-plist
index eb26f7eb8f87..628f676b8517 100644
--- a/security/p5-Digest-EMAC/pkg-plist
+++ b/security/p5-Digest-EMAC/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Digest/EMAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/EMAC/.packlist
 %%PERL5_MAN3%%/Digest::EMAC.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/EMAC/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Elf/Makefile b/security/p5-Digest-Elf/Makefile
index aa749ea0fb8c..ed05e913b418 100644
--- a/security/p5-Digest-Elf/Makefile
+++ b/security/p5-Digest-Elf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Elf
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Elf/pkg-plist b/security/p5-Digest-Elf/pkg-plist
index 2739d1ef0f58..49f78dad477a 100644
--- a/security/p5-Digest-Elf/pkg-plist
+++ b/security/p5-Digest-Elf/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/Elf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/Elf.so
+%%SITE_ARCH%%/Digest/Elf.pm
+%%SITE_ARCH%%/auto/Digest/Elf/Elf.so
 %%PERL5_MAN3%%/Digest::Elf.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-FNV/Makefile b/security/p5-Digest-FNV/Makefile
index be9a3ecb988e..4d51dca79e0c 100644
--- a/security/p5-Digest-FNV/Makefile
+++ b/security/p5-Digest-FNV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-FNV
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-FNV/pkg-plist b/security/p5-Digest-FNV/pkg-plist
index 045c0094f6cf..9ff06dbe10ef 100644
--- a/security/p5-Digest-FNV/pkg-plist
+++ b/security/p5-Digest-FNV/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/FNV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/FNV.so
+%%SITE_ARCH%%/Digest/FNV.pm
+%%SITE_ARCH%%/auto/Digest/FNV/autosplit.ix
+%%SITE_ARCH%%/auto/Digest/FNV/FNV.so
 %%PERL5_MAN3%%/Digest::FNV.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index c3632c718e20..071e2ae3fa97 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-HMAC
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-HMAC/pkg-plist b/security/p5-Digest-HMAC/pkg-plist
index bd6c5c6f8dda..bf5b8e358ae9 100644
--- a/security/p5-Digest-HMAC/pkg-plist
+++ b/security/p5-Digest-HMAC/pkg-plist
@@ -4,7 +4,3 @@
 %%SITE_PERL%%/Digest/HMAC.pm
 %%SITE_PERL%%/Digest/HMAC_MD5.pm
 %%SITE_PERL%%/Digest/HMAC_SHA1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/Digest
diff --git a/security/p5-Digest-Hashcash/Makefile b/security/p5-Digest-Hashcash/Makefile
index a380a88d786d..868db8010173 100644
--- a/security/p5-Digest-Hashcash/Makefile
+++ b/security/p5-Digest-Hashcash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Hashcash
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMBACK
diff --git a/security/p5-Digest-Hashcash/pkg-plist b/security/p5-Digest-Hashcash/pkg-plist
index eedf3763bf7f..1bf8f9829e5f 100644
--- a/security/p5-Digest-Hashcash/pkg-plist
+++ b/security/p5-Digest-Hashcash/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/Hashcash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/Hashcash.so
+%%SITE_ARCH%%/Digest/Hashcash.pm
+%%SITE_ARCH%%/auto/Digest/Hashcash/Hashcash.so
 %%PERL5_MAN3%%/Digest::Hashcash.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
diff --git a/security/p5-Digest-Haval256/Makefile b/security/p5-Digest-Haval256/Makefile
index a8d8d8d8fdeb..01c1ed3ca576 100644
--- a/security/p5-Digest-Haval256/Makefile
+++ b/security/p5-Digest-Haval256/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Haval256
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Haval256/pkg-plist b/security/p5-Digest-Haval256/pkg-plist
index 961b109bacfe..9d7df33cfab4 100644
--- a/security/p5-Digest-Haval256/pkg-plist
+++ b/security/p5-Digest-Haval256/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/Haval256.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256/Haval256.so
+%%SITE_ARCH%%/Digest/Haval256.pm
+%%SITE_ARCH%%/auto/Digest/Haval256/Haval256.so
 %%PERL5_MAN3%%/Digest::Haval256.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-JHash/Makefile b/security/p5-Digest-JHash/Makefile
index 738e5901b0d6..093f699cdf83 100644
--- a/security/p5-Digest-JHash/Makefile
+++ b/security/p5-Digest-JHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-JHash
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-JHash/pkg-plist b/security/p5-Digest-JHash/pkg-plist
index c35b4d817ee2..eef501f19190 100644
--- a/security/p5-Digest-JHash/pkg-plist
+++ b/security/p5-Digest-JHash/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/JHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/JHash.so
+%%SITE_ARCH%%/Digest/JHash.pm
+%%SITE_ARCH%%/auto/Digest/JHash/JHash.so
 %%PERL5_MAN3%%/Digest::JHash.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-MD2/Makefile b/security/p5-Digest-MD2/Makefile
index 062d92b0bb92..2f4acef46384 100644
--- a/security/p5-Digest-MD2/Makefile
+++ b/security/p5-Digest-MD2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-MD2
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-MD2/pkg-plist b/security/p5-Digest-MD2/pkg-plist
index 825b77e18694..28dd72c0a90d 100644
--- a/security/p5-Digest-MD2/pkg-plist
+++ b/security/p5-Digest-MD2/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Digest::MD2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
+%%SITE_ARCH%%/Digest/MD2.pm
+%%SITE_ARCH%%/auto/Digest/MD2/MD2.so
diff --git a/security/p5-Digest-MD4/Makefile b/security/p5-Digest-MD4/Makefile
index 7791e0d44deb..019e04e78e4e 100644
--- a/security/p5-Digest-MD4/Makefile
+++ b/security/p5-Digest-MD4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-MD4
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-MD4/pkg-plist b/security/p5-Digest-MD4/pkg-plist
index 996d097406ad..5c2847d03c61 100644
--- a/security/p5-Digest-MD4/pkg-plist
+++ b/security/p5-Digest-MD4/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Digest::MD4.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4/MD4.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
+%%SITE_ARCH%%/Digest/MD4.pm
+%%SITE_ARCH%%/auto/Digest/MD4/MD4.so
diff --git a/security/p5-Digest-MD5-File/Makefile b/security/p5-Digest-MD5-File/Makefile
index ffe47a063d8d..8370a0e7097f 100644
--- a/security/p5-Digest-MD5-File/Makefile
+++ b/security/p5-Digest-MD5-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-MD5-File
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-MD5-File/pkg-plist b/security/p5-Digest-MD5-File/pkg-plist
index 077fb3c64e8d..a51d59fa326b 100644
--- a/security/p5-Digest-MD5-File/pkg-plist
+++ b/security/p5-Digest-MD5-File/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Digest/MD5/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/File/.packlist
 %%PERL5_MAN3%%/Digest::MD5::File.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/File/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/Digest/MD5
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-MD5-M4p/Makefile b/security/p5-Digest-MD5-M4p/Makefile
index e43c486c1ced..18d1eb8da288 100644
--- a/security/p5-Digest-MD5-M4p/Makefile
+++ b/security/p5-Digest-MD5-M4p/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Digest-MD5-M4p
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-MD5-M4p/pkg-plist b/security/p5-Digest-MD5-M4p/pkg-plist
index adb351df2a32..9089adc65166 100644
--- a/security/p5-Digest-MD5-M4p/pkg-plist
+++ b/security/p5-Digest-MD5-M4p/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD5/M4p.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p/M4p.so
+%%SITE_ARCH%%/Digest/MD5/M4p.pm
+%%SITE_ARCH%%/auto/Digest/MD5/M4p/M4p.so
 %%PERL5_MAN3%%/Digest::MD5::M4p.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-MD5-Reverse/Makefile b/security/p5-Digest-MD5-Reverse/Makefile
index e16b47d20f56..4f2e1bd65695 100644
--- a/security/p5-Digest-MD5-Reverse/Makefile
+++ b/security/p5-Digest-MD5-Reverse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-MD5-Reverse
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-MD5-Reverse/pkg-plist b/security/p5-Digest-MD5-Reverse/pkg-plist
index dc35ebc2b0c3..5eb7192a4749 100644
--- a/security/p5-Digest-MD5-Reverse/pkg-plist
+++ b/security/p5-Digest-MD5-Reverse/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Digest/MD5/Reverse.pm
 %%PERL5_MAN3%%/Digest::MD5::Reverse.3.gz
-@dirrmtry %%SITE_PERL%%/Digest/MD5
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index eb5a14ac3dd5..ce9500d2a437 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-MD5
 PORTVERSION=	2.53
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-MD5/pkg-plist b/security/p5-Digest-MD5/pkg-plist
index ffec7082d2ea..1e4a027d45bb 100644
--- a/security/p5-Digest-MD5/pkg-plist
+++ b/security/p5-Digest-MD5/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Digest::MD5.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/MD5.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
+%%SITE_ARCH%%/Digest/MD5.pm
+%%SITE_ARCH%%/auto/Digest/MD5/MD5.so
diff --git a/security/p5-Digest-ManberHash/Makefile b/security/p5-Digest-ManberHash/Makefile
index 40fd8a705d5b..44dc216a1c8e 100644
--- a/security/p5-Digest-ManberHash/Makefile
+++ b/security/p5-Digest-ManberHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-ManberHash
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-ManberHash/pkg-plist b/security/p5-Digest-ManberHash/pkg-plist
index 2337790391f1..5703f3e38408 100644
--- a/security/p5-Digest-ManberHash/pkg-plist
+++ b/security/p5-Digest-ManberHash/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ManberHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash/ManberHash.so
+%%SITE_ARCH%%/Digest/ManberHash.pm
+%%SITE_ARCH%%/auto/Digest/ManberHash/ManberHash.so
 %%PERL5_MAN3%%/Digest::ManberHash.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-MurmurHash/Makefile b/security/p5-Digest-MurmurHash/Makefile
index 5e8ed085a023..0dbb97dbf302 100644
--- a/security/p5-Digest-MurmurHash/Makefile
+++ b/security/p5-Digest-MurmurHash/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Digest-MurmurHash
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-MurmurHash/pkg-plist b/security/p5-Digest-MurmurHash/pkg-plist
index 2fb6850d79dc..15dc5905a1cd 100644
--- a/security/p5-Digest-MurmurHash/pkg-plist
+++ b/security/p5-Digest-MurmurHash/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MurmurHash/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MurmurHash/MurmurHash.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MurmurHash.pm
+%%SITE_ARCH%%/auto/Digest/MurmurHash/MurmurHash.so
+%%SITE_ARCH%%/Digest/MurmurHash.pm
 %%PERL5_MAN3%%/Digest::MurmurHash.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MurmurHash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index 57853afaee98..48f35f8b0e47 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Nilsimsa
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Nilsimsa/pkg-plist b/security/p5-Digest-Nilsimsa/pkg-plist
index 9f96d43222cc..15fb23decf8c 100644
--- a/security/p5-Digest-Nilsimsa/pkg-plist
+++ b/security/p5-Digest-Nilsimsa/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/Nilsimsa.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa/Nilsimsa.so
+%%SITE_ARCH%%/Digest/Nilsimsa.pm
+%%SITE_ARCH%%/auto/Digest/Nilsimsa/Nilsimsa.so
 %%PERL5_MAN3%%/Digest::Nilsimsa.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-Pearson-PurePerl/Makefile b/security/p5-Digest-Pearson-PurePerl/Makefile
index c0147aa45af4..657a67780ffe 100644
--- a/security/p5-Digest-Pearson-PurePerl/Makefile
+++ b/security/p5-Digest-Pearson-PurePerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Pearson-PurePerl
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Pearson-PurePerl/pkg-plist b/security/p5-Digest-Pearson-PurePerl/pkg-plist
index ec37479cdb55..fd193203f06e 100644
--- a/security/p5-Digest-Pearson-PurePerl/pkg-plist
+++ b/security/p5-Digest-Pearson-PurePerl/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Digest/Pearson/PurePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/PurePerl/.packlist
 %%PERL5_MAN3%%/Digest::Pearson::PurePerl.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/PurePerl/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrm %%SITE_PERL%%/Digest/Pearson/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Pearson/Makefile b/security/p5-Digest-Pearson/Makefile
index 167e619c4c55..31104d76e4c7 100644
--- a/security/p5-Digest-Pearson/Makefile
+++ b/security/p5-Digest-Pearson/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Pearson
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Pearson/pkg-plist b/security/p5-Digest-Pearson/pkg-plist
index 8b749a034001..f71dac704eab 100644
--- a/security/p5-Digest-Pearson/pkg-plist
+++ b/security/p5-Digest-Pearson/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/Pearson.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/Pearson.so
+%%SITE_ARCH%%/Digest/Pearson.pm
+%%SITE_ARCH%%/auto/Digest/Pearson/Pearson.so
 %%PERL5_MAN3%%/Digest::Pearson.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-Perl-MD4/Makefile b/security/p5-Digest-Perl-MD4/Makefile
index 1c7f27480cce..bc99aec5f246 100644
--- a/security/p5-Digest-Perl-MD4/Makefile
+++ b/security/p5-Digest-Perl-MD4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Perl-MD4
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Perl-MD4/pkg-plist b/security/p5-Digest-Perl-MD4/pkg-plist
index 985cc8248d34..7f947a32acb7 100644
--- a/security/p5-Digest-Perl-MD4/pkg-plist
+++ b/security/p5-Digest-Perl-MD4/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Digest/Perl/MD4.pm
 %%SITE_PERL%%/Digest/Perl/Digest-MD4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD4/.packlist
 %%PERL5_MAN3%%/Digest::Perl::Digest-MD4.3.gz
 %%PERL5_MAN3%%/Digest::Perl::MD4.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD4/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrm %%SITE_PERL%%/Digest/Perl/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Perl-MD5/Makefile b/security/p5-Digest-Perl-MD5/Makefile
index 76dfcc029664..0dfebe485af0 100644
--- a/security/p5-Digest-Perl-MD5/Makefile
+++ b/security/p5-Digest-Perl-MD5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Perl-MD5
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Perl-MD5/pkg-plist b/security/p5-Digest-Perl-MD5/pkg-plist
index d3b473f4a2e4..5bc265ff2a49 100644
--- a/security/p5-Digest-Perl-MD5/pkg-plist
+++ b/security/p5-Digest-Perl-MD5/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Digest/Perl/MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD5/.packlist
 %%PERL5_MAN3%%/Digest::Perl::MD5.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD5/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrm %%SITE_PERL%%/Digest/Perl/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-SHA-PurePerl/Makefile b/security/p5-Digest-SHA-PurePerl/Makefile
index ca27d1d71f49..56afb9d1b5b5 100644
--- a/security/p5-Digest-SHA-PurePerl/Makefile
+++ b/security/p5-Digest-SHA-PurePerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-SHA-PurePerl
 PORTVERSION=	5.89
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-SHA-PurePerl/pkg-plist b/security/p5-Digest-SHA-PurePerl/pkg-plist
index 956dbb5eec0c..c4e6195e60a9 100644
--- a/security/p5-Digest-SHA-PurePerl/pkg-plist
+++ b/security/p5-Digest-SHA-PurePerl/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Digest/SHA/PurePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/PurePerl/.packlist
 %%PERL5_MAN3%%/Digest::SHA::PurePerl.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/PurePerl/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
-@dirrmtry %%SITE_PERL%%/Digest/SHA/
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-SHA/Makefile b/security/p5-Digest-SHA/Makefile
index 7bec5c23ff18..2e94b1775fa0 100644
--- a/security/p5-Digest-SHA/Makefile
+++ b/security/p5-Digest-SHA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-SHA
 PORTVERSION=	5.93
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -23,6 +24,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Digest/SHA/SHA.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Digest/SHA/SHA.so
 
 .include <bsd.port.mk>
diff --git a/security/p5-Digest-SHA/pkg-plist b/security/p5-Digest-SHA/pkg-plist
index cf70ba7a0bfb..98076d8e23bf 100644
--- a/security/p5-Digest-SHA/pkg-plist
+++ b/security/p5-Digest-SHA/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Digest::SHA.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/SHA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/SHA.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
+%%SITE_ARCH%%/Digest/SHA.pm
+%%SITE_ARCH%%/auto/Digest/SHA/SHA.so
diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index 4f1b1e60037a..0521cb4ae71b 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-SHA1
 PORTVERSION=	2.13
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-SHA1/pkg-plist b/security/p5-Digest-SHA1/pkg-plist
index 79a0d5903573..e5a95fee83f3 100644
--- a/security/p5-Digest-SHA1/pkg-plist
+++ b/security/p5-Digest-SHA1/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Digest::SHA1.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/SHA1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1/SHA1.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
+%%SITE_ARCH%%/Digest/SHA1.pm
+%%SITE_ARCH%%/auto/Digest/SHA1/SHA1.so
diff --git a/security/p5-Digest-SV1/Makefile b/security/p5-Digest-SV1/Makefile
index 7f219a31d1c4..615d1154781f 100644
--- a/security/p5-Digest-SV1/Makefile
+++ b/security/p5-Digest-SV1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-SV1
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-SV1/pkg-plist b/security/p5-Digest-SV1/pkg-plist
index 8da0d33e9cdd..787ecef4b8dd 100644
--- a/security/p5-Digest-SV1/pkg-plist
+++ b/security/p5-Digest-SV1/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Digest/SV1.pm
 %%PERL5_MAN3%%/Digest::SV1.3.gz
-@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Tiger/Makefile b/security/p5-Digest-Tiger/Makefile
index 95d8e84bca7b..0724cd25b346 100644
--- a/security/p5-Digest-Tiger/Makefile
+++ b/security/p5-Digest-Tiger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Tiger
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Tiger/pkg-plist b/security/p5-Digest-Tiger/pkg-plist
index f23d229cdc2c..7467d1eacda3 100644
--- a/security/p5-Digest-Tiger/pkg-plist
+++ b/security/p5-Digest-Tiger/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/Tiger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger/Tiger.so
+%%SITE_ARCH%%/Digest/Tiger.pm
+%%SITE_ARCH%%/auto/Digest/Tiger/autosplit.ix
+%%SITE_ARCH%%/auto/Digest/Tiger/Tiger.so
 %%PERL5_MAN3%%/Digest::Tiger.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-Whirlpool/Makefile b/security/p5-Digest-Whirlpool/Makefile
index f05b0d964588..025646f4efba 100644
--- a/security/p5-Digest-Whirlpool/Makefile
+++ b/security/p5-Digest-Whirlpool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest-Whirlpool
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-Whirlpool/pkg-plist b/security/p5-Digest-Whirlpool/pkg-plist
index 52866896503c..d1774b220512 100644
--- a/security/p5-Digest-Whirlpool/pkg-plist
+++ b/security/p5-Digest-Whirlpool/pkg-plist
@@ -1,9 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Digest/Whirlpool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool/Whirlpool.so
+%%SITE_ARCH%%/Digest/Whirlpool.pm
+%%SITE_ARCH%%/auto/Digest/Whirlpool/Whirlpool.so
 bin/whirlpoolsum
 %%PERL5_MAN3%%/Digest::Whirlpool.3.gz
 man/man1/whirlpoolsum.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index 58f79772e4a4..06068db6d632 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Digest
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest/pkg-plist b/security/p5-Digest/pkg-plist
index 1c9e955ac031..379ec63990f8 100644
--- a/security/p5-Digest/pkg-plist
+++ b/security/p5-Digest/pkg-plist
@@ -4,6 +4,3 @@
 %%SITE_PERL%%/Digest.pm
 %%SITE_PERL%%/Digest/base.pm
 %%SITE_PERL%%/Digest/file.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
-@dirrmtry %%SITE_PERL%%/Digest
diff --git a/security/p5-File-KeePass-Agent/Makefile b/security/p5-File-KeePass-Agent/Makefile
index 6f355017fa0e..34f577d0a997 100644
--- a/security/p5-File-KeePass-Agent/Makefile
+++ b/security/p5-File-KeePass-Agent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-KeePass-Agent
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-File-KeePass-Agent/pkg-plist b/security/p5-File-KeePass-Agent/pkg-plist
index d218c7a26b87..a6a5ca84a5e8 100644
--- a/security/p5-File-KeePass-Agent/pkg-plist
+++ b/security/p5-File-KeePass-Agent/pkg-plist
@@ -2,13 +2,7 @@ bin/fkp-agent
 %%SITE_PERL%%/File/KeePass/Agent.pm
 %%SITE_PERL%%/File/KeePass/Agent/linux.pm
 %%SITE_PERL%%/File/KeePass/Agent/unix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/KeePass/Agent/.packlist
 %%PERL5_MAN3%%/File::KeePass::Agent.3.gz
 %%PERL5_MAN3%%/File::KeePass::Agent::linux.3.gz
 %%PERL5_MAN3%%/File::KeePass::Agent::unix.3.gz
 man/man1/fkp-agent.1.gz
-@dirrm %%SITE_PERL%%/File/KeePass/Agent
-@dirrm %%SITE_PERL%%/File/KeePass
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/KeePass/Agent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/security/p5-File-KeePass/Makefile b/security/p5-File-KeePass/Makefile
index 3a489d9f5787..d147a85369d4 100644
--- a/security/p5-File-KeePass/Makefile
+++ b/security/p5-File-KeePass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-KeePass
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-File-KeePass/pkg-plist b/security/p5-File-KeePass/pkg-plist
index 8889793d0725..1b5e29c6c5a5 100644
--- a/security/p5-File-KeePass/pkg-plist
+++ b/security/p5-File-KeePass/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/File/KeePass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/KeePass/.packlist
 %%PERL5_MAN3%%/File::KeePass.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/KeePass
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 2abaeef675a3..a695ab64ef70 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	File-Scan-ClamAV
 PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-File-Scan-ClamAV/pkg-plist b/security/p5-File-Scan-ClamAV/pkg-plist
index 5827df4756cd..d58404e47205 100644
--- a/security/p5-File-Scan-ClamAV/pkg-plist
+++ b/security/p5-File-Scan-ClamAV/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/File::Scan::ClamAV.3.gz
 %%SITE_PERL%%/File/Scan/ClamAV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan/ClamAV/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan/ClamAV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File/Scan
-@dirrmtry %%SITE_PERL%%/File
diff --git a/security/p5-File-Scan/Makefile b/security/p5-File-Scan/Makefile
index 957fe9e1e2cf..f6405c7b383f 100644
--- a/security/p5-File-Scan/Makefile
+++ b/security/p5-File-Scan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Scan
 PORTVERSION=	1.43
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-File-Scan/pkg-plist b/security/p5-File-Scan/pkg-plist
index 7d66a5e0ab3f..3646cc303207 100644
--- a/security/p5-File-Scan/pkg-plist
+++ b/security/p5-File-Scan/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/File/Scan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan/.packlist
 %%PERL5_MAN3%%/File::Scan.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index 2aa16ad444c2..e64ebe57e248 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/p5-Filter-CBC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filter-CBC
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Filter-CBC/pkg-plist b/security/p5-Filter-CBC/pkg-plist
index b5bb42f895f2..fb1334092201 100644
--- a/security/p5-Filter-CBC/pkg-plist
+++ b/security/p5-Filter-CBC/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Filter::CBC.3.gz
 %%SITE_PERL%%/Filter/CBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/autofilter.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blowfish.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cbc2code.pl
@@ -15,6 +14,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tea.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twofish.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter
-@dirrmtry %%SITE_PERL%%/Filter
diff --git a/security/p5-Filter-Crypto/Makefile b/security/p5-Filter-Crypto/Makefile
index 97f14fcf8c4d..e91e521a3613 100644
--- a/security/p5-Filter-Crypto/Makefile
+++ b/security/p5-Filter-Crypto/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filter-Crypto
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Filter-Crypto/pkg-plist b/security/p5-Filter-Crypto/pkg-plist
index 37c7de6d59ec..9e71c2f86950 100644
--- a/security/p5-Filter-Crypto/pkg-plist
+++ b/security/p5-Filter-Crypto/pkg-plist
@@ -3,19 +3,10 @@ bin/crypt_file
 %%PERL5_MAN3%%/Filter::Crypto::CryptFile.3.gz
 %%PERL5_MAN3%%/Filter::Crypto::Decrypt.3.gz
 %%PERL5_MAN3%%/PAR::Filter::Crypto.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/Crypto.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/Crypto/CryptFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Filter/Crypto/Decrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/PAR/Filter/Crypto.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/CryptFile/CryptFile.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt/Decrypt.so
+%%SITE_ARCH%%/Filter/Crypto.pm
+%%SITE_ARCH%%/Filter/Crypto/CryptFile.pm
+%%SITE_ARCH%%/Filter/Crypto/Decrypt.pm
+%%SITE_ARCH%%/PAR/Filter/Crypto.pm
+%%SITE_ARCH%%/auto/Filter/Crypto/CryptFile/CryptFile.so
+%%SITE_ARCH%%/auto/Filter/Crypto/Decrypt/Decrypt.so
 man/man1/crypt_file.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/CryptFile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PAR/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PAR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filter/Crypto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filter
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index df18308c1b71..70dc40e3f19f 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GD-SecurityImage
 PORTVERSION=	1.72
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
diff --git a/security/p5-GD-SecurityImage/pkg-plist b/security/p5-GD-SecurityImage/pkg-plist
index 380739e9c445..f783121f8e46 100644
--- a/security/p5-GD-SecurityImage/pkg-plist
+++ b/security/p5-GD-SecurityImage/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/GD/SecurityImage/GD.pm
 %%SITE_PERL%%/GD/SecurityImage/Magick.pm
 %%SITE_PERL%%/GD/SecurityImage/Styles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/SecurityImage/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/SecurityImage
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
-@dirrmtry %%SITE_PERL%%/GD/SecurityImage
-@dirrmtry %%SITE_PERL%%/GD
diff --git a/security/p5-GSSAPI/Makefile b/security/p5-GSSAPI/Makefile
index 5f71210ac771..3f8baee30554 100644
--- a/security/p5-GSSAPI/Makefile
+++ b/security/p5-GSSAPI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GSSAPI
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	LWP/AGROLMS
diff --git a/security/p5-GSSAPI/pkg-plist b/security/p5-GSSAPI/pkg-plist
index 356d4f42f6dd..135fa0bd64ce 100644
--- a/security/p5-GSSAPI/pkg-plist
+++ b/security/p5-GSSAPI/pkg-plist
@@ -2,12 +2,8 @@
 %%PERL5_MAN3%%/GSSAPI::OID.3.gz
 %%PERL5_MAN3%%/GSSAPI::OID::Set.3.gz
 %%PERL5_MAN3%%/GSSAPI::Status.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/GSSAPI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GSSAPI/OID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GSSAPI/OID/Set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GSSAPI/Status.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GSSAPI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GSSAPI/GSSAPI.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GSSAPI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GSSAPI/OID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GSSAPI
+%%SITE_ARCH%%/GSSAPI.pm
+%%SITE_ARCH%%/GSSAPI/OID.pm
+%%SITE_ARCH%%/GSSAPI/OID/Set.pm
+%%SITE_ARCH%%/GSSAPI/Status.pm
+%%SITE_ARCH%%/auto/GSSAPI/GSSAPI.so
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index e6a9907689b4..3fcfc8814347 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GnuPG-Interface
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-GnuPG-Interface/pkg-plist b/security/p5-GnuPG-Interface/pkg-plist
index 54371c12e8ea..fcb01bac6c7e 100644
--- a/security/p5-GnuPG-Interface/pkg-plist
+++ b/security/p5-GnuPG-Interface/pkg-plist
@@ -25,7 +25,3 @@
 %%SITE_PERL%%/GnuPG/SubKey.pm
 %%SITE_PERL%%/GnuPG/UserAttribute.pm
 %%SITE_PERL%%/GnuPG/UserId.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GnuPG/Interface/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GnuPG/Interface
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GnuPG
-@dirrmtry %%SITE_PERL%%/GnuPG
diff --git a/security/p5-GnuPG/Makefile b/security/p5-GnuPG/Makefile
index 7ece35864764..bf806e20975e 100644
--- a/security/p5-GnuPG/Makefile
+++ b/security/p5-GnuPG/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GnuPG
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-GnuPG/pkg-plist b/security/p5-GnuPG/pkg-plist
index 97e8afbd5ddd..6e1a8c42929e 100644
--- a/security/p5-GnuPG/pkg-plist
+++ b/security/p5-GnuPG/pkg-plist
@@ -5,10 +5,6 @@ bin/gpgmailtunl
 %%SITE_PERL%%/GnuPG/Tie/Decrypt.pm
 %%SITE_PERL%%/GnuPG/Tie/Encrypt.pm
 %%SITE_PERL%%/GnuPG/Tie/Sign.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GnuPG/.packlist
 %%PERL5_MAN3%%/GnuPG.3.gz
 %%PERL5_MAN3%%/GnuPG::Tie.3.gz
 man/man1/gpgmailtunl.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GnuPG
-@dirrm %%SITE_PERL%%/GnuPG/Tie
-@dirrm %%SITE_PERL%%/GnuPG
diff --git a/security/p5-HTML-Email-Obfuscate/Makefile b/security/p5-HTML-Email-Obfuscate/Makefile
index f89fc57e85f8..7f64de5232f9 100644
--- a/security/p5-HTML-Email-Obfuscate/Makefile
+++ b/security/p5-HTML-Email-Obfuscate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Email-Obfuscate
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-HTML-Email-Obfuscate/pkg-plist b/security/p5-HTML-Email-Obfuscate/pkg-plist
index 9e2952117f27..31b2b121b4f2 100644
--- a/security/p5-HTML-Email-Obfuscate/pkg-plist
+++ b/security/p5-HTML-Email-Obfuscate/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::Email::Obfuscate.3.gz
 %%SITE_PERL%%/HTML/Email/Obfuscate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Email/Obfuscate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Email/Obfuscate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Email
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/security/p5-IO-Async-SSL/Makefile b/security/p5-IO-Async-SSL/Makefile
index e7e5a3690be5..98b7ce0decf3 100644
--- a/security/p5-IO-Async-SSL/Makefile
+++ b/security/p5-IO-Async-SSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Async-SSL
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
diff --git a/security/p5-IO-Async-SSL/pkg-plist b/security/p5-IO-Async-SSL/pkg-plist
index a860222c56a6..e963b406dae2 100644
--- a/security/p5-IO-Async-SSL/pkg-plist
+++ b/security/p5-IO-Async-SSL/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/IO/Async/SSL.pm
 %%SITE_PERL%%/IO/Async/SSLStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Async/SSL/.packlist
 %%PERL5_MAN3%%/IO::Async::SSL.3.gz
 %%PERL5_MAN3%%/IO::Async::SSLStream.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Async/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Async
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
-@dirrmtry %%SITE_PERL%%/IO/Async
-@dirrmtry %%SITE_PERL%%/IO
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index 4ef1b98edf37..c884fc3d4bfe 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-Socket-SSL
 PORTVERSION=	2.006
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SULLR
diff --git a/security/p5-IO-Socket-SSL/pkg-plist b/security/p5-IO-Socket-SSL/pkg-plist
index bbfa24f8ae72..aaf7c101ae48 100644
--- a/security/p5-IO-Socket-SSL/pkg-plist
+++ b/security/p5-IO-Socket-SSL/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/SSL/.packlist
 %%SITE_PERL%%/IO/Socket/SSL.pm
 %%SITE_PERL%%/IO/Socket/SSL.pod
 %%SITE_PERL%%/IO/Socket/SSL/Intercept.pm
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index bde88b681c05..0c457583f496 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MD5
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	${PORTNAME}/GAAS
diff --git a/security/p5-MD5/pkg-plist b/security/p5-MD5/pkg-plist
index 310f15bbc671..8f398b71df95 100644
--- a/security/p5-MD5/pkg-plist
+++ b/security/p5-MD5/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/MD5.3.gz
 %%SITE_PERL%%/MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MD5/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MD5
diff --git a/security/p5-Mcrypt/Makefile b/security/p5-Mcrypt/Makefile
index d87699711a2b..bb4b23e52748 100644
--- a/security/p5-Mcrypt/Makefile
+++ b/security/p5-Mcrypt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mcrypt
 PORTVERSION=	2.5.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JESUS
diff --git a/security/p5-Mcrypt/pkg-plist b/security/p5-Mcrypt/pkg-plist
index 99403c9cd7f8..cbb3814e76af 100644
--- a/security/p5-Mcrypt/pkg-plist
+++ b/security/p5-Mcrypt/pkg-plist
@@ -1,14 +1,4 @@
 %%PERL5_MAN3%%/Mcrypt.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Mcrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mcrypt/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mcrypt/Mcrypt.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mcrypt/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mcrypt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%
-@dirrmtry lib/perl5/site_perl
-@dirrmtry %%PERL5_MAN3%%
-@dirrmtry lib/perl5/%%PERL_VER%%/man
-@dirrmtry lib/perl5/%%PERL_VER%%
-@dirrmtry lib/perl5
+%%SITE_ARCH%%/Mcrypt.pm
+%%SITE_ARCH%%/auto/Mcrypt/Mcrypt.so
+%%SITE_ARCH%%/auto/Mcrypt/autosplit.ix
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index f4a06ac21062..5c6863e88196 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Module-Signature
 PORTVERSION=	0.73
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Module-Signature/pkg-plist b/security/p5-Module-Signature/pkg-plist
index f78e9c8f4c7d..e327642f15f7 100644
--- a/security/p5-Module-Signature/pkg-plist
+++ b/security/p5-Module-Signature/pkg-plist
@@ -1,8 +1,4 @@
 bin/cpansign
 %%PERL5_MAN3%%/Module::Signature.3.gz
 %%SITE_PERL%%/Module/Signature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Signature/.packlist
 man/man1/cpansign.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Signature
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
-@dirrmtry %%SITE_PERL%%/Module
diff --git a/security/p5-Net-Daemon-SSL/Makefile b/security/p5-Net-Daemon-SSL/Makefile
index 80bc6c329b53..9330bded13ff 100644
--- a/security/p5-Net-Daemon-SSL/Makefile
+++ b/security/p5-Net-Daemon-SSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Daemon-SSL
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	security net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Net-Daemon-SSL/pkg-plist b/security/p5-Net-Daemon-SSL/pkg-plist
index a6fc8976182c..f3c484dd73e2 100644
--- a/security/p5-Net-Daemon-SSL/pkg-plist
+++ b/security/p5-Net-Daemon-SSL/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Net/Daemon/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon/SSL/.packlist
 %%PERL5_MAN3%%/Net::Daemon::SSL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon/SSL
diff --git a/security/p5-Net-OpenID-Common/Makefile b/security/p5-Net-OpenID-Common/Makefile
index 1cf62edb1c32..1184b9e5252f 100644
--- a/security/p5-Net-OpenID-Common/Makefile
+++ b/security/p5-Net-OpenID-Common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OpenID-Common
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	security net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Net-OpenID-Common/pkg-plist b/security/p5-Net-OpenID-Common/pkg-plist
index c4dc4fc6b231..169c2f95bfec 100644
--- a/security/p5-Net-OpenID-Common/pkg-plist
+++ b/security/p5-Net-OpenID-Common/pkg-plist
@@ -14,4 +14,3 @@
 %%SITE_PERL%%/Net/OpenID/URIFetch.pm
 %%SITE_PERL%%/Net/OpenID/Yadis.pm
 %%SITE_PERL%%/Net/OpenID/Yadis/Service.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Common/.packlist
diff --git a/security/p5-Net-OpenID-JanRain/Makefile b/security/p5-Net-OpenID-JanRain/Makefile
index c66e062397c7..4f7030b87868 100644
--- a/security/p5-Net-OpenID-JanRain/Makefile
+++ b/security/p5-Net-OpenID-JanRain/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-OpenID-JanRain
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Net-OpenID-JanRain/pkg-plist b/security/p5-Net-OpenID-JanRain/pkg-plist
index bd095b1d2737..f1eab4b27a88 100644
--- a/security/p5-Net-OpenID-JanRain/pkg-plist
+++ b/security/p5-Net-OpenID-JanRain/pkg-plist
@@ -19,12 +19,3 @@
 %%SITE_PERL%%/Net/OpenID/JanRain/Stores/SQLStore.pm
 %%SITE_PERL%%/Net/OpenID/JanRain/Stores/SQLiteStore.pm
 %%SITE_PERL%%/Net/OpenID/JanRain/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/JanRain/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/JanRain
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/OpenID/JanRain/Stores
-@dirrmtry %%SITE_PERL%%/Net/OpenID/JanRain/Consumer
-@dirrmtry %%SITE_PERL%%/Net/OpenID/JanRain
-@dirrmtry %%SITE_PERL%%/Net/OpenID
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/security/p5-Net-OpenID-Server/Makefile b/security/p5-Net-OpenID-Server/Makefile
index 771e3a205aef..59134779feb0 100644
--- a/security/p5-Net-OpenID-Server/Makefile
+++ b/security/p5-Net-OpenID-Server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-OpenID-Server
 PORTVERSION=	1.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Net-OpenID-Server/pkg-plist b/security/p5-Net-OpenID-Server/pkg-plist
index dd6d7cfe64e4..a0ed825572cf 100644
--- a/security/p5-Net-OpenID-Server/pkg-plist
+++ b/security/p5-Net-OpenID-Server/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::OpenID::Server.3.gz
 %%SITE_PERL%%/Net/OpenID/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Server/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/OpenID
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/security/p5-Net-Radius-Server/Makefile b/security/p5-Net-Radius-Server/Makefile
index 9998e03d68e5..9f3ca9b1759d 100644
--- a/security/p5-Net-Radius-Server/Makefile
+++ b/security/p5-Net-Radius-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Radius-Server
 PORTVERSION=	1.116
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/security/p5-Net-Radius-Server/pkg-plist b/security/p5-Net-Radius-Server/pkg-plist
index 39adde8f148f..28eacdf0e925 100644
--- a/security/p5-Net-Radius-Server/pkg-plist
+++ b/security/p5-Net-Radius-Server/pkg-plist
@@ -32,18 +32,9 @@ bin/rad-client
 %%SITE_PERL%%/Net/Radius/Server/Set/Proxy.pm
 %%SITE_PERL%%/Net/Radius/Server/Set/Replace.pm
 %%SITE_PERL%%/Net/Radius/Server/Set/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius/Server/.packlist
 man/man1/nrsd.1.gz
 man/man1/nrsdbtoyaml.1.gz
 man/man1/pam-client.1.gz
 man/man1/rad-bulk-make.1.gz
 man/man1/rad-bulk.1.gz
 man/man1/rad-client.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Radius/Server/Set
-@dirrmtry %%SITE_PERL%%/Net/Radius/Server/Match
-@dirrmtry %%SITE_PERL%%/Net/Radius/Server
-@dirrmtry %%SITE_PERL%%/Net/Radius
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index 9f5fa4f2a14b..41d7dcc3ec46 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-SAML
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	http://zxid.org/ \
 		CPAN
diff --git a/security/p5-Net-SAML/pkg-plist b/security/p5-Net-SAML/pkg-plist
index 51eceb4fe933..3012cf3c50aa 100644
--- a/security/p5-Net-SAML/pkg-plist
+++ b/security/p5-Net-SAML/pkg-plist
@@ -1,11 +1,7 @@
 %%PERL5_MAN3%%/Net::SAML.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SAML.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAML/SAML.so
+%%SITE_ARCH%%/Net/SAML.pm
+%%SITE_ARCH%%/Net/SAML.pod
+%%SITE_ARCH%%/auto/Net/SAML/SAML.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zxid.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zxidhlo.pl
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/security/p5-Net-SSL-ExpireDate/Makefile b/security/p5-Net-SSL-ExpireDate/Makefile
index f8f49abe1c8e..5699f3d63684 100644
--- a/security/p5-Net-SSL-ExpireDate/Makefile
+++ b/security/p5-Net-SSL-ExpireDate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SSL-ExpireDate
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Net-SSL-ExpireDate/pkg-plist b/security/p5-Net-SSL-ExpireDate/pkg-plist
index 8155ff5a9d56..5d992d8d8a8d 100644
--- a/security/p5-Net-SSL-ExpireDate/pkg-plist
+++ b/security/p5-Net-SSL-ExpireDate/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Net::SSL::ExpireDate.3.gz
 %%SITE_PERL%%/Net/SSL/ExpireDate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSL/ExpireDate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSL/ExpireDate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SSL
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/security/p5-Net-SSLGlue/Makefile b/security/p5-Net-SSLGlue/Makefile
index df2918cda5eb..ab5f1a79e900 100644
--- a/security/p5-Net-SSLGlue/Makefile
+++ b/security/p5-Net-SSLGlue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SSLGlue
 PORTVERSION=	1.053
+PORTREVISION=	1
 CATEGORIES=	security net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Net-SSLGlue/pkg-plist b/security/p5-Net-SSLGlue/pkg-plist
index 64a3931429b2..2e59170fa2d4 100644
--- a/security/p5-Net-SSLGlue/pkg-plist
+++ b/security/p5-Net-SSLGlue/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Net/SSLGlue/POP3.pm
 %%SITE_PERL%%/Net/SSLGlue/SMTP.pm
 %%SITE_PERL%%/Net/SSLGlue/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLGlue/.packlist
 %%PERL5_MAN3%%/Net::SSLGlue.3.gz
 %%PERL5_MAN3%%/Net::SSLGlue::FTP.3.gz
 %%PERL5_MAN3%%/Net::SSLGlue::LDAP.3.gz
@@ -13,7 +12,3 @@
 %%PERL5_MAN3%%/Net::SSLGlue::POP3.3.gz
 %%PERL5_MAN3%%/Net::SSLGlue::SMTP.3.gz
 %%PERL5_MAN3%%/Net::SSLGlue::Socket.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLGlue
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/SSLGlue
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 90f26d96a1ba..2eecbb5a1acb 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-SSLeay
 PORTVERSION=	1.66
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -28,7 +29,7 @@ PORTEXAMPLES=	*
 SHEBANG_FILES=	examples/*.pl
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/SSLeay/SSLeay.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/SSLeay/SSLeay.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/req.conf ${STAGEDIR}${EXAMPLESDIR}/req.conf
diff --git a/security/p5-Net-SSLeay/pkg-plist b/security/p5-Net-SSLeay/pkg-plist
index b57f518676fa..73ef62f07b77 100644
--- a/security/p5-Net-SSLeay/pkg-plist
+++ b/security/p5-Net-SSLeay/pkg-plist
@@ -1,87 +1,82 @@
 %%PERL5_MAN3%%/Net::SSLeay.3.gz
 %%PERL5_MAN3%%/Net::SSLeay::Handle.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/SSLeay.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/debug_read.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_httpx2.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_httpx3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_httpx4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/dump_peer_certificate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_http.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_http3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_http4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_httpx.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_httpx3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_httpx4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_http.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_http3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_http4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_httpx.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_httpx3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_httpx4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/http_cat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/https_cat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/httpx_cat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/initialize.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/make_form.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/make_headers.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/new_x_ctx.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/open_proxy_tcp_connection.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/open_tcp_connection.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_http.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_http3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_http4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_httpx.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_httpx3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_httpx4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_http.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_http3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_http4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_httpx.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_httpx3.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_httpx4.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/randomize.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_cert_and_key.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_proxy.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_server_cert_and_key.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_CRLF.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_all.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_until.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_write_CRLF.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_write_all.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/sslcat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/tcp_read_CRLF.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/tcp_read_all.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/tcp_read_until.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/tcp_write_CRLF.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/tcp_write_all.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/tcpcat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/tcpxcat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_X509_lookup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_nothing.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_read.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_write.al
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+%%SITE_ARCH%%/Net/SSLeay.pm
+%%SITE_ARCH%%/Net/SSLeay.pod
+%%SITE_ARCH%%/Net/SSLeay/Handle.pm
+%%SITE_ARCH%%/auto/Net/SSLeay/SSLeay.so
+%%SITE_ARCH%%/auto/Net/SSLeay/autosplit.ix
+%%SITE_ARCH%%/auto/Net/SSLeay/debug_read.al
+%%SITE_ARCH%%/auto/Net/SSLeay/do_https.al
+%%SITE_ARCH%%/auto/Net/SSLeay/do_https2.al
+%%SITE_ARCH%%/auto/Net/SSLeay/do_https3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/do_https4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/do_httpx2.al
+%%SITE_ARCH%%/auto/Net/SSLeay/do_httpx3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/do_httpx4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/dump_peer_certificate.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_http.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_http3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_http4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_https.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_https3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_https4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_httpx.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_httpx3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/get_httpx4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_http.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_http3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_http4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_https.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_https3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_https4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_httpx.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_httpx3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/head_httpx4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/http_cat.al
+%%SITE_ARCH%%/auto/Net/SSLeay/https_cat.al
+%%SITE_ARCH%%/auto/Net/SSLeay/httpx_cat.al
+%%SITE_ARCH%%/auto/Net/SSLeay/initialize.al
+%%SITE_ARCH%%/auto/Net/SSLeay/make_form.al
+%%SITE_ARCH%%/auto/Net/SSLeay/make_headers.al
+%%SITE_ARCH%%/auto/Net/SSLeay/new_x_ctx.al
+%%SITE_ARCH%%/auto/Net/SSLeay/open_proxy_tcp_connection.al
+%%SITE_ARCH%%/auto/Net/SSLeay/open_tcp_connection.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_http.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_http3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_http4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_https.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_https3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_https4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_httpx.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_httpx3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/post_httpx4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_http.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_http3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_http4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_https.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_https3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_https4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_httpx.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_httpx3.al
+%%SITE_ARCH%%/auto/Net/SSLeay/put_httpx4.al
+%%SITE_ARCH%%/auto/Net/SSLeay/randomize.al
+%%SITE_ARCH%%/auto/Net/SSLeay/set_cert_and_key.al
+%%SITE_ARCH%%/auto/Net/SSLeay/set_proxy.al
+%%SITE_ARCH%%/auto/Net/SSLeay/set_server_cert_and_key.al
+%%SITE_ARCH%%/auto/Net/SSLeay/ssl_read_CRLF.al
+%%SITE_ARCH%%/auto/Net/SSLeay/ssl_read_all.al
+%%SITE_ARCH%%/auto/Net/SSLeay/ssl_read_until.al
+%%SITE_ARCH%%/auto/Net/SSLeay/ssl_write_CRLF.al
+%%SITE_ARCH%%/auto/Net/SSLeay/ssl_write_all.al
+%%SITE_ARCH%%/auto/Net/SSLeay/sslcat.al
+%%SITE_ARCH%%/auto/Net/SSLeay/tcp_read_CRLF.al
+%%SITE_ARCH%%/auto/Net/SSLeay/tcp_read_all.al
+%%SITE_ARCH%%/auto/Net/SSLeay/tcp_read_until.al
+%%SITE_ARCH%%/auto/Net/SSLeay/tcp_write_CRLF.al
+%%SITE_ARCH%%/auto/Net/SSLeay/tcp_write_all.al
+%%SITE_ARCH%%/auto/Net/SSLeay/tcpcat.al
+%%SITE_ARCH%%/auto/Net/SSLeay/tcpxcat.al
+%%SITE_ARCH%%/auto/Net/SSLeay/want_X509_lookup.al
+%%SITE_ARCH%%/auto/Net/SSLeay/want_nothing.al
+%%SITE_ARCH%%/auto/Net/SSLeay/want_read.al
+%%SITE_ARCH%%/auto/Net/SSLeay/want_write.al
diff --git a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
index f2b41c5cfee6..f28ed571b109 100644
--- a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
+++ b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Server-Mail-ESMTP-AUTH
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	security mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Net-Server-Mail-ESMTP-AUTH/pkg-plist b/security/p5-Net-Server-Mail-ESMTP-AUTH/pkg-plist
index 64453b29ef6d..401abbb0c3e8 100644
--- a/security/p5-Net-Server-Mail-ESMTP-AUTH/pkg-plist
+++ b/security/p5-Net-Server-Mail-ESMTP-AUTH/pkg-plist
@@ -1,12 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail/ESMTP/AUTH/.packlist
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/AUTH.pm
 %%PERL5_MAN3%%/Net::Server::Mail::ESMTP::AUTH.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail/ESMTP/AUTH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail/ESMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Server/Mail/ESMTP
-@dirrmtry %%SITE_PERL%%/Net/Server/Mail
-@dirrmtry %%SITE_PERL%%/Net/Server
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/security/p5-Net-SinFP/Makefile b/security/p5-Net-SinFP/Makefile
index 0371f6cb9f0c..c9e52ee7eb56 100644
--- a/security/p5-Net-SinFP/Makefile
+++ b/security/p5-Net-SinFP/Makefile
@@ -4,7 +4,9 @@
 PORTNAME?=	Net-SinFP
 PORTVERSION=	2.09
 .ifdef DBDATE
-PORTREVISION=	${DBDATE}
+PORTREVISION=	${DBDATE}1
+.else
+PORTREVISION=	1
 .endif
 CATEGORIES=	security ipv6 perl5
 MASTER_SITES=	CPAN
diff --git a/security/p5-Net-SinFP/pkg-plist b/security/p5-Net-SinFP/pkg-plist
index 9de16e971aa0..803272d06819 100644
--- a/security/p5-Net-SinFP/pkg-plist
+++ b/security/p5-Net-SinFP/pkg-plist
@@ -18,7 +18,6 @@
 %%SITE_PERL%%/Net/SinFP/Search.pm
 %%SITE_PERL%%/Net/SinFP/SinFP4.pm
 %%SITE_PERL%%/Net/SinFP/SinFP6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SinFP/.packlist
 %%PERL5_MAN3%%/Net::SinFP.3.gz
 %%PERL5_MAN3%%/Net::SinFP::Consts.3.gz
 %%PERL5_MAN3%%/Net::SinFP::DB.3.gz
@@ -39,8 +38,3 @@
 %%PERL5_MAN3%%/Net::SinFP::Search.3.gz
 %%PERL5_MAN3%%/Net::SinFP::SinFP4.3.gz
 %%PERL5_MAN3%%/Net::SinFP::SinFP6.3.gz
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/SinFP/DB
-@dirrm %%SITE_PERL%%/Net/SinFP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SinFP
diff --git a/security/p5-Nmap-Parser/Makefile b/security/p5-Nmap-Parser/Makefile
index 20da0f3d94f9..f46b81186f9e 100644
--- a/security/p5-Nmap-Parser/Makefile
+++ b/security/p5-Nmap-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nmap-Parser
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Nmap-Parser/pkg-plist b/security/p5-Nmap-Parser/pkg-plist
index 47ca5c297698..1e2369c5f608 100644
--- a/security/p5-Nmap-Parser/pkg-plist
+++ b/security/p5-Nmap-Parser/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap/Parser/.packlist
 %%SITE_PERL%%/Nmap/Parser.pm
 %%PERL5_MAN3%%/Nmap::Parser.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap/Parser
-@dirrmtry %%SITE_PERL%%/Nmap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap
diff --git a/security/p5-Nmap-Scanner/Makefile b/security/p5-Nmap-Scanner/Makefile
index 861d31f8a91e..7fdcc32f1eec 100644
--- a/security/p5-Nmap-Scanner/Makefile
+++ b/security/p5-Nmap-Scanner/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Nmap-Scanner
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Nmap-Scanner/pkg-plist b/security/p5-Nmap-Scanner/pkg-plist
index 18214069069d..60464b8faa2c 100644
--- a/security/p5-Nmap-Scanner/pkg-plist
+++ b/security/p5-Nmap-Scanner/pkg-plist
@@ -61,12 +61,3 @@
 %%SITE_PERL%%/Nmap/Scanner/TaskProgress.pm
 %%SITE_PERL%%/Nmap/Scanner/Util.pm
 %%SITE_PERL%%/Nmap/Scanner/Util/BannerScanner.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap/Scanner/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap/Scanner
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap
-@dirrmtry %%SITE_PERL%%/Nmap/Scanner/Util
-@dirrmtry %%SITE_PERL%%/Nmap/Scanner/RunStats
-@dirrmtry %%SITE_PERL%%/Nmap/Scanner/OS
-@dirrmtry %%SITE_PERL%%/Nmap/Scanner/Backend
-@dirrmtry %%SITE_PERL%%/Nmap/Scanner
-@dirrmtry %%SITE_PERL%%/Nmap
diff --git a/security/p5-OpenCA-CRL/Makefile b/security/p5-OpenCA-CRL/Makefile
index 7c59189e1e21..3ef55f6d92b7 100644
--- a/security/p5-OpenCA-CRL/Makefile
+++ b/security/p5-OpenCA-CRL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OpenCA-CRL
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
diff --git a/security/p5-OpenCA-CRL/pkg-plist b/security/p5-OpenCA-CRL/pkg-plist
index acdc49eb3812..675c1ee85518 100644
--- a/security/p5-OpenCA-CRL/pkg-plist
+++ b/security/p5-OpenCA-CRL/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/OpenCA::CRL.3.gz
 %%SITE_PERL%%/OpenCA/CRL.pm
 %%SITE_PERL%%/OpenCA/CRL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRL/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
-@dirrmtry %%SITE_PERL%%/OpenCA
diff --git a/security/p5-OpenCA-CRR/Makefile b/security/p5-OpenCA-CRR/Makefile
index fd9dc44e83ab..743e06fbbef6 100644
--- a/security/p5-OpenCA-CRR/Makefile
+++ b/security/p5-OpenCA-CRR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OpenCA-CRR
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-OpenCA-CRR/pkg-plist b/security/p5-OpenCA-CRR/pkg-plist
index c9693beee1f8..d8abd1dd389b 100644
--- a/security/p5-OpenCA-CRR/pkg-plist
+++ b/security/p5-OpenCA-CRR/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/OpenCA::CRR.3.gz
 %%SITE_PERL%%/OpenCA/CRR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRR/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
-@dirrmtry %%SITE_PERL%%/OpenCA
diff --git a/security/p5-OpenCA-OpenSSL/Makefile b/security/p5-OpenCA-OpenSSL/Makefile
index 2b4512e15ede..900b60388c09 100644
--- a/security/p5-OpenCA-OpenSSL/Makefile
+++ b/security/p5-OpenCA-OpenSSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OpenCA-OpenSSL
 PORTVERSION=	2.0.29
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MADWOLF
diff --git a/security/p5-OpenCA-OpenSSL/pkg-plist b/security/p5-OpenCA-OpenSSL/pkg-plist
index 5aa7844b23c9..0a13e3e23cbd 100644
--- a/security/p5-OpenCA-OpenSSL/pkg-plist
+++ b/security/p5-OpenCA-OpenSSL/pkg-plist
@@ -1,11 +1,6 @@
 %%PERL5_MAN3%%/OpenCA::OpenSSL.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenCA/OpenSSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenCA/OpenSSL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenCA/OpenSSL/SMIME.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/OpenSSL/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/OpenSSL/OpenSSL.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/OpenSSL/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenCA/OpenSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenCA
+%%SITE_ARCH%%/OpenCA/OpenSSL.pm
+%%SITE_ARCH%%/OpenCA/OpenSSL.pod
+%%SITE_ARCH%%/OpenCA/OpenSSL/SMIME.pm
+%%SITE_ARCH%%/auto/OpenCA/OpenSSL/OpenSSL.so
+%%SITE_ARCH%%/auto/OpenCA/OpenSSL/autosplit.ix
diff --git a/security/p5-OpenCA-PKCS7/Makefile b/security/p5-OpenCA-PKCS7/Makefile
index 680265a001f7..351e590a5368 100644
--- a/security/p5-OpenCA-PKCS7/Makefile
+++ b/security/p5-OpenCA-PKCS7/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OpenCA-PKCS7
 PORTVERSION=	0.9.1.1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
diff --git a/security/p5-OpenCA-PKCS7/pkg-plist b/security/p5-OpenCA-PKCS7/pkg-plist
index 6659d2582bf9..9bf01988260c 100644
--- a/security/p5-OpenCA-PKCS7/pkg-plist
+++ b/security/p5-OpenCA-PKCS7/pkg-plist
@@ -1,5 +1 @@
 %%SITE_PERL%%/OpenCA/PKCS7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/PKCS7/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/PKCS7
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
-@dirrmtry %%SITE_PERL%%/OpenCA
diff --git a/security/p5-OpenCA-REQ/Makefile b/security/p5-OpenCA-REQ/Makefile
index 859cf0c2e108..6a69aa46d5c0 100644
--- a/security/p5-OpenCA-REQ/Makefile
+++ b/security/p5-OpenCA-REQ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OpenCA-REQ
 PORTVERSION=	0.9.60
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MADWOLF
diff --git a/security/p5-OpenCA-REQ/pkg-plist b/security/p5-OpenCA-REQ/pkg-plist
index 9a26e93fe2c7..31da9457918c 100644
--- a/security/p5-OpenCA-REQ/pkg-plist
+++ b/security/p5-OpenCA-REQ/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/OpenCA::REQ.3.gz
 %%SITE_PERL%%/OpenCA/REQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/REQ/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/REQ
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
-@dirrmtry %%SITE_PERL%%/OpenCA
diff --git a/security/p5-OpenCA-X509/Makefile b/security/p5-OpenCA-X509/Makefile
index 98baefa5c412..8d2a0a2b6414 100644
--- a/security/p5-OpenCA-X509/Makefile
+++ b/security/p5-OpenCA-X509/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OpenCA-X509
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MADWOLF
diff --git a/security/p5-OpenCA-X509/pkg-plist b/security/p5-OpenCA-X509/pkg-plist
index 575ab3fe8268..086d2817e03b 100644
--- a/security/p5-OpenCA-X509/pkg-plist
+++ b/security/p5-OpenCA-X509/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/OpenCA/X509.pm
 %%SITE_PERL%%/OpenCA/prova.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/X509/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/X509
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
-@dirrmtry %%SITE_PERL%%/OpenCA
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 72eaf0318d1a..e8db465caedc 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PGP-Sign
 PORTVERSION=	0.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-PGP-Sign/pkg-plist b/security/p5-PGP-Sign/pkg-plist
index 559653ae4c3f..65e29dc1e870 100644
--- a/security/p5-PGP-Sign/pkg-plist
+++ b/security/p5-PGP-Sign/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/PGP::Sign.3.gz
 %%SITE_PERL%%/PGP/Sign.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP
-@dirrmtry %%SITE_PERL%%/PGP
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 215611a0f9dc..b6136e414492 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PGP
 PORTVERSION=	0.3a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-PGP/pkg-plist b/security/p5-PGP/pkg-plist
index bbeeeeed649d..8daffbe6c0d5 100644
--- a/security/p5-PGP/pkg-plist
+++ b/security/p5-PGP/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/PGP::Pipe.3.gz
 %%SITE_PERL%%/PGP/Pipe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Pipe/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Pipe
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP
-@dirrmtry %%SITE_PERL%%/PGP
diff --git a/security/p5-POE-Component-SSLify/Makefile b/security/p5-POE-Component-SSLify/Makefile
index 9b08f405a02c..4c45397bd8b0 100644
--- a/security/p5-POE-Component-SSLify/Makefile
+++ b/security/p5-POE-Component-SSLify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-SSLify
 PORTVERSION=	1.008
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN/${PORTNAME:C/-.*//}/APOCAL
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-POE-Component-SSLify/pkg-plist b/security/p5-POE-Component-SSLify/pkg-plist
index 46956e2f250b..b69648903dd4 100644
--- a/security/p5-POE-Component-SSLify/pkg-plist
+++ b/security/p5-POE-Component-SSLify/pkg-plist
@@ -4,10 +4,3 @@
 %%SITE_PERL%%/POE/Component/SSLify.pm
 %%SITE_PERL%%/POE/Component/SSLify/ClientHandle.pm
 %%SITE_PERL%%/POE/Component/SSLify/ServerHandle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SSLify/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SSLify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/SSLify
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/security/p5-POE-Filter-SSL/Makefile b/security/p5-POE-Filter-SSL/Makefile
index 5d58b36984fd..daddba47eef5 100644
--- a/security/p5-POE-Filter-SSL/Makefile
+++ b/security/p5-POE-Filter-SSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-SSL
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PRIVI
diff --git a/security/p5-POE-Filter-SSL/pkg-plist b/security/p5-POE-Filter-SSL/pkg-plist
index 20967c7d8f21..ddbea83c8c81 100644
--- a/security/p5-POE-Filter-SSL/pkg-plist
+++ b/security/p5-POE-Filter-SSL/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/SSL/SSL.so
-%%SITE_PERL%%/%%PERL_ARCH%%/POE/Filter/SSL.pm
+%%SITE_ARCH%%/auto/POE/Filter/SSL/SSL.so
+%%SITE_ARCH%%/POE/Filter/SSL.pm
 %%PERL5_MAN3%%/POE::Filter::SSL.3.gz
diff --git a/security/p5-PerlCryptLib/Makefile b/security/p5-PerlCryptLib/Makefile
index a0107931ad50..d2f3386cefd9 100644
--- a/security/p5-PerlCryptLib/Makefile
+++ b/security/p5-PerlCryptLib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlCryptLib
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ALVAROL
diff --git a/security/p5-PerlCryptLib/pkg-plist b/security/p5-PerlCryptLib/pkg-plist
index cd4f131fc18d..9cb11f375c10 100644
--- a/security/p5-PerlCryptLib/pkg-plist
+++ b/security/p5-PerlCryptLib/pkg-plist
@@ -1,7 +1,5 @@
 %%PERL5_MAN3%%/PerlCryptLib.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlCryptLib.ph
-%%SITE_PERL%%/%%PERL_ARCH%%/PerlCryptLib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlCryptLib/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlCryptLib/PerlCryptLib.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlCryptLib/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlCryptLib
+%%SITE_ARCH%%/PerlCryptLib.ph
+%%SITE_ARCH%%/PerlCryptLib.pm
+%%SITE_ARCH%%/auto/PerlCryptLib/PerlCryptLib.so
+%%SITE_ARCH%%/auto/PerlCryptLib/autosplit.ix
diff --git a/security/p5-SAVI-Perl/Makefile b/security/p5-SAVI-Perl/Makefile
index d7115284ba46..4c75014c608c 100644
--- a/security/p5-SAVI-Perl/Makefile
+++ b/security/p5-SAVI-Perl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SAVI-Perl
 PORTVERSION=	0.30
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security perl5
 MASTER_SITES=	http://www.csupomona.edu/~henson/archive/projects/SAVI-Perl/dist/
 MASTER_SITE_SUBDIR=	security
diff --git a/security/p5-SAVI-Perl/pkg-plist b/security/p5-SAVI-Perl/pkg-plist
index c9854b1556cd..6f94b2c7824c 100644
--- a/security/p5-SAVI-Perl/pkg-plist
+++ b/security/p5-SAVI-Perl/pkg-plist
@@ -1,6 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/SAVI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SAVI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SAVI/SAVI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SAVI/autosplit.ix
+%%SITE_ARCH%%/SAVI.pm
+%%SITE_ARCH%%/auto/SAVI/SAVI.so
+%%SITE_ARCH%%/auto/SAVI/autosplit.ix
 %%PERL5_MAN3%%/SAVI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SAVI
diff --git a/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index 6ea60240d6c0..3d034a1d5908 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SHA
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GAAS
diff --git a/security/p5-SHA/pkg-plist b/security/p5-SHA/pkg-plist
index 55ef334ef440..a265205ec1c0 100644
--- a/security/p5-SHA/pkg-plist
+++ b/security/p5-SHA/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/SHA.3.gz
 %%SITE_PERL%%/SHA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SHA/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SHA
diff --git a/security/p5-Safe-Hole/Makefile b/security/p5-Safe-Hole/Makefile
index dde1746e698e..4472158b7d53 100644
--- a/security/p5-Safe-Hole/Makefile
+++ b/security/p5-Safe-Hole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Safe-Hole
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Safe-Hole/pkg-plist b/security/p5-Safe-Hole/pkg-plist
index e63de8f92598..23aac87b176c 100644
--- a/security/p5-Safe-Hole/pkg-plist
+++ b/security/p5-Safe-Hole/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/Hole.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Safe/Hole.pm
+%%SITE_ARCH%%/auto/Safe/Hole/Hole.so
+%%SITE_ARCH%%/Safe/Hole.pm
 %%PERL5_MAN3%%/Safe::Hole.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Safe
diff --git a/security/p5-Snort-Rule/Makefile b/security/p5-Snort-Rule/Makefile
index b82bc753166f..36c3cd8e8d07 100644
--- a/security/p5-Snort-Rule/Makefile
+++ b/security/p5-Snort-Rule/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Snort-Rule
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAXJAZMAN/Snort
@@ -15,10 +16,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 PLIST_FILES=	%%SITE_PERL%%/Snort/Rule.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Snort/Rule/.packlist \
 		%%PERL5_MAN3%%/Snort::Rule.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Snort/Rule \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Snort \
-		%%SITE_PERL%%/Snort
 
 .include <bsd.port.mk>
diff --git a/security/p5-String-MkPasswd/Makefile b/security/p5-String-MkPasswd/Makefile
index 6d096083a82c..dd754f641e50 100644
--- a/security/p5-String-MkPasswd/Makefile
+++ b/security/p5-String-MkPasswd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-MkPasswd
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CGRAU
diff --git a/security/p5-String-MkPasswd/pkg-plist b/security/p5-String-MkPasswd/pkg-plist
index 3670f8106c0e..361d71b9d871 100644
--- a/security/p5-String-MkPasswd/pkg-plist
+++ b/security/p5-String-MkPasswd/pkg-plist
@@ -1,8 +1,4 @@
 bin/mkpasswd.pl
 %%SITE_PERL%%/String/MkPasswd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/MkPasswd/.packlist
 %%PERL5_MAN3%%/String::MkPasswd.3.gz
 man/man1/mkpasswd.pl.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/MkPasswd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/security/p5-Sudo/Makefile b/security/p5-Sudo/Makefile
index 255f9a9e2344..16de09dfedb0 100644
--- a/security/p5-Sudo/Makefile
+++ b/security/p5-Sudo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sudo
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WAG
diff --git a/security/p5-Sudo/pkg-plist b/security/p5-Sudo/pkg-plist
index 7e89ddaff2cf..5a9561115ed7 100644
--- a/security/p5-Sudo/pkg-plist
+++ b/security/p5-Sudo/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Sudo.3.gz
 %%SITE_PERL%%/Sudo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sudo/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sudo
diff --git a/security/p5-Text-Password-Pronounceable/Makefile b/security/p5-Text-Password-Pronounceable/Makefile
index bcb0427c3b73..08eb144d9be6 100644
--- a/security/p5-Text-Password-Pronounceable/Makefile
+++ b/security/p5-Text-Password-Pronounceable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Password-Pronounceable
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	security textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Text-Password-Pronounceable/pkg-plist b/security/p5-Text-Password-Pronounceable/pkg-plist
index fda1e399a9e2..407bfc717b69 100644
--- a/security/p5-Text-Password-Pronounceable/pkg-plist
+++ b/security/p5-Text-Password-Pronounceable/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::Password::Pronounceable.3.gz
 %%SITE_PERL%%/Text/Password/Pronounceable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Password/Pronounceable/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Password/Pronounceable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Password
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Password
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index 1449d7e5a356..87f97d847ab1 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-EncryptedHash
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Tie-EncryptedHash/pkg-plist b/security/p5-Tie-EncryptedHash/pkg-plist
index 04f1d423b53a..fcc12b32e1c8 100644
--- a/security/p5-Tie-EncryptedHash/pkg-plist
+++ b/security/p5-Tie-EncryptedHash/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Tie::EncryptedHash.3.gz
 %%SITE_PERL%%/Tie/EncryptedHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/EncryptedHash/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/EncryptedHash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
-@dirrmtry %%SITE_PERL%%/Tie
diff --git a/security/p5-Tree-Authz/Makefile b/security/p5-Tree-Authz/Makefile
index 93a31079776d..6c5ce6f13420 100644
--- a/security/p5-Tree-Authz/Makefile
+++ b/security/p5-Tree-Authz/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-Authz
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Tree-Authz/pkg-plist b/security/p5-Tree-Authz/pkg-plist
index f9b83543b2b1..6dd12c4f8f93 100644
--- a/security/p5-Tree-Authz/pkg-plist
+++ b/security/p5-Tree-Authz/pkg-plist
@@ -2,5 +2,3 @@
 %%PERL5_MAN3%%/Tree::Authz::Role.3.gz
 %%SITE_PERL%%/Tree/Authz.pm
 %%SITE_PERL%%/Tree/Authz/Role.pm
-@dirrmtry %%SITE_PERL%%/Tree/Authz
-@dirrmtry %%SITE_PERL%%/Tree
diff --git a/security/p5-Unix-Passwd-File/Makefile b/security/p5-Unix-Passwd-File/Makefile
index e0791d59a2b1..75ee77bff2ef 100644
--- a/security/p5-Unix-Passwd-File/Makefile
+++ b/security/p5-Unix-Passwd-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unix-Passwd-File
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Unix-Passwd-File/pkg-plist b/security/p5-Unix-Passwd-File/pkg-plist
index 3acbe0b061c0..604b3d56942b 100644
--- a/security/p5-Unix-Passwd-File/pkg-plist
+++ b/security/p5-Unix-Passwd-File/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Unix/Passwd/File.pm
 %%PERL5_MAN3%%/Unix::Passwd::File.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Passwd/File/.packlist
-@dirrmtry %%SITE_PERL%%/Unix/Passwd
-@dirrmtry %%SITE_PERL%%/Unix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Passwd/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Passwd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
diff --git a/security/p5-Yahoo-BBAuth/Makefile b/security/p5-Yahoo-BBAuth/Makefile
index 79c2a7407329..1bb2dbb33d33 100644
--- a/security/p5-Yahoo-BBAuth/Makefile
+++ b/security/p5-Yahoo-BBAuth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Yahoo-BBAuth
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	security www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Yahoo-BBAuth/pkg-plist b/security/p5-Yahoo-BBAuth/pkg-plist
index 2f2ed6b0d553..ba926bed261b 100644
--- a/security/p5-Yahoo-BBAuth/pkg-plist
+++ b/security/p5-Yahoo-BBAuth/pkg-plist
@@ -1,10 +1,6 @@
 %%SITE_PERL%%/Yahoo/BBAuth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo/BBAuth/.packlist
 %%PERL5_MAN3%%/Yahoo::BBAuth.3.gz
 %%WWWDIR%%/cgi-bin/testMAIL.cgi
 %%WWWDIR%%/cgi-bin/testPHOTOS.cgi
 @dirrm %%WWWDIR%%/cgi-bin
 @dirrm %%WWWDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo/BBAuth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo
-@dirrmtry %%SITE_PERL%%/Yahoo
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 59d899d7b0ea..1a0108b1622f 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openxpki
 PORTVERSION=	0.23.0.1
+PORTREVISION=	1
 CATEGORIES=	security perl5
 PKGNAMEPREFIX=	p5-
 DIST_SUBDIR=	openxpki
@@ -119,7 +120,7 @@ pre-install:	test
 .include <bsd.port.pre.mk>
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/OpenXPKI/OpenXPKI.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OpenXPKI/OpenXPKI.so
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/../../config && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 .	if ${PORT_OPTIONS:MDOCS}
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index 4e6c0527a84f..4f09461d7c3b 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -300,330 +300,329 @@ bin/openxpkictl
 %%PERL5_MAN3%%/OpenXPKI::Workflow::Handler.3.gz
 %%PERL5_MAN3%%/OpenXPKI::XML::Cache.3.gz
 %%PERL5_MAN3%%/OpenXPKI::i18n.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Assert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/SCEP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Bootstrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Certificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Crl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Handle/Profile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Home.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Information.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Login.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Plain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Profile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Result.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Secret.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Client/UI/Workflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Config/Merge.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Config/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Connector/FakeValidity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Control.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL.xs
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/CLI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_cert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_crl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_key.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_pkcs10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/DSA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/EC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST2001.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST2001CP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST94.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST94CP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/RSA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_params.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkcs10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkcs12.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_random.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/get_pkcs8_keytype.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/is_issuer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/is_prime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/issue_cert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/issue_crl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/list_algorithms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_decrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_encrypt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_get_chain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_sign.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_verify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/verify_cert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/GOST.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/OpenSSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/PKCS11.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/SafeNetProtectServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/nCipher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/CRL.xs
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/PKCS10.xs
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/SPKAC.xs
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/X509.xs
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CLI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CRL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CRR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CSR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/CRL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/Certificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Secret.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Secret/Plain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Secret/Split.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/TokenManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/CLI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/Command/create_keystore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/Engine/OpenSSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/CLI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_certificate_reply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_error_reply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_nextca_reply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_pending_reply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_getcert_serial.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_message_type.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_pkcs10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_signer_cert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_transaction_id.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Engine/OpenSSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Toolkit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/VolatileVault.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/X509.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/DN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/DateTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Exception.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/FileUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/SOAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/SOAP/Revoke.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Serialization/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Serialization/JSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Serialization/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/ACL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Default.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Profile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Secret.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Smartcard.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Token.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/UI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Visualization.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Workflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/Anonymous.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/ChallengeX509.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/ClientSSO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/ClientX509.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/Connector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/External.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/Password.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/X509.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/DBH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver/DB2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver/MySQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver/Oracle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver/PostgreSQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/SQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Schema.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Init.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log/Appender/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log/CLI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log/NOOP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Notification/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Notification/Handler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Notification/RT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Notification/SMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Notification/ServiceNow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Session.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Session/Mock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Watchdog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Watchdog/WorkflowInstance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/CreateQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRR/MarkRevoked.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRR/PersistRequest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GenerateKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GeneratePKCS10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/PersistRequest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance/PublishCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertRenewal/FetchOrgCertData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/CheckForRevocation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/FetchCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/IssueCRL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/IssueCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/RenewCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/RevokeCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/UnrevokeCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Noop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/AddToQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/GenerateExportFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/GetConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/TagAsExported.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/CalcApprovals.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/EvaluateChallenge.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/EvaluateEligibility.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/EvaluateSignerTrust.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/ExtractCSR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/FetchGroupPolicy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/LoadRecentCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/RevokeExistingCerts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Skeleton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/ApplyCSRPolicy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/CheckPrereqs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/ComputePUK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/CreateEscrowedKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/CreatePKCS12.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/FetchPUK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GenerateActivationCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GeneratePUK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GetOwnerByCardID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/PersistCSRs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/PublishCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/RenameEscrowedKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Approve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CalculateKeyId.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CancelApprovals.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Connector/GetValue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/AppendToEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/DeleteEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/GetEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/ModifyEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/SetEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Disconnect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Export.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GenerateKey.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GeneratePassword.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GetCertificateIdentifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/LoadCertificateMetadata.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Notify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ParseCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ParsePKCS10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Pause.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PersistCertificateMetadata.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PublishCRL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PublishCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RenderSubject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RetrieveCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RevokeCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetErrorCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetSource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/UpdateCertificateMetadata.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/WFArray.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/WFHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Transfer/SCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/WorkflowTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/ACL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/AlwaysFalse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/AlwaysTrue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Approved.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/CertificateHasStatus.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/CertificateNotYetRevoked.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/CheckExistingCertificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Connector/IsValue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/DatapoolEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/DateTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/HasRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/IsServerKeyGeneration.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Key.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/MaxIterationsNotReached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/NICE/IsCertificateIssued.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/NICE/IsCertificatePending.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/SCEPv2/ValidSCEPTID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Smartcard/AuthCodesValid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Smartcard/AuthIdValid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/SubjectMatchesPKCS10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/ValidCSRSerialPresent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/WFArray.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/WFHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/WorkflowContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/WorkflowContextBulk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/WorkflowCreator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/NICE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/NICE/Factory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/NICE/Local.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Observer/AddExecuteHistory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Observer/Debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Observer/Log.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Pause.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI/SequenceId.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Stub.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/ApprovalSignature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/Bulk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertIdentifierExists.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertProfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectAltNameParts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectParts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/Connector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/Creator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/InvalidityTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/KeyLength.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/KeyReuse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/PKCS10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/PasswordQuality.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/ReasonCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/Regex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/RelativeDate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/SPKAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/SmartcardPINUnblockAuthIDs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/ValidityTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/ValidityWindow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/WFObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/WFObject/WFArray.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/WFObject/WFHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default/Command/nop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command/GetCACaps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command/GetCACert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command/GetNextCACert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command/PKIOperation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Template/Plugin/Certificate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Template/Plugin/RandomPassword.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Test/More.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Tests.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Transport/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/VERSION.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Workflow/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Workflow/Factory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Workflow/Handler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/XML/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/i18n.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/OpenXPKI.so
+%%SITE_ARCH%%/OpenXPKI.pm
+%%SITE_ARCH%%/OpenXPKI/Assert.pm
+%%SITE_ARCH%%/OpenXPKI/Client.pm
+%%SITE_ARCH%%/OpenXPKI/Client/API.pm
+%%SITE_ARCH%%/OpenXPKI/Client/SCEP.pm
+%%SITE_ARCH%%/OpenXPKI/Client/Simple.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Bootstrap.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Certificate.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Crl.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Handle/Profile.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Home.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Information.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Login.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Plain.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Profile.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Result.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Secret.pm
+%%SITE_ARCH%%/OpenXPKI/Client/UI/Workflow.pm
+%%SITE_ARCH%%/OpenXPKI/Config.pm
+%%SITE_ARCH%%/OpenXPKI/Config/Merge.pm
+%%SITE_ARCH%%/OpenXPKI/Config/Test.pm
+%%SITE_ARCH%%/OpenXPKI/Connector/FakeValidity.pm
+%%SITE_ARCH%%/OpenXPKI/Control.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/API.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/API.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL.xs
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/CLI.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_cert.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_crl.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_key.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/convert_pkcs10.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/DSA.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/EC.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST2001.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST2001CP.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST94.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST94CP.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/RSA.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_params.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkcs10.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkcs12.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkey.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_random.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/get_pkcs8_keytype.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/is_issuer.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/is_prime.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/issue_cert.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/issue_crl.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/list_algorithms.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_decrypt.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_encrypt.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_get_chain.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_sign.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_verify.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/verify_cert.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Config.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/GOST.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/OpenSSL.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/PKCS11.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/SafeNetProtectServer.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/nCipher.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/CRL.xs
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/PKCS10.xs
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/SPKAC.xs
+%%SITE_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/X509.xs
+%%SITE_ARCH%%/OpenXPKI/Crypto/CLI.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/CRL.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/CRR.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/CSR.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Header.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Object.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Profile/Base.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Profile/CRL.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Profile/Certificate.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Secret.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Secret/Plain.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Secret/Split.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/TokenManager.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/API.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/CLI.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/Command/create_keystore.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/Engine/OpenSSL.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/API.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/CLI.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_certificate_reply.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_error_reply.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_nextca_reply.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/create_pending_reply.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_getcert_serial.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_message_type.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_pkcs10.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_signer_cert.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_transaction_id.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Engine/OpenSSL.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/Toolkit.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/VolatileVault.pm
+%%SITE_ARCH%%/OpenXPKI/Crypto/X509.pm
+%%SITE_ARCH%%/OpenXPKI/DN.pm
+%%SITE_ARCH%%/OpenXPKI/DateTime.pm
+%%SITE_ARCH%%/OpenXPKI/Debug.pm
+%%SITE_ARCH%%/OpenXPKI/Exception.pm
+%%SITE_ARCH%%/OpenXPKI/FileUtils.pm
+%%SITE_ARCH%%/OpenXPKI/SOAP.pm
+%%SITE_ARCH%%/OpenXPKI/SOAP/Revoke.pm
+%%SITE_ARCH%%/OpenXPKI/Serialization/Fast.pm
+%%SITE_ARCH%%/OpenXPKI/Serialization/JSON.pm
+%%SITE_ARCH%%/OpenXPKI/Serialization/Simple.pm
+%%SITE_ARCH%%/OpenXPKI/Server.pm
+%%SITE_ARCH%%/OpenXPKI/Server/ACL.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Default.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Object.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Profile.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Secret.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Smartcard.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Token.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/UI.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Visualization.pm
+%%SITE_ARCH%%/OpenXPKI/Server/API/Workflow.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/Anonymous.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/ChallengeX509.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/ClientSSO.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/ClientX509.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/Connector.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/External.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/Password.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Authentication/X509.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Context.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/DBH.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Driver.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Driver/DB2.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Driver/MySQL.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Driver/Oracle.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Driver/PostgreSQL.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Driver/SQLite.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Hash.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/SQL.pm
+%%SITE_ARCH%%/OpenXPKI/Server/DBI/Schema.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Init.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Log.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Log/Appender/DBI.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Log/CLI.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Log/NOOP.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Notification/Base.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Notification/Handler.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Notification/RT.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Notification/SMTP.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Notification/ServiceNow.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Session.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Session/Mock.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Watchdog.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Watchdog/WorkflowInstance.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/CreateQueue.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRR/MarkRevoked.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRR/PersistRequest.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GenerateKey.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GeneratePKCS10.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/PersistRequest.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance/PublishCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertRenewal/FetchOrgCertData.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/CheckForRevocation.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/FetchCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/IssueCRL.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/IssueCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/RenewCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/RevokeCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/UnrevokeCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Noop.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/AddToQueue.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/GenerateExportFile.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/GetConfig.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Reports/CertExport/TagAsExported.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/CalcApprovals.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/EvaluateChallenge.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/EvaluateEligibility.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/EvaluateSignerTrust.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/ExtractCSR.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/FetchGroupPolicy.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/LoadRecentCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEPv2/RevokeExistingCerts.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Skeleton.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/ApplyCSRPolicy.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/CheckPrereqs.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/ComputePUK.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/CreateEscrowedKey.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/CreatePKCS12.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/FetchPUK.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GenerateActivationCode.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GeneratePUK.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GetOwnerByCardID.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/PersistCSRs.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/PublishCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/RenameEscrowedKey.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Test.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Approve.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CalculateKeyId.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CancelApprovals.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Connector/GetValue.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/AppendToEntry.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/DeleteEntry.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/GetEntry.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/ModifyEntry.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/SetEntry.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Disconnect.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Export.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GenerateKey.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GeneratePassword.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GetCertificateIdentifier.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/LoadCertificateMetadata.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Notify.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ParseCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ParsePKCS10.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Pause.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PersistCertificateMetadata.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PublishCRL.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PublishCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RenderSubject.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RetrieveCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RevokeCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetContext.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetErrorCode.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetSource.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/UpdateCertificateMetadata.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/WFArray.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/WFHash.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Transfer/SCP.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/WorkflowTest.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/ACL.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/AlwaysFalse.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/AlwaysTrue.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Approved.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/CertificateHasStatus.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/CertificateNotYetRevoked.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/CheckExistingCertificate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Connector/IsValue.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/DatapoolEntry.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/DateTime.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/HasRole.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/IsServerKeyGeneration.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Key.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/MaxIterationsNotReached.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/NICE/IsCertificateIssued.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/NICE/IsCertificatePending.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/SCEPv2/ValidSCEPTID.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Smartcard/AuthCodesValid.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Smartcard/AuthIdValid.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/SubjectMatchesPKCS10.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/ValidCSRSerialPresent.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/WFArray.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/WFHash.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/WorkflowContext.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/WorkflowContextBulk.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/WorkflowCreator.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/NICE.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/NICE/Factory.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/NICE/Local.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Observer/AddExecuteHistory.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Observer/Debug.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Observer/Log.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Pause.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI/SequenceId.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Stub.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/ApprovalSignature.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Bulk.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertIdentifierExists.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertProfile.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertRole.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubject.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectAltNameParts.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectParts.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Connector.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Creator.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/InvalidityTime.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/KeyLength.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/KeyReuse.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/PKCS10.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/PasswordQuality.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/ReasonCode.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Regex.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/RelativeDate.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/SPKAC.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/SmartcardPINUnblockAuthIDs.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/ValidityTime.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/ValidityWindow.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/WFObject.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/WFObject/WFArray.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/WFObject/WFHash.pm
+%%SITE_ARCH%%/OpenXPKI/Service.pm
+%%SITE_ARCH%%/OpenXPKI/Service/Default.pm
+%%SITE_ARCH%%/OpenXPKI/Service/Default/Command.pm
+%%SITE_ARCH%%/OpenXPKI/Service/Default/Command/nop.pm
+%%SITE_ARCH%%/OpenXPKI/Service/SCEP.pm
+%%SITE_ARCH%%/OpenXPKI/Service/SCEP/Command.pm
+%%SITE_ARCH%%/OpenXPKI/Service/SCEP/Command/GetCACaps.pm
+%%SITE_ARCH%%/OpenXPKI/Service/SCEP/Command/GetCACert.pm
+%%SITE_ARCH%%/OpenXPKI/Service/SCEP/Command/GetNextCACert.pm
+%%SITE_ARCH%%/OpenXPKI/Service/SCEP/Command/PKIOperation.pm
+%%SITE_ARCH%%/OpenXPKI/Template.pm
+%%SITE_ARCH%%/OpenXPKI/Template/Plugin/Certificate.pm
+%%SITE_ARCH%%/OpenXPKI/Template/Plugin/RandomPassword.pm
+%%SITE_ARCH%%/OpenXPKI/Test/More.pm
+%%SITE_ARCH%%/OpenXPKI/Tests.pm
+%%SITE_ARCH%%/OpenXPKI/Transport/Simple.pm
+%%SITE_ARCH%%/OpenXPKI/VERSION.pm
+%%SITE_ARCH%%/OpenXPKI/Workflow/Config.pm
+%%SITE_ARCH%%/OpenXPKI/Workflow/Factory.pm
+%%SITE_ARCH%%/OpenXPKI/Workflow/Handler.pm
+%%SITE_ARCH%%/OpenXPKI/XML/Cache.pm
+%%SITE_ARCH%%/OpenXPKI/i18n.pm
+%%SITE_ARCH%%/auto/OpenXPKI/OpenXPKI.so
 man/man1/openxpkiadm.1.gz
 man/man1/openxpkicli.1.gz
 man/man1/openxpkicmd.1.gz
diff --git a/security/pbnj/Makefile b/security/pbnj/Makefile
index b5fcc193d6ba..d5330ff37981 100644
--- a/security/pbnj/Makefile
+++ b/security/pbnj/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pbnj
 PORTVERSION=	2.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/security/pbnj/pkg-plist b/security/pbnj/pkg-plist
index a19a0446a7a5..5974870a6414 100644
--- a/security/pbnj/pkg-plist
+++ b/security/pbnj/pkg-plist
@@ -4,5 +4,3 @@ bin/genlist
 man/man1/genlist.1p.gz
 man/man1/outputpbnj.1p.gz
 man/man1/scanpbnj.1p.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pbnj/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/pbnj
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index 9419fe495a3c..d927f0101d48 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	swatch
 PORTVERSION=	3.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security sysutils
 MASTER_SITES=	SF
 
diff --git a/security/swatch/pkg-plist b/security/swatch/pkg-plist
index 56114bfb456f..46f9a1faa0d7 100644
--- a/security/swatch/pkg-plist
+++ b/security/swatch/pkg-plist
@@ -3,12 +3,7 @@ bin/swatch
 %%SITE_PERL%%/Swatch/Threshold.pm
 %%SITE_PERL%%/Swatch/Throttle.pm
 %%SITE_PERL%%/auto/Swatch/Actions/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/swatch/.packlist
 %%PERL5_MAN3%%/Swatch::Actions.3.gz
 %%PERL5_MAN3%%/Swatch::Threshold.3.gz
 %%PERL5_MAN3%%/Swatch::Throttle.3.gz
 man/man1/swatch.1.gz
-@dirrm %%SITE_PERL%%/Swatch
-@dirrm %%SITE_PERL%%/auto/Swatch/Actions
-@dirrm %%SITE_PERL%%/auto/Swatch
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/swatch
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index e8e58d8abcd3..f0f30b7bb518 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tinyca
 PORTVERSION=	0.7.6
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://opsec.eu/src/${PORTNAME}/
 
@@ -27,9 +28,9 @@ LIB2_FILES=	CALLBACK.pm HELPERS.pm TCONFIG.pm WORDS.pm X509_browser.pm X509_info
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PORTNAME}/GUI
-	${INSTALL_DATA} ${LIB_FILES:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${SITE_PERL}/${PORTNAME}
-	${INSTALL_DATA} ${LIB2_FILES:S|^|${WRKSRC}/lib/GUI/|} ${STAGEDIR}${SITE_PERL}/${PORTNAME}/GUI
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/GUI
+	${INSTALL_DATA} ${LIB_FILES:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
+	${INSTALL_DATA} ${LIB2_FILES:S|^|${WRKSRC}/lib/GUI/|} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/GUI
 	${INSTALL_DATA} ${WRKSRC}/templates/openssl.cnf ${STAGEDIR}${PREFIX}/etc/tinyca.cnf.sample
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
 		-e "s:%%SITE_PERL%%:${SITE_PERL}:g" \
diff --git a/shells/p5-Bash-Completion/Makefile b/shells/p5-Bash-Completion/Makefile
index e4979b9107bc..abb9402156ce 100644
--- a/shells/p5-Bash-Completion/Makefile
+++ b/shells/p5-Bash-Completion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bash-Completion
 PORTVERSION=	0.008
+PORTREVISION=	1
 CATEGORIES=	shells perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MELO
diff --git a/shells/p5-Bash-Completion/pkg-plist b/shells/p5-Bash-Completion/pkg-plist
index 78d574309f14..b5daa96a1068 100644
--- a/shells/p5-Bash-Completion/pkg-plist
+++ b/shells/p5-Bash-Completion/pkg-plist
@@ -7,7 +7,6 @@ bin/setup-bash-complete
 %%SITE_PERL%%/Bash/Completion/Plugins/Perldoc.pm
 %%SITE_PERL%%/Bash/Completion/Request.pm
 %%SITE_PERL%%/Bash/Completion/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bash/Completion/.packlist
 %%PERL5_MAN3%%/App::BashComplete.3.gz
 %%PERL5_MAN3%%/Bash::Completion.3.gz
 %%PERL5_MAN3%%/Bash::Completion::Plugin.3.gz
@@ -17,9 +16,3 @@ bin/setup-bash-complete
 %%PERL5_MAN3%%/Bash::Completion::Utils.3.gz
 man/man1/bash-complete.1.gz
 man/man1/setup-bash-complete.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bash/Completion
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bash
-@dirrm %%SITE_PERL%%/Bash/Completion/Plugins
-@dirrm %%SITE_PERL%%/Bash/Completion
-@dirrmtry %%SITE_PERL%%/Bash
-@dirrmtry %%SITE_PERL%%/App
diff --git a/shells/p5-Shell-Perl/Makefile b/shells/p5-Shell-Perl/Makefile
index 0ad9e3ebd368..2dd993a75571 100644
--- a/shells/p5-Shell-Perl/Makefile
+++ b/shells/p5-Shell-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Shell-Perl
 PORTVERSION=	0.0022
+PORTREVISION=	1
 CATEGORIES=	shells perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/shells/p5-Shell-Perl/pkg-plist b/shells/p5-Shell-Perl/pkg-plist
index 9650785924b9..33970d1e605a 100644
--- a/shells/p5-Shell-Perl/pkg-plist
+++ b/shells/p5-Shell-Perl/pkg-plist
@@ -4,8 +4,3 @@ man/man1/pirl.1.gz
 %%PERL5_MAN3%%/Shell::Perl::Dumper.3.gz
 %%SITE_PERL%%/Shell/Perl.pm
 %%SITE_PERL%%/Shell/Perl/Dumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Perl/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Perl
-@dirrm %%SITE_PERL%%/Shell/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell
-@dirrmtry %%SITE_PERL%%/Shell
diff --git a/shells/p5-Term-ShellUI/Makefile b/shells/p5-Term-ShellUI/Makefile
index 7adb59d17a3b..6fff741b914c 100644
--- a/shells/p5-Term-ShellUI/Makefile
+++ b/shells/p5-Term-ShellUI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Term-ShellUI
 PORTVERSION=	0.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/shells/p5-Term-ShellUI/pkg-plist b/shells/p5-Term-ShellUI/pkg-plist
index 45dae0409f09..59d10a337659 100644
--- a/shells/p5-Term-ShellUI/pkg-plist
+++ b/shells/p5-Term-ShellUI/pkg-plist
@@ -2,14 +2,8 @@
 %%PERL5_MAN3%%/Text::Shellwords::Cursor.3.gz
 %%SITE_PERL%%/Term/ShellUI.pm
 %%SITE_PERL%%/Text/Shellwords/Cursor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ShellUI/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileman-example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis-big
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tui-sample
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ShellUI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
-@dirrmtry %%SITE_PERL%%/Text/Shellwords
-@dirrmtry %%SITE_PERL%%/Text
-@dirrmtry %%SITE_PERL%%/Term
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index ccd838cc07c4..a8b7597b893e 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	psh
 PORTVERSION=	1.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	shells perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GREGOR
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index dcbbbe04fa92..00f398eb5365 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -111,7 +111,6 @@ bin/psh
 %%SITE_PERL%%/Psh/Support/Functions.pm
 %%SITE_PERL%%/Psh/Support/TiedOption.pm
 %%SITE_PERL%%/Psh/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/psh/.packlist
 man/man1/psh.1.gz
 man/man1/pshcomplete.1.gz
 man/man1/pshconfig.1.gz
@@ -182,11 +181,3 @@ man/man1/pshdevel.1.gz
 @dirrm %%DATADIR%%/complete
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh
-@dirrm %%SITE_PERL%%/Psh/Builtins/Fallback
-@dirrm %%SITE_PERL%%/Psh/Builtins
-@dirrm %%SITE_PERL%%/Psh/Locale
-@dirrm %%SITE_PERL%%/Psh/OS
-@dirrm %%SITE_PERL%%/Psh/Strategy
-@dirrm %%SITE_PERL%%/Psh/Support
-@dirrm %%SITE_PERL%%/Psh
diff --git a/shells/vshnu/Makefile b/shells/vshnu/Makefile
index 349cf8277992..05010aaa65e1 100644
--- a/shells/vshnu/Makefile
+++ b/shells/vshnu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vshnu
 PORTVERSION=	1.0305
+PORTREVISION=	1
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.cs.indiana.edu/~kinzler/${PORTNAME}/
 
diff --git a/shells/vshnu/pkg-plist b/shells/vshnu/pkg-plist
index eca016d734c4..2d6f9fe16282 100644
--- a/shells/vshnu/pkg-plist
+++ b/shells/vshnu/pkg-plist
@@ -1,4 +1,2 @@
 @shell bin/vshnu
 %%SITE_PERL%%/vshnucfg.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/vshnu/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/vshnu
diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile
index cf1e4585ac08..577d54175e07 100644
--- a/sysutils/debhelper/Makefile
+++ b/sysutils/debhelper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	debhelper
 PORTVERSION=	9.20141107
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile
index dfb8adef6e30..ffb6e44c9234 100644
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	logwatch
 PORTVERSION=	7.4.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index e405916a959e..2773851d271f 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-common
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 6bacc0774581..5f48066a8205 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-master
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 44d2fb0db6ef..c4112b92bc51 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
diff --git a/sysutils/namefix/Makefile b/sysutils/namefix/Makefile
index 0c7d25441fc4..b45e71ad2f62 100644
--- a/sysutils/namefix/Makefile
+++ b/sysutils/namefix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	namefix
 PORTVERSION=	4.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}.pl/${PORTVERSION}
 DISTNAME=	${PORTNAME}.pl_${PORTVERSION}
diff --git a/sysutils/namefix/pkg-plist b/sysutils/namefix/pkg-plist
index 1b6656295c3d..ea6c1d5a2240 100644
--- a/sysutils/namefix/pkg-plist
+++ b/sysutils/namefix/pkg-plist
@@ -38,8 +38,3 @@ bin/namefix-cli
 %%SITE_PERL%%/namefix/txt/links.txt
 %%SITE_PERL%%/namefix/txt/thanks.txt
 %%SITE_PERL%%/namefix/txt/todo.txt
-@dirrm %%SITE_PERL%%/namefix/txt
-@dirrm %%SITE_PERL%%/namefix/libs/gui
-@dirrm %%SITE_PERL%%/namefix/libs/cli
-@dirrm %%SITE_PERL%%/namefix/libs
-@dirrm %%SITE_PERL%%/namefix
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index 784430d7540d..2840cf04dca9 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openipmi
 PORTVERSION=	2.0.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/OpenIPMI%202.0%20Library
 DISTNAME=	OpenIPMI-${PORTVERSION}
diff --git a/sysutils/openipmi/pkg-plist b/sysutils/openipmi/pkg-plist
index d7c7529622fd..e536179c9bdc 100644
--- a/sysutils/openipmi/pkg-plist
+++ b/sysutils/openipmi/pkg-plist
@@ -120,9 +120,8 @@ man/man8/ipmilan.8.gz
 %%TCL%%lib/libOpenIPMItcl.so.0.0.1
 %%TCL%%libdata/pkgconfig/OpenIPMItcl.pc
 %%PERL%%@comment files list for PERL
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OpenIPMI.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenIPMI/OpenIPMI.so
-%%PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenIPMI
+%%PERL%%%%SITE_ARCH%%/OpenIPMI.pm
+%%PERL%%%%SITE_ARCH%%/auto/OpenIPMI/OpenIPMI.so
 %%PYTHON%%@comment files list for PYTHON
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyc
diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile
index 320e4203e203..0f2cd8367844 100644
--- a/sysutils/p5-BSD-Jail-Object/Makefile
+++ b/sysutils/p5-BSD-Jail-Object/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	BSD-Jail-Object
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-BSD-Jail-Object/pkg-plist b/sysutils/p5-BSD-Jail-Object/pkg-plist
index 23ab4c4fcdfd..1e264d26148b 100644
--- a/sysutils/p5-BSD-Jail-Object/pkg-plist
+++ b/sysutils/p5-BSD-Jail-Object/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/Jail/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Jail/Object/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Jail/Object/Object.so
+%%SITE_ARCH%%/BSD/Jail/Object.pm
+%%SITE_ARCH%%/auto/BSD/Jail/Object/Object.so
 %%PERL5_MAN3%%/BSD::Jail::Object.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Jail/Object
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Jail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD/Jail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD
diff --git a/sysutils/p5-BSD-Process/Makefile b/sysutils/p5-BSD-Process/Makefile
index 10e24e945b1e..42b285baa24a 100644
--- a/sysutils/p5-BSD-Process/Makefile
+++ b/sysutils/p5-BSD-Process/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BSD-Process
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DLAND
diff --git a/sysutils/p5-BSD-Process/pkg-plist b/sysutils/p5-BSD-Process/pkg-plist
index 5ba2992f937d..74148fca99f2 100644
--- a/sysutils/p5-BSD-Process/pkg-plist
+++ b/sysutils/p5-BSD-Process/pkg-plist
@@ -2,9 +2,5 @@ bin/procinfo
 bin/showprocattr
 bin/topten
 %%PERL5_MAN3%%/BSD::Process.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/Process.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Process/Process.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Process/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Process
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD
+%%SITE_ARCH%%/BSD/Process.pm
+%%SITE_ARCH%%/auto/BSD/Process/Process.so
diff --git a/sysutils/p5-BSD-Sysctl/Makefile b/sysutils/p5-BSD-Sysctl/Makefile
index ab9459bc9d0f..56d8b8d85bed 100644
--- a/sysutils/p5-BSD-Sysctl/Makefile
+++ b/sysutils/p5-BSD-Sysctl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BSD-Sysctl
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-BSD-Sysctl/pkg-plist b/sysutils/p5-BSD-Sysctl/pkg-plist
index 62c0faa4c369..29f2267cc775 100644
--- a/sysutils/p5-BSD-Sysctl/pkg-plist
+++ b/sysutils/p5-BSD-Sysctl/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/Sysctl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/bsd-sysctl.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Sysctl/Sysctl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Sysctl/.packlist
+%%SITE_ARCH%%/BSD/Sysctl.pm
+%%SITE_ARCH%%/BSD/bsd-sysctl.pl
+%%SITE_ARCH%%/auto/BSD/Sysctl/Sysctl.so
 %%PERL5_MAN3%%/BSD::Sysctl.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Sysctl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD
diff --git a/sysutils/p5-BackupPC-XS/Makefile b/sysutils/p5-BackupPC-XS/Makefile
index 4658469341c2..6eb6fa9e5867 100644
--- a/sysutils/p5-BackupPC-XS/Makefile
+++ b/sysutils/p5-BackupPC-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BackupPC-XS
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	backuppc/backuppc-beta/4.0.0alpha3
diff --git a/sysutils/p5-BackupPC-XS/pkg-plist b/sysutils/p5-BackupPC-XS/pkg-plist
index aca3f3e7ada8..d0b197b59ef6 100644
--- a/sysutils/p5-BackupPC-XS/pkg-plist
+++ b/sysutils/p5-BackupPC-XS/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/BackupPC::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/BackupPC/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC/XS/XS.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC/XS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BackupPC
+%%SITE_ARCH%%/BackupPC/XS.pm
+%%SITE_ARCH%%/auto/BackupPC/XS/XS.so
diff --git a/sysutils/p5-Brackup/Makefile b/sysutils/p5-Brackup/Makefile
index 6b3b25b1ae2d..40dad81b31ed 100644
--- a/sysutils/p5-Brackup/Makefile
+++ b/sysutils/p5-Brackup/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Brackup
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
diff --git a/sysutils/p5-Brackup/pkg-plist b/sysutils/p5-Brackup/pkg-plist
index 8230b8d2d782..b3caf48e2eeb 100644
--- a/sysutils/p5-Brackup/pkg-plist
+++ b/sysutils/p5-Brackup/pkg-plist
@@ -61,15 +61,8 @@ bin/brackup-verify-inventory
 %%SITE_PERL%%/Brackup/TargetBackupStatInfo.pm
 %%SITE_PERL%%/Brackup/Test.pm
 %%SITE_PERL%%/Brackup/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Brackup/.packlist
 man/man1/brackup-mount.1.gz
 man/man1/brackup-restore.1.gz
 man/man1/brackup-target.1.gz
 man/man1/brackup-verify-inventory.1.gz
 man/man1/brackup.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Brackup
-@dirrmtry %%SITE_PERL%%/Brackup/Target
-@dirrmtry %%SITE_PERL%%/Brackup/Manual
-@dirrmtry %%SITE_PERL%%/Brackup/Dict
-@dirrmtry %%SITE_PERL%%/Brackup/Chunker
-@dirrmtry %%SITE_PERL%%/Brackup
diff --git a/sysutils/p5-Dir-Purge/Makefile b/sysutils/p5-Dir-Purge/Makefile
index 02d2902153df..a003af774a79 100644
--- a/sysutils/p5-Dir-Purge/Makefile
+++ b/sysutils/p5-Dir-Purge/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dir-Purge
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Dir-Purge/pkg-plist b/sysutils/p5-Dir-Purge/pkg-plist
index 221a0eb7283a..c8863495bd53 100644
--- a/sysutils/p5-Dir-Purge/pkg-plist
+++ b/sysutils/p5-Dir-Purge/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dir/Purge/.packlist
 %%SITE_PERL%%/Dir/Purge.pm
 %%PERL5_MAN3%%/Dir::Purge.3.gz
diff --git a/sysutils/p5-File-DirCompare/Makefile b/sysutils/p5-File-DirCompare/Makefile
index 3fab3923a11a..e90a69178c65 100644
--- a/sysutils/p5-File-DirCompare/Makefile
+++ b/sysutils/p5-File-DirCompare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-DirCompare
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-File-DirCompare/pkg-plist b/sysutils/p5-File-DirCompare/pkg-plist
index 38bfd3a128ba..f244e9f5c3b2 100644
--- a/sysutils/p5-File-DirCompare/pkg-plist
+++ b/sysutils/p5-File-DirCompare/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/File::DirCompare.3.gz
 %%SITE_PERL%%/File/DirCompare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirCompare/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirCompare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-File-Listing/Makefile b/sysutils/p5-File-Listing/Makefile
index 7c352413f50b..96124080d6cb 100644
--- a/sysutils/p5-File-Listing/Makefile
+++ b/sysutils/p5-File-Listing/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Listing
 PORTVERSION=	6.04
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-File-Listing/pkg-plist b/sysutils/p5-File-Listing/pkg-plist
index e377510d6d3d..e90b1b96d574 100644
--- a/sysutils/p5-File-Listing/pkg-plist
+++ b/sysutils/p5-File-Listing/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/File::Listing.3.gz
 %%SITE_PERL%%/File/Listing.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Listing/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Listing
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-File-Log/Makefile b/sysutils/p5-File-Log/Makefile
index cc1bf6bdcc38..edc51f559f6d 100644
--- a/sysutils/p5-File-Log/Makefile
+++ b/sysutils/p5-File-Log/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		File-Log
 PORTVERSION=		1.05
+PORTREVISION=	1
 CATEGORIES=		sysutils perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/sysutils/p5-File-Log/pkg-plist b/sysutils/p5-File-Log/pkg-plist
index 08e5d032cdb0..f0028e288369 100644
--- a/sysutils/p5-File-Log/pkg-plist
+++ b/sysutils/p5-File-Log/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/File/Log.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Log/.packlist
 %%PERL5_MAN3%%/File::Log.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Log
-@dirrmtry %%SITE_PERL%%/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/sysutils/p5-File-Next/Makefile b/sysutils/p5-File-Next/Makefile
index 52f46a62e2f1..2f6b46168cd0 100644
--- a/sysutils/p5-File-Next/Makefile
+++ b/sysutils/p5-File-Next/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Next
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-File-Next/pkg-plist b/sysutils/p5-File-Next/pkg-plist
index 52d0ae903501..fc59ba8c558a 100644
--- a/sysutils/p5-File-Next/pkg-plist
+++ b/sysutils/p5-File-Next/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/File::Next.3.gz
 %%SITE_PERL%%/File/Next.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Next/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Next
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-File-Signature/Makefile b/sysutils/p5-File-Signature/Makefile
index 010ec49b495c..2658f0cd52cd 100644
--- a/sysutils/p5-File-Signature/Makefile
+++ b/sysutils/p5-File-Signature/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Signature
 PORTVERSION=	1.009
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-File-Signature/pkg-plist b/sysutils/p5-File-Signature/pkg-plist
index 7f2b4e8c489b..41273264f1fd 100644
--- a/sysutils/p5-File-Signature/pkg-plist
+++ b/sysutils/p5-File-Signature/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/File/Signature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Signature/.packlist
 %%PERL5_MAN3%%/File::Signature.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Signature
-@dirrmtry %%SITE_PERL%%/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/sysutils/p5-File-Stat-Bits/Makefile b/sysutils/p5-File-Stat-Bits/Makefile
index 861e896b997a..d93eaa6f63d2 100644
--- a/sysutils/p5-File-Stat-Bits/Makefile
+++ b/sysutils/p5-File-Stat-Bits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Stat-Bits
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-File-Stat-Bits/pkg-plist b/sysutils/p5-File-Stat-Bits/pkg-plist
index 8414b650b87e..e49eeb7de459 100644
--- a/sysutils/p5-File-Stat-Bits/pkg-plist
+++ b/sysutils/p5-File-Stat-Bits/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/File/Stat/Bits.pm
 %%SITE_PERL%%/File/Stat/Bits/stat.ph
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/Bits/.packlist
 %%PERL5_MAN3%%/File::Stat::Bits.3.gz
-@dirrm %%SITE_PERL%%/File/Stat/Bits
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/Bits
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File/Stat
-@dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-File-Stat-ModeString/Makefile b/sysutils/p5-File-Stat-ModeString/Makefile
index e84bda315f0a..b589ce481517 100644
--- a/sysutils/p5-File-Stat-ModeString/Makefile
+++ b/sysutils/p5-File-Stat-ModeString/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Stat-ModeString
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FEDOROV
diff --git a/sysutils/p5-File-Stat-ModeString/pkg-plist b/sysutils/p5-File-Stat-ModeString/pkg-plist
index 3c00ece43f93..411866a88c78 100644
--- a/sysutils/p5-File-Stat-ModeString/pkg-plist
+++ b/sysutils/p5-File-Stat-ModeString/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/File/Stat/ModeString.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/ModeString/.packlist
 %%PERL5_MAN3%%/File::Stat::ModeString.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/ModeString
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File/Stat
-@dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-File-Tee/Makefile b/sysutils/p5-File-Tee/Makefile
index 3e9706116d46..cf8b5461a593 100644
--- a/sysutils/p5-File-Tee/Makefile
+++ b/sysutils/p5-File-Tee/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Tee
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN \
 		http://kostjn.spb.ru/freebsd/
diff --git a/sysutils/p5-File-Tee/pkg-plist b/sysutils/p5-File-Tee/pkg-plist
index 3f228d153d91..4b38c2deb3d2 100644
--- a/sysutils/p5-File-Tee/pkg-plist
+++ b/sysutils/p5-File-Tee/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tee/.packlist
 %%SITE_PERL%%/File/Tee.pm
 %%PERL5_MAN3%%/File::Tee.3.gz
-@dirrmtry %%SITE_PERL%%/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tee
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/sysutils/p5-File-Which/Makefile b/sysutils/p5-File-Which/Makefile
index 74f5e5b54a66..90b5789ad924 100644
--- a/sysutils/p5-File-Which/Makefile
+++ b/sysutils/p5-File-Which/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Which
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-File-Which/pkg-plist b/sysutils/p5-File-Which/pkg-plist
index 35b692a07986..12ccac9e1f75 100644
--- a/sysutils/p5-File-Which/pkg-plist
+++ b/sysutils/p5-File-Which/pkg-plist
@@ -2,7 +2,3 @@ bin/pwhich
 %%PERL5_MAN3%%/File::Which.3.gz
 man/man1/pwhich.1.gz
 %%SITE_PERL%%/File/Which.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Which/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Which
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-Filesys-Df/Makefile b/sysutils/p5-Filesys-Df/Makefile
index 01fb0e760fad..affaf423a089 100644
--- a/sysutils/p5-Filesys-Df/Makefile
+++ b/sysutils/p5-Filesys-Df/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-Df
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Filesys-Df/pkg-plist b/sysutils/p5-Filesys-Df/pkg-plist
index 688f60ac1bff..575e839470ef 100644
--- a/sysutils/p5-Filesys-Df/pkg-plist
+++ b/sysutils/p5-Filesys-Df/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Filesys/Df.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Df/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Df/Df.so
+%%SITE_ARCH%%/Filesys/Df.pm
+%%SITE_ARCH%%/auto/Filesys/Df/Df.so
 %%PERL5_MAN3%%/Filesys::Df.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Df
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filesys
diff --git a/sysutils/p5-Filesys-DfPortable/Makefile b/sysutils/p5-Filesys-DfPortable/Makefile
index 22464c0b772d..a54674a67643 100644
--- a/sysutils/p5-Filesys-DfPortable/Makefile
+++ b/sysutils/p5-Filesys-DfPortable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-DfPortable
 PORTVERSION=	0.85
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Filesys
diff --git a/sysutils/p5-Filesys-DfPortable/pkg-plist b/sysutils/p5-Filesys-DfPortable/pkg-plist
index 7d398ba2f173..30ab3587c549 100644
--- a/sysutils/p5-Filesys-DfPortable/pkg-plist
+++ b/sysutils/p5-Filesys-DfPortable/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Filesys/DfPortable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DfPortable/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DfPortable/DfPortable.so
+%%SITE_ARCH%%/Filesys/DfPortable.pm
+%%SITE_ARCH%%/auto/Filesys/DfPortable/DfPortable.so
 %%PERL5_MAN3%%/Filesys::DfPortable.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DfPortable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filesys
diff --git a/sysutils/p5-Filesys-DiskFree/Makefile b/sysutils/p5-Filesys-DiskFree/Makefile
index fb568bf76860..f5b5c74ce79d 100644
--- a/sysutils/p5-Filesys-DiskFree/Makefile
+++ b/sysutils/p5-Filesys-DiskFree/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Filesys-DiskFree
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Filesys-DiskFree/pkg-plist b/sysutils/p5-Filesys-DiskFree/pkg-plist
index c2d33f6459d3..6d768d3cdb69 100644
--- a/sysutils/p5-Filesys-DiskFree/pkg-plist
+++ b/sysutils/p5-Filesys-DiskFree/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Filesys::DiskFree.3.gz
 %%SITE_PERL%%/Filesys/DiskFree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskFree/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskFree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrmtry %%SITE_PERL%%/Filesys
diff --git a/sysutils/p5-Filesys-DiskSpace/Makefile b/sysutils/p5-Filesys-DiskSpace/Makefile
index 6eb46d5d206d..80172e4491df 100644
--- a/sysutils/p5-Filesys-DiskSpace/Makefile
+++ b/sysutils/p5-Filesys-DiskSpace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-DiskSpace
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Filesys-DiskSpace/pkg-plist b/sysutils/p5-Filesys-DiskSpace/pkg-plist
index 4fd6aae4cfd4..9ca0a05d41e1 100644
--- a/sysutils/p5-Filesys-DiskSpace/pkg-plist
+++ b/sysutils/p5-Filesys-DiskSpace/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskSpace/.packlist
 %%SITE_PERL%%/Filesys/DiskSpace.pm
 %%PERL5_MAN3%%/Filesys::DiskSpace.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskSpace
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrm %%SITE_PERL%%/Filesys
diff --git a/sysutils/p5-Filesys-DiskUsage/Makefile b/sysutils/p5-Filesys-DiskUsage/Makefile
index 3b1106724f48..937b8c687b1a 100644
--- a/sysutils/p5-Filesys-DiskUsage/Makefile
+++ b/sysutils/p5-Filesys-DiskUsage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-DiskUsage
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Filesys-DiskUsage/pkg-plist b/sysutils/p5-Filesys-DiskUsage/pkg-plist
index ded60bf5f9df..85ae30bd7732 100644
--- a/sysutils/p5-Filesys-DiskUsage/pkg-plist
+++ b/sysutils/p5-Filesys-DiskUsage/pkg-plist
@@ -1,8 +1,4 @@
 bin/fdu
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskUsage/.packlist
 %%SITE_PERL%%/Filesys/DiskUsage.pm
 %%PERL5_MAN3%%/Filesys::DiskUsage.3.gz
 man/man1/fdu.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskUsage
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrm %%SITE_PERL%%/Filesys
diff --git a/sysutils/p5-Filesys-Statvfs/Makefile b/sysutils/p5-Filesys-Statvfs/Makefile
index aee44130a492..55bae9617cee 100644
--- a/sysutils/p5-Filesys-Statvfs/Makefile
+++ b/sysutils/p5-Filesys-Statvfs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filesys-Statvfs
 PORTVERSION=	0.82
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Filesys-Statvfs/pkg-plist b/sysutils/p5-Filesys-Statvfs/pkg-plist
index aa69ea85fe5b..4cd96e0eafc2 100644
--- a/sysutils/p5-Filesys-Statvfs/pkg-plist
+++ b/sysutils/p5-Filesys-Statvfs/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Filesys/Statvfs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs/Statvfs.so
+%%SITE_ARCH%%/Filesys/Statvfs.pm
+%%SITE_ARCH%%/auto/Filesys/Statvfs/Statvfs.so
 %%PERL5_MAN3%%/Filesys::Statvfs.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filesys
diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile
index ff3e299ad3eb..fbf08ca43c03 100644
--- a/sysutils/p5-Fuse-Simple/Makefile
+++ b/sysutils/p5-Fuse-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Fuse-Simple
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NOSEYNICK
diff --git a/sysutils/p5-Fuse-Simple/pkg-plist b/sysutils/p5-Fuse-Simple/pkg-plist
index ab52498682f7..c3304caba400 100644
--- a/sysutils/p5-Fuse-Simple/pkg-plist
+++ b/sysutils/p5-Fuse-Simple/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Fuse/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fuse/Simple/.packlist
 %%PERL5_MAN3%%/Fuse::Simple.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fuse/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fuse
-@dirrmtry %%SITE_PERL%%/Fuse
diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile
index 22663d05775a..2586b460e61a 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/sysutils/p5-Fuse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Fuse
 PORTVERSION=	0.16.1
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DPATES
diff --git a/sysutils/p5-Fuse/pkg-plist b/sysutils/p5-Fuse/pkg-plist
index 38e48c29f13a..8125fb7a462a 100644
--- a/sysutils/p5-Fuse/pkg-plist
+++ b/sysutils/p5-Fuse/pkg-plist
@@ -1,6 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Fuse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fuse/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fuse/Fuse.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fuse/autosplit.ix
+%%SITE_ARCH%%/Fuse.pm
+%%SITE_ARCH%%/auto/Fuse/Fuse.so
+%%SITE_ARCH%%/auto/Fuse/autosplit.ix
 %%PERL5_MAN3%%/Fuse.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fuse
diff --git a/sysutils/p5-Iterator-File/Makefile b/sysutils/p5-Iterator-File/Makefile
index 8439e038d608..866c8f8b2793 100644
--- a/sysutils/p5-Iterator-File/Makefile
+++ b/sysutils/p5-Iterator-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Iterator-File
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Iterator-File/pkg-plist b/sysutils/p5-Iterator-File/pkg-plist
index 40cadb8b5440..9a7cc6bfa338 100644
--- a/sysutils/p5-Iterator-File/pkg-plist
+++ b/sysutils/p5-Iterator-File/pkg-plist
@@ -14,10 +14,3 @@
 %%SITE_PERL%%/Iterator/File/State/TempFile.pm
 %%SITE_PERL%%/Iterator/File/Status.pm
 %%SITE_PERL%%/Iterator/File/Utility.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/File/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator
-@dirrmtry %%SITE_PERL%%/Iterator/File/State
-@dirrmtry %%SITE_PERL%%/Iterator/File/Source
-@dirrmtry %%SITE_PERL%%/Iterator/File
-@dirrmtry %%SITE_PERL%%/Iterator
diff --git a/sysutils/p5-Lchown/Makefile b/sysutils/p5-Lchown/Makefile
index 67671945ad8f..facaa200cfec 100644
--- a/sysutils/p5-Lchown/Makefile
+++ b/sysutils/p5-Lchown/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lchown
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NCLEATON
@@ -16,6 +16,6 @@ USES=		perl5
 USE_PERL5=	modbuild
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Lchown/Lchown.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Lchown/Lchown.so
 
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Lchown/pkg-plist b/sysutils/p5-Lchown/pkg-plist
index 447710c2908f..3f13c45417dd 100644
--- a/sysutils/p5-Lchown/pkg-plist
+++ b/sysutils/p5-Lchown/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Lchown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lchown/Lchown.so
+%%SITE_ARCH%%/Lchown.pm
+%%SITE_ARCH%%/auto/Lchown/Lchown.so
 %%PERL5_MAN3%%/Lchown.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lchown
diff --git a/sysutils/p5-Linux-Cpuinfo/Makefile b/sysutils/p5-Linux-Cpuinfo/Makefile
index 4a933f7717b0..42152c61c95d 100644
--- a/sysutils/p5-Linux-Cpuinfo/Makefile
+++ b/sysutils/p5-Linux-Cpuinfo/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Linux-Cpuinfo
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Linux-Cpuinfo/pkg-plist b/sysutils/p5-Linux-Cpuinfo/pkg-plist
index 5e13555317a6..67bb0eb249c5 100644
--- a/sysutils/p5-Linux-Cpuinfo/pkg-plist
+++ b/sysutils/p5-Linux-Cpuinfo/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Linux::Cpuinfo.3.gz
 %%SITE_PERL%%/Linux/Cpuinfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Linux/Cpuinfo/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Linux/Cpuinfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Linux
-@dirrmtry %%SITE_PERL%%/Linux
diff --git a/sysutils/p5-MogileFS-Client/Makefile b/sysutils/p5-MogileFS-Client/Makefile
index f90e519d0846..3606ed88c871 100644
--- a/sysutils/p5-MogileFS-Client/Makefile
+++ b/sysutils/p5-MogileFS-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MogileFS-Client
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	sysutils net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DORMANDO
diff --git a/sysutils/p5-MogileFS-Client/pkg-plist b/sysutils/p5-MogileFS-Client/pkg-plist
index 85db906e4783..b0899e6fcf4f 100644
--- a/sysutils/p5-MogileFS-Client/pkg-plist
+++ b/sysutils/p5-MogileFS-Client/pkg-plist
@@ -3,8 +3,4 @@
 %%SITE_PERL%%/MogileFS/Client.pm
 %%SITE_PERL%%/MogileFS/ClientHTTPFile.pm
 %%SITE_PERL%%/MogileFS/NewHTTPFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Client/.packlist
 %%PERL5_MAN3%%/MogileFS::Client.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS
-@dirrmtry %%SITE_PERL%%/MogileFS
diff --git a/sysutils/p5-MogileFS-Network/Makefile b/sysutils/p5-MogileFS-Network/Makefile
index 5c27ce7e635c..8d217cac45d7 100644
--- a/sysutils/p5-MogileFS-Network/Makefile
+++ b/sysutils/p5-MogileFS-Network/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MogileFS-Network
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	sysutils net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HACHI
diff --git a/sysutils/p5-MogileFS-Network/pkg-plist b/sysutils/p5-MogileFS-Network/pkg-plist
index f8d4ce92fb6f..bd3802ca4732 100644
--- a/sysutils/p5-MogileFS-Network/pkg-plist
+++ b/sysutils/p5-MogileFS-Network/pkg-plist
@@ -2,11 +2,5 @@
 %%SITE_PERL%%/MogileFS/Plugin/ZoneLocal.pm
 %%SITE_PERL%%/MogileFS/ReplicationPolicy/HostsPerNetwork.pm
 %%SITE_PERL%%/MogileFS/ReplicationPolicy/MultipleNetworks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Network/.packlist
 %%PERL5_MAN3%%/MogileFS::Network.3.gz
 %%PERL5_MAN3%%/MogileFS::ReplicationPolicy::MultipleNetworks.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Network
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS
-@dirrmtry %%SITE_PERL%%/MogileFS/Plugin
-@dirrmtry %%SITE_PERL%%/MogileFS/ReplicationPolicy
-@dirrmtry %%SITE_PERL%%/MogileFS
diff --git a/sysutils/p5-MogileFS-Server/Makefile b/sysutils/p5-MogileFS-Server/Makefile
index 8cd7663ba12c..642ff22a441a 100644
--- a/sysutils/p5-MogileFS-Server/Makefile
+++ b/sysutils/p5-MogileFS-Server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MogileFS-Server
 PORTVERSION=	2.70
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DORMANDO
diff --git a/sysutils/p5-MogileFS-Server/pkg-plist b/sysutils/p5-MogileFS-Server/pkg-plist
index bbd79ce91f79..2f3a4bcd329e 100644
--- a/sysutils/p5-MogileFS-Server/pkg-plist
+++ b/sysutils/p5-MogileFS-Server/pkg-plist
@@ -65,7 +65,6 @@ man/man1/mogstored.1.gz
 %%SITE_PERL%%/Mogstored/SideChannelClient.pm
 %%SITE_PERL%%/Mogstored/SideChannelListener.pm
 %%SITE_PERL%%/Mogstored/TaskQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Server/.packlist
 %%PERL5_MAN3%%/MogileFS::Checksum.3.gz
 %%PERL5_MAN3%%/MogileFS::Class.3.gz
 %%PERL5_MAN3%%/MogileFS::DevFID.3.gz
@@ -93,14 +92,3 @@ man/man1/mogstored.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pluggable-replication-policies.txt
 %%PORTDOCS%%%%DOCSDIR%%/testing.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS
-@dirrmtry %%SITE_PERL%%/Mogstored/HTTPServer
-@dirrmtry %%SITE_PERL%%/Mogstored/ChildProcess
-@dirrmtry %%SITE_PERL%%/Mogstored
-@dirrmtry %%SITE_PERL%%/MogileFS/Worker
-@dirrmtry %%SITE_PERL%%/MogileFS/Store
-@dirrmtry %%SITE_PERL%%/MogileFS/ReplicationPolicy
-@dirrmtry %%SITE_PERL%%/MogileFS/Factory
-@dirrmtry %%SITE_PERL%%/MogileFS/Connection
-@dirrmtry %%SITE_PERL%%/MogileFS
diff --git a/sysutils/p5-MogileFS-Utils/Makefile b/sysutils/p5-MogileFS-Utils/Makefile
index 6649d07dbc7b..3f9126b18756 100644
--- a/sysutils/p5-MogileFS-Utils/Makefile
+++ b/sysutils/p5-MogileFS-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MogileFS-Utils
 PORTVERSION=	2.28
+PORTREVISION=	1
 CATEGORIES=	sysutils net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DORMANDO
diff --git a/sysutils/p5-MogileFS-Utils/pkg-plist b/sysutils/p5-MogileFS-Utils/pkg-plist
index aa81451b0ab2..460dbc499373 100644
--- a/sysutils/p5-MogileFS-Utils/pkg-plist
+++ b/sysutils/p5-MogileFS-Utils/pkg-plist
@@ -21,8 +21,4 @@ man/man1/mogstats.1.gz
 man/man1/mogtool.1.gz
 man/man1/mogupload.1.gz
 %%SITE_PERL%%/MogileFS/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Utils/.packlist
 %%PERL5_MAN3%%/MogileFS::Utils.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS/Utils
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MogileFS
-@dirrmtry %%SITE_PERL%%/MogileFS
diff --git a/sysutils/p5-Monitor-Simple/Makefile b/sysutils/p5-Monitor-Simple/Makefile
index bfe046c54471..f8b707257ee6 100644
--- a/sysutils/p5-Monitor-Simple/Makefile
+++ b/sysutils/p5-Monitor-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Monitor-Simple
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Monitor-Simple/pkg-plist b/sysutils/p5-Monitor-Simple/pkg-plist
index deacdade35ea..9e27549f74b8 100644
--- a/sysutils/p5-Monitor-Simple/pkg-plist
+++ b/sysutils/p5-Monitor-Simple/pkg-plist
@@ -25,7 +25,6 @@ bin/smonitor
 %%SITE_PERL%%/Monitor/Simple/plugins/check_mem.pl
 %%SITE_PERL%%/Monitor/Simple/plugins/copy-message.pl
 %%SITE_PERL%%/Monitor/Simple/plugins/get-date.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Monitor/Simple/.packlist
 %%PERL5_MAN3%%/Monitor::Simple.3.gz
 %%PERL5_MAN3%%/Monitor::Simple::Config.3.gz
 %%PERL5_MAN3%%/Monitor::Simple::Log.3.gz
@@ -34,10 +33,3 @@ bin/smonitor
 %%PERL5_MAN3%%/Monitor::Simple::UserAgent.3.gz
 %%PERL5_MAN3%%/Monitor::Simple::Utils.3.gz
 man/man1/smonitor.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Monitor/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Monitor
-@dirrmtry %%SITE_PERL%%/Monitor/Simple/plugins
-@dirrmtry %%SITE_PERL%%/Monitor/Simple/notifiers
-@dirrmtry %%SITE_PERL%%/Monitor/Simple/configs
-@dirrmtry %%SITE_PERL%%/Monitor/Simple
-@dirrmtry %%SITE_PERL%%/Monitor
diff --git a/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile b/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
index 28f183f1b6b0..f5f0029c1aed 100644
--- a/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
+++ b/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plugtools-Plugins-HomeOU
 PORTVERSION=	0.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/sysutils/p5-Plugtools-Plugins-HomeOU/pkg-plist b/sysutils/p5-Plugtools-Plugins-HomeOU/pkg-plist
index f10887f3870c..250e9aecef8e 100644
--- a/sysutils/p5-Plugtools-Plugins-HomeOU/pkg-plist
+++ b/sysutils/p5-Plugtools-Plugins-HomeOU/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Plugtools/Plugins/HomeOU.pm
 %%SITE_PERL%%/Plugtools/Plugins/HomeOUremove.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plugtools/Plugins/HomeOU/.packlist
 %%PERL5_MAN3%%/Plugtools::Plugins::HomeOU.3.gz
 %%PERL5_MAN3%%/Plugtools::Plugins::HomeOUremove.3.gz
-@dirrmtry %%SITE_PERL%%/Plugtools/Plugins/
-@dirrmtry %%SITE_PERL%%/Plugtools/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plugtools/Plugins/HomeOU
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plugtools/Plugins
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plugtools
diff --git a/sysutils/p5-Plugtools/Makefile b/sysutils/p5-Plugtools/Makefile
index 0983aa85b091..d1025c0ce682 100644
--- a/sysutils/p5-Plugtools/Makefile
+++ b/sysutils/p5-Plugtools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plugtools
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/sysutils/p5-Plugtools/pkg-plist b/sysutils/p5-Plugtools/pkg-plist
index 797948311e92..5d87754e0c8d 100644
--- a/sysutils/p5-Plugtools/pkg-plist
+++ b/sysutils/p5-Plugtools/pkg-plist
@@ -8,9 +8,5 @@ bin/plupass
 bin/plurm
 %%SITE_PERL%%/Plugtools.pm
 %%SITE_PERL%%/Plugtools/Plugins/Dump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plugtools/.packlist
 %%PERL5_MAN3%%/Plugtools.3.gz
 %%PERL5_MAN3%%/Plugtools::Plugins::Dump.3.gz
-@dirrmtry %%SITE_PERL%%/Plugtools/Plugins/
-@dirrmtry %%SITE_PERL%%/Plugtools/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plugtools/
diff --git a/sysutils/p5-Probe-Perl/Makefile b/sysutils/p5-Probe-Perl/Makefile
index 27bdf4aa1cab..e79ba60ae3fa 100644
--- a/sysutils/p5-Probe-Perl/Makefile
+++ b/sysutils/p5-Probe-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Probe-Perl
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KWILLIAMS
diff --git a/sysutils/p5-Probe-Perl/pkg-plist b/sysutils/p5-Probe-Perl/pkg-plist
index 5483bbf12d61..2d2c1b61a515 100644
--- a/sysutils/p5-Probe-Perl/pkg-plist
+++ b/sysutils/p5-Probe-Perl/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Probe/Perl/.packlist
 %%SITE_PERL%%/Probe/Perl.pm
 %%PERL5_MAN3%%/Probe::Perl.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Probe/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Probe
-@dirrmtry %%SITE_PERL%%/Probe
diff --git a/sysutils/p5-Proc-PidUtil/Makefile b/sysutils/p5-Proc-PidUtil/Makefile
index 588cd12be982..7a4c5657039a 100644
--- a/sysutils/p5-Proc-PidUtil/Makefile
+++ b/sysutils/p5-Proc-PidUtil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Proc-PidUtil
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Proc-PidUtil/pkg-plist b/sysutils/p5-Proc-PidUtil/pkg-plist
index 62dc5cf1c8de..e4116b6a41d8 100644
--- a/sysutils/p5-Proc-PidUtil/pkg-plist
+++ b/sysutils/p5-Proc-PidUtil/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Proc/PidUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PidUtil/.packlist
 %%PERL5_MAN3%%/Proc::PidUtil.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PidUtil
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
-@dirrmtry %%SITE_PERL%%/Proc
diff --git a/sysutils/p5-Proclet/Makefile b/sysutils/p5-Proclet/Makefile
index 219bab28afdd..7e59d0b59f78 100644
--- a/sysutils/p5-Proclet/Makefile
+++ b/sysutils/p5-Proclet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Proclet
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZEBURO
diff --git a/sysutils/p5-Quota/Makefile b/sysutils/p5-Quota/Makefile
index c27df1f2e521..d364923cc52e 100644
--- a/sysutils/p5-Quota/Makefile
+++ b/sysutils/p5-Quota/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Quota
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Quota/pkg-plist b/sysutils/p5-Quota/pkg-plist
index ad67448d1b11..f461b06c3cd9 100644
--- a/sysutils/p5-Quota/pkg-plist
+++ b/sysutils/p5-Quota/pkg-plist
@@ -1,6 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Quota/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Quota/Quota.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Quota/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Quota.pm
+%%SITE_ARCH%%/auto/Quota/autosplit.ix
+%%SITE_ARCH%%/auto/Quota/Quota.so
+%%SITE_ARCH%%/Quota.pm
 %%PERL5_MAN3%%/Quota.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Quota
diff --git a/sysutils/p5-Rex/Makefile b/sysutils/p5-Rex/Makefile
index a3ee67d3edfa..bac58eb7c5cf 100644
--- a/sysutils/p5-Rex/Makefile
+++ b/sysutils/p5-Rex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Rex
 PORTVERSION=	0.55.1
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JFRIED
diff --git a/sysutils/p5-Rex/pkg-plist b/sysutils/p5-Rex/pkg-plist
index 02f0ca046d6e..979545e8d200 100644
--- a/sysutils/p5-Rex/pkg-plist
+++ b/sysutils/p5-Rex/pkg-plist
@@ -350,6 +350,5 @@ bin/rexify
 %%SITE_PERL%%/Rex/Virtualization/VBox/shutdown.pm
 %%SITE_PERL%%/Rex/Virtualization/VBox/start.pm
 %%SITE_PERL%%/Rex/Virtualization/VBox/status.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rex/.packlist
 man/man1/rex.1.gz
 man/man1/rexify.1.gz
diff --git a/sysutils/p5-Samba-SIDhelper/Makefile b/sysutils/p5-Samba-SIDhelper/Makefile
index fd355c94d913..6ac6fd93a377 100644
--- a/sysutils/p5-Samba-SIDhelper/Makefile
+++ b/sysutils/p5-Samba-SIDhelper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Samba-SIDhelper
 PORTVERSION=	0.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Samba
diff --git a/sysutils/p5-Samba-SIDhelper/pkg-plist b/sysutils/p5-Samba-SIDhelper/pkg-plist
index 169e7dcab69a..99d30d8240a4 100644
--- a/sysutils/p5-Samba-SIDhelper/pkg-plist
+++ b/sysutils/p5-Samba-SIDhelper/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Samba/SIDhelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Samba/SIDhelper/.packlist
 %%PERL5_MAN3%%/Samba::SIDhelper.3.gz
-@dirrmtry %%SITE_PERL%%/Samba/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Samba/SIDhelper/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Samba/
diff --git a/sysutils/p5-Schedule-At/Makefile b/sysutils/p5-Schedule-At/Makefile
index 345da0fbfcca..9adb011932b3 100644
--- a/sysutils/p5-Schedule-At/Makefile
+++ b/sysutils/p5-Schedule-At/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Schedule-At
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Schedule-At/pkg-plist b/sysutils/p5-Schedule-At/pkg-plist
index ffc1d11e9ea0..8145880ebd38 100644
--- a/sysutils/p5-Schedule-At/pkg-plist
+++ b/sysutils/p5-Schedule-At/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Schedule/At.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At/.packlist
 %%PERL5_MAN3%%/Schedule::At.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At
-@dirrmtry %%SITE_PERL%%/Schedule
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule
diff --git a/sysutils/p5-Schedule-Cron/Makefile b/sysutils/p5-Schedule-Cron/Makefile
index da6fc9ae88bf..915c8ef085e1 100644
--- a/sysutils/p5-Schedule-Cron/Makefile
+++ b/sysutils/p5-Schedule-Cron/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Schedule-Cron
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Schedule-Cron/pkg-plist b/sysutils/p5-Schedule-Cron/pkg-plist
index 4f65ce3d1101..7d17aa77f233 100644
--- a/sysutils/p5-Schedule-Cron/pkg-plist
+++ b/sysutils/p5-Schedule-Cron/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron/.packlist
 %%SITE_PERL%%/Schedule/Cron.pm
 %%PERL5_MAN3%%/Schedule::Cron.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule
-@dirrmtry %%SITE_PERL%%/Schedule
diff --git a/sysutils/p5-Schedule-Load/Makefile b/sysutils/p5-Schedule-Load/Makefile
index c5248ad29ad2..d2aaaf4a485e 100644
--- a/sysutils/p5-Schedule-Load/Makefile
+++ b/sysutils/p5-Schedule-Load/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Schedule-Load
 PORTVERSION=	3.064
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Schedule-Load/pkg-plist b/sysutils/p5-Schedule-Load/pkg-plist
index d9076d968720..bdd8c7d3986f 100644
--- a/sysutils/p5-Schedule-Load/pkg-plist
+++ b/sysutils/p5-Schedule-Load/pkg-plist
@@ -34,7 +34,6 @@ bin/slrsh
 %%SITE_PERL%%/Schedule/Load/Schedule.pm
 %%SITE_PERL%%/auto/Schedule/Load/Hosts/Host/autosplit.ix
 %%SITE_PERL%%/auto/Schedule/Load/Hosts/Proc/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Load/.packlist
 man/man1/rschedule.1.gz
 man/man1/slchoosed.1.gz
 man/man1/slchoosed_watchd.1.gz
@@ -45,14 +44,3 @@ man/man1/slrsh.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.d/slreportd
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/init.d
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Load
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule
-@dirrmtry %%SITE_PERL%%/auto/Schedule/Load/Hosts/Proc
-@dirrmtry %%SITE_PERL%%/auto/Schedule/Load/Hosts/Host
-@dirrmtry %%SITE_PERL%%/auto/Schedule/Load/Hosts
-@dirrmtry %%SITE_PERL%%/auto/Schedule/Load
-@dirrmtry %%SITE_PERL%%/auto/Schedule
-@dirrmtry %%SITE_PERL%%/Schedule/Load/Reporter
-@dirrmtry %%SITE_PERL%%/Schedule/Load/Hosts
-@dirrmtry %%SITE_PERL%%/Schedule/Load
-@dirrmtry %%SITE_PERL%%/Schedule
diff --git a/sysutils/p5-Schedule-Match/Makefile b/sysutils/p5-Schedule-Match/Makefile
index 3ecec56a146e..318ce0a7c6d0 100644
--- a/sysutils/p5-Schedule-Match/Makefile
+++ b/sysutils/p5-Schedule-Match/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Schedule-Match
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Schedule-Match/pkg-plist b/sysutils/p5-Schedule-Match/pkg-plist
index 6fd20c6f95e3..dcc9dc59a584 100644
--- a/sysutils/p5-Schedule-Match/pkg-plist
+++ b/sysutils/p5-Schedule-Match/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match/.packlist
 %%SITE_PERL%%/Schedule/Match.pm
 %%PERL5_MAN3%%/Schedule::Match.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule
-@dirrmtry %%SITE_PERL%%/Schedule
diff --git a/sysutils/p5-Shell-Command/Makefile b/sysutils/p5-Shell-Command/Makefile
index 4d5242ef2a99..6f316c234ff4 100644
--- a/sysutils/p5-Shell-Command/Makefile
+++ b/sysutils/p5-Shell-Command/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Shell-Command
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Shell-Command/pkg-plist b/sysutils/p5-Shell-Command/pkg-plist
index 790981ae1f31..7e90f62c4af3 100644
--- a/sysutils/p5-Shell-Command/pkg-plist
+++ b/sysutils/p5-Shell-Command/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Shell::Command.3.gz
 %%SITE_PERL%%/Shell/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Command/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Command
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell
-@dirrmtry %%SITE_PERL%%/Shell
diff --git a/sysutils/p5-Stat-lsMode/Makefile b/sysutils/p5-Stat-lsMode/Makefile
index 8f618dd61715..7e8d4aeaa792 100644
--- a/sysutils/p5-Stat-lsMode/Makefile
+++ b/sysutils/p5-Stat-lsMode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Stat-lsMode
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Stat-lsMode/pkg-plist b/sysutils/p5-Stat-lsMode/pkg-plist
index bd40625dfe23..a62b0d5eb04a 100644
--- a/sysutils/p5-Stat-lsMode/pkg-plist
+++ b/sysutils/p5-Stat-lsMode/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode/.packlist
 %%SITE_PERL%%/Stat/lsMode.pm
 %%PERL5_MAN3%%/Stat::lsMode.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat
-@dirrmtry %%SITE_PERL%%/Stat
diff --git a/sysutils/p5-Sys-CpuLoad/Makefile b/sysutils/p5-Sys-CpuLoad/Makefile
index 1944b76f4c5e..5b9ebabfb856 100644
--- a/sysutils/p5-Sys-CpuLoad/Makefile
+++ b/sysutils/p5-Sys-CpuLoad/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-CpuLoad
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Sys-CpuLoad/pkg-plist b/sysutils/p5-Sys-CpuLoad/pkg-plist
index 9471ff7ee945..0fbcb7e0f72a 100644
--- a/sysutils/p5-Sys-CpuLoad/pkg-plist
+++ b/sysutils/p5-Sys-CpuLoad/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/CpuLoad.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/CpuLoad.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/autosplit.ix
+%%SITE_ARCH%%/Sys/CpuLoad.pm
+%%SITE_ARCH%%/auto/Sys/CpuLoad/CpuLoad.so
+%%SITE_ARCH%%/auto/Sys/CpuLoad/autosplit.ix
 %%PERL5_MAN3%%/Sys::CpuLoad.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
diff --git a/sysutils/p5-Sys-Filesystem/Makefile b/sysutils/p5-Sys-Filesystem/Makefile
index 1eb596d78b1a..165503eb3ede 100644
--- a/sysutils/p5-Sys-Filesystem/Makefile
+++ b/sysutils/p5-Sys-Filesystem/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Filesystem
 PORTVERSION=	1.401
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Sys
diff --git a/sysutils/p5-Sys-Filesystem/pkg-plist b/sysutils/p5-Sys-Filesystem/pkg-plist
index 6f51324cb1b3..64b708fc14b0 100644
--- a/sysutils/p5-Sys-Filesystem/pkg-plist
+++ b/sysutils/p5-Sys-Filesystem/pkg-plist
@@ -22,5 +22,3 @@
 %%PERL5_MAN3%%/Sys::Filesystem::Netbsd.3.gz
 %%PERL5_MAN3%%/Sys::Filesystem::Solaris.3.gz
 %%PERL5_MAN3%%/Sys::Filesystem::Unix.3.gz
-@dirrm %%SITE_PERL%%/Sys/Filesystem
-@dirrmtry %%SITE_PERL%%/Sys
diff --git a/sysutils/p5-Sys-Gamin/Makefile b/sysutils/p5-Sys-Gamin/Makefile
index bb35f838a619..b118b322c3c5 100644
--- a/sysutils/p5-Sys-Gamin/Makefile
+++ b/sysutils/p5-Sys-Gamin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Sys-Gamin
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Sys-Gamin/pkg-plist b/sysutils/p5-Sys-Gamin/pkg-plist
index 2b180a4317ca..d8bfaf5cb309 100644
--- a/sysutils/p5-Sys-Gamin/pkg-plist
+++ b/sysutils/p5-Sys-Gamin/pkg-plist
@@ -1,21 +1,17 @@
 bin/gamin-monitor
 %%PERL5_MAN3%%/Sys::Gamin.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Gamin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/Gamin.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/cancel.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/check_monitored.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/monitor.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/monitored.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/next_event.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/pending.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/resume.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/suspend.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/suspended.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/which.al
+%%SITE_ARCH%%/Sys/Gamin.pm
+%%SITE_ARCH%%/auto/Sys/Gamin/Gamin.so
+%%SITE_ARCH%%/auto/Sys/Gamin/autosplit.ix
+%%SITE_ARCH%%/auto/Sys/Gamin/cancel.al
+%%SITE_ARCH%%/auto/Sys/Gamin/check_monitored.al
+%%SITE_ARCH%%/auto/Sys/Gamin/monitor.al
+%%SITE_ARCH%%/auto/Sys/Gamin/monitored.al
+%%SITE_ARCH%%/auto/Sys/Gamin/new.al
+%%SITE_ARCH%%/auto/Sys/Gamin/next_event.al
+%%SITE_ARCH%%/auto/Sys/Gamin/pending.al
+%%SITE_ARCH%%/auto/Sys/Gamin/resume.al
+%%SITE_ARCH%%/auto/Sys/Gamin/suspend.al
+%%SITE_ARCH%%/auto/Sys/Gamin/suspended.al
+%%SITE_ARCH%%/auto/Sys/Gamin/which.al
 man/man1/gamin-monitor.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
diff --git a/sysutils/p5-Sys-Group-GIDhelper/Makefile b/sysutils/p5-Sys-Group-GIDhelper/Makefile
index 783a49d1be9a..46c88207cc16 100644
--- a/sysutils/p5-Sys-Group-GIDhelper/Makefile
+++ b/sysutils/p5-Sys-Group-GIDhelper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Group-GIDhelper
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/sysutils/p5-Sys-Group-GIDhelper/pkg-plist b/sysutils/p5-Sys-Group-GIDhelper/pkg-plist
index 5f5b6c699004..5e25d3a72d3b 100644
--- a/sysutils/p5-Sys-Group-GIDhelper/pkg-plist
+++ b/sysutils/p5-Sys-Group-GIDhelper/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Sys/Group/GIDhelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Group/GIDhelper/.packlist
 %%PERL5_MAN3%%/Sys::Group::GIDhelper.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Group/GIDhelper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Group/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/
-@dirrmtry %%SITE_PERL%%/Sys/Group/
-@dirrmtry %%SITE_PERL%%/Sys/
diff --git a/sysutils/p5-Sys-HostIP/Makefile b/sysutils/p5-Sys-HostIP/Makefile
index 8d0c17a31b94..c1927d4223ae 100644
--- a/sysutils/p5-Sys-HostIP/Makefile
+++ b/sysutils/p5-Sys-HostIP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-HostIP
 PORTVERSION=	1.9.3
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Sys-HostIP/pkg-plist b/sysutils/p5-Sys-HostIP/pkg-plist
index 5e97206de773..5767b0a51e95 100644
--- a/sysutils/p5-Sys-HostIP/pkg-plist
+++ b/sysutils/p5-Sys-HostIP/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/HostIP/.packlist
 %%SITE_PERL%%/Sys/HostIP.pm
 %%PERL5_MAN3%%/Sys::HostIP.3.gz
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/HostIP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
-@dirrmtry %%SITE_PERL%%/Sys
diff --git a/sysutils/p5-Sys-Hostname-FQDN/Makefile b/sysutils/p5-Sys-Hostname-FQDN/Makefile
index be237e4731ac..ed8df74e133b 100644
--- a/sysutils/p5-Sys-Hostname-FQDN/Makefile
+++ b/sysutils/p5-Sys-Hostname-FQDN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Hostname-FQDN
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Sys-Hostname-FQDN/pkg-plist b/sysutils/p5-Sys-Hostname-FQDN/pkg-plist
index 02838056258e..65aecee90906 100644
--- a/sysutils/p5-Sys-Hostname-FQDN/pkg-plist
+++ b/sysutils/p5-Sys-Hostname-FQDN/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Hostname/FQDN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/FQDN/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/FQDN/FQDN.so
+%%SITE_ARCH%%/Sys/Hostname/FQDN.pm
+%%SITE_ARCH%%/auto/Sys/Hostname/FQDN/FQDN.so
 %%PERL5_MAN3%%/Sys::Hostname::FQDN.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/FQDN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys/Hostname
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
diff --git a/sysutils/p5-Sys-Hostname-Long/Makefile b/sysutils/p5-Sys-Hostname-Long/Makefile
index e244b1e0f6b7..5e98d523f3d1 100644
--- a/sysutils/p5-Sys-Hostname-Long/Makefile
+++ b/sysutils/p5-Sys-Hostname-Long/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Hostname-Long
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Sys-Hostname-Long/pkg-plist b/sysutils/p5-Sys-Hostname-Long/pkg-plist
index 4873ad77c891..cc4ee59e5bfb 100644
--- a/sysutils/p5-Sys-Hostname-Long/pkg-plist
+++ b/sysutils/p5-Sys-Hostname-Long/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Sys/Hostname/Long.pm
 %%SITE_PERL%%/Sys/Hostname/testall.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/Long/.packlist
 %%PERL5_MAN3%%/Sys::Hostname::Long.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/Long
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
-@dirrmtry %%SITE_PERL%%/Sys/Hostname
-@dirrmtry %%SITE_PERL%%/Sys
diff --git a/sysutils/p5-Sys-Load/Makefile b/sysutils/p5-Sys-Load/Makefile
index 3bba2d81a735..f5e047380616 100644
--- a/sysutils/p5-Sys-Load/Makefile
+++ b/sysutils/p5-Sys-Load/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Load
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN \
 		http://kostjn.spb.ru/freebsd/
diff --git a/sysutils/p5-Sys-Load/pkg-plist b/sysutils/p5-Sys-Load/pkg-plist
index 20415dc35c45..8f14db84227b 100644
--- a/sysutils/p5-Sys-Load/pkg-plist
+++ b/sysutils/p5-Sys-Load/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Load/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Load/Load.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Load.pm
+%%SITE_ARCH%%/auto/Sys/Load/Load.so
+%%SITE_ARCH%%/Sys/Load.pm
 %%PERL5_MAN3%%/Sys::Load.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Load
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
diff --git a/sysutils/p5-Sys-Syslog/Makefile b/sysutils/p5-Sys-Syslog/Makefile
index a2dd74e1b7a0..12398912414d 100644
--- a/sysutils/p5-Sys-Syslog/Makefile
+++ b/sysutils/p5-Sys-Syslog/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Sys-Syslog
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Sys-Syslog/pkg-plist b/sysutils/p5-Sys-Syslog/pkg-plist
index caa3a1d7ad41..ec8d8ecd4e68 100644
--- a/sysutils/p5-Sys-Syslog/pkg-plist
+++ b/sysutils/p5-Sys-Syslog/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syslog/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syslog/Syslog.so
+%%SITE_ARCH%%/Sys/Syslog.pm
+%%SITE_ARCH%%/auto/Sys/Syslog/Syslog.so
 %%PERL5_MAN3%%/Sys::Syslog.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syslog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
diff --git a/sysutils/p5-Sys-User-UIDhelper/Makefile b/sysutils/p5-Sys-User-UIDhelper/Makefile
index 8237dbf255e6..d68c9be9a4a2 100644
--- a/sysutils/p5-Sys-User-UIDhelper/Makefile
+++ b/sysutils/p5-Sys-User-UIDhelper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-User-UIDhelper
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/sysutils/p5-Sys-User-UIDhelper/pkg-plist b/sysutils/p5-Sys-User-UIDhelper/pkg-plist
index 66dd3d7d2eb4..327e69222bfe 100644
--- a/sysutils/p5-Sys-User-UIDhelper/pkg-plist
+++ b/sysutils/p5-Sys-User-UIDhelper/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Sys/User/UIDhelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/User/UIDhelper/.packlist
 %%PERL5_MAN3%%/Sys::User::UIDhelper.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/User/UIDhelper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/User/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/
-@dirrmtry %%SITE_PERL%%/Sys/User/
-@dirrmtry %%SITE_PERL%%/Sys/
diff --git a/sysutils/p5-Sysadm-Install/Makefile b/sysutils/p5-Sysadm-Install/Makefile
index ee3df8295aaa..7ac2d1eabbb5 100644
--- a/sysutils/p5-Sysadm-Install/Makefile
+++ b/sysutils/p5-Sysadm-Install/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sysadm-Install
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSCHILLI
diff --git a/sysutils/p5-Sysadm-Install/pkg-plist b/sysutils/p5-Sysadm-Install/pkg-plist
index e558b2b41f9c..b5a475caba27 100644
--- a/sysutils/p5-Sysadm-Install/pkg-plist
+++ b/sysutils/p5-Sysadm-Install/pkg-plist
@@ -1,7 +1,3 @@
 bin/one-liner
 %%PERL5_MAN3%%/Sysadm::Install.3.gz
 %%SITE_PERL%%/Sysadm/Install.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sysadm/Install/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sysadm/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sysadm
-@dirrmtry %%SITE_PERL%%/Sysadm
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index bc519213c75f..b0a5c2a3d6c4 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SyslogScan
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-SyslogScan/pkg-plist b/sysutils/p5-SyslogScan/pkg-plist
index da4a4b6a9b24..53e61bdf08bb 100644
--- a/sysutils/p5-SyslogScan/pkg-plist
+++ b/sysutils/p5-SyslogScan/pkg-plist
@@ -18,7 +18,6 @@
 %%SITE_PERL%%/SyslogScan/Volume.pm
 %%SITE_PERL%%/SyslogScan/WhereIs.pm
 %%SITE_PERL%%/read_mail_log.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SyslogScan/.packlist
 %%PERL5_MAN3%%/SyslogScan::ByGroup.3.gz
 %%PERL5_MAN3%%/SyslogScan::Delivery.3.gz
 %%PERL5_MAN3%%/SyslogScan::DeliveryIterator.3.gz
@@ -31,5 +30,3 @@
 %%PERL5_MAN3%%/SyslogScan::Usage.3.gz
 %%PERL5_MAN3%%/SyslogScan::WhereIs.3.gz
 %%PERL5_MAN3%%/read_mail_log.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SyslogScan
-@dirrm %%SITE_PERL%%/SyslogScan
diff --git a/sysutils/p5-Tail-Stat/Makefile b/sysutils/p5-Tail-Stat/Makefile
index f09990dfe905..1e5ab8eaabba 100644
--- a/sysutils/p5-Tail-Stat/Makefile
+++ b/sysutils/p5-Tail-Stat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tail-Stat
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LONERR
diff --git a/sysutils/p5-Tail-Stat/pkg-plist b/sysutils/p5-Tail-Stat/pkg-plist
index fecea840bd3b..dbf22462b36b 100644
--- a/sysutils/p5-Tail-Stat/pkg-plist
+++ b/sysutils/p5-Tail-Stat/pkg-plist
@@ -16,4 +16,3 @@ man/man1/tstatd.1.gz
 %%SITE_PERL%%/Tail/Stat/Plugin/icecast.pm
 %%SITE_PERL%%/Tail/Stat/Plugin/nginx.pm
 %%SITE_PERL%%/Tail/Stat/Plugin/spamd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tail/Stat/.packlist
diff --git a/sysutils/p5-Tie-Syslog/Makefile b/sysutils/p5-Tie-Syslog/Makefile
index 51018b56d279..13b0dfb991fb 100644
--- a/sysutils/p5-Tie-Syslog/Makefile
+++ b/sysutils/p5-Tie-Syslog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tie-Syslog
 PORTVERSION=	2.04.03
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Tie-Syslog/pkg-plist b/sysutils/p5-Tie-Syslog/pkg-plist
index dff31a8e1704..232d28b2ebe4 100644
--- a/sysutils/p5-Tie-Syslog/pkg-plist
+++ b/sysutils/p5-Tie-Syslog/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Tie::Syslog.3.gz
 %%SITE_PERL%%/Tie/Syslog.pm
 %%SITE_PERL%%/Tie/Syslog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
-@dirrmtry %%SITE_PERL%%/Tie
diff --git a/sysutils/p5-Ubic/Makefile b/sysutils/p5-Ubic/Makefile
index 8fc704ca85e6..d115db590c13 100644
--- a/sysutils/p5-Ubic/Makefile
+++ b/sysutils/p5-Ubic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Ubic
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MMCLERIC
diff --git a/sysutils/p5-Ubic/pkg-plist b/sysutils/p5-Ubic/pkg-plist
index 6bf607ff3d64..4fea2ec07bbb 100644
--- a/sysutils/p5-Ubic/pkg-plist
+++ b/sysutils/p5-Ubic/pkg-plist
@@ -106,21 +106,3 @@ man/man1/ubic.1.gz
 %%SITE_PERL%%/Ubic/SingletonLock.pm
 %%SITE_PERL%%/Ubic/UA.pm
 %%SITE_PERL%%/Ubic/Watchdog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ubic/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ubic
-@dirrm %%SITE_PERL%%/Ubic/Settings
-@dirrm %%SITE_PERL%%/Ubic/ServiceLoader/Ext
-@dirrm %%SITE_PERL%%/Ubic/ServiceLoader
-@dirrm %%SITE_PERL%%/Ubic/Service
-@dirrm %%SITE_PERL%%/Ubic/Result
-@dirrm %%SITE_PERL%%/Ubic/Ping
-@dirrm %%SITE_PERL%%/Ubic/Multiservice
-@dirrm %%SITE_PERL%%/Ubic/Manual
-@dirrm %%SITE_PERL%%/Ubic/Lockf
-@dirrm %%SITE_PERL%%/Ubic/Daemon/OS
-@dirrm %%SITE_PERL%%/Ubic/Daemon
-@dirrm %%SITE_PERL%%/Ubic/Credentials/OS
-@dirrm %%SITE_PERL%%/Ubic/Credentials
-@dirrm %%SITE_PERL%%/Ubic/Cmd
-@dirrm %%SITE_PERL%%/Ubic/Admin
-@dirrm %%SITE_PERL%%/Ubic
diff --git a/sysutils/p5-Unix-ConfigFile/Makefile b/sysutils/p5-Unix-ConfigFile/Makefile
index 7d8b0cf2d182..98d706ff4953 100644
--- a/sysutils/p5-Unix-ConfigFile/Makefile
+++ b/sysutils/p5-Unix-ConfigFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unix-ConfigFile
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Unix-ConfigFile/pkg-plist b/sysutils/p5-Unix-ConfigFile/pkg-plist
index 6d24bf9fbd19..a19ed437f183 100644
--- a/sysutils/p5-Unix-ConfigFile/pkg-plist
+++ b/sysutils/p5-Unix-ConfigFile/pkg-plist
@@ -8,7 +8,3 @@
 %%SITE_PERL%%/Unix/ConfigFile.pm
 %%SITE_PERL%%/Unix/GroupFile.pm
 %%SITE_PERL%%/Unix/PasswdFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
-@dirrmtry %%SITE_PERL%%/Unix
diff --git a/sysutils/p5-Unix-Lsof/Makefile b/sysutils/p5-Unix-Lsof/Makefile
index 4117d19824a6..438c6b4ab899 100644
--- a/sysutils/p5-Unix-Lsof/Makefile
+++ b/sysutils/p5-Unix-Lsof/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Unix-Lsof
 PORTVERSION=	0.0.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Unix-Lsof/pkg-plist b/sysutils/p5-Unix-Lsof/pkg-plist
index 7bcf9aeb350d..3816f86b0d28 100644
--- a/sysutils/p5-Unix-Lsof/pkg-plist
+++ b/sysutils/p5-Unix-Lsof/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/Unix/Lsof.pm
 %%SITE_PERL%%/Unix/Lsof/Result.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Lsof/.packlist
 %%PERL5_MAN3%%/Unix::Lsof.3.gz
 %%PERL5_MAN3%%/Unix::Lsof::Result.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Lsof
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
-@dirrmtry %%SITE_PERL%%/Unix/Lsof
-@dirrmtry %%SITE_PERL%%/Unix
diff --git a/sysutils/p5-Unix-Mknod/Makefile b/sysutils/p5-Unix-Mknod/Makefile
index 71e1bca3e9fa..d2024de2de4d 100644
--- a/sysutils/p5-Unix-Mknod/Makefile
+++ b/sysutils/p5-Unix-Mknod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unix-Mknod
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Unix-Mknod/pkg-plist b/sysutils/p5-Unix-Mknod/pkg-plist
index 899fc5d9b5bc..f6fd460f8032 100644
--- a/sysutils/p5-Unix-Mknod/pkg-plist
+++ b/sysutils/p5-Unix-Mknod/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Mknod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod/Mknod.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod/.packlist
+%%SITE_ARCH%%/Unix/Mknod.pm
+%%SITE_ARCH%%/auto/Unix/Mknod/Mknod.so
 %%PERL5_MAN3%%/Unix::Mknod.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix
diff --git a/sysutils/p5-Unix-Processors/Makefile b/sysutils/p5-Unix-Processors/Makefile
index ceb672fbe00c..3c953b299aaa 100644
--- a/sysutils/p5-Unix-Processors/Makefile
+++ b/sysutils/p5-Unix-Processors/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unix-Processors
 PORTVERSION=	2.043
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Unix-Processors/pkg-plist b/sysutils/p5-Unix-Processors/pkg-plist
index 9a655cf80eac..66647931bd69 100644
--- a/sysutils/p5-Unix-Processors/pkg-plist
+++ b/sysutils/p5-Unix-Processors/pkg-plist
@@ -1,10 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Processors.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Processors/Info.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors/Processors.so
+%%SITE_ARCH%%/Unix/Processors.pm
+%%SITE_ARCH%%/Unix/Processors/Info.pm
+%%SITE_ARCH%%/auto/Unix/Processors/Processors.so
 %%PERL5_MAN3%%/Unix::Processors.3.gz
 %%PERL5_MAN3%%/Unix::Processors::Info.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unix/Processors
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
diff --git a/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
index c2ff36e48641..080fc1a20fa8 100644
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ b/sysutils/p5-Unix-Syslog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unix-Syslog
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Unix-Syslog/pkg-plist b/sysutils/p5-Unix-Syslog/pkg-plist
index c50282f04392..8181393fcd86 100644
--- a/sysutils/p5-Unix-Syslog/pkg-plist
+++ b/sysutils/p5-Unix-Syslog/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Unix::Syslog.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix
+%%SITE_ARCH%%/Unix/Syslog.pm
+%%SITE_ARCH%%/auto/Unix/Syslog/Syslog.so
diff --git a/sysutils/p5-User/Makefile b/sysutils/p5-User/Makefile
index 7db3fb01dbaa..1ae77c74a30f 100644
--- a/sysutils/p5-User/Makefile
+++ b/sysutils/p5-User/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	User
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-User/pkg-plist b/sysutils/p5-User/pkg-plist
index 76ccb7d203a4..6a59c0394bd2 100644
--- a/sysutils/p5-User/pkg-plist
+++ b/sysutils/p5-User/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/User.3.gz
 %%SITE_PERL%%/User.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/User/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/User
diff --git a/sysutils/p5-ZConf-Cron/Makefile b/sysutils/p5-ZConf-Cron/Makefile
index cc73978ec103..6822a8b093f5 100644
--- a/sysutils/p5-ZConf-Cron/Makefile
+++ b/sysutils/p5-ZConf-Cron/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ZConf-Cron
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/sysutils/p5-ZConf-Cron/pkg-plist b/sysutils/p5-ZConf-Cron/pkg-plist
index 92ed46be7638..a53c390419db 100644
--- a/sysutils/p5-ZConf-Cron/pkg-plist
+++ b/sysutils/p5-ZConf-Cron/pkg-plist
@@ -3,10 +3,5 @@ bin/zccrontab
 bin/gzccrontab
 %%SITE_PERL%%/ZConf/Cron.pm
 %%SITE_PERL%%/ZConf/Cron/GUI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Cron/.packlist
 %%PERL5_MAN3%%/ZConf::Cron.3.gz
 %%PERL5_MAN3%%/ZConf::Cron::GUI.3.gz
-@dirrmtry %%SITE_PERL%%/ZConf/Cron
-@dirrmtry %%SITE_PERL%%/ZConf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Cron
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
diff --git a/sysutils/p5-arclog/Makefile b/sysutils/p5-arclog/Makefile
index ec2f4c6ce02c..72e66f00dcca 100644
--- a/sysutils/p5-arclog/Makefile
+++ b/sysutils/p5-arclog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	arclog
 PORTVERSION=	3.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Locale/IMACAT
diff --git a/sysutils/p5-arclog/pkg-plist b/sysutils/p5-arclog/pkg-plist
index 728e0a768d5a..a2a78ab51dbd 100644
--- a/sysutils/p5-arclog/pkg-plist
+++ b/sysutils/p5-arclog/pkg-plist
@@ -1,4 +1,2 @@
 bin/arclog
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/arclog/.packlist
 man/man1/arclog.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/arclog
diff --git a/sysutils/p5-reslog/Makefile b/sysutils/p5-reslog/Makefile
index b61ac37e0403..581ceba552ff 100644
--- a/sysutils/p5-reslog/Makefile
+++ b/sysutils/p5-reslog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	reslog
 PORTVERSION=	3.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Locale/IMACAT
diff --git a/sysutils/p5-reslog/pkg-plist b/sysutils/p5-reslog/pkg-plist
index ae95f4d11f96..0e3b787da6de 100644
--- a/sysutils/p5-reslog/pkg-plist
+++ b/sysutils/p5-reslog/pkg-plist
@@ -1,4 +1,2 @@
 bin/reslog
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/reslog/.packlist
 man/man1/reslog.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/reslog
diff --git a/sysutils/savelogs/Makefile b/sysutils/savelogs/Makefile
index cd77de8f2366..0c1e2d5e45a4 100644
--- a/sysutils/savelogs/Makefile
+++ b/sysutils/savelogs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	savelogs
 PORTVERSION=	1.98
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SCOTTW
diff --git a/sysutils/savelogs/pkg-plist b/sysutils/savelogs/pkg-plist
index 6f9e9e878528..f36b0d147616 100644
--- a/sysutils/savelogs/pkg-plist
+++ b/sysutils/savelogs/pkg-plist
@@ -2,8 +2,6 @@ bin/savelogs
 etc/savelogs.conf.sample
 man/man1/rotation.1.gz
 man/man1/savelogs.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/savelogs/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/savelogs
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/savelogs.conf.lint
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index cb7b5e780e49..e1a53d0e5955 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	stow
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU
 
diff --git a/sysutils/stow/pkg-plist b/sysutils/stow/pkg-plist
index 9f4f9f7f9028..c257565c678f 100644
--- a/sysutils/stow/pkg-plist
+++ b/sysutils/stow/pkg-plist
@@ -3,4 +3,3 @@ bin/stow
 %%SITE_PERL%%/Stow.pm
 %%SITE_PERL%%/Stow/Util.pm
 man/man8/stow.8.gz
-@dirrm %%SITE_PERL%%/Stow
diff --git a/sysutils/tartarus/Makefile b/sysutils/tartarus/Makefile
index 71bef50a4139..0a230d705ef7 100644
--- a/sysutils/tartarus/Makefile
+++ b/sysutils/tartarus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tartarus
 PORTVERSION=	0.9.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://wertarbyte.de/tartarus/ \
 		http://ftp.wilbury.sk/pub/FreeBSD/local/distfiles/
@@ -24,7 +24,7 @@ SHEBANG_FILES=	${WRKSRC}/bin/*
 do-install:
 	cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} charon charon.ftp charon.local \
 		charon.pipe orpheus tartarus ${STAGEDIR}${PREFIX}/bin
-	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Tartarus ${STAGEDIR}${SITE_PERL}
+	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Tartarus ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	cd ${WRKSRC}/man && ${INSTALL_MAN} charon.ftp.1 charon.local.1 \
 		charon.pipe.1 tartarus.1 ${STAGEDIR}${PREFIX}/man/man1
 	${LN} -sf charon.ftp.1 ${STAGEDIR}${PREFIX}/man/man1/charon.1
diff --git a/sysutils/tartarus/pkg-plist b/sysutils/tartarus/pkg-plist
index 2a5f1c10908f..044f9f63d64e 100644
--- a/sysutils/tartarus/pkg-plist
+++ b/sysutils/tartarus/pkg-plist
@@ -10,5 +10,3 @@ man/man1/charon.local.1.gz
 man/man1/charon.pipe.1.gz
 man/man1/tartarus.1.gz
 %%SITE_PERL%%/Tartarus/Charon/Filter.pm
-@dirrmtry %%SITE_PERL%%/Tartarus/Charon
-@dirrmtry %%SITE_PERL%%/Tartarus
diff --git a/sysutils/watchmen/Makefile b/sysutils/watchmen/Makefile
index a01491414752..8692a4f550f1 100644
--- a/sysutils/watchmen/Makefile
+++ b/sysutils/watchmen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	watchmen
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
 
@@ -28,10 +28,7 @@ POD2MAN?=	pod2man
 
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample etc/${PORTNAME}.conf.sample" \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/watchmen/.packlist \
 		man/man1/${PORTNAME}.1.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/watchmen \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/App
 
 .include <bsd.port.options.mk>
 
diff --git a/textproc/ack/Makefile b/textproc/ack/Makefile
index d392dff78bbf..5e33707bd196 100644
--- a/textproc/ack/Makefile
+++ b/textproc/ack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ack
 PORTVERSION=	2.14
+PORTREVISION=	1
 CATEGORIES=	textproc sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PETDANCE
diff --git a/textproc/ack/pkg-plist b/textproc/ack/pkg-plist
index 05a37c76d315..45f910e7b240 100644
--- a/textproc/ack/pkg-plist
+++ b/textproc/ack/pkg-plist
@@ -16,10 +16,4 @@ bin/ack
 %%SITE_PERL%%/App/Ack/Resource.pm
 %%SITE_PERL%%/App/Ack/Resource/Basic.pm
 %%SITE_PERL%%/App/Ack/Resources.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ack/.packlist
 man/man1/ack.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ack
-@dirrmtry %%SITE_PERL%%/App/Ack/Resource
-@dirrmtry %%SITE_PERL%%/App/Ack/Filter
-@dirrmtry %%SITE_PERL%%/App/Ack
-@dirrmtry %%SITE_PERL%%/App
diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile
index 4e95e539677f..306eb80fccfa 100644
--- a/textproc/bib2html/Makefile
+++ b/textproc/bib2html/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bib2html
 DISTVERSION=	5.1-1
+PORTREVISION=	1
 CATEGORIES=	textproc print
 MASTER_SITES=	http://www.arakhne.org/IMG/gz/ \
 		http://fresh.t-systems-sfr.com/fresh/unix/src/privat2/
@@ -28,11 +29,9 @@ post-patch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bib2html ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bib2xml ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Bib2HTML
-	cd ${WRKSRC}/Bib2HTML && ${COPYTREE_SHARE} . ${STAGEDIR}${SITE_PERL}/Bib2HTML
-	${FIND} ${STAGEDIR}${SITE_PERL}/Bib2HTML -type f | \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Bib2HTML
+	cd ${WRKSRC}/Bib2HTML && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Bib2HTML
+	${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type f | \
 		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
-	${FIND} ${STAGEDIR}${SITE_PERL}/Bib2HTML -type d | ${SORT} -r | \
-		${SED} "s,^${STAGEDIR}${PREFIX}/,@dirrm ," >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/dtdparse/Makefile b/textproc/dtdparse/Makefile
index c8d676729519..077fc3e40548 100644
--- a/textproc/dtdparse/Makefile
+++ b/textproc/dtdparse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dtdparse
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 DISTNAME=	SGML-DTDParse-${PORTVERSION}
diff --git a/textproc/dtdparse/pkg-plist b/textproc/dtdparse/pkg-plist
index f09b991a539c..da745905a954 100644
--- a/textproc/dtdparse/pkg-plist
+++ b/textproc/dtdparse/pkg-plist
@@ -20,9 +20,3 @@ man/man1/dtdflatten.1.gz
 %%SITE_PERL%%/SGML/DTDParse/Tokenizer.pm
 %%SITE_PERL%%/SGML/DTDParse/Util.pm
 %%SITE_PERL%%/SGML/DTDParse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/DTDParse/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/DTDParse
-@dirrm %%SITE_PERL%%/SGML/DTDParse/Format
-@dirrm %%SITE_PERL%%/SGML/DTDParse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML
-@dirrmtry %%SITE_PERL%%/SGML
diff --git a/textproc/libtext-charwidth-perl/Makefile b/textproc/libtext-charwidth-perl/Makefile
index 170fffc803e4..c3de7ad6805c 100644
--- a/textproc/libtext-charwidth-perl/Makefile
+++ b/textproc/libtext-charwidth-perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libtext-charwidth-perl
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/libt/libtext-charwidth-perl
diff --git a/textproc/libtext-charwidth-perl/pkg-plist b/textproc/libtext-charwidth-perl/pkg-plist
index 66d6293cfb2b..f14b247441f2 100644
--- a/textproc/libtext-charwidth-perl/pkg-plist
+++ b/textproc/libtext-charwidth-perl/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::CharWidth.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CharWidth/CharWidth.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CharWidth/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/CharWidth.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CharWidth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/auto/Text/CharWidth/CharWidth.so
+%%SITE_ARCH%%/Text/CharWidth.pm
diff --git a/textproc/libtext-wrapi18n-perl/Makefile b/textproc/libtext-wrapi18n-perl/Makefile
index 4da2b80d83c0..0009b128ba0e 100644
--- a/textproc/libtext-wrapi18n-perl/Makefile
+++ b/textproc/libtext-wrapi18n-perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libtext-wrapi18n-perl
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/libt/libtext-wrapi18n-perl
diff --git a/textproc/libtext-wrapi18n-perl/pkg-plist b/textproc/libtext-wrapi18n-perl/pkg-plist
index e829b9ae1f21..d1a92fba11cb 100644
--- a/textproc/libtext-wrapi18n-perl/pkg-plist
+++ b/textproc/libtext-wrapi18n-perl/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WrapI18N/.packlist
 %%SITE_PERL%%/Text/WrapI18N.pm
 %%PERL5_MAN3%%/Text::WrapI18N.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WrapI18N
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/makepatch/Makefile b/textproc/makepatch/Makefile
index 5348921e921a..81b92a0147f4 100644
--- a/textproc/makepatch/Makefile
+++ b/textproc/makepatch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	makepatch
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JV
diff --git a/textproc/makepatch/pkg-plist b/textproc/makepatch/pkg-plist
index d78d9632b17e..50e2d9072464 100644
--- a/textproc/makepatch/pkg-plist
+++ b/textproc/makepatch/pkg-plist
@@ -2,5 +2,3 @@ bin/applypatch
 bin/makepatch
 man/man1/makepatch.1.gz
 man/man1/applypatch.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/makepatch/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/makepatch
diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index 6dfd7a9e13db..f0ecf8d1a93c 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openfts
 PORTVERSION=	0.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/OpenFTS-perl%2C%20v${PORTVERSION}
 DISTNAME=	Search-OpenFTS-${PORTVERSION}
diff --git a/textproc/openfts/pkg-plist b/textproc/openfts/pkg-plist
index 3eac270d506c..13e8d7d986bc 100644
--- a/textproc/openfts/pkg-plist
+++ b/textproc/openfts/pkg-plist
@@ -7,22 +7,21 @@
 %%PERL5_MAN3%%/Search::OpenFTS::Index.3.gz
 %%PERL5_MAN3%%/Search::OpenFTS::Morph::ISpell.3.gz
 %%PERL5_MAN3%%/Search::OpenFTS::Parser.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/PorterEng.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/Snowball.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/Synonym.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/UnknownDict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Index.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Morph/ISpell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict/PorterEng/PorterEng.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict/PorterEng/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Morph/ISpell/ISpell.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Morph/ISpell/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser/Parser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser/autosplit.ix
+%%SITE_ARCH%%/Search/OpenFTS.pm
+%%SITE_ARCH%%/Search/OpenFTS/Base.pm
+%%SITE_ARCH%%/Search/OpenFTS/Dict/PorterEng.pm
+%%SITE_ARCH%%/Search/OpenFTS/Dict/Snowball.pm
+%%SITE_ARCH%%/Search/OpenFTS/Dict/Synonym.pm
+%%SITE_ARCH%%/Search/OpenFTS/Dict/UnknownDict.pm
+%%SITE_ARCH%%/Search/OpenFTS/Index.pm
+%%SITE_ARCH%%/Search/OpenFTS/Morph/ISpell.pm
+%%SITE_ARCH%%/Search/OpenFTS/Parser.pm
+%%SITE_ARCH%%/auto/Search/OpenFTS/Dict/PorterEng/PorterEng.so
+%%SITE_ARCH%%/auto/Search/OpenFTS/Dict/PorterEng/autosplit.ix
+%%SITE_ARCH%%/auto/Search/OpenFTS/Morph/ISpell/ISpell.so
+%%SITE_ARCH%%/auto/Search/OpenFTS/Morph/ISpell/autosplit.ix
+%%SITE_ARCH%%/auto/Search/OpenFTS/Parser/Parser.so
+%%SITE_ARCH%%/auto/Search/OpenFTS/Parser/autosplit.ix
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/DecimalDict.pm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/EngStem.pm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/IntegerDict.pm
@@ -43,14 +42,3 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/parser
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Dict
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Morph/ISpell
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Morph
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict/PorterEng
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Morph
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search
diff --git a/textproc/p5-AI-Categorizer/Makefile b/textproc/p5-AI-Categorizer/Makefile
index d69a7f1228e3..331fab35ac98 100644
--- a/textproc/p5-AI-Categorizer/Makefile
+++ b/textproc/p5-AI-Categorizer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	AI-Categorizer
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-AI-Categorizer/pkg-plist b/textproc/p5-AI-Categorizer/pkg-plist
index 621156fb6bc9..2539098a6381 100644
--- a/textproc/p5-AI-Categorizer/pkg-plist
+++ b/textproc/p5-AI-Categorizer/pkg-plist
@@ -51,9 +51,3 @@
 %%SITE_PERL%%/AI/Categorizer/ObjectSet.pm
 %%SITE_PERL%%/AI/Categorizer/Storable.pm
 %%SITE_PERL%%/AI/Categorizer/Util.pm
-@dirrm %%SITE_PERL%%/AI/Categorizer/Learner
-@dirrm %%SITE_PERL%%/AI/Categorizer/FeatureSelector
-@dirrm %%SITE_PERL%%/AI/Categorizer/Document
-@dirrm %%SITE_PERL%%/AI/Categorizer/Collection
-@dirrm %%SITE_PERL%%/AI/Categorizer
-@dirrmtry %%SITE_PERL%%/AI
diff --git a/textproc/p5-Algorithm-CheckDigits/Makefile b/textproc/p5-Algorithm-CheckDigits/Makefile
index c9c6edaf1afd..5d888dff7fb2 100644
--- a/textproc/p5-Algorithm-CheckDigits/Makefile
+++ b/textproc/p5-Algorithm-CheckDigits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-CheckDigits
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-Algorithm-CheckDigits/pkg-plist b/textproc/p5-Algorithm-CheckDigits/pkg-plist
index 04e9bc0e544b..bbf8f1f9ff52 100644
--- a/textproc/p5-Algorithm-CheckDigits/pkg-plist
+++ b/textproc/p5-Algorithm-CheckDigits/pkg-plist
@@ -88,8 +88,3 @@ man/man1/checkdigits.pl.1.gz
 %%SITE_PERL%%/Algorithm/CheckDigits/MXX_005.pm
 %%SITE_PERL%%/Algorithm/CheckDigits/MXX_006.pm
 %%SITE_PERL%%/Algorithm/CheckDigits.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/CheckDigits/.packlist
-@dirrm %%SITE_PERL%%/Algorithm/CheckDigits
-@dirrm %%SITE_PERL%%/Algorithm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/CheckDigits
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
diff --git a/textproc/p5-Algorithm-RabinKarp/Makefile b/textproc/p5-Algorithm-RabinKarp/Makefile
index 4cf23a2d147f..e8cc7b4c7c71 100644
--- a/textproc/p5-Algorithm-RabinKarp/Makefile
+++ b/textproc/p5-Algorithm-RabinKarp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-RabinKarp
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NNUNLEY
diff --git a/textproc/p5-Algorithm-RabinKarp/pkg-plist b/textproc/p5-Algorithm-RabinKarp/pkg-plist
index d25df36da221..c42e8a822942 100644
--- a/textproc/p5-Algorithm-RabinKarp/pkg-plist
+++ b/textproc/p5-Algorithm-RabinKarp/pkg-plist
@@ -4,8 +4,3 @@ bin/rabin.pl
 %%SITE_PERL%%/Algorithm/RabinKarp.pm
 %%SITE_PERL%%/Algorithm/RabinKarp/Util.pm
 %%SITE_PERL%%/Algorithm/rabin.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/RabinKarp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/RabinKarp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
-@dirrmtry %%SITE_PERL%%/Algorithm/RabinKarp
-@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/textproc/p5-Apache-ParseLog/Makefile b/textproc/p5-Apache-ParseLog/Makefile
index 449ddd2a4cbc..a8bb559fed7d 100644
--- a/textproc/p5-Apache-ParseLog/Makefile
+++ b/textproc/p5-Apache-ParseLog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-ParseLog
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Apache-ParseLog/pkg-plist b/textproc/p5-Apache-ParseLog/pkg-plist
index 2844789540ec..cc2a07c1f2c9 100644
--- a/textproc/p5-Apache-ParseLog/pkg-plist
+++ b/textproc/p5-Apache-ParseLog/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Apache::ParseLog.3.gz
 %%SITE_PERL%%/Apache/ParseLog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/textproc/p5-BibTeX-Parser/Makefile b/textproc/p5-BibTeX-Parser/Makefile
index fe8f3c7b4449..b32f5e85232a 100644
--- a/textproc/p5-BibTeX-Parser/Makefile
+++ b/textproc/p5-BibTeX-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BibTeX-Parser
 PORTVERSION=	0.65
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GERHARD
diff --git a/textproc/p5-BibTeX-Parser/pkg-plist b/textproc/p5-BibTeX-Parser/pkg-plist
index 7633bb705e06..fc1bd9640ca6 100644
--- a/textproc/p5-BibTeX-Parser/pkg-plist
+++ b/textproc/p5-BibTeX-Parser/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/BibTeX/Parser.pm
 %%SITE_PERL%%/BibTeX/Parser/Author.pm
 %%SITE_PERL%%/BibTeX/Parser/Entry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BibTeX/Parser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BibTeX/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BibTeX
-@dirrmtry %%SITE_PERL%%/BibTeX/Parser
-@dirrmtry %%SITE_PERL%%/BibTeX
diff --git a/textproc/p5-Bloom-Filter/Makefile b/textproc/p5-Bloom-Filter/Makefile
index f91326af3c20..e87c7823f429 100644
--- a/textproc/p5-Bloom-Filter/Makefile
+++ b/textproc/p5-Bloom-Filter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Bloom-Filter
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MCEGLOWS
diff --git a/textproc/p5-Bloom-Filter/pkg-plist b/textproc/p5-Bloom-Filter/pkg-plist
index b30e1133e1dc..a017fec6fc52 100644
--- a/textproc/p5-Bloom-Filter/pkg-plist
+++ b/textproc/p5-Bloom-Filter/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Bloom::Filter.3.gz
 %%SITE_PERL%%/Bloom/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bloom/Filter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bloom/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bloom
-@dirrmtry %%SITE_PERL%%/Bloom
diff --git a/textproc/p5-CAM-PDF/Makefile b/textproc/p5-CAM-PDF/Makefile
index c7a32063fc2c..82b09bd4ff6b 100644
--- a/textproc/p5-CAM-PDF/Makefile
+++ b/textproc/p5-CAM-PDF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CAM-PDF
 PORTVERSION=	1.60
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CAM-PDF/pkg-plist b/textproc/p5-CAM-PDF/pkg-plist
index c3fa8d49114e..9d6d75a89fc6 100644
--- a/textproc/p5-CAM-PDF/pkg-plist
+++ b/textproc/p5-CAM-PDF/pkg-plist
@@ -49,7 +49,6 @@ bin/uninlinepdfimages.pl
 %%SITE_PERL%%/CAM/PDF/Renderer/Images.pm
 %%SITE_PERL%%/CAM/PDF/Renderer/Text.pm
 %%SITE_PERL%%/CAM/PDF/Renderer/TextFB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CAM/PDF/.packlist
 man/man1/appendpdf.pl.1.gz
 man/man1/changepagestring.pl.1.gz
 man/man1/changepdfstring.pl.1.gz
@@ -77,9 +76,3 @@ man/man1/setpdfbackground.pl.1.gz
 man/man1/setpdfpage.pl.1.gz
 man/man1/stamppdf.pl.1.gz
 man/man1/uninlinepdfimages.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CAM/PDF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CAM
-@dirrmtry %%SITE_PERL%%/CAM/PDF/Renderer
-@dirrmtry %%SITE_PERL%%/CAM/PDF/GS
-@dirrmtry %%SITE_PERL%%/CAM/PDF
-@dirrmtry %%SITE_PERL%%/CAM
diff --git a/textproc/p5-CQL-Parser/Makefile b/textproc/p5-CQL-Parser/Makefile
index efe0acb26ca6..f42b33352777 100644
--- a/textproc/p5-CQL-Parser/Makefile
+++ b/textproc/p5-CQL-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CQL-Parser
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRICAS
diff --git a/textproc/p5-CQL-Parser/pkg-plist b/textproc/p5-CQL-Parser/pkg-plist
index 1abbec69a823..6260e2776e6e 100644
--- a/textproc/p5-CQL-Parser/pkg-plist
+++ b/textproc/p5-CQL-Parser/pkg-plist
@@ -15,7 +15,6 @@
 %%SITE_PERL%%/CQL/Token.pm
 %%SITE_PERL%%/CQL/Utils.pm
 %%SITE_PERL%%/CQL/Visitor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CQL/Parser/.packlist
 %%PERL5_MAN3%%/CQL::AndNode.3.gz
 %%PERL5_MAN3%%/CQL::BooleanNode.3.gz
 %%PERL5_MAN3%%/CQL::Lexer.3.gz
@@ -32,6 +31,3 @@
 %%PERL5_MAN3%%/CQL::TermNode.3.gz
 %%PERL5_MAN3%%/CQL::Token.3.gz
 %%PERL5_MAN3%%/CQL::Visitor.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CQL/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CQL
-@dirrmtry %%SITE_PERL%%/CQL
diff --git a/textproc/p5-CSS-Compressor/Makefile b/textproc/p5-CSS-Compressor/Makefile
index b6404841d43b..70c067f96529 100644
--- a/textproc/p5-CSS-Compressor/Makefile
+++ b/textproc/p5-CSS-Compressor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CSS-Compressor
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-Compressor/pkg-plist b/textproc/p5-CSS-Compressor/pkg-plist
index f725946de5e1..7876ac76d1c8 100644
--- a/textproc/p5-CSS-Compressor/pkg-plist
+++ b/textproc/p5-CSS-Compressor/pkg-plist
@@ -1,7 +1,3 @@
 bin/csscompressor
 %%PERL5_MAN3%%/CSS::Compressor.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Compressor/.packlist
 %%SITE_PERL%%/CSS/Compressor.pm
-@dirrmtry %%SITE_PERL%%/CSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Compressor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
diff --git a/textproc/p5-CSS-Croco/Makefile b/textproc/p5-CSS-Croco/Makefile
index 3213945b83fe..27e2497ec053 100644
--- a/textproc/p5-CSS-Croco/Makefile
+++ b/textproc/p5-CSS-Croco/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Croco
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-Croco/pkg-plist b/textproc/p5-CSS-Croco/pkg-plist
index 4c901edabef6..702001784305 100644
--- a/textproc/p5-CSS-Croco/pkg-plist
+++ b/textproc/p5-CSS-Croco/pkg-plist
@@ -10,24 +10,17 @@
 %%PERL5_MAN3%%/CSS::Croco::Term::Number.3.gz
 %%PERL5_MAN3%%/CSS::Croco::Term::String.3.gz
 %%PERL5_MAN3%%/CSS::Croco::Term::URI.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Selector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Statement.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Statement/Media.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Statement/RuleSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/StyleSheet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Term.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Term/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Term/Ident.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Term/Number.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Term/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Term/URI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Croco/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Croco/Croco.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Croco/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Croco
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Term
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco/Statement
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CSS/Croco
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CSS
+%%SITE_ARCH%%/CSS/Croco.pm
+%%SITE_ARCH%%/CSS/Croco/Selector.pm
+%%SITE_ARCH%%/CSS/Croco/Statement.pm
+%%SITE_ARCH%%/CSS/Croco/Statement/Media.pm
+%%SITE_ARCH%%/CSS/Croco/Statement/RuleSet.pm
+%%SITE_ARCH%%/CSS/Croco/StyleSheet.pm
+%%SITE_ARCH%%/CSS/Croco/Term.pm
+%%SITE_ARCH%%/CSS/Croco/Term/Hash.pm
+%%SITE_ARCH%%/CSS/Croco/Term/Ident.pm
+%%SITE_ARCH%%/CSS/Croco/Term/Number.pm
+%%SITE_ARCH%%/CSS/Croco/Term/String.pm
+%%SITE_ARCH%%/CSS/Croco/Term/URI.pm
+%%SITE_ARCH%%/auto/CSS/Croco/Croco.so
+%%SITE_ARCH%%/auto/CSS/Croco/autosplit.ix
diff --git a/textproc/p5-CSS-Minifier-XS/Makefile b/textproc/p5-CSS-Minifier-XS/Makefile
index ad20f0a87f05..b6b1a9a991fa 100644
--- a/textproc/p5-CSS-Minifier-XS/Makefile
+++ b/textproc/p5-CSS-Minifier-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Minifier-XS
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-Minifier-XS/pkg-plist b/textproc/p5-CSS-Minifier-XS/pkg-plist
index 6555254548cf..ccddafa3d751 100644
--- a/textproc/p5-CSS-Minifier-XS/pkg-plist
+++ b/textproc/p5-CSS-Minifier-XS/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Minifier/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/XS/XS.so
+%%SITE_ARCH%%/CSS/Minifier/XS.pm
+%%SITE_ARCH%%/auto/CSS/Minifier/XS/XS.so
 %%PERL5_MAN3%%/CSS::Minifier::XS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/CSS/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CSS
diff --git a/textproc/p5-CSS-Minifier/Makefile b/textproc/p5-CSS-Minifier/Makefile
index bf9882ffce17..27076b41c9ba 100644
--- a/textproc/p5-CSS-Minifier/Makefile
+++ b/textproc/p5-CSS-Minifier/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Minifier
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-Minifier/pkg-plist b/textproc/p5-CSS-Minifier/pkg-plist
index 878fa50e3384..b7f30e2fb364 100644
--- a/textproc/p5-CSS-Minifier/pkg-plist
+++ b/textproc/p5-CSS-Minifier/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CSS/Minifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/.packlist
 %%PERL5_MAN3%%/CSS::Minifier.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/CSS
diff --git a/textproc/p5-CSS-Packer/Makefile b/textproc/p5-CSS-Packer/Makefile
index 84c46e255201..7092b1b65dd0 100644
--- a/textproc/p5-CSS-Packer/Makefile
+++ b/textproc/p5-CSS-Packer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Packer
 PORTVERSION=	1.002.001
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-Packer/pkg-plist b/textproc/p5-CSS-Packer/pkg-plist
index 410ac97e8e41..6102effc3e14 100644
--- a/textproc/p5-CSS-Packer/pkg-plist
+++ b/textproc/p5-CSS-Packer/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CSS/Packer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Packer/.packlist
 %%PERL5_MAN3%%/CSS::Packer.3.gz
diff --git a/textproc/p5-CSS-SAC/Makefile b/textproc/p5-CSS-SAC/Makefile
index a2b6f52a8f2c..1e07b6f145e1 100644
--- a/textproc/p5-CSS-SAC/Makefile
+++ b/textproc/p5-CSS-SAC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CSS-SAC
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5 www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-SAC/pkg-plist b/textproc/p5-CSS-SAC/pkg-plist
index 23f85d5bd92c..d662b632475e 100644
--- a/textproc/p5-CSS-SAC/pkg-plist
+++ b/textproc/p5-CSS-SAC/pkg-plist
@@ -44,10 +44,3 @@
 %%SITE_PERL%%/CSS/SAC/SelectorList.pm
 %%SITE_PERL%%/CSS/SAC/TestWriter.pm
 %%SITE_PERL%%/CSS/SAC/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/CSS/SAC/Selector
-@dirrmtry %%SITE_PERL%%/CSS/SAC/Condition
-@dirrmtry %%SITE_PERL%%/CSS/SAC
-@dirrmtry %%SITE_PERL%%/CSS
diff --git a/textproc/p5-CSS-Simple/Makefile b/textproc/p5-CSS-Simple/Makefile
index 8dabcd8bdfee..0394b2a369e6 100644
--- a/textproc/p5-CSS-Simple/Makefile
+++ b/textproc/p5-CSS-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Simple
 PORTVERSION=	3211
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -21,9 +22,5 @@ USE_PERL5=	configure
 
 PLIST_FILES=	%%SITE_PERL%%/CSS/Simple.pm \
 		%%PERL5_MAN3%%/CSS::Simple.3.gz \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Simple/.packlist
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Simple \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS \
-		%%SITE_PERL%%/CSS
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-CSS-Squish/Makefile b/textproc/p5-CSS-Squish/Makefile
index 832048b9e32a..98cf932e675c 100644
--- a/textproc/p5-CSS-Squish/Makefile
+++ b/textproc/p5-CSS-Squish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Squish
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-Squish/pkg-plist b/textproc/p5-CSS-Squish/pkg-plist
index 6654c407cd6a..e03c6f205645 100644
--- a/textproc/p5-CSS-Squish/pkg-plist
+++ b/textproc/p5-CSS-Squish/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CSS::Squish.3.gz
 %%SITE_PERL%%/CSS/Squish.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Squish/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Squish
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/CSS
diff --git a/textproc/p5-CSS-Tiny/Makefile b/textproc/p5-CSS-Tiny/Makefile
index ec0cbcb8fb51..a510492b357f 100644
--- a/textproc/p5-CSS-Tiny/Makefile
+++ b/textproc/p5-CSS-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Tiny
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-CSS-Tiny/pkg-plist b/textproc/p5-CSS-Tiny/pkg-plist
index ec411a00d91e..533ec17631ac 100644
--- a/textproc/p5-CSS-Tiny/pkg-plist
+++ b/textproc/p5-CSS-Tiny/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CSS::Tiny.3.gz
 %%SITE_PERL%%/CSS/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Tiny/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Tiny
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/CSS
diff --git a/textproc/p5-CSS/Makefile b/textproc/p5-CSS/Makefile
index 75e3b3a59b3c..3a1d8d5a2599 100644
--- a/textproc/p5-CSS/Makefile
+++ b/textproc/p5-CSS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:IAMCAL
diff --git a/textproc/p5-CSS/pkg-plist b/textproc/p5-CSS/pkg-plist
index ead7f18de474..be3e2b146bdf 100644
--- a/textproc/p5-CSS/pkg-plist
+++ b/textproc/p5-CSS/pkg-plist
@@ -25,8 +25,3 @@
 %%SITE_PERL%%/CSS/Selector.pm
 %%SITE_PERL%%/CSS/Style.pm
 %%SITE_PERL%%/CSS/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/CSS/Parse
-@dirrmtry %%SITE_PERL%%/CSS/Adaptor
-@dirrmtry %%SITE_PERL%%/CSS
diff --git a/textproc/p5-Chess-PGN-Parse/Makefile b/textproc/p5-Chess-PGN-Parse/Makefile
index a471c97c44e9..1de6c16cabd0 100644
--- a/textproc/p5-Chess-PGN-Parse/Makefile
+++ b/textproc/p5-Chess-PGN-Parse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chess-PGN-Parse
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	textproc games perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GMAX
diff --git a/textproc/p5-Chess-PGN-Parse/pkg-plist b/textproc/p5-Chess-PGN-Parse/pkg-plist
index 030accf83805..8bd17e4ddbfb 100644
--- a/textproc/p5-Chess-PGN-Parse/pkg-plist
+++ b/textproc/p5-Chess-PGN-Parse/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Chess::PGN::Parse.3.gz
 %%SITE_PERL%%/Chess/PGN/Parse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN/Parse/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN/Parse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess
-@dirrmtry %%SITE_PERL%%/Chess/PGN
-@dirrmtry %%SITE_PERL%%/Chess
diff --git a/textproc/p5-Class-CSV/Makefile b/textproc/p5-Class-CSV/Makefile
index 30b06457cfd3..f5daadebf9cd 100644
--- a/textproc/p5-Class-CSV/Makefile
+++ b/textproc/p5-Class-CSV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-CSV
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Class-CSV/pkg-plist b/textproc/p5-Class-CSV/pkg-plist
index 28d67aaa1237..5b8c2e064c2e 100644
--- a/textproc/p5-Class-CSV/pkg-plist
+++ b/textproc/p5-Class-CSV/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Class::CSV.3.gz
 %%SITE_PERL%%/Class/CSV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/CSV/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/CSV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
-@dirrmtry %%SITE_PERL%%/Class
diff --git a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
index 3aafba761314..9e159231b34b 100644
--- a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
+++ b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-FormValidator-Constraints-DateTime
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WONKO
diff --git a/textproc/p5-Data-FormValidator-Constraints-DateTime/pkg-plist b/textproc/p5-Data-FormValidator-Constraints-DateTime/pkg-plist
index 1b81f82251a7..9994cb9b41b0 100644
--- a/textproc/p5-Data-FormValidator-Constraints-DateTime/pkg-plist
+++ b/textproc/p5-Data-FormValidator-Constraints-DateTime/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Data::FormValidator::Constraints::DateTime.3.gz
 %%SITE_PERL%%/Data/FormValidator/Constraints/DateTime.pm
-@dirrmtry %%SITE_PERL%%/Data/FormValidator/Constraints
-@dirrmtry %%SITE_PERL%%/Data/FormValidator
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index d2aa6432a3ad..96ac6656ecd4 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-FormValidator
 PORTVERSION=	4.81
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Data-FormValidator/pkg-plist b/textproc/p5-Data-FormValidator/pkg-plist
index 8d187578bdcb..b758c960492d 100644
--- a/textproc/p5-Data-FormValidator/pkg-plist
+++ b/textproc/p5-Data-FormValidator/pkg-plist
@@ -12,6 +12,3 @@
 %%SITE_PERL%%/Data/FormValidator/ConstraintsFactory.pm
 %%SITE_PERL%%/Data/FormValidator/Filters.pm
 %%SITE_PERL%%/Data/FormValidator/Results.pm
-@dirrmtry %%SITE_PERL%%/Data/FormValidator/Constraints
-@dirrmtry %%SITE_PERL%%/Data/FormValidator
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile b/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
index db078662f674..6468c2d86b84 100644
--- a/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
+++ b/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Phrasebook-Loader-YAML
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Data-Phrasebook-Loader-YAML/pkg-plist b/textproc/p5-Data-Phrasebook-Loader-YAML/pkg-plist
index 76a143ff67d5..467bb5b3649e 100644
--- a/textproc/p5-Data-Phrasebook-Loader-YAML/pkg-plist
+++ b/textproc/p5-Data-Phrasebook-Loader-YAML/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Data::Phrasebook::Loader::YAML.3.gz
 %%SITE_PERL%%/Data/Phrasebook/Loader/YAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Phrasebook/Loader/YAML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Phrasebook/Loader/YAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Phrasebook/Loader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Phrasebook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data/Phrasebook/Loader
-@dirrmtry %%SITE_PERL%%/Data/Phrasebook
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-Data-Phrasebook/Makefile b/textproc/p5-Data-Phrasebook/Makefile
index 425958d475de..7ce90f68f528 100644
--- a/textproc/p5-Data-Phrasebook/Makefile
+++ b/textproc/p5-Data-Phrasebook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Phrasebook
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Data-Phrasebook/pkg-plist b/textproc/p5-Data-Phrasebook/pkg-plist
index 85fd1abbe17e..80b31a178f87 100644
--- a/textproc/p5-Data-Phrasebook/pkg-plist
+++ b/textproc/p5-Data-Phrasebook/pkg-plist
@@ -16,10 +16,3 @@
 %%SITE_PERL%%/Data/Phrasebook/Plain.pm
 %%SITE_PERL%%/Data/Phrasebook/SQL.pm
 %%SITE_PERL%%/Data/Phrasebook/SQL/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Phrasebook/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Phrasebook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data/Phrasebook/SQL
-@dirrmtry %%SITE_PERL%%/Data/Phrasebook/Loader
-@dirrmtry %%SITE_PERL%%/Data/Phrasebook
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-Data-Report/Makefile b/textproc/p5-Data-Report/Makefile
index 96aa51746c81..fd7ff60a45ef 100644
--- a/textproc/p5-Data-Report/Makefile
+++ b/textproc/p5-Data-Report/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-Report
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Data-Report/pkg-plist b/textproc/p5-Data-Report/pkg-plist
index 06160ea03851..a3425928e24d 100644
--- a/textproc/p5-Data-Report/pkg-plist
+++ b/textproc/p5-Data-Report/pkg-plist
@@ -5,6 +5,3 @@
 %%SITE_PERL%%/Data/Report/Plugin/Csv.pm
 %%SITE_PERL%%/Data/Report/Plugin/Html.pm
 %%SITE_PERL%%/Data/Report/Plugin/Text.pm
-@dirrmtry %%SITE_PERL%%/Data/Report/Plugin
-@dirrmtry %%SITE_PERL%%/Data/Report
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-Data-SpreadPagination/Makefile b/textproc/p5-Data-SpreadPagination/Makefile
index 6b8fd68b229a..c059f3714217 100644
--- a/textproc/p5-Data-SpreadPagination/Makefile
+++ b/textproc/p5-Data-SpreadPagination/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-SpreadPagination
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Data-SpreadPagination/pkg-plist b/textproc/p5-Data-SpreadPagination/pkg-plist
index 20781e0c99a2..49cc4cbb206c 100644
--- a/textproc/p5-Data-SpreadPagination/pkg-plist
+++ b/textproc/p5-Data-SpreadPagination/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Data::SpreadPagination.3.gz
 %%SITE_PERL%%/Data/SpreadPagination.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/SpreadPagination/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/SpreadPagination
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-DelimMatch/Makefile b/textproc/p5-DelimMatch/Makefile
index 2ac3218aa53d..e7b29a5c8ce6 100644
--- a/textproc/p5-DelimMatch/Makefile
+++ b/textproc/p5-DelimMatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DelimMatch
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://nwalsh.com/perl/delimmatch/
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-DelimMatch/pkg-plist b/textproc/p5-DelimMatch/pkg-plist
index c06c5a379d85..16585c719a03 100644
--- a/textproc/p5-DelimMatch/pkg-plist
+++ b/textproc/p5-DelimMatch/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Text::DelimMatch.3.gz
 %%SITE_PERL%%/auto/Text/DelimMatch/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
 %%SITE_PERL%%/Text/DelimMatch.pm
-@dirrm %%SITE_PERL%%/auto/Text/DelimMatch
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch
-@dirrmtry %%SITE_PERL%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Dev-Bollocks/Makefile b/textproc/p5-Dev-Bollocks/Makefile
index 513de63e9b8a..174db9a56be7 100644
--- a/textproc/p5-Dev-Bollocks/Makefile
+++ b/textproc/p5-Dev-Bollocks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dev-Bollocks
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TELS
diff --git a/textproc/p5-Dev-Bollocks/pkg-plist b/textproc/p5-Dev-Bollocks/pkg-plist
index 68c59049c780..2bcd887ddd82 100644
--- a/textproc/p5-Dev-Bollocks/pkg-plist
+++ b/textproc/p5-Dev-Bollocks/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Dev::Bollocks.3.gz
 %%SITE_PERL%%/Dev/Bollocks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dev/Bollocks/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dev/Bollocks
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dev
-@dirrmtry %%SITE_PERL%%/Dev
diff --git a/textproc/p5-Devel-TraceSAX/Makefile b/textproc/p5-Devel-TraceSAX/Makefile
index a11ecb24c51b..63fe8b6f3570 100644
--- a/textproc/p5-Devel-TraceSAX/Makefile
+++ b/textproc/p5-Devel-TraceSAX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Devel-TraceSAX
 PORTVERSION=	0.021
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Devel-TraceSAX/pkg-plist b/textproc/p5-Devel-TraceSAX/pkg-plist
index abe20fa3ed58..03abefee2918 100644
--- a/textproc/p5-Devel-TraceSAX/pkg-plist
+++ b/textproc/p5-Devel-TraceSAX/pkg-plist
@@ -1,8 +1,3 @@
 %%PERL5_MAN3%%/Devel::TraceSAX.3.gz
 %%SITE_PERL%%/Devel/TraceSAX.pm
 %%SITE_PERL%%/Devel/TraceSAX/DB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
-@dirrm %%SITE_PERL%%/Devel/TraceSAX
-@dirrmtry %%SITE_PERL%%/Devel
diff --git a/textproc/p5-DocSet/Makefile b/textproc/p5-DocSet/Makefile
index 0590a4fa364a..dba2315fee4a 100644
--- a/textproc/p5-DocSet/Makefile
+++ b/textproc/p5-DocSet/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	DocSet
 PORTVERSION=	0.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STAS
diff --git a/textproc/p5-DocSet/pkg-plist b/textproc/p5-DocSet/pkg-plist
index ec4f2e81b9cc..f1d4e3956d60 100644
--- a/textproc/p5-DocSet/pkg-plist
+++ b/textproc/p5-DocSet/pkg-plist
@@ -41,12 +41,4 @@ bin/html2ps
 %%SITE_PERL%%/DocSet/Source/Text.pm
 %%SITE_PERL%%/DocSet/Template/Plugin/NavigateCache.pm
 %%SITE_PERL%%/DocSet/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DocSet/.packlist
 man/man1/docset_build.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DocSet
-@dirrmtry %%SITE_PERL%%/DocSet/Template/Plugin
-@dirrmtry %%SITE_PERL%%/DocSet/Template
-@dirrmtry %%SITE_PERL%%/DocSet/Source
-@dirrmtry %%SITE_PERL%%/DocSet/DocSet
-@dirrmtry %%SITE_PERL%%/DocSet/Doc
-@dirrmtry %%SITE_PERL%%/DocSet
diff --git a/textproc/p5-EBook-Tools/Makefile b/textproc/p5-EBook-Tools/Makefile
index 45658ca2392e..dca6f479c61b 100644
--- a/textproc/p5-EBook-Tools/Makefile
+++ b/textproc/p5-EBook-Tools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	EBook-Tools
 PORTVERSION=	0.4.9
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-EBook-Tools/pkg-plist b/textproc/p5-EBook-Tools/pkg-plist
index 2a57da0c651d..8e64ecd870a0 100644
--- a/textproc/p5-EBook-Tools/pkg-plist
+++ b/textproc/p5-EBook-Tools/pkg-plist
@@ -16,5 +16,3 @@ man/man1/ebook.1.gz
 %%SITE_PERL%%/EBook/Tools/PalmDoc.pm
 %%SITE_PERL%%/EBook/Tools/Unpack.pm
 bin/ebook
-@dirrmtry %%SITE_PERL%%/EBook/Tools
-@dirrmtry %%SITE_PERL%%/EBook
diff --git a/textproc/p5-ElasticSearch-SearchBuilder/Makefile b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
index 1aab1887fe2e..cd2ea2e32eba 100644
--- a/textproc/p5-ElasticSearch-SearchBuilder/Makefile
+++ b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ElasticSearch-SearchBuilder
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/../by-authors/id/D/DR/DRTECH/
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist b/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist
index 441bd082e965..78fd58750dd4 100644
--- a/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist
+++ b/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/ElasticSearch::SearchBuilder.3.gz
 %%SITE_PERL%%/ElasticSearch/SearchBuilder.pm
-%%SITE_PERL%%/mach/auto/ElasticSearch/SearchBuilder/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/ElasticSearch/SearchBuilder
-@dirrmtry %%SITE_PERL%%/mach/auto/ElasticSearch
-@dirrmtry %%SITE_PERL%%/ElasticSearch
diff --git a/textproc/p5-ElasticSearch-legacy/Makefile b/textproc/p5-ElasticSearch-legacy/Makefile
index df843ec94610..cf78f428a448 100644
--- a/textproc/p5-ElasticSearch-legacy/Makefile
+++ b/textproc/p5-ElasticSearch-legacy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ElasticSearch
 PORTVERSION=	0.66
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/../by-authors/id/D/DR/DRTECH/
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-ElasticSearch-legacy/pkg-plist b/textproc/p5-ElasticSearch-legacy/pkg-plist
index dff68f1be315..c64bb08df73f 100644
--- a/textproc/p5-ElasticSearch-legacy/pkg-plist
+++ b/textproc/p5-ElasticSearch-legacy/pkg-plist
@@ -19,7 +19,3 @@
 %%SITE_PERL%%/ElasticSearch/Transport/HTTPLite.pm
 %%SITE_PERL%%/ElasticSearch/Transport/HTTPTiny.pm
 %%SITE_PERL%%/ElasticSearch/Util.pm
-%%SITE_PERL%%/mach/auto/ElasticSearch/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/ElasticSearch
-@dirrm %%SITE_PERL%%/ElasticSearch/Transport
-@dirrmtry %%SITE_PERL%%/ElasticSearch
diff --git a/textproc/p5-Excel-Template/Makefile b/textproc/p5-Excel-Template/Makefile
index 1540cb0d6561..0ef56a9b03bc 100644
--- a/textproc/p5-Excel-Template/Makefile
+++ b/textproc/p5-Excel-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Excel-Template
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Excel-Template/pkg-plist b/textproc/p5-Excel-Template/pkg-plist
index 8c533f35c9c6..87e3a76eee21 100644
--- a/textproc/p5-Excel-Template/pkg-plist
+++ b/textproc/p5-Excel-Template/pkg-plist
@@ -30,7 +30,6 @@
 %%PERL5_MAN3%%/Excel::Template::Format.3.gz
 %%PERL5_MAN3%%/Excel::Template::Iterator.3.gz
 %%PERL5_MAN3%%/Excel::Template::TextObject.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Excel/Template/.packlist
 %%SITE_PERL%%/Excel/Template.pm
 %%SITE_PERL%%/Excel/Template/Base.pm
 %%SITE_PERL%%/Excel/Template/Container.pm
@@ -63,10 +62,3 @@
 %%SITE_PERL%%/Excel/Template/Format.pm
 %%SITE_PERL%%/Excel/Template/Iterator.pm
 %%SITE_PERL%%/Excel/Template/TextObject.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Excel/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Excel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/Excel/Template/Element
-@dirrmtry %%SITE_PERL%%/Excel/Template/Container
-@dirrmtry %%SITE_PERL%%/Excel/Template
-@dirrmtry %%SITE_PERL%%/Excel
diff --git a/textproc/p5-Excel-Writer-XLSX/Makefile b/textproc/p5-Excel-Writer-XLSX/Makefile
index 0f05f4b97f2b..077f6f3f0fa8 100644
--- a/textproc/p5-Excel-Writer-XLSX/Makefile
+++ b/textproc/p5-Excel-Writer-XLSX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Excel-Writer-XLSX
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JMCNAMARA
diff --git a/textproc/p5-Excel-Writer-XLSX/pkg-plist b/textproc/p5-Excel-Writer-XLSX/pkg-plist
index e18f50e08c36..cfc85111af22 100644
--- a/textproc/p5-Excel-Writer-XLSX/pkg-plist
+++ b/textproc/p5-Excel-Writer-XLSX/pkg-plist
@@ -30,7 +30,6 @@ bin/extract_vba
 %%SITE_PERL%%/Excel/Writer/XLSX/Utility.pm
 %%SITE_PERL%%/Excel/Writer/XLSX/Workbook.pm
 %%SITE_PERL%%/Excel/Writer/XLSX/Worksheet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Excel/Writer/XLSX/.packlist
 %%PERL5_MAN3%%/Excel::Writer::XLSX.3.gz
 %%PERL5_MAN3%%/Excel::Writer::XLSX::Chart.3.gz
 %%PERL5_MAN3%%/Excel::Writer::XLSX::Chart::Area.3.gz
diff --git a/textproc/p5-File-Inplace/Makefile b/textproc/p5-File-Inplace/Makefile
index c164c8aea5d8..f570b19c8c0f 100644
--- a/textproc/p5-File-Inplace/Makefile
+++ b/textproc/p5-File-Inplace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Inplace
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-File-Inplace/pkg-plist b/textproc/p5-File-Inplace/pkg-plist
index 904c8ad7e4ed..52018d6cdb07 100644
--- a/textproc/p5-File-Inplace/pkg-plist
+++ b/textproc/p5-File-Inplace/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/File::Inplace.3.gz
 %%SITE_PERL%%/File/Inplace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Inplace/.packlist
-@dirrmtry %%SITE_PERL%%/File
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Inplace
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/textproc/p5-Filter-Simple/Makefile b/textproc/p5-Filter-Simple/Makefile
index 7270cc9ce5e6..040ca36f4897 100644
--- a/textproc/p5-Filter-Simple/Makefile
+++ b/textproc/p5-Filter-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Filter-Simple
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Filter-Simple/pkg-plist b/textproc/p5-Filter-Simple/pkg-plist
index c6d390466beb..729753d84235 100644
--- a/textproc/p5-Filter-Simple/pkg-plist
+++ b/textproc/p5-Filter-Simple/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Filter::Simple.3.gz
 %%SITE_PERL%%/Filter/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter
-@dirrmtry %%SITE_PERL%%/Filter
diff --git a/textproc/p5-FormValidator-Lite/Makefile b/textproc/p5-FormValidator-Lite/Makefile
index 5420815b0dc6..abf4bd8d484f 100644
--- a/textproc/p5-FormValidator-Lite/Makefile
+++ b/textproc/p5-FormValidator-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FormValidator-Lite
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Games-Dissociate/Makefile b/textproc/p5-Games-Dissociate/Makefile
index 0da64279002a..2ea58569e027 100644
--- a/textproc/p5-Games-Dissociate/Makefile
+++ b/textproc/p5-Games-Dissociate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Games-Dissociate
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	textproc games perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AVIF
diff --git a/textproc/p5-Games-Dissociate/pkg-plist b/textproc/p5-Games-Dissociate/pkg-plist
index 730875e690d7..bda34af7c816 100644
--- a/textproc/p5-Games-Dissociate/pkg-plist
+++ b/textproc/p5-Games-Dissociate/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Games::Dissociate.3.gz
 %%SITE_PERL%%/Games/Dissociate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Dissociate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Dissociate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
-@dirrmtry %%SITE_PERL%%/Games
diff --git a/textproc/p5-Geo-Parse-OSM/Makefile b/textproc/p5-Geo-Parse-OSM/Makefile
index 03675255fe5b..921b5867093d 100644
--- a/textproc/p5-Geo-Parse-OSM/Makefile
+++ b/textproc/p5-Geo-Parse-OSM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Parse-OSM
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	textproc geography perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LIOSHA
diff --git a/textproc/p5-Geo-Parse-OSM/pkg-plist b/textproc/p5-Geo-Parse-OSM/pkg-plist
index 94a02698ddf7..2769af206797 100644
--- a/textproc/p5-Geo-Parse-OSM/pkg-plist
+++ b/textproc/p5-Geo-Parse-OSM/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Geo/Parse/OSM.pm
 %%SITE_PERL%%/Geo/Parse/OSM/Multipass.pm
 %%SITE_PERL%%/Geo/Parse/OSM/Singlepass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Parse/OSM/.packlist
diff --git a/textproc/p5-Getopt-Lucid/Makefile b/textproc/p5-Getopt-Lucid/Makefile
index 443512452017..04a7fa5f8690 100644
--- a/textproc/p5-Getopt-Lucid/Makefile
+++ b/textproc/p5-Getopt-Lucid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Getopt-Lucid
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Getopt-Lucid/pkg-plist b/textproc/p5-Getopt-Lucid/pkg-plist
index 7ab5aeba690c..d9d124825663 100644
--- a/textproc/p5-Getopt-Lucid/pkg-plist
+++ b/textproc/p5-Getopt-Lucid/pkg-plist
@@ -1,9 +1,4 @@
 %%PERL5_MAN3%%/Getopt::Lucid.3.gz
 %%PERL5_MAN3%%/Getopt::Lucid::Exception.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Lucid/.packlist
 %%SITE_PERL%%/Getopt/Lucid.pm
 %%SITE_PERL%%/Getopt/Lucid/Exception.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Lucid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt
-@dirrmtry %%SITE_PERL%%/Getopt/Lucid
-@dirrmtry %%SITE_PERL%%/Getopt
diff --git a/textproc/p5-Google-Data-JSON/Makefile b/textproc/p5-Google-Data-JSON/Makefile
index 615bac135a5b..0c179f61e086 100644
--- a/textproc/p5-Google-Data-JSON/Makefile
+++ b/textproc/p5-Google-Data-JSON/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Google-Data-JSON
 PORTVERSION=	0.1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TAKERU
diff --git a/textproc/p5-Google-Data-JSON/pkg-plist b/textproc/p5-Google-Data-JSON/pkg-plist
index 80cb10b380c5..0a2604cf1157 100644
--- a/textproc/p5-Google-Data-JSON/pkg-plist
+++ b/textproc/p5-Google-Data-JSON/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Google/Data/JSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Data/JSON/.packlist
 %%PERL5_MAN3%%/Google::Data::JSON.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Data/JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Data
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google
-@dirrmtry %%SITE_PERL%%/Google/Data
-@dirrmtry %%SITE_PERL%%/Google
diff --git a/textproc/p5-Groonga-API/Makefile b/textproc/p5-Groonga-API/Makefile
index d11eeff16b72..7ab58a9dca77 100644
--- a/textproc/p5-Groonga-API/Makefile
+++ b/textproc/p5-Groonga-API/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Groonga-API
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ISHIGAKI
diff --git a/textproc/p5-Groonga-API/pkg-plist b/textproc/p5-Groonga-API/pkg-plist
index 78dc35ec714a..c0c0c68f9076 100644
--- a/textproc/p5-Groonga-API/pkg-plist
+++ b/textproc/p5-Groonga-API/pkg-plist
@@ -3,10 +3,9 @@
 %%PERL5_MAN3%%/Groonga::API::Exports.3.gz
 %%PERL5_MAN3%%/Groonga::API::Test.3.gz
 %%PERL5_MAN3%%/Ploonga.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Groonga/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Groonga/API/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Groonga/API/Exports.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Groonga/API/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Ploonga.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Groonga/API/API.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Groonga/API/.packlist
+%%SITE_ARCH%%/Groonga/API.pm
+%%SITE_ARCH%%/Groonga/API/Constants.pm
+%%SITE_ARCH%%/Groonga/API/Exports.pm
+%%SITE_ARCH%%/Groonga/API/Test.pm
+%%SITE_ARCH%%/Ploonga.pm
+%%SITE_ARCH%%/auto/Groonga/API/API.so
diff --git a/textproc/p5-HTML-CTPP2/Makefile b/textproc/p5-HTML-CTPP2/Makefile
index 7fb6cad9c5ca..25666e9bbd50 100644
--- a/textproc/p5-HTML-CTPP2/Makefile
+++ b/textproc/p5-HTML-CTPP2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-CTPP2
 PORTVERSION=	2.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN \
 		http://ctpp.havoc.ru/download/
diff --git a/textproc/p5-HTML-CTPP2/pkg-plist b/textproc/p5-HTML-CTPP2/pkg-plist
index 1dcd03e469fa..8b5a1d3bfc14 100644
--- a/textproc/p5-HTML-CTPP2/pkg-plist
+++ b/textproc/p5-HTML-CTPP2/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/CTPP2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CTPP2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CTPP2/CTPP2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CTPP2/autosplit.ix
+%%SITE_ARCH%%/HTML/CTPP2.pm
+%%SITE_ARCH%%/auto/HTML/CTPP2/CTPP2.so
+%%SITE_ARCH%%/auto/HTML/CTPP2/autosplit.ix
 %%PERL5_MAN3%%/HTML::CTPP2.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CTPP2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
diff --git a/textproc/p5-HTML-Copy/Makefile b/textproc/p5-HTML-Copy/Makefile
index a1e921c6bd12..7ab1ed6bea49 100644
--- a/textproc/p5-HTML-Copy/Makefile
+++ b/textproc/p5-HTML-Copy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Copy
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Copy/pkg-plist b/textproc/p5-HTML-Copy/pkg-plist
index 935e05406dde..b73136bf35db 100644
--- a/textproc/p5-HTML-Copy/pkg-plist
+++ b/textproc/p5-HTML-Copy/pkg-plist
@@ -1,8 +1,4 @@
 bin/htmlcopy
 %%PERL5_MAN3%%/HTML::Copy.3.gz
 %%SITE_PERL%%/HTML/Copy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Copy/.packlist
 man/man1/htmlcopy.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Copy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Entities-ImodePictogram/Makefile b/textproc/p5-HTML-Entities-ImodePictogram/Makefile
index fc01bd480008..348f91408a3b 100644
--- a/textproc/p5-HTML-Entities-ImodePictogram/Makefile
+++ b/textproc/p5-HTML-Entities-ImodePictogram/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Entities-ImodePictogram
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist b/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist
index 00e02fdf7068..9f68a8fdaf18 100644
--- a/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist
+++ b/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist
@@ -2,9 +2,3 @@
 %%PERL5_MAN3%%/HTML::Entities::ImodePictogram.ja.3.gz
 %%SITE_PERL%%/HTML/Entities/ImodePictogram.ja.pod
 %%SITE_PERL%%/HTML/Entities/ImodePictogram.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/ImodePictogram/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/ImodePictogram
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Entities
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Entities-Interpolate/Makefile b/textproc/p5-HTML-Entities-Interpolate/Makefile
index adba5c9e1e9d..e8d4f2f9c7d4 100644
--- a/textproc/p5-HTML-Entities-Interpolate/Makefile
+++ b/textproc/p5-HTML-Entities-Interpolate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Entities-Interpolate
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Entities-Interpolate/pkg-plist b/textproc/p5-HTML-Entities-Interpolate/pkg-plist
index ce2c0cf29394..41ea23c8f54d 100644
--- a/textproc/p5-HTML-Entities-Interpolate/pkg-plist
+++ b/textproc/p5-HTML-Entities-Interpolate/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/Entities/Interpolate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Interpolate/.packlist
 %%PERL5_MAN3%%/HTML::Entities::Interpolate.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Interpolate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities
-@dirrmtry %%SITE_PERL%%/HTML/Entities
diff --git a/textproc/p5-HTML-Entities-Numbered/Makefile b/textproc/p5-HTML-Entities-Numbered/Makefile
index 28e3646432e9..7ccef83f1ba2 100644
--- a/textproc/p5-HTML-Entities-Numbered/Makefile
+++ b/textproc/p5-HTML-Entities-Numbered/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Entities-Numbered
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Entities-Numbered/pkg-plist b/textproc/p5-HTML-Entities-Numbered/pkg-plist
index 3b6bde102bf2..e3a43b717f03 100644
--- a/textproc/p5-HTML-Entities-Numbered/pkg-plist
+++ b/textproc/p5-HTML-Entities-Numbered/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/HTML::Entities::Numbered::Table.3.gz
 %%SITE_PERL%%/HTML/Entities/Numbered.pm
 %%SITE_PERL%%/HTML/Entities/Numbered/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities
-@dirrm %%SITE_PERL%%/HTML/Entities/Numbered
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Entities
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-EscapeEvil/Makefile b/textproc/p5-HTML-EscapeEvil/Makefile
index cfc11a101490..9783b6bd5c27 100644
--- a/textproc/p5-HTML-EscapeEvil/Makefile
+++ b/textproc/p5-HTML-EscapeEvil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-EscapeEvil
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5 www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-EscapeEvil/pkg-plist b/textproc/p5-HTML-EscapeEvil/pkg-plist
index f517348d85b8..957dce50ceee 100644
--- a/textproc/p5-HTML-EscapeEvil/pkg-plist
+++ b/textproc/p5-HTML-EscapeEvil/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::EscapeEvil.3.gz
 %%SITE_PERL%%/HTML/EscapeEvil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/EscapeEvil/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/EscapeEvil
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index 950eee21edf9..82959cbd9357 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-Format
 PORTVERSION=	2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Format/pkg-plist b/textproc/p5-HTML-Format/pkg-plist
index cffc6fb7d87a..1aef0efcde19 100644
--- a/textproc/p5-HTML-Format/pkg-plist
+++ b/textproc/p5-HTML-Format/pkg-plist
@@ -8,4 +8,3 @@
 %%PERL5_MAN3%%/HTML::FormatRTF.3.gz
 %%PERL5_MAN3%%/HTML::FormatText.3.gz
 %%PERL5_MAN3%%/HTML::Formatter.3.gz
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
index 348b0ef110fb..baa14194a03c 100644
--- a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FormatText-WithLinks-AndTables
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-plist b/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-plist
index 13e90925471b..2260af231fb1 100644
--- a/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-plist
+++ b/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/HTML::FormatText::WithLinks::AndTables.3.gz
 %%SITE_PERL%%/HTML/FormatText/WithLinks/AndTables.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText/WithLinks/AndTables/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText/WithLinks/AndTables
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText/WithLinks
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/FormatText/WithLinks
-@dirrmtry %%SITE_PERL%%/HTML/FormatText
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-FormatText-WithLinks/Makefile b/textproc/p5-HTML-FormatText-WithLinks/Makefile
index e6e7f78ec3fc..c31484fabb65 100644
--- a/textproc/p5-HTML-FormatText-WithLinks/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FormatText-WithLinks
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-FormatText-WithLinks/pkg-plist b/textproc/p5-HTML-FormatText-WithLinks/pkg-plist
index 02c5858894cc..244b624bf2fe 100644
--- a/textproc/p5-HTML-FormatText-WithLinks/pkg-plist
+++ b/textproc/p5-HTML-FormatText-WithLinks/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::FormatText::WithLinks.3.gz
 %%SITE_PERL%%/HTML/FormatText/WithLinks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText/WithLinks/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText/WithLinks
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText
-@dirrmtry %%SITE_PERL%%/HTML/FormatText
diff --git a/textproc/p5-HTML-Fraction/Makefile b/textproc/p5-HTML-Fraction/Makefile
index 38b4a81e531d..28ba7c8a6fb1 100644
--- a/textproc/p5-HTML-Fraction/Makefile
+++ b/textproc/p5-HTML-Fraction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Fraction
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Fraction/pkg-plist b/textproc/p5-HTML-Fraction/pkg-plist
index 1bb726af43fb..7ae3e230c147 100644
--- a/textproc/p5-HTML-Fraction/pkg-plist
+++ b/textproc/p5-HTML-Fraction/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Fraction.3.gz
 %%SITE_PERL%%/HTML/Fraction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-HTML5-Entities/Makefile b/textproc/p5-HTML-HTML5-Entities/Makefile
index beda6f3cf559..69b4dad5bba6 100644
--- a/textproc/p5-HTML-HTML5-Entities/Makefile
+++ b/textproc/p5-HTML-HTML5-Entities/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-HTML5-Entities
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/textproc/p5-HTML-HTML5-Entities/pkg-plist b/textproc/p5-HTML-HTML5-Entities/pkg-plist
index 2fa706f3287e..2188f236cae7 100644
--- a/textproc/p5-HTML-HTML5-Entities/pkg-plist
+++ b/textproc/p5-HTML-HTML5-Entities/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::HTML5::Entities.3.gz
 %%SITE_PERL%%/HTML/HTML5/Entities.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Entities/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Entities
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/HTML5
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-HTML5-Parser/Makefile b/textproc/p5-HTML-HTML5-Parser/Makefile
index d9e62ada4247..ac6e7f05a74f 100644
--- a/textproc/p5-HTML-HTML5-Parser/Makefile
+++ b/textproc/p5-HTML-HTML5-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-HTML5-Parser
 PORTVERSION=	0.301
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
diff --git a/textproc/p5-HTML-HTML5-Parser/pkg-plist b/textproc/p5-HTML-HTML5-Parser/pkg-plist
index 0425c43e410d..ea83216cc134 100644
--- a/textproc/p5-HTML-HTML5-Parser/pkg-plist
+++ b/textproc/p5-HTML-HTML5-Parser/pkg-plist
@@ -14,11 +14,3 @@ bin/html5debug
 %%SITE_PERL%%/HTML/HTML5/Parser/Tokenizer.pm
 %%SITE_PERL%%/HTML/HTML5/Parser/UA.pm
 %%SITE_PERL%%/HTML/HTML5/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Parser/.packlist
-@dirrm %%SITE_PERL%%/HTML/HTML5/Parser/Charset
-@dirrm %%SITE_PERL%%/HTML/HTML5/Parser
-@dirrmtry %%SITE_PERL%%/HTML/HTML5
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/textproc/p5-HTML-HTMLDoc/Makefile b/textproc/p5-HTML-HTMLDoc/Makefile
index 8c593fd99fdd..e49eb197078a 100644
--- a/textproc/p5-HTML-HTMLDoc/Makefile
+++ b/textproc/p5-HTML-HTMLDoc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-HTMLDoc
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://kostjn.spb.ru/freebsd/ \
 		CPAN
diff --git a/textproc/p5-HTML-HTMLDoc/pkg-plist b/textproc/p5-HTML-HTMLDoc/pkg-plist
index c796758e6e14..d126e656124f 100644
--- a/textproc/p5-HTML-HTMLDoc/pkg-plist
+++ b/textproc/p5-HTML-HTMLDoc/pkg-plist
@@ -1,9 +1,4 @@
 %%PERL5_MAN3%%/HTML::HTMLDoc.3.gz
 %%PERL5_MAN3%%/HTML::HTMLDoc::PDF.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTMLDoc/.packlist
 %%SITE_PERL%%/HTML/HTMLDoc.pm
 %%SITE_PERL%%/HTML/HTMLDoc/PDF.pm
-@dirrmtry %%SITE_PERL%%/HTML/HTMLDoc
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTMLDoc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/textproc/p5-HTML-Packer/Makefile b/textproc/p5-HTML-Packer/Makefile
index fe2e8aa6a893..6d199145bac4 100644
--- a/textproc/p5-HTML-Packer/Makefile
+++ b/textproc/p5-HTML-Packer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Packer
 PORTVERSION=	1.004.001
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Packer/pkg-plist b/textproc/p5-HTML-Packer/pkg-plist
index ab8f53f58429..ce5055f4978d 100644
--- a/textproc/p5-HTML-Packer/pkg-plist
+++ b/textproc/p5-HTML-Packer/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/HTML/Packer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Packer/.packlist
 %%PERL5_MAN3%%/HTML::Packer.3.gz
diff --git a/textproc/p5-HTML-QRCode/Makefile b/textproc/p5-HTML-QRCode/Makefile
index 7b3902727a63..8880a0bfa8ac 100644
--- a/textproc/p5-HTML-QRCode/Makefile
+++ b/textproc/p5-HTML-QRCode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-QRCode
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-QRCode/pkg-plist b/textproc/p5-HTML-QRCode/pkg-plist
index f7276f0c26d7..75300f09e6f2 100644
--- a/textproc/p5-HTML-QRCode/pkg-plist
+++ b/textproc/p5-HTML-QRCode/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::QRCode.3.gz
 %%SITE_PERL%%/HTML/QRCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QRCode/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QRCode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Quoted/Makefile b/textproc/p5-HTML-Quoted/Makefile
index 41038c9bedb5..06bcb5e60b6f 100644
--- a/textproc/p5-HTML-Quoted/Makefile
+++ b/textproc/p5-HTML-Quoted/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Quoted
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Quoted/pkg-plist b/textproc/p5-HTML-Quoted/pkg-plist
index 192f8e11cc82..d66c54686aba 100644
--- a/textproc/p5-HTML-Quoted/pkg-plist
+++ b/textproc/p5-HTML-Quoted/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Quoted.3.gz
 %%SITE_PERL%%/HTML/Quoted.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Quoted/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Quoted
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-RewriteAttributes/Makefile b/textproc/p5-HTML-RewriteAttributes/Makefile
index 261552af5f4f..d4941ee1661c 100644
--- a/textproc/p5-HTML-RewriteAttributes/Makefile
+++ b/textproc/p5-HTML-RewriteAttributes/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-RewriteAttributes
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-RewriteAttributes/pkg-plist b/textproc/p5-HTML-RewriteAttributes/pkg-plist
index 1809fba0b55d..1170081e9a0d 100644
--- a/textproc/p5-HTML-RewriteAttributes/pkg-plist
+++ b/textproc/p5-HTML-RewriteAttributes/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/HTML/RewriteAttributes.pm
 %%SITE_PERL%%/HTML/RewriteAttributes/Links.pm
 %%SITE_PERL%%/HTML/RewriteAttributes/Resources.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/RewriteAttributes/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/RewriteAttributes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/RewriteAttributes
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-SBC/Makefile b/textproc/p5-HTML-SBC/Makefile
index c7a2cbcc8e71..798a946bc0d0 100644
--- a/textproc/p5-HTML-SBC/Makefile
+++ b/textproc/p5-HTML-SBC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-SBC
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-SBC/pkg-plist b/textproc/p5-HTML-SBC/pkg-plist
index 071349856589..6dc1ec186f8c 100644
--- a/textproc/p5-HTML-SBC/pkg-plist
+++ b/textproc/p5-HTML-SBC/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::SBC.3.gz
 %%SITE_PERL%%/HTML/SBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SBC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SBC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-SuperForm/Makefile b/textproc/p5-HTML-SuperForm/Makefile
index 139ae7b3c10d..630038b56eba 100644
--- a/textproc/p5-HTML-SuperForm/Makefile
+++ b/textproc/p5-HTML-SuperForm/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-SuperForm
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JALLWINE
diff --git a/textproc/p5-HTML-SuperForm/pkg-plist b/textproc/p5-HTML-SuperForm/pkg-plist
index ea07add7367c..c3e34b591e93 100644
--- a/textproc/p5-HTML-SuperForm/pkg-plist
+++ b/textproc/p5-HTML-SuperForm/pkg-plist
@@ -24,9 +24,3 @@
 %%SITE_PERL%%/HTML/SuperForm/Field/Submit.pm
 %%SITE_PERL%%/HTML/SuperForm/Field/Text.pm
 %%SITE_PERL%%/HTML/SuperForm/Field/Textarea.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SuperForm/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SuperForm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/SuperForm/Field
-@dirrmtry %%SITE_PERL%%/HTML/SuperForm
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-TagFilter/Makefile b/textproc/p5-HTML-TagFilter/Makefile
index fac7c77a0fb8..a152b48ed48f 100644
--- a/textproc/p5-HTML-TagFilter/Makefile
+++ b/textproc/p5-HTML-TagFilter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TagFilter
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-TagFilter/pkg-plist b/textproc/p5-HTML-TagFilter/pkg-plist
index b7adb10c3ee1..6a5cd0f3d1e9 100644
--- a/textproc/p5-HTML-TagFilter/pkg-plist
+++ b/textproc/p5-HTML-TagFilter/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::TagFilter.3.gz
 %%SITE_PERL%%/HTML/TagFilter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagFilter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagFilter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Tidy/Makefile b/textproc/p5-HTML-Tidy/Makefile
index 2b55e0659c18..bcda51c69a36 100644
--- a/textproc/p5-HTML-Tidy/Makefile
+++ b/textproc/p5-HTML-Tidy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Tidy
 PORTVERSION=	1.56
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Tidy/pkg-plist b/textproc/p5-HTML-Tidy/pkg-plist
index 50c86dedb3dc..e2f281ffd9a7 100644
--- a/textproc/p5-HTML-Tidy/pkg-plist
+++ b/textproc/p5-HTML-Tidy/pkg-plist
@@ -1,11 +1,6 @@
 bin/webtidy
 %%PERL5_MAN3%%/HTML::Tidy.3.gz
 %%PERL5_MAN3%%/HTML::Tidy::Message.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Tidy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Tidy/Message.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy/Tidy.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Tidy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
+%%SITE_ARCH%%/HTML/Tidy.pm
+%%SITE_ARCH%%/HTML/Tidy/Message.pm
+%%SITE_ARCH%%/auto/HTML/Tidy/Tidy.so
diff --git a/textproc/p5-HTML-Tiny/Makefile b/textproc/p5-HTML-Tiny/Makefile
index 306cd6600915..386204d26aba 100644
--- a/textproc/p5-HTML-Tiny/Makefile
+++ b/textproc/p5-HTML-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Tiny
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ANDYA
diff --git a/textproc/p5-HTML-Tiny/pkg-plist b/textproc/p5-HTML-Tiny/pkg-plist
index 34ac91e7c55d..c2735382ed13 100644
--- a/textproc/p5-HTML-Tiny/pkg-plist
+++ b/textproc/p5-HTML-Tiny/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Tiny.3.gz
 %%SITE_PERL%%/HTML/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tiny/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tiny
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Truncate/Makefile b/textproc/p5-HTML-Truncate/Makefile
index 19aa34cff3ab..bf56fd371037 100644
--- a/textproc/p5-HTML-Truncate/Makefile
+++ b/textproc/p5-HTML-Truncate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Truncate
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Truncate/pkg-plist b/textproc/p5-HTML-Truncate/pkg-plist
index 4445a8fe2928..3c34dd45b8a1 100644
--- a/textproc/p5-HTML-Truncate/pkg-plist
+++ b/textproc/p5-HTML-Truncate/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Truncate.3.gz
 %%SITE_PERL%%/HTML/Truncate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Truncate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Truncate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-Hailo/Makefile b/textproc/p5-Hailo/Makefile
index 66608d1a6b74..0b42322cfe8d 100644
--- a/textproc/p5-Hailo/Makefile
+++ b/textproc/p5-Hailo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Hailo
 PORTVERSION=	0.70
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HINRIK
diff --git a/textproc/p5-Hailo/pkg-plist b/textproc/p5-Hailo/pkg-plist
index a25e8885d4f0..e43e5e2c5bb5 100644
--- a/textproc/p5-Hailo/pkg-plist
+++ b/textproc/p5-Hailo/pkg-plist
@@ -34,11 +34,3 @@ man/man1/hailo.1.gz
 %%SITE_PERL%%/Hailo/Tokenizer/Chars.pm
 %%SITE_PERL%%/Hailo/Tokenizer/Words.pm
 %%SITE_PERL%%/Hailo/UI/ReadLine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hailo/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hailo
-@dirrmtry %%SITE_PERL%%/Hailo/Engine
-@dirrmtry %%SITE_PERL%%/Hailo/Role
-@dirrmtry %%SITE_PERL%%/Hailo/Storage
-@dirrmtry %%SITE_PERL%%/Hailo/Tokenizer
-@dirrmtry %%SITE_PERL%%/Hailo/UI
-@dirrm %%SITE_PERL%%/Hailo
diff --git a/textproc/p5-Hash-Merge/Makefile b/textproc/p5-Hash-Merge/Makefile
index ba4242f551e4..56f29eebd59f 100644
--- a/textproc/p5-Hash-Merge/Makefile
+++ b/textproc/p5-Hash-Merge/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Hash-Merge
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Hash-Merge/pkg-plist b/textproc/p5-Hash-Merge/pkg-plist
index 1b6ab39c47d3..6310f26e4097 100644
--- a/textproc/p5-Hash-Merge/pkg-plist
+++ b/textproc/p5-Hash-Merge/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Hash/Merge.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Merge/.packlist
 %%PERL5_MAN3%%/Hash::Merge.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Merge
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash
-@dirrmtry %%SITE_PERL%%/Hash
diff --git a/textproc/p5-Hatena-Keyword/Makefile b/textproc/p5-Hatena-Keyword/Makefile
index ac9683aa838c..d5f6939bcce7 100644
--- a/textproc/p5-Hatena-Keyword/Makefile
+++ b/textproc/p5-Hatena-Keyword/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Hatena-Keyword
 PORTVERSION=	0.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NAOYA
diff --git a/textproc/p5-Hatena-Keyword/pkg-plist b/textproc/p5-Hatena-Keyword/pkg-plist
index f6b85ad0fe9f..924eff641bbf 100644
--- a/textproc/p5-Hatena-Keyword/pkg-plist
+++ b/textproc/p5-Hatena-Keyword/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Hatena::Keyword.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hatena/Keyword/.packlist
 %%SITE_PERL%%/Hatena/Keyword.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hatena/Keyword
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hatena
-@dirrmtry %%SITE_PERL%%/Hatena
diff --git a/textproc/p5-IDNA-Punycode/Makefile b/textproc/p5-IDNA-Punycode/Makefile
index 175256c34120..2fc2b52fe5c7 100644
--- a/textproc/p5-IDNA-Punycode/Makefile
+++ b/textproc/p5-IDNA-Punycode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IDNA-Punycode
 PORTVERSION=	0.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROBURBAN
diff --git a/textproc/p5-IDNA-Punycode/pkg-plist b/textproc/p5-IDNA-Punycode/pkg-plist
index 8c63ccd2666d..aad6e707c689 100644
--- a/textproc/p5-IDNA-Punycode/pkg-plist
+++ b/textproc/p5-IDNA-Punycode/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/IDNA::Punycode.3.gz
 %%SITE_PERL%%/IDNA/Punycode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IDNA/Punycode/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IDNA/Punycode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IDNA
-@dirrmtry %%SITE_PERL%%/IDNA
diff --git a/textproc/p5-IO-CSVHeaderFile/Makefile b/textproc/p5-IO-CSVHeaderFile/Makefile
index 5613d27e44b0..51fc48ba2609 100644
--- a/textproc/p5-IO-CSVHeaderFile/Makefile
+++ b/textproc/p5-IO-CSVHeaderFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IO-CSVHeaderFile
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-IO-CSVHeaderFile/pkg-plist b/textproc/p5-IO-CSVHeaderFile/pkg-plist
index 9267d65dd2fe..8b5796a1af13 100644
--- a/textproc/p5-IO-CSVHeaderFile/pkg-plist
+++ b/textproc/p5-IO-CSVHeaderFile/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/IO::CSVHeaderFile.3.gz
 %%SITE_PERL%%/IO/CSVHeaderFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
-@dirrmtry %%SITE_PERL%%/IO
diff --git a/textproc/p5-JavaScript-Minifier-XS/Makefile b/textproc/p5-JavaScript-Minifier-XS/Makefile
index ade0c45ca57c..3dd3881069a0 100644
--- a/textproc/p5-JavaScript-Minifier-XS/Makefile
+++ b/textproc/p5-JavaScript-Minifier-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JavaScript-Minifier-XS
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-JavaScript-Minifier-XS/pkg-plist b/textproc/p5-JavaScript-Minifier-XS/pkg-plist
index 52238a019c79..6d1b6bf63d73 100644
--- a/textproc/p5-JavaScript-Minifier-XS/pkg-plist
+++ b/textproc/p5-JavaScript-Minifier-XS/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/Minifier/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/XS/XS.so
+%%SITE_ARCH%%/JavaScript/Minifier/XS.pm
+%%SITE_ARCH%%/auto/JavaScript/Minifier/XS/XS.so
 %%PERL5_MAN3%%/JavaScript::Minifier::XS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript
diff --git a/textproc/p5-JavaScript-Minifier/Makefile b/textproc/p5-JavaScript-Minifier/Makefile
index 7e2b5bf95225..5d82cf185120 100644
--- a/textproc/p5-JavaScript-Minifier/Makefile
+++ b/textproc/p5-JavaScript-Minifier/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JavaScript-Minifier
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ZOFFIX
diff --git a/textproc/p5-JavaScript-Minifier/pkg-plist b/textproc/p5-JavaScript-Minifier/pkg-plist
index 0a58c6362535..80e0f0370c12 100644
--- a/textproc/p5-JavaScript-Minifier/pkg-plist
+++ b/textproc/p5-JavaScript-Minifier/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/JavaScript::Minifier.3.gz
 %%SITE_PERL%%/JavaScript/Minifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
-@dirrmtry %%SITE_PERL%%/JavaScript
diff --git a/textproc/p5-JavaScript-Packer/Makefile b/textproc/p5-JavaScript-Packer/Makefile
index c8152a8773b8..fbadfd112fc9 100644
--- a/textproc/p5-JavaScript-Packer/Makefile
+++ b/textproc/p5-JavaScript-Packer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JavaScript-Packer
 PORTVERSION=	1.006.003
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-JavaScript-Packer/pkg-plist b/textproc/p5-JavaScript-Packer/pkg-plist
index ad30132c3a8b..f88e8c060eae 100644
--- a/textproc/p5-JavaScript-Packer/pkg-plist
+++ b/textproc/p5-JavaScript-Packer/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/JavaScript/Packer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Packer/.packlist
 %%PERL5_MAN3%%/JavaScript::Packer.3.gz
diff --git a/textproc/p5-KinoSearch1/Makefile b/textproc/p5-KinoSearch1/Makefile
index 3b424800cf69..33ac13e7c209 100644
--- a/textproc/p5-KinoSearch1/Makefile
+++ b/textproc/p5-KinoSearch1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	KinoSearch1
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CREAMYG
diff --git a/textproc/p5-KinoSearch1/pkg-plist b/textproc/p5-KinoSearch1/pkg-plist
index 0f9759e58b56..94473c65c434 100644
--- a/textproc/p5-KinoSearch1/pkg-plist
+++ b/textproc/p5-KinoSearch1/pkg-plist
@@ -33,103 +33,92 @@
 %%PERL5_MAN3%%/KinoSearch1::Store::FSInvIndex.3.gz
 %%PERL5_MAN3%%/KinoSearch1::Store::InvIndex.3.gz
 %%PERL5_MAN3%%/KinoSearch1::Store::RAMInvIndex.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/Analyzer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/LCNormalizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/PolyAnalyzer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/Stemmer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/Stopalizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/Token.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/TokenBatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis/Tokenizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Docs/FileFormat.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Docs/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Document/Doc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Document/Field.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Highlight/Encoder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Highlight/Formatter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Highlight/Highlighter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Highlight/SimpleHTMLEncoder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Highlight/SimpleHTMLFormatter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/CompoundFileReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/CompoundFileWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/DelDocs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/FieldInfos.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/FieldsReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/FieldsWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/IndexFileNames.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/IndexReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/MultiReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/MultiTermDocs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/NormsReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/PostingsWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/SegInfos.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/SegReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/SegTermDocs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/SegTermEnum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/SegWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/Term.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/TermBuffer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/TermDocs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/TermEnum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/TermInfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/TermInfosReader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/TermInfosWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index/TermVector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/InvIndexer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/QueryParser/QueryParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/BooleanClause.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/BooleanQuery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/BooleanScorer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/Hit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/HitCollector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/HitQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/Hits.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/MultiSearcher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/PhraseQuery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/PhraseScorer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/QueryFilter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/Scorer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/SearchClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/SearchServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/Searchable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/Similarity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/TermQuery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/TermScorer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search/Weight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Searcher.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/FSInvIndex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/FSLock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/InStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/InvIndex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/Lock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/OutStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/RAMInvIndex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store/RAMLock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/BitVector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/ByteBuf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/CClass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/Carp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/IntMap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/MathUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/MemManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/PriorityQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/SortExternal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/StringHelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/ToStringUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/ToolSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util/VerifyArgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/KinoSearch1/KinoSearch1.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/KinoSearch1
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Util
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/QueryParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Index
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Highlight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Document
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Docs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1/Analysis
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/KinoSearch1
+%%SITE_ARCH%%/KinoSearch1.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/Analyzer.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/LCNormalizer.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/PolyAnalyzer.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/Stemmer.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/Stopalizer.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/Token.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/TokenBatch.pm
+%%SITE_ARCH%%/KinoSearch1/Analysis/Tokenizer.pm
+%%SITE_ARCH%%/KinoSearch1/Docs/FileFormat.pod
+%%SITE_ARCH%%/KinoSearch1/Docs/Tutorial.pod
+%%SITE_ARCH%%/KinoSearch1/Document/Doc.pm
+%%SITE_ARCH%%/KinoSearch1/Document/Field.pm
+%%SITE_ARCH%%/KinoSearch1/Highlight/Encoder.pm
+%%SITE_ARCH%%/KinoSearch1/Highlight/Formatter.pm
+%%SITE_ARCH%%/KinoSearch1/Highlight/Highlighter.pm
+%%SITE_ARCH%%/KinoSearch1/Highlight/SimpleHTMLEncoder.pm
+%%SITE_ARCH%%/KinoSearch1/Highlight/SimpleHTMLFormatter.pm
+%%SITE_ARCH%%/KinoSearch1/Index/CompoundFileReader.pm
+%%SITE_ARCH%%/KinoSearch1/Index/CompoundFileWriter.pm
+%%SITE_ARCH%%/KinoSearch1/Index/DelDocs.pm
+%%SITE_ARCH%%/KinoSearch1/Index/FieldInfos.pm
+%%SITE_ARCH%%/KinoSearch1/Index/FieldsReader.pm
+%%SITE_ARCH%%/KinoSearch1/Index/FieldsWriter.pm
+%%SITE_ARCH%%/KinoSearch1/Index/IndexFileNames.pm
+%%SITE_ARCH%%/KinoSearch1/Index/IndexReader.pm
+%%SITE_ARCH%%/KinoSearch1/Index/MultiReader.pm
+%%SITE_ARCH%%/KinoSearch1/Index/MultiTermDocs.pm
+%%SITE_ARCH%%/KinoSearch1/Index/NormsReader.pm
+%%SITE_ARCH%%/KinoSearch1/Index/PostingsWriter.pm
+%%SITE_ARCH%%/KinoSearch1/Index/SegInfos.pm
+%%SITE_ARCH%%/KinoSearch1/Index/SegReader.pm
+%%SITE_ARCH%%/KinoSearch1/Index/SegTermDocs.pm
+%%SITE_ARCH%%/KinoSearch1/Index/SegTermEnum.pm
+%%SITE_ARCH%%/KinoSearch1/Index/SegWriter.pm
+%%SITE_ARCH%%/KinoSearch1/Index/Term.pm
+%%SITE_ARCH%%/KinoSearch1/Index/TermBuffer.pm
+%%SITE_ARCH%%/KinoSearch1/Index/TermDocs.pm
+%%SITE_ARCH%%/KinoSearch1/Index/TermEnum.pm
+%%SITE_ARCH%%/KinoSearch1/Index/TermInfo.pm
+%%SITE_ARCH%%/KinoSearch1/Index/TermInfosReader.pm
+%%SITE_ARCH%%/KinoSearch1/Index/TermInfosWriter.pm
+%%SITE_ARCH%%/KinoSearch1/Index/TermVector.pm
+%%SITE_ARCH%%/KinoSearch1/InvIndexer.pm
+%%SITE_ARCH%%/KinoSearch1/QueryParser/QueryParser.pm
+%%SITE_ARCH%%/KinoSearch1/Search/BooleanClause.pm
+%%SITE_ARCH%%/KinoSearch1/Search/BooleanQuery.pm
+%%SITE_ARCH%%/KinoSearch1/Search/BooleanScorer.pm
+%%SITE_ARCH%%/KinoSearch1/Search/Hit.pm
+%%SITE_ARCH%%/KinoSearch1/Search/HitCollector.pm
+%%SITE_ARCH%%/KinoSearch1/Search/HitQueue.pm
+%%SITE_ARCH%%/KinoSearch1/Search/Hits.pm
+%%SITE_ARCH%%/KinoSearch1/Search/MultiSearcher.pm
+%%SITE_ARCH%%/KinoSearch1/Search/PhraseQuery.pm
+%%SITE_ARCH%%/KinoSearch1/Search/PhraseScorer.pm
+%%SITE_ARCH%%/KinoSearch1/Search/Query.pm
+%%SITE_ARCH%%/KinoSearch1/Search/QueryFilter.pm
+%%SITE_ARCH%%/KinoSearch1/Search/Scorer.pm
+%%SITE_ARCH%%/KinoSearch1/Search/SearchClient.pm
+%%SITE_ARCH%%/KinoSearch1/Search/SearchServer.pm
+%%SITE_ARCH%%/KinoSearch1/Search/Searchable.pm
+%%SITE_ARCH%%/KinoSearch1/Search/Similarity.pm
+%%SITE_ARCH%%/KinoSearch1/Search/TermQuery.pm
+%%SITE_ARCH%%/KinoSearch1/Search/TermScorer.pm
+%%SITE_ARCH%%/KinoSearch1/Search/Weight.pm
+%%SITE_ARCH%%/KinoSearch1/Searcher.pm
+%%SITE_ARCH%%/KinoSearch1/Store/FSInvIndex.pm
+%%SITE_ARCH%%/KinoSearch1/Store/FSLock.pm
+%%SITE_ARCH%%/KinoSearch1/Store/InStream.pm
+%%SITE_ARCH%%/KinoSearch1/Store/InvIndex.pm
+%%SITE_ARCH%%/KinoSearch1/Store/Lock.pm
+%%SITE_ARCH%%/KinoSearch1/Store/OutStream.pm
+%%SITE_ARCH%%/KinoSearch1/Store/RAMInvIndex.pm
+%%SITE_ARCH%%/KinoSearch1/Store/RAMLock.pm
+%%SITE_ARCH%%/KinoSearch1/Util/BitVector.pm
+%%SITE_ARCH%%/KinoSearch1/Util/ByteBuf.pm
+%%SITE_ARCH%%/KinoSearch1/Util/CClass.pm
+%%SITE_ARCH%%/KinoSearch1/Util/Carp.pm
+%%SITE_ARCH%%/KinoSearch1/Util/Class.pm
+%%SITE_ARCH%%/KinoSearch1/Util/IntMap.pm
+%%SITE_ARCH%%/KinoSearch1/Util/MathUtils.pm
+%%SITE_ARCH%%/KinoSearch1/Util/MemManager.pm
+%%SITE_ARCH%%/KinoSearch1/Util/PriorityQueue.pm
+%%SITE_ARCH%%/KinoSearch1/Util/SortExternal.pm
+%%SITE_ARCH%%/KinoSearch1/Util/StringHelper.pm
+%%SITE_ARCH%%/KinoSearch1/Util/ToStringUtils.pm
+%%SITE_ARCH%%/KinoSearch1/Util/ToolSet.pm
+%%SITE_ARCH%%/KinoSearch1/Util/VerifyArgs.pm
+%%SITE_ARCH%%/auto/KinoSearch1/KinoSearch1.so
diff --git a/textproc/p5-Kwalify/Makefile b/textproc/p5-Kwalify/Makefile
index 288e897f0a75..c8b9d81da74e 100644
--- a/textproc/p5-Kwalify/Makefile
+++ b/textproc/p5-Kwalify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Kwalify
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SREZIC
diff --git a/textproc/p5-Kwalify/pkg-plist b/textproc/p5-Kwalify/pkg-plist
index 6a1355e39c99..23827560a8a1 100644
--- a/textproc/p5-Kwalify/pkg-plist
+++ b/textproc/p5-Kwalify/pkg-plist
@@ -3,8 +3,4 @@ bin/pkwalify
 %%PERL5_MAN3%%/Schema::Kwalify.3.gz
 %%SITE_PERL%%/Kwalify.pm
 %%SITE_PERL%%/Schema/Kwalify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwalify/.packlist
 man/man1/pkwalify.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwalify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/Schema
diff --git a/textproc/p5-LaTeX-Driver/Makefile b/textproc/p5-LaTeX-Driver/Makefile
index 543c7287f7cd..d2c763dc65c7 100644
--- a/textproc/p5-LaTeX-Driver/Makefile
+++ b/textproc/p5-LaTeX-Driver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LaTeX-Driver
 PORTVERSION=	0.20.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-LaTeX-Driver/pkg-plist b/textproc/p5-LaTeX-Driver/pkg-plist
index d6613da295af..8297962fa30f 100644
--- a/textproc/p5-LaTeX-Driver/pkg-plist
+++ b/textproc/p5-LaTeX-Driver/pkg-plist
@@ -3,12 +3,8 @@ bin/latex2pdf
 bin/latex2ps
 %%SITE_PERL%%/LaTeX/Driver.pm
 %%SITE_PERL%%/LaTeX/Driver/FilterProgram.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX-Driver/.packlist
 %%PERL5_MAN3%%/LaTeX::Driver.3.gz
 %%PERL5_MAN3%%/LaTeX::Driver::FilterProgram.3.gz
 man/man1/latex2dvi.1.gz
 man/man1/latex2pdf.1.gz
 man/man1/latex2ps.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX-Driver
-@dirrm %%SITE_PERL%%/LaTeX/Driver
-@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-Encode/Makefile b/textproc/p5-LaTeX-Encode/Makefile
index b17c9d432ce0..5a66b195ba31 100644
--- a/textproc/p5-LaTeX-Encode/Makefile
+++ b/textproc/p5-LaTeX-Encode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LaTeX-Encode
 PORTVERSION=	0.091.5
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-LaTeX-Encode/pkg-plist b/textproc/p5-LaTeX-Encode/pkg-plist
index cccdf8dd952b..25f293cd15f0 100644
--- a/textproc/p5-LaTeX-Encode/pkg-plist
+++ b/textproc/p5-LaTeX-Encode/pkg-plist
@@ -1,8 +1,4 @@
 bin/latex-encode
 %%PERL5_MAN3%%/LaTeX::Encode.3.gz
 %%SITE_PERL%%/LaTeX/Encode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Encode/.packlist
 man/man1/latex-encode.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Encode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX
-@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-Pod/Makefile b/textproc/p5-LaTeX-Pod/Makefile
index 4884a353e88e..e702c43e24c4 100644
--- a/textproc/p5-LaTeX-Pod/Makefile
+++ b/textproc/p5-LaTeX-Pod/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	LaTeX-Pod
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-LaTeX-Pod/pkg-plist b/textproc/p5-LaTeX-Pod/pkg-plist
index 6c02f9b39ad7..0f713a54b906 100644
--- a/textproc/p5-LaTeX-Pod/pkg-plist
+++ b/textproc/p5-LaTeX-Pod/pkg-plist
@@ -1,8 +1,4 @@
 bin/latex2pod
 %%PERL5_MAN3%%/LaTeX::Pod.3.gz
 %%SITE_PERL%%/LaTeX/Pod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Pod/.packlist
 man/man1/latex2pod.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Pod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX
-@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-TOM/Makefile b/textproc/p5-LaTeX-TOM/Makefile
index 6b3eba562307..4efef1c298cb 100644
--- a/textproc/p5-LaTeX-TOM/Makefile
+++ b/textproc/p5-LaTeX-TOM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LaTeX-TOM
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-LaTeX-TOM/pkg-plist b/textproc/p5-LaTeX-TOM/pkg-plist
index af9f7275b79f..04aff1f76a6b 100644
--- a/textproc/p5-LaTeX-TOM/pkg-plist
+++ b/textproc/p5-LaTeX-TOM/pkg-plist
@@ -3,8 +3,3 @@
 %%SITE_PERL%%/LaTeX/TOM/Node.pm
 %%SITE_PERL%%/LaTeX/TOM/Parser.pm
 %%SITE_PERL%%/LaTeX/TOM/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/TOM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/TOM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX
-@dirrmtry %%SITE_PERL%%/LaTeX/TOM
-@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-Table/Makefile b/textproc/p5-LaTeX-Table/Makefile
index dadb010abcfc..607d7c8f2b3a 100644
--- a/textproc/p5-LaTeX-Table/Makefile
+++ b/textproc/p5-LaTeX-Table/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	LaTeX-Table
 PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-LaTeX-Table/pkg-plist b/textproc/p5-LaTeX-Table/pkg-plist
index 72b456eb28c1..91b29d6c2e58 100644
--- a/textproc/p5-LaTeX-Table/pkg-plist
+++ b/textproc/p5-LaTeX-Table/pkg-plist
@@ -24,7 +24,3 @@ bin/ltpretty
 %%SITE_PERL%%/LaTeX/Table/Types/TypeI.pm
 man/man1/csv2pdf.1.gz
 man/man1/ltpretty.1.gz
-@dirrm %%SITE_PERL%%/LaTeX/Table/Types
-@dirrm %%SITE_PERL%%/LaTeX/Table/Themes
-@dirrm %%SITE_PERL%%/LaTeX/Table
-@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-ToUnicode/Makefile b/textproc/p5-LaTeX-ToUnicode/Makefile
index 40204bddd4ee..843f4ccba6c0 100644
--- a/textproc/p5-LaTeX-ToUnicode/Makefile
+++ b/textproc/p5-LaTeX-ToUnicode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LaTeX-ToUnicode
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GERHARD
diff --git a/textproc/p5-LaTeX-ToUnicode/pkg-plist b/textproc/p5-LaTeX-ToUnicode/pkg-plist
index 6781dc71d935..93c329d84678 100644
--- a/textproc/p5-LaTeX-ToUnicode/pkg-plist
+++ b/textproc/p5-LaTeX-ToUnicode/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/LaTeX::ToUnicode.3.gz
 %%SITE_PERL%%/LaTeX/ToUnicode.pm
 %%SITE_PERL%%/LaTeX/ToUnicode/Tables.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/ToUnicode/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/ToUnicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX
-@dirrm %%SITE_PERL%%/LaTeX/ToUnicode
-@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-Lingua-Conjunction/Makefile b/textproc/p5-Lingua-Conjunction/Makefile
index 0067a288620c..257df1155724 100644
--- a/textproc/p5-Lingua-Conjunction/Makefile
+++ b/textproc/p5-Lingua-Conjunction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Conjunction
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Conjunction/pkg-plist b/textproc/p5-Lingua-Conjunction/pkg-plist
index 1be269bbc97a..019b1fda5791 100644
--- a/textproc/p5-Lingua-Conjunction/pkg-plist
+++ b/textproc/p5-Lingua-Conjunction/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Lingua::Conjunction.3.gz
 %%SITE_PERL%%/Lingua/Conjunction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-AddressParse/Makefile b/textproc/p5-Lingua-EN-AddressParse/Makefile
index b8c1cd234710..553621f2abdd 100644
--- a/textproc/p5-Lingua-EN-AddressParse/Makefile
+++ b/textproc/p5-Lingua-EN-AddressParse/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Lingua-EN-AddressParse
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	textproc perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-AddressParse/pkg-plist b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
index e029f88d6bfc..401fbff2cfb3 100644
--- a/textproc/p5-Lingua-EN-AddressParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Lingua::EN::AddressParse::Grammar.3.gz
 %%SITE_PERL%%/Lingua/EN/AddressParse.pm
 %%SITE_PERL%%/Lingua/EN/AddressParse/Grammar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/AddressParse
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Fathom/Makefile b/textproc/p5-Lingua-EN-Fathom/Makefile
index d8fae6a7439e..59da6ff8e3a6 100644
--- a/textproc/p5-Lingua-EN-Fathom/Makefile
+++ b/textproc/p5-Lingua-EN-Fathom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Fathom
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Fathom/pkg-plist b/textproc/p5-Lingua-EN-Fathom/pkg-plist
index 81f931449cf7..0c7ee38d3be6 100644
--- a/textproc/p5-Lingua-EN-Fathom/pkg-plist
+++ b/textproc/p5-Lingua-EN-Fathom/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Fathom.3.gz
 %%SITE_PERL%%/Lingua/EN/Fathom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Fathom/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Fathom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-FindNumber/Makefile b/textproc/p5-Lingua-EN-FindNumber/Makefile
index dc7aadcc096e..2f24a7b0e18d 100644
--- a/textproc/p5-Lingua-EN-FindNumber/Makefile
+++ b/textproc/p5-Lingua-EN-FindNumber/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-FindNumber
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-FindNumber/pkg-plist b/textproc/p5-Lingua-EN-FindNumber/pkg-plist
index 2c7c30053ada..9f34a81a2b12 100644
--- a/textproc/p5-Lingua-EN-FindNumber/pkg-plist
+++ b/textproc/p5-Lingua-EN-FindNumber/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Lingua/EN/FindNumber.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/FindNumber/.packlist
 %%PERL5_MAN3%%/Lingua::EN::FindNumber.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/FindNumber
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Gender/Makefile b/textproc/p5-Lingua-EN-Gender/Makefile
index 5ddf586d96e1..817096d85097 100644
--- a/textproc/p5-Lingua-EN-Gender/Makefile
+++ b/textproc/p5-Lingua-EN-Gender/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-EN-Gender
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-Lingua-EN-Gender/pkg-plist b/textproc/p5-Lingua-EN-Gender/pkg-plist
index ebdecae71069..27fdee71cec5 100644
--- a/textproc/p5-Lingua-EN-Gender/pkg-plist
+++ b/textproc/p5-Lingua-EN-Gender/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Gender.3.gz
 %%SITE_PERL%%/Lingua/EN/Gender.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Infinitive/Makefile b/textproc/p5-Lingua-EN-Infinitive/Makefile
index b1f97f0d37af..37d2d2648c4c 100644
--- a/textproc/p5-Lingua-EN-Infinitive/Makefile
+++ b/textproc/p5-Lingua-EN-Infinitive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Infinitive
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Infinitive/pkg-plist b/textproc/p5-Lingua-EN-Infinitive/pkg-plist
index 8007c6a59000..b7d6b353e549 100644
--- a/textproc/p5-Lingua-EN-Infinitive/pkg-plist
+++ b/textproc/p5-Lingua-EN-Infinitive/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Infinitive.3.gz
 %%SITE_PERL%%/Lingua/EN/Infinitive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Inflect-Number/Makefile b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
index 7e583aadc547..5b97f0a3c25e 100644
--- a/textproc/p5-Lingua-EN-Inflect-Number/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Inflect-Number
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist b/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist
index 44648a04df17..64708fcf3633 100644
--- a/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist
+++ b/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Inflect::Number.3.gz
 %%SITE_PERL%%/Lingua/EN/Inflect/Number.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Number/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Number
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/Inflect
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
index a24e035a3f07..ac2bdbd77cfe 100644
--- a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Lingua-EN-Inflect-Phrase
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Inflect-Phrase/pkg-plist b/textproc/p5-Lingua-EN-Inflect-Phrase/pkg-plist
index ad4a4a465f44..a7e7f89e9fd8 100644
--- a/textproc/p5-Lingua-EN-Inflect-Phrase/pkg-plist
+++ b/textproc/p5-Lingua-EN-Inflect-Phrase/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Inflect::Phrase.3.gz
 %%SITE_PERL%%/Lingua/EN/Inflect/Phrase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Phrase/.packlist
-@dirrmtry %%SITE_PERL%%/Lingua/EN/Inflect
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Phrase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/textproc/p5-Lingua-EN-Inflect/Makefile b/textproc/p5-Lingua-EN-Inflect/Makefile
index efbdb899e31e..4bd2dc6623b2 100644
--- a/textproc/p5-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Inflect
 PORTVERSION=	1.89.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Inflect/pkg-plist b/textproc/p5-Lingua-EN-Inflect/pkg-plist
index dfee38cac829..214ef9f73219 100644
--- a/textproc/p5-Lingua-EN-Inflect/pkg-plist
+++ b/textproc/p5-Lingua-EN-Inflect/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Inflect.3.gz
 %%SITE_PERL%%/Lingua/EN/Inflect.pm
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-MatchNames/Makefile b/textproc/p5-Lingua-EN-MatchNames/Makefile
index 79d9dcd9ab92..cd09210066d2 100644
--- a/textproc/p5-Lingua-EN-MatchNames/Makefile
+++ b/textproc/p5-Lingua-EN-MatchNames/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-MatchNames
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-MatchNames/pkg-plist b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
index 1f6120431e77..7fbf6717ba9e 100644
--- a/textproc/p5-Lingua-EN-MatchNames/pkg-plist
+++ b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::MatchNames.3.gz
 %%SITE_PERL%%/Lingua/EN/MatchNames.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-NameCase/Makefile b/textproc/p5-Lingua-EN-NameCase/Makefile
index 77e5ccb4f834..9a164b5c6cb3 100644
--- a/textproc/p5-Lingua-EN-NameCase/Makefile
+++ b/textproc/p5-Lingua-EN-NameCase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-NameCase
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-NameCase/pkg-plist b/textproc/p5-Lingua-EN-NameCase/pkg-plist
index c7f927f71c54..8e795d77b186 100644
--- a/textproc/p5-Lingua-EN-NameCase/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameCase/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Lingua/EN/NameCase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase/.packlist
 %%PERL5_MAN3%%/Lingua::EN::NameCase.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-NameParse/Makefile b/textproc/p5-Lingua-EN-NameParse/Makefile
index d0c93c292233..63da2c7d1d7b 100644
--- a/textproc/p5-Lingua-EN-NameParse/Makefile
+++ b/textproc/p5-Lingua-EN-NameParse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-NameParse
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-NameParse/pkg-plist b/textproc/p5-Lingua-EN-NameParse/pkg-plist
index 51409360affd..b24e21a92867 100644
--- a/textproc/p5-Lingua-EN-NameParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameParse/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Lingua::EN::NameParse::Grammar.3.gz
 %%SITE_PERL%%/Lingua/EN/NameParse.pm
 %%SITE_PERL%%/Lingua/EN/NameParse/Grammar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/NameParse
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-NamedEntity/Makefile b/textproc/p5-Lingua-EN-NamedEntity/Makefile
index 2725bfe18506..6cedc403644e 100644
--- a/textproc/p5-Lingua-EN-NamedEntity/Makefile
+++ b/textproc/p5-Lingua-EN-NamedEntity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-NamedEntity
 PORTVERSION=	1.92
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-NamedEntity/pkg-plist b/textproc/p5-Lingua-EN-NamedEntity/pkg-plist
index cb9ffd841c55..63e1c9e1871f 100644
--- a/textproc/p5-Lingua-EN-NamedEntity/pkg-plist
+++ b/textproc/p5-Lingua-EN-NamedEntity/pkg-plist
@@ -2,10 +2,3 @@
 %%SITE_PERL%%/Lingua/EN/NamedEntity.pm
 %%SITE_PERL%%/Lingua/EN/NamedEntity/forename
 %%SITE_PERL%%/Lingua/EN/NamedEntity/wordlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NamedEntity/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NamedEntity
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/NamedEntity
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Nickname/Makefile b/textproc/p5-Lingua-EN-Nickname/Makefile
index df6ce2f3cb0f..971dd19cd5e8 100644
--- a/textproc/p5-Lingua-EN-Nickname/Makefile
+++ b/textproc/p5-Lingua-EN-Nickname/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Nickname
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRIANL
diff --git a/textproc/p5-Lingua-EN-Nickname/pkg-plist b/textproc/p5-Lingua-EN-Nickname/pkg-plist
index 3753693bba86..d26d20b5c164 100644
--- a/textproc/p5-Lingua-EN-Nickname/pkg-plist
+++ b/textproc/p5-Lingua-EN-Nickname/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Lingua::EN::Nickname.3.gz
 %%SITE_PERL%%/Lingua/EN/Nickname.pm
 %%SITE_PERL%%/Lingua/EN/nickhash.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile b/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
index fdf130875e8b..2dd07378cc28 100644
--- a/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
+++ b/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Lingua-EN-Number-IsOrdinal
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Number-IsOrdinal/pkg-plist b/textproc/p5-Lingua-EN-Number-IsOrdinal/pkg-plist
index 34bc5a128a24..8d8dee38fbc9 100644
--- a/textproc/p5-Lingua-EN-Number-IsOrdinal/pkg-plist
+++ b/textproc/p5-Lingua-EN-Number-IsOrdinal/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Number::IsOrdinal.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Number/IsOrdinal/.packlist
 %%SITE_PERL%%/Lingua/EN/Number/IsOrdinal.pm
-@dirrmtry %%SITE_PERL%%/Lingua/EN/Number
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Number/IsOrdinal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Number
diff --git a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
index 1e2dd0c54bed..d249f4436633 100644
--- a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Numbers-Easy
 PORTVERSION=	2009110701
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Numbers-Easy/pkg-plist b/textproc/p5-Lingua-EN-Numbers-Easy/pkg-plist
index caa7da6f5b2c..792251e5822d 100644
--- a/textproc/p5-Lingua-EN-Numbers-Easy/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers-Easy/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Numbers::Easy.3.gz
 %%SITE_PERL%%/Lingua/EN/Numbers/Easy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Easy/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Easy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/Numbers
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
index edf0704684b2..33d8959daec2 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Numbers-Ordinate
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
index c46434662303..3b15799f555b 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Numbers::Ordinate.3.gz
 %%SITE_PERL%%/Lingua/EN/Numbers/Ordinate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/Numbers
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Numbers/Makefile b/textproc/p5-Lingua-EN-Numbers/Makefile
index c91352a3ff63..e13f4b814c96 100644
--- a/textproc/p5-Lingua-EN-Numbers/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Numbers
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Numbers/pkg-plist b/textproc/p5-Lingua-EN-Numbers/pkg-plist
index 466f1a68083f..f1d1cc7d3dd8 100644
--- a/textproc/p5-Lingua-EN-Numbers/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Numbers.3.gz
 %%SITE_PERL%%/Lingua/EN/Numbers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-PluralToSingular/Makefile b/textproc/p5-Lingua-EN-PluralToSingular/Makefile
index ee63087742fe..eb7311b01e20 100644
--- a/textproc/p5-Lingua-EN-PluralToSingular/Makefile
+++ b/textproc/p5-Lingua-EN-PluralToSingular/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-PluralToSingular
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-PluralToSingular/pkg-plist b/textproc/p5-Lingua-EN-PluralToSingular/pkg-plist
index 09d38eae4797..97ec016d6e53 100644
--- a/textproc/p5-Lingua-EN-PluralToSingular/pkg-plist
+++ b/textproc/p5-Lingua-EN-PluralToSingular/pkg-plist
@@ -1,10 +1,4 @@
 bin/singular
 %%SITE_PERL%%/Lingua/EN/PluralToSingular.pm
 %%SITE_PERL%%/Lingua/EN/PluralToSingular.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/PluralToSingular/.packlist
 %%PERL5_MAN3%%/Lingua::EN::PluralToSingular.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/PluralToSingular
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Sentence/Makefile b/textproc/p5-Lingua-EN-Sentence/Makefile
index c2bf943f2468..36ba28216f41 100644
--- a/textproc/p5-Lingua-EN-Sentence/Makefile
+++ b/textproc/p5-Lingua-EN-Sentence/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Sentence
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SHLOMOY
diff --git a/textproc/p5-Lingua-EN-Sentence/pkg-plist b/textproc/p5-Lingua-EN-Sentence/pkg-plist
index 8e74bbc8897c..4b264b06e91b 100644
--- a/textproc/p5-Lingua-EN-Sentence/pkg-plist
+++ b/textproc/p5-Lingua-EN-Sentence/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Sentence.3.gz
 %%SITE_PERL%%/Lingua/EN/Sentence.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Squeeze/Makefile b/textproc/p5-Lingua-EN-Squeeze/Makefile
index 5d986dbe8835..2e1d81f60b9d 100644
--- a/textproc/p5-Lingua-EN-Squeeze/Makefile
+++ b/textproc/p5-Lingua-EN-Squeeze/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Squeeze
 PORTVERSION=	2006.0704
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Squeeze/pkg-plist b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
index 60db2ea20122..5e5321363c6a 100644
--- a/textproc/p5-Lingua-EN-Squeeze/pkg-plist
+++ b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Squeeze.3.gz
 %%SITE_PERL%%/Lingua/EN/Squeeze.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Summarize/Makefile b/textproc/p5-Lingua-EN-Summarize/Makefile
index a8eac62208c1..f89b284b8ad1 100644
--- a/textproc/p5-Lingua-EN-Summarize/Makefile
+++ b/textproc/p5-Lingua-EN-Summarize/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-EN-Summarize
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Summarize/pkg-plist b/textproc/p5-Lingua-EN-Summarize/pkg-plist
index 8d4608b2ae65..b936618adbeb 100644
--- a/textproc/p5-Lingua-EN-Summarize/pkg-plist
+++ b/textproc/p5-Lingua-EN-Summarize/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Lingua::EN::Summarize.3.gz
 %%SITE_PERL%%/Lingua/EN/Summarize.pm
 %%SITE_PERL%%/Lingua/EN/Summarize/Filters.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/Summarize
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Syllable/Makefile b/textproc/p5-Lingua-EN-Syllable/Makefile
index 318ef0c9f1d1..e8c235f92772 100644
--- a/textproc/p5-Lingua-EN-Syllable/Makefile
+++ b/textproc/p5-Lingua-EN-Syllable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Syllable
 PORTVERSION=	0.251
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Syllable/pkg-plist b/textproc/p5-Lingua-EN-Syllable/pkg-plist
index d6683949f4fa..06e3944bf4eb 100644
--- a/textproc/p5-Lingua-EN-Syllable/pkg-plist
+++ b/textproc/p5-Lingua-EN-Syllable/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Lingua::EN::Syllable.3.gz
 %%SITE_PERL%%/Lingua/EN/Syllable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Tagger/Makefile b/textproc/p5-Lingua-EN-Tagger/Makefile
index 53d581485d5f..6103c76fe4af 100644
--- a/textproc/p5-Lingua-EN-Tagger/Makefile
+++ b/textproc/p5-Lingua-EN-Tagger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Tagger
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Tagger/pkg-plist b/textproc/p5-Lingua-EN-Tagger/pkg-plist
index 660acf54ac3d..25d807d977ea 100644
--- a/textproc/p5-Lingua-EN-Tagger/pkg-plist
+++ b/textproc/p5-Lingua-EN-Tagger/pkg-plist
@@ -5,10 +5,3 @@
 %%SITE_PERL%%/Lingua/EN/Tagger/tags.yml
 %%SITE_PERL%%/Lingua/EN/Tagger/unknown.yml
 %%SITE_PERL%%/Lingua/EN/Tagger/words.yml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Tagger/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Tagger
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN/Tagger
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Words2Nums/Makefile b/textproc/p5-Lingua-EN-Words2Nums/Makefile
index aaca7c746e29..c73bc65355d6 100644
--- a/textproc/p5-Lingua-EN-Words2Nums/Makefile
+++ b/textproc/p5-Lingua-EN-Words2Nums/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-EN-Words2Nums
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-EN-Words2Nums/pkg-plist b/textproc/p5-Lingua-EN-Words2Nums/pkg-plist
index 74b84dae015d..d8a8129032f3 100644
--- a/textproc/p5-Lingua-EN-Words2Nums/pkg-plist
+++ b/textproc/p5-Lingua-EN-Words2Nums/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Lingua/EN/Words2Nums.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Words2Nums/.packlist
 %%PERL5_MAN3%%/Lingua::EN::Words2Nums.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Words2Nums
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Ident/Makefile b/textproc/p5-Lingua-Ident/Makefile
index 601ddb3825dd..090b544951e8 100644
--- a/textproc/p5-Lingua-Ident/Makefile
+++ b/textproc/p5-Lingua-Ident/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Ident
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MPIOTR
diff --git a/textproc/p5-Lingua-Ident/pkg-plist b/textproc/p5-Lingua-Ident/pkg-plist
index 08f9a6d275af..4f83919be88f 100644
--- a/textproc/p5-Lingua-Ident/pkg-plist
+++ b/textproc/p5-Lingua-Ident/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Lingua/Ident.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident/.packlist
 bin/trainlid
 %%PERL5_MAN3%%/Lingua::Ident.3.gz
 man/man1/trainlid.1.gz
diff --git a/textproc/p5-Lingua-Identify/Makefile b/textproc/p5-Lingua-Identify/Makefile
index 59052e17114d..456efcfd7ba9 100644
--- a/textproc/p5-Lingua-Identify/Makefile
+++ b/textproc/p5-Lingua-Identify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Identify
 PORTVERSION=	0.56
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Identify/pkg-plist b/textproc/p5-Lingua-Identify/pkg-plist
index cc39a3ae7af3..ee69c2180cc0 100644
--- a/textproc/p5-Lingua-Identify/pkg-plist
+++ b/textproc/p5-Lingua-Identify/pkg-plist
@@ -56,10 +56,5 @@ bin/make-lingua-identify-language
 %%SITE_PERL%%/Lingua/Identify/SV.pm
 %%SITE_PERL%%/Lingua/Identify/TR.pm
 %%SITE_PERL%%/Lingua/Identify/UK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify/.packlist
 man/man1/langident.1.gz
 man/man1/make-lingua-identify-language.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Identify
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Ispell/Makefile b/textproc/p5-Lingua-Ispell/Makefile
index 1e07360dbc1b..7ae10dd0e658 100644
--- a/textproc/p5-Lingua-Ispell/Makefile
+++ b/textproc/p5-Lingua-Ispell/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-Ispell
 PORTVERSION=	0.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Ispell/pkg-plist b/textproc/p5-Lingua-Ispell/pkg-plist
index 1a23ce826cb8..2f3b5be024eb 100644
--- a/textproc/p5-Lingua-Ispell/pkg-plist
+++ b/textproc/p5-Lingua-Ispell/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/Ispell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ispell/.packlist
 %%PERL5_MAN3%%/Lingua::Ispell.3.gz
diff --git a/textproc/p5-Lingua-PT-Stemmer/Makefile b/textproc/p5-Lingua-PT-Stemmer/Makefile
index 89ae31ff1274..130867a95689 100644
--- a/textproc/p5-Lingua-PT-Stemmer/Makefile
+++ b/textproc/p5-Lingua-PT-Stemmer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-PT-Stemmer
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-PT-Stemmer/pkg-plist b/textproc/p5-Lingua-PT-Stemmer/pkg-plist
index 6e48017c16aa..cbd9a9daca26 100644
--- a/textproc/p5-Lingua-PT-Stemmer/pkg-plist
+++ b/textproc/p5-Lingua-PT-Stemmer/pkg-plist
@@ -1,11 +1,4 @@
 %%SITE_PERL%%/Lingua/GL/Stemmer.pm
 %%SITE_PERL%%/Lingua/PT/Stemmer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT/Stemmer/.packlist
 %%PERL5_MAN3%%/Lingua::GL::Stemmer.3.gz
 %%PERL5_MAN3%%/Lingua::PT::Stemmer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT/Stemmer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/PT
-@dirrmtry %%SITE_PERL%%/Lingua/GL
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Preferred/Makefile b/textproc/p5-Lingua-Preferred/Makefile
index deb77920a7ff..99cdf7e46973 100644
--- a/textproc/p5-Lingua-Preferred/Makefile
+++ b/textproc/p5-Lingua-Preferred/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Preferred
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EDAVIS
diff --git a/textproc/p5-Lingua-Preferred/pkg-plist b/textproc/p5-Lingua-Preferred/pkg-plist
index e6cd8a2ebf50..bd2b6f2de12c 100644
--- a/textproc/p5-Lingua-Preferred/pkg-plist
+++ b/textproc/p5-Lingua-Preferred/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Lingua::Preferred.3.gz
 %%SITE_PERL%%/Lingua/Preferred.pm
 %%SITE_PERL%%/auto/Lingua/Preferred/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/auto/Lingua/Preferred
-@dirrmtry %%SITE_PERL%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Fr/Makefile b/textproc/p5-Lingua-Stem-Fr/Makefile
index fbe5eb5ff535..d2cdd4bb73e2 100644
--- a/textproc/p5-Lingua-Stem-Fr/Makefile
+++ b/textproc/p5-Lingua-Stem-Fr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Stem-Fr
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Stem-Fr/pkg-plist b/textproc/p5-Lingua-Stem-Fr/pkg-plist
index ce8915a8b00c..eff1f6e27f8c 100644
--- a/textproc/p5-Lingua-Stem-Fr/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Fr/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Lingua/Stem/Fr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Fr/.packlist
 %%PERL5_MAN3%%/Lingua::Stem::Fr.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Fr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-It/Makefile b/textproc/p5-Lingua-Stem-It/Makefile
index 0d6af5a001b7..19e42eb5afdb 100644
--- a/textproc/p5-Lingua-Stem-It/Makefile
+++ b/textproc/p5-Lingua-Stem-It/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Stem-It
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Stem-It/pkg-plist b/textproc/p5-Lingua-Stem-It/pkg-plist
index 74cd9c759ca2..fe8ef9eb219c 100644
--- a/textproc/p5-Lingua-Stem-It/pkg-plist
+++ b/textproc/p5-Lingua-Stem-It/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Lingua/Stem/It.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/It/.packlist
 %%PERL5_MAN3%%/Lingua::Stem::It.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/It
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Ru/Makefile b/textproc/p5-Lingua-Stem-Ru/Makefile
index 65b52d9e4ba9..58610ead7e9b 100644
--- a/textproc/p5-Lingua-Stem-Ru/Makefile
+++ b/textproc/p5-Lingua-Stem-Ru/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Stem-Ru
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Stem-Ru/pkg-plist b/textproc/p5-Lingua-Stem-Ru/pkg-plist
index a0508b045453..464f2609c0b4 100644
--- a/textproc/p5-Lingua-Stem-Ru/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Ru/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Lingua/Stem/Ru.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Ru/.packlist
 %%PERL5_MAN3%%/Lingua::Stem::Ru.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Ru
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball-Da/Makefile b/textproc/p5-Lingua-Stem-Snowball-Da/Makefile
index 1d5c9dedc9a2..74150a8ad562 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Da/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball-Da/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Stem-Snowball-Da
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
index d4899f2ede8e..47bb8eecbfda 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
@@ -1,11 +1,3 @@
 %%SITE_PERL%%/Lingua/Stem/Snowball/Da.pm
 %%SITE_PERL%%/Lingua/Stem/Snowball/stemmer.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Da/.packlist
 %%PERL5_MAN3%%/Lingua::Stem::Snowball::Da.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Da
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball-No/Makefile b/textproc/p5-Lingua-Stem-Snowball-No/Makefile
index 34b290fc416d..02ca3e1e5b3d 100644
--- a/textproc/p5-Lingua-Stem-Snowball-No/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball-No/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Lingua-Stem-Snowball-No
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ASKSH
diff --git a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
index 2c8430931208..f01610d4ece7 100644
--- a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
@@ -1,11 +1,3 @@
 bin/stemmer-no.pl
 %%PERL5_MAN3%%/Lingua::Stem::Snowball::No.3.gz
 %%SITE_PERL%%/Lingua/Stem/Snowball/No.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/No/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/No
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball-Se/Makefile b/textproc/p5-Lingua-Stem-Snowball-Se/Makefile
index 6dbc1fa17943..6461b1d0aa48 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Se/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball-Se/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Stem-Snowball-Se
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ASKSH
diff --git a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
index f6fa4b826136..4534da9cd6bc 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
@@ -1,11 +1,3 @@
 bin/stemmer-se.pl
 %%PERL5_MAN3%%/Lingua::Stem::Snowball::Se.3.gz
 %%SITE_PERL%%/Lingua/Stem/Snowball/Se.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Se/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Se
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball/Makefile b/textproc/p5-Lingua-Stem-Snowball/Makefile
index a4cce8516f46..bbf453afc8ef 100644
--- a/textproc/p5-Lingua-Stem-Snowball/Makefile
+++ b/textproc/p5-Lingua-Stem-Snowball/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Stem-Snowball
 PORTVERSION=	0.952
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Stem-Snowball/pkg-plist b/textproc/p5-Lingua-Stem-Snowball/pkg-plist
index 30e8f7dd8a4c..a535f692a4c8 100644
--- a/textproc/p5-Lingua-Stem-Snowball/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball/pkg-plist
@@ -1,8 +1,3 @@
 %%PERL5_MAN3%%/Lingua::Stem::Snowball.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Stem/Snowball.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Snowball.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua
+%%SITE_ARCH%%/Lingua/Stem/Snowball.pm
+%%SITE_ARCH%%/auto/Lingua/Stem/Snowball/Snowball.so
diff --git a/textproc/p5-Lingua-Stem/Makefile b/textproc/p5-Lingua-Stem/Makefile
index 3a30ea8a8fa7..047a50140918 100644
--- a/textproc/p5-Lingua-Stem/Makefile
+++ b/textproc/p5-Lingua-Stem/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Stem
 PORTVERSION=	0.84
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SNOWHARE
diff --git a/textproc/p5-Lingua-Stem/pkg-plist b/textproc/p5-Lingua-Stem/pkg-plist
index 97e3d4c78eb2..59827d4f9b84 100644
--- a/textproc/p5-Lingua-Stem/pkg-plist
+++ b/textproc/p5-Lingua-Stem/pkg-plist
@@ -19,8 +19,3 @@
 %%SITE_PERL%%/Lingua/Stem/No.pm
 %%SITE_PERL%%/Lingua/Stem/Pt.pm
 %%SITE_PERL%%/Lingua/Stem/Sv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-StopWords/Makefile b/textproc/p5-Lingua-StopWords/Makefile
index ef436a966ad9..675c76ad9317 100644
--- a/textproc/p5-Lingua-StopWords/Makefile
+++ b/textproc/p5-Lingua-StopWords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-StopWords
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-StopWords/pkg-plist b/textproc/p5-Lingua-StopWords/pkg-plist
index 6979dc2a329f..c872bb63bfb0 100644
--- a/textproc/p5-Lingua-StopWords/pkg-plist
+++ b/textproc/p5-Lingua-StopWords/pkg-plist
@@ -13,8 +13,3 @@
 %%SITE_PERL%%/Lingua/StopWords/PT.pm
 %%SITE_PERL%%/Lingua/StopWords/RU.pm
 %%SITE_PERL%%/Lingua/StopWords/SV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/StopWords
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Treebank/Makefile b/textproc/p5-Lingua-Treebank/Makefile
index 68e772953d64..8cd8b7504702 100644
--- a/textproc/p5-Lingua-Treebank/Makefile
+++ b/textproc/p5-Lingua-Treebank/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Treebank
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Lingua-Treebank/pkg-plist b/textproc/p5-Lingua-Treebank/pkg-plist
index 8d12bb1cd55d..7266523e20ef 100644
--- a/textproc/p5-Lingua-Treebank/pkg-plist
+++ b/textproc/p5-Lingua-Treebank/pkg-plist
@@ -10,14 +10,9 @@ bin/vocabulary
 %%SITE_PERL%%/Lingua/Treebank.pm
 %%SITE_PERL%%/Lingua/Treebank/Const.pm
 %%SITE_PERL%%/Lingua/Treebank/HeadFinder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Treebank/.packlist
 man/man1/get-words.1.gz
 man/man1/list-edges.1.gz
 man/man1/list-rewrites.1.gz
 man/man1/tree-collapse.1.gz
 man/man1/tree-inflate.1.gz
 man/man1/vocabulary.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Treebank
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Treebank
-@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-MARC-Charset/Makefile b/textproc/p5-MARC-Charset/Makefile
index f82629e4d5b2..d4bd0b1a9bbe 100644
--- a/textproc/p5-MARC-Charset/Makefile
+++ b/textproc/p5-MARC-Charset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MARC-Charset
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-MARC-Charset/pkg-plist b/textproc/p5-MARC-Charset/pkg-plist
index c0881b098a94..a135296f83a9 100644
--- a/textproc/p5-MARC-Charset/pkg-plist
+++ b/textproc/p5-MARC-Charset/pkg-plist
@@ -9,8 +9,3 @@
 %%SITE_PERL%%/MARC/Charset/Constants.pm
 %%SITE_PERL%%/MARC/Charset/Table
 %%SITE_PERL%%/MARC/Charset/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/Charset/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/Charset
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC
-@dirrmtry %%SITE_PERL%%/MARC/Charset
-@dirrmtry %%SITE_PERL%%/MARC
diff --git a/textproc/p5-MARC-Lint/Makefile b/textproc/p5-MARC-Lint/Makefile
index 9b34d0c724c0..354a286fc6e1 100644
--- a/textproc/p5-MARC-Lint/Makefile
+++ b/textproc/p5-MARC-Lint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MARC-Lint
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-MARC-Lint/pkg-plist b/textproc/p5-MARC-Lint/pkg-plist
index de1cc7dd4be4..d17c4b9dfdbc 100644
--- a/textproc/p5-MARC-Lint/pkg-plist
+++ b/textproc/p5-MARC-Lint/pkg-plist
@@ -3,7 +3,4 @@ bin/marclint
 %%PERL5_MAN3%%/MARC::Lint::CodeData.3.gz
 %%SITE_PERL%%/MARC/Lint.pm
 %%SITE_PERL%%/MARC/Lint/CodeData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/Lint/.packlist
 man/man1/marclint.1.gz
-@dirrm %%SITE_PERL%%/MARC/Lint
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/Lint
diff --git a/textproc/p5-MARC-Record/Makefile b/textproc/p5-MARC-Record/Makefile
index 460a7d904489..db4b8962deeb 100644
--- a/textproc/p5-MARC-Record/Makefile
+++ b/textproc/p5-MARC-Record/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MARC-Record
 PORTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-MARC-Record/pkg-plist b/textproc/p5-MARC-Record/pkg-plist
index b20ab8621a59..b311edc5bc78 100644
--- a/textproc/p5-MARC-Record/pkg-plist
+++ b/textproc/p5-MARC-Record/pkg-plist
@@ -16,9 +16,3 @@ man/man1/marcdump.1.gz
 %%SITE_PERL%%/MARC/File/MicroLIF.pm
 %%SITE_PERL%%/MARC/File/USMARC.pm
 %%SITE_PERL%%/MARC/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/Record/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/Record
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC
-@dirrm %%SITE_PERL%%/MARC/File
-@dirrm %%SITE_PERL%%/MARC/Doc
-@dirrmtry %%SITE_PERL%%/MARC
diff --git a/textproc/p5-MARC-XML/Makefile b/textproc/p5-MARC-XML/Makefile
index f65596f21f9d..ae59d934ca2d 100644
--- a/textproc/p5-MARC-XML/Makefile
+++ b/textproc/p5-MARC-XML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MARC-XML
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-MARC-XML/pkg-plist b/textproc/p5-MARC-XML/pkg-plist
index a28de50b6214..75c02b6ad09c 100644
--- a/textproc/p5-MARC-XML/pkg-plist
+++ b/textproc/p5-MARC-XML/pkg-plist
@@ -2,7 +2,5 @@ bin/marc2xml
 bin/xml2marc
 %%PERL5_MAN3%%/MARC::File::XML.3.gz
 %%SITE_PERL%%/MARC/File/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC-XML/.packlist
 man/man1/marc2xml.1.gz
 man/man1/xml2marc.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC-XML
diff --git a/textproc/p5-MARC/Makefile b/textproc/p5-MARC/Makefile
index b6d91a088f64..39e0e812ea11 100644
--- a/textproc/p5-MARC/Makefile
+++ b/textproc/p5-MARC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MARC
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-MARC/pkg-plist b/textproc/p5-MARC/pkg-plist
index f96d3a8199c8..99aea47fa621 100644
--- a/textproc/p5-MARC/pkg-plist
+++ b/textproc/p5-MARC/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/MARC.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/.packlist
 %%SITE_PERL%%/MARC.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC
diff --git a/textproc/p5-MKDoc-XML/Makefile b/textproc/p5-MKDoc-XML/Makefile
index 4eb590b7b1a9..55b75516b921 100644
--- a/textproc/p5-MKDoc-XML/Makefile
+++ b/textproc/p5-MKDoc-XML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MKDoc-XML
 PORTVERSION=	0.75
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BPOSTLE
diff --git a/textproc/p5-MKDoc-XML/pkg-plist b/textproc/p5-MKDoc-XML/pkg-plist
index 5aae91a94dd0..7db1a848f874 100644
--- a/textproc/p5-MKDoc-XML/pkg-plist
+++ b/textproc/p5-MKDoc-XML/pkg-plist
@@ -26,11 +26,3 @@
 %%SITE_PERL%%/MKDoc/XML/Tokenizer.pm
 %%SITE_PERL%%/MKDoc/XML/TreeBuilder.pm
 %%SITE_PERL%%/MKDoc/XML/TreePrinter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MKDoc/XML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MKDoc/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MKDoc
-@dirrmtry %%SITE_PERL%%/MKDoc/XML/Tagger
-@dirrmtry %%SITE_PERL%%/MKDoc/XML/Stripper
-@dirrmtry %%SITE_PERL%%/MKDoc/XML/Decode
-@dirrmtry %%SITE_PERL%%/MKDoc/XML
-@dirrmtry %%SITE_PERL%%/MKDoc
diff --git a/textproc/p5-Makefile-DOM/Makefile b/textproc/p5-Makefile-DOM/Makefile
index d7e366753630..b931ca33eebe 100644
--- a/textproc/p5-Makefile-DOM/Makefile
+++ b/textproc/p5-Makefile-DOM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Makefile-DOM
 PORTVERSION=	0.008
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AGENT
diff --git a/textproc/p5-Makefile-DOM/pkg-plist b/textproc/p5-Makefile-DOM/pkg-plist
index 37bb5af1c83a..69236570d91a 100644
--- a/textproc/p5-Makefile-DOM/pkg-plist
+++ b/textproc/p5-Makefile-DOM/pkg-plist
@@ -20,7 +20,6 @@
 %%SITE_PERL%%/MDOM/Unknown.pm
 %%SITE_PERL%%/MDOM/Util.pm
 %%SITE_PERL%%/Makefile/DOM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile/DOM/.packlist
 %%PERL5_MAN3%%/MDOM::Dumper.3.gz
 %%PERL5_MAN3%%/MDOM::Element.3.gz
 %%PERL5_MAN3%%/MDOM::Node.3.gz
diff --git a/textproc/p5-Makefile-Parser/Makefile b/textproc/p5-Makefile-Parser/Makefile
index a44f680692c6..473c8fbb75c6 100644
--- a/textproc/p5-Makefile-Parser/Makefile
+++ b/textproc/p5-Makefile-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Makefile-Parser
 PORTVERSION=	0.215
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AGENT
diff --git a/textproc/p5-Makefile-Parser/pkg-plist b/textproc/p5-Makefile-Parser/pkg-plist
index d807350366b1..0896ddd03188 100644
--- a/textproc/p5-Makefile-Parser/pkg-plist
+++ b/textproc/p5-Makefile-Parser/pkg-plist
@@ -15,13 +15,6 @@ bin/plmake
 %%SITE_PERL%%/Makefile/AST/Variable.pm
 %%SITE_PERL%%/Makefile/Parser.pm
 %%SITE_PERL%%/Makefile/Parser/GmakeDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile/Parser/.packlist
 man/man1/makesimple.1.gz
 man/man1/pgmake-db.1.gz
 man/man1/plmake.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile
-@dirrmtry %%SITE_PERL%%/Makefile/Parser
-@dirrmtry %%SITE_PERL%%/Makefile/AST/Rule
-@dirrmtry %%SITE_PERL%%/Makefile/AST
-@dirrmtry %%SITE_PERL%%/Makefile
diff --git a/textproc/p5-Markapl/Makefile b/textproc/p5-Markapl/Makefile
index 58eea4c0df7a..8a2d4ceb2c6d 100644
--- a/textproc/p5-Markapl/Makefile
+++ b/textproc/p5-Markapl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Markapl
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GUGOD
diff --git a/textproc/p5-Markapl/pkg-plist b/textproc/p5-Markapl/pkg-plist
index 4d1bb28497d9..1b643941a55b 100644
--- a/textproc/p5-Markapl/pkg-plist
+++ b/textproc/p5-Markapl/pkg-plist
@@ -5,6 +5,3 @@
 %%SITE_PERL%%/Markapl/Helpers.pm
 %%SITE_PERL%%/Markapl/TagHandlers.pm
 %%SITE_PERL%%/Markapl/Tags.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Markapl/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Markapl
-@dirrmtry %%SITE_PERL%%/Markapl
diff --git a/textproc/p5-Marpa-HTML/Makefile b/textproc/p5-Marpa-HTML/Makefile
index 12c083c11257..14c021cd4c5d 100644
--- a/textproc/p5-Marpa-HTML/Makefile
+++ b/textproc/p5-Marpa-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Marpa-HTML
 PORTVERSION=	0.112
+PORTREVISION=	1
 CATEGORIES=	textproc lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEGL
diff --git a/textproc/p5-Marpa-HTML/pkg-plist b/textproc/p5-Marpa-HTML/pkg-plist
index 3caadeef0519..1b31261cbc42 100644
--- a/textproc/p5-Marpa-HTML/pkg-plist
+++ b/textproc/p5-Marpa-HTML/pkg-plist
@@ -8,13 +8,7 @@ bin/html_score
 %%SITE_PERL%%/Marpa/HTML/Test.pm
 %%SITE_PERL%%/Marpa/HTML/Test/Util.pm
 %%SITE_PERL%%/Marpa/HTML/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/HTML/.packlist
 %%PERL5_MAN3%%/Marpa::HTML.3.gz
 %%PERL5_MAN3%%/Marpa::HTML::Support.3.gz
 man/man1/html_fmt.1.gz
 man/man1/html_score.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa
-@dirrm %%SITE_PERL%%/Marpa/HTML/Test
-@dirrm %%SITE_PERL%%/Marpa/HTML
-@dirrmtry %%SITE_PERL%%/Marpa
diff --git a/textproc/p5-MathML-Entities/Makefile b/textproc/p5-MathML-Entities/Makefile
index b2bc22420e24..cfd3e57f4eb8 100644
--- a/textproc/p5-MathML-Entities/Makefile
+++ b/textproc/p5-MathML-Entities/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MathML-Entities
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	textproc www math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-MathML-Entities/pkg-plist b/textproc/p5-MathML-Entities/pkg-plist
index b93d0612b09c..e326f1b56f0c 100644
--- a/textproc/p5-MathML-Entities/pkg-plist
+++ b/textproc/p5-MathML-Entities/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/MathML::Entities.3.gz
 %%SITE_PERL%%/MathML/Entities.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MathML/Entities/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MathML/Entities
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MathML
-@dirrmtry %%SITE_PERL%%/MathML
diff --git a/textproc/p5-Net-IDN-Encode/Makefile b/textproc/p5-Net-IDN-Encode/Makefile
index 1825760979e0..c7a4363f5fb0 100644
--- a/textproc/p5-Net-IDN-Encode/Makefile
+++ b/textproc/p5-Net-IDN-Encode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-IDN-Encode
 PORTVERSION=	2.100
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Net-IDN-Encode/pkg-plist b/textproc/p5-Net-IDN-Encode/pkg-plist
index 00a8aa981042..3f9295bd9461 100644
--- a/textproc/p5-Net-IDN-Encode/pkg-plist
+++ b/textproc/p5-Net-IDN-Encode/pkg-plist
@@ -1,11 +1,11 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/Encode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/Overview.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/Punycode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/Punycode/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/Standards.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/UTS46.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/UTS46/_Mapping.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IDN/Punycode/Punycode.so
+%%SITE_ARCH%%/Net/IDN/Encode.pm
+%%SITE_ARCH%%/Net/IDN/Overview.pod
+%%SITE_ARCH%%/Net/IDN/Punycode.pm
+%%SITE_ARCH%%/Net/IDN/Punycode/PP.pm
+%%SITE_ARCH%%/Net/IDN/Standards.pod
+%%SITE_ARCH%%/Net/IDN/UTS46.pm
+%%SITE_ARCH%%/Net/IDN/UTS46/_Mapping.pm
+%%SITE_ARCH%%/auto/Net/IDN/Punycode/Punycode.so
 %%PERL5_MAN3%%/Net::IDN::Encode.3.gz
 %%PERL5_MAN3%%/Net::IDN::Overview.3.gz
 %%PERL5_MAN3%%/Net::IDN::Punycode.3.gz
@@ -13,10 +13,3 @@
 %%PERL5_MAN3%%/Net::IDN::Standards.3.gz
 %%PERL5_MAN3%%/Net::IDN::UTS46.3.gz
 %%PERL5_MAN3%%/Net::IDN::UTS46::_Mapping.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IDN/Punycode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IDN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/UTS46
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN/Punycode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/IDN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/textproc/p5-Net-Snort-Parser/Makefile b/textproc/p5-Net-Snort-Parser/Makefile
index 0c01378ed185..1b2744e6cfc2 100644
--- a/textproc/p5-Net-Snort-Parser/Makefile
+++ b/textproc/p5-Net-Snort-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Snort-Parser
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	https://projects.honeynet.org/svn/honeywall/honeywall/trunk/rpm-devel/perl-${PORTNAME}/ \
     		http://mirrors.rit.edu/zi/
diff --git a/textproc/p5-Net-Snort-Parser/pkg-plist b/textproc/p5-Net-Snort-Parser/pkg-plist
index dc257b877ed8..67305d27f599 100644
--- a/textproc/p5-Net-Snort-Parser/pkg-plist
+++ b/textproc/p5-Net-Snort-Parser/pkg-plist
@@ -5,11 +5,4 @@ bin/verify-rule
 %%SITE_PERL%%/Net/Snort/Parser/File.pm
 %%SITE_PERL%%/Net/Snort/Parser/Rule.pm
 %%SITE_PERL%%/Net/Snort/Parser/RuleOptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Snort/Parser/.packlist
 man/man1/snortconfig.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Snort/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Snort
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Snort/Parser
-@dirrmtry %%SITE_PERL%%/Net/Snort
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/textproc/p5-Net-YASA/Makefile b/textproc/p5-Net-YASA/Makefile
index 66566a132fd2..f6590d6e39ca 100644
--- a/textproc/p5-Net-YASA/Makefile
+++ b/textproc/p5-Net-YASA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-YASA
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Net-YASA/pkg-plist b/textproc/p5-Net-YASA/pkg-plist
index c4eae3be85ef..228cc3e933f9 100644
--- a/textproc/p5-Net-YASA/pkg-plist
+++ b/textproc/p5-Net-YASA/pkg-plist
@@ -2,5 +2,3 @@
 %%PERL5_MAN3%%/Net::YASA::ConfigData.3.gz
 %%SITE_PERL%%/Net/YASA.pm
 %%SITE_PERL%%/Net/YASA/ConfigData.pm
-@dirrmtry %%SITE_PERL%%/Net/YASA
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/textproc/p5-NetAddr-IP-Find/Makefile b/textproc/p5-NetAddr-IP-Find/Makefile
index 45155e8d7423..e04201171972 100644
--- a/textproc/p5-NetAddr-IP-Find/Makefile
+++ b/textproc/p5-NetAddr-IP-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NetAddr-IP-Find
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-NetAddr-IP-Find/pkg-plist b/textproc/p5-NetAddr-IP-Find/pkg-plist
index 803af997a6af..7182c4e2d87b 100644
--- a/textproc/p5-NetAddr-IP-Find/pkg-plist
+++ b/textproc/p5-NetAddr-IP-Find/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/NetAddr::IP::Find.3.gz
 %%SITE_PERL%%/NetAddr/IP/Find.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrmtry %%SITE_PERL%%/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/NetAddr
diff --git a/textproc/p5-Number-Format/Makefile b/textproc/p5-Number-Format/Makefile
index 5f6c3e494e51..fe8016ed3753 100644
--- a/textproc/p5-Number-Format/Makefile
+++ b/textproc/p5-Number-Format/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Number-Format
 PORTVERSION=		1.73
+PORTREVISION=	1
 CATEGORIES=		textproc perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/textproc/p5-Number-Format/pkg-plist b/textproc/p5-Number-Format/pkg-plist
index 8bdf66d2edd1..cf30ee5a92e6 100644
--- a/textproc/p5-Number-Format/pkg-plist
+++ b/textproc/p5-Number-Format/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Number::Format.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format/.packlist
 %%SITE_PERL%%/Number/Format.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
-@dirrmtry %%SITE_PERL%%/Number
diff --git a/textproc/p5-Number-Spell/Makefile b/textproc/p5-Number-Spell/Makefile
index 6a4e6efe41ae..2d77ff04a02c 100644
--- a/textproc/p5-Number-Spell/Makefile
+++ b/textproc/p5-Number-Spell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Spell
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Number-Spell/pkg-plist b/textproc/p5-Number-Spell/pkg-plist
index ce47341c6c1c..307eec092a50 100644
--- a/textproc/p5-Number-Spell/pkg-plist
+++ b/textproc/p5-Number-Spell/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Number::Spell.3.gz
 %%SITE_PERL%%/Number/Spell.pm
 %%SITE_PERL%%/auto/Number/Spell/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Spell/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Spell
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
-@dirrmtry %%SITE_PERL%%/auto/Number/Spell
-@dirrmtry %%SITE_PERL%%/auto/Number
-@dirrmtry %%SITE_PERL%%/Number
diff --git a/textproc/p5-ODF-lpOD/Makefile b/textproc/p5-ODF-lpOD/Makefile
index 57b82b729e76..e6504e044e6a 100644
--- a/textproc/p5-ODF-lpOD/Makefile
+++ b/textproc/p5-ODF-lpOD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ODF-lpOD
 PORTVERSION=	1.126
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-ODF-lpOD/pkg-plist b/textproc/p5-ODF-lpOD/pkg-plist
index f52a19839329..baf00d6fe642 100644
--- a/textproc/p5-ODF-lpOD/pkg-plist
+++ b/textproc/p5-ODF-lpOD/pkg-plist
@@ -33,11 +33,4 @@ bin/lpod_test
 %%SITE_PERL%%/ODF/lpOD/templates/presentation.odp
 %%SITE_PERL%%/ODF/lpOD/templates/spreadsheet.ods
 %%SITE_PERL%%/ODF/lpOD/templates/text.odt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ODF/lpOD/.packlist
 man/man1/lpod_test.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ODF/lpOD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ODF
-@dirrmtry %%SITE_PERL%%/ODF/lpOD/templates
-@dirrmtry %%SITE_PERL%%/ODF/lpOD/data
-@dirrmtry %%SITE_PERL%%/ODF/lpOD
-@dirrmtry %%SITE_PERL%%/ODF
diff --git a/textproc/p5-OpenOffice-OODoc/Makefile b/textproc/p5-OpenOffice-OODoc/Makefile
index 1127da33e288..086a1975d617 100644
--- a/textproc/p5-OpenOffice-OODoc/Makefile
+++ b/textproc/p5-OpenOffice-OODoc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	OpenOffice-OODoc
 PORTVERSION=	2.125
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-OpenOffice-OODoc/pkg-plist b/textproc/p5-OpenOffice-OODoc/pkg-plist
index 07b4c247d393..64fda654e677 100644
--- a/textproc/p5-OpenOffice-OODoc/pkg-plist
+++ b/textproc/p5-OpenOffice-OODoc/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenOffice/OODoc/.packlist
 %%SITE_PERL%%/OpenOffice/OODoc.pod
 %%SITE_PERL%%/OpenOffice/OODoc.pm
 %%SITE_PERL%%/OpenOffice/OODoc/Styles.pod
@@ -65,9 +64,3 @@ man/man1/odfsearch.1.gz
 man/man1/oodoc_test.1.gz
 man/man1/text2odf.1.gz
 man/man1/text2table.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenOffice/OODoc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenOffice
-@dirrm %%SITE_PERL%%/OpenOffice/OODoc/data
-@dirrm %%SITE_PERL%%/OpenOffice/OODoc/templates
-@dirrm %%SITE_PERL%%/OpenOffice/OODoc
-@dirrmtry %%SITE_PERL%%/OpenOffice
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 48e71b4ef27d..9c8d6535e655 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-API2
 PORTVERSION=	2.022
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SSIMMS
diff --git a/textproc/p5-PDF-API2/pkg-plist b/textproc/p5-PDF-API2/pkg-plist
index 47bcdc1f63c0..491bdf73425c 100644
--- a/textproc/p5-PDF-API2/pkg-plist
+++ b/textproc/p5-PDF-API2/pkg-plist
@@ -150,25 +150,3 @@
 %%SITE_PERL%%/PDF/API2/UniWrap.pm
 %%SITE_PERL%%/PDF/API2/Util.pm
 %%SITE_PERL%%/PDF/API2/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API2/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/XObject/Image
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/XObject/Form/BarCode
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/XObject/Form
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/XObject
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/Font/CoreFont
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/Font
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/ColorSpace/Indexed
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/ColorSpace
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/CIDFont/TrueType
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/CIDFont/CMap
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/CIDFont/CJKFont
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource/CIDFont
-@dirrmtry %%SITE_PERL%%/PDF/API2/Resource
-@dirrmtry %%SITE_PERL%%/PDF/API2/Content
-@dirrmtry %%SITE_PERL%%/PDF/API2/Basic/PDF/Filter
-@dirrmtry %%SITE_PERL%%/PDF/API2/Basic/PDF
-@dirrmtry %%SITE_PERL%%/PDF/API2/Basic
-@dirrmtry %%SITE_PERL%%/PDF/API2
-@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-PDF-API3/Makefile b/textproc/p5-PDF-API3/Makefile
index edf393083c37..cf6686b0ee4c 100644
--- a/textproc/p5-PDF-API3/Makefile
+++ b/textproc/p5-PDF-API3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-API3
 PORTVERSION=	3.001
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PDF-API3/pkg-plist b/textproc/p5-PDF-API3/pkg-plist
index 83eaa0503a96..7caf37111dc8 100644
--- a/textproc/p5-PDF-API3/pkg-plist
+++ b/textproc/p5-PDF-API3/pkg-plist
@@ -352,30 +352,3 @@
 %%SITE_PERL%%/PDF/API3/Compat/API2/fonts/langcover.txt
 %%SITE_PERL%%/PDF/API3/Compat/API2/fonts/status.txt
 %%SITE_PERL%%/PDF/API3/Compat/API2/fonts/unicover.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/fonts
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/XObject/Image
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/XObject/Form/BarCode
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/XObject/Form
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/XObject
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/Font/CoreFont
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/Font
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/ColorSpace/Indexed
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/ColorSpace
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/CIDFont/TrueType
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/CIDFont/CMap
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/CIDFont/CJKFont
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource/CIDFont
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Resource
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Content
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Basic/TTF/Mort
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Basic/TTF/Kern
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Basic/TTF
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Basic/PDF
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2/Basic
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat/API2
-@dirrmtry %%SITE_PERL%%/PDF/API3/Compat
-@dirrmtry %%SITE_PERL%%/PDF/API3
-@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index 2a8482cd2d46..a0833a439415 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-Create
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PDF-Create/pkg-plist b/textproc/p5-PDF-Create/pkg-plist
index c99d6d05a2ff..b7ddb7501737 100644
--- a/textproc/p5-PDF-Create/pkg-plist
+++ b/textproc/p5-PDF-Create/pkg-plist
@@ -1,12 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create/.packlist
 %%SITE_PERL%%/PDF/Create/Page.pm
 %%SITE_PERL%%/PDF/Create/Outline.pm
 %%SITE_PERL%%/PDF/Create.pm
 %%SITE_PERL%%/PDF/Image/GIF.pm
 %%SITE_PERL%%/PDF/Image/JPEG.pm
 %%PERL5_MAN3%%/PDF::Create.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create
-@dirrm %%SITE_PERL%%/PDF/Create
-@dirrm %%SITE_PERL%%/PDF/Image
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
-@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-PDF-FromHTML/Makefile b/textproc/p5-PDF-FromHTML/Makefile
index db5ac411ac84..a8659f864b8c 100644
--- a/textproc/p5-PDF-FromHTML/Makefile
+++ b/textproc/p5-PDF-FromHTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-FromHTML
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PDF-FromHTML/pkg-plist b/textproc/p5-PDF-FromHTML/pkg-plist
index 62afc70ed856..0e2dc8512729 100644
--- a/textproc/p5-PDF-FromHTML/pkg-plist
+++ b/textproc/p5-PDF-FromHTML/pkg-plist
@@ -56,12 +56,4 @@ bin/html2pdf.pl
 %%SITE_PERL%%/PDF/FromHTML/Template/Iterator.pm
 %%SITE_PERL%%/PDF/FromHTML/Template/TextObject.pm
 %%SITE_PERL%%/PDF/FromHTML/Twig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/FromHTML/.packlist
 man/man1/html2pdf.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/FromHTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
-@dirrmtry %%SITE_PERL%%/PDF/FromHTML/Template/Element
-@dirrmtry %%SITE_PERL%%/PDF/FromHTML/Template/Container
-@dirrmtry %%SITE_PERL%%/PDF/FromHTML/Template
-@dirrmtry %%SITE_PERL%%/PDF/FromHTML
-@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-PDF-Table/Makefile b/textproc/p5-PDF-Table/Makefile
index a0a964b6e6e5..55da988991bf 100644
--- a/textproc/p5-PDF-Table/Makefile
+++ b/textproc/p5-PDF-Table/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-Table
 DISTVERSION=	0.9.6_h3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PDF-Table/pkg-plist b/textproc/p5-PDF-Table/pkg-plist
index 6e7c9bafd737..a68c08ac8d6b 100644
--- a/textproc/p5-PDF-Table/pkg-plist
+++ b/textproc/p5-PDF-Table/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/PDF/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Table/.packlist
 %%PERL5_MAN3%%/PDF::Table.3.gz
-@dirrmtry %%SITE_PERL%%/PDF
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Table
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
diff --git a/textproc/p5-PDF-Writer/Makefile b/textproc/p5-PDF-Writer/Makefile
index bb767dffc104..00a25778271b 100644
--- a/textproc/p5-PDF-Writer/Makefile
+++ b/textproc/p5-PDF-Writer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-Writer
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PDF-Writer/pkg-plist b/textproc/p5-PDF-Writer/pkg-plist
index 0f148ebf3597..2ae7419b2a01 100644
--- a/textproc/p5-PDF-Writer/pkg-plist
+++ b/textproc/p5-PDF-Writer/pkg-plist
@@ -5,5 +5,3 @@
 %%PERL5_MAN3%%/PDF::Writer.3.gz
 %%PERL5_MAN3%%/PDF::Writer::pdfapi2.3.gz
 %%PERL5_MAN3%%/PDF::Writer::pdflib.3.gz
-@dirrm %%SITE_PERL%%/PDF/Writer
-@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-POD2-Base/Makefile b/textproc/p5-POD2-Base/Makefile
index 1a1a0c7501f1..10f73c500959 100644
--- a/textproc/p5-POD2-Base/Makefile
+++ b/textproc/p5-POD2-Base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POD2-Base
 PORTVERSION=	0.043
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FERREIRA
diff --git a/textproc/p5-POD2-Base/pkg-plist b/textproc/p5-POD2-Base/pkg-plist
index bef1028b98c2..b98595dd16d7 100644
--- a/textproc/p5-POD2-Base/pkg-plist
+++ b/textproc/p5-POD2-Base/pkg-plist
@@ -3,9 +3,3 @@
 %%SITE_PERL%%/POD2/Base.pm
 %%SITE_PERL%%/POD2/Base.pod
 %%SITE_PERL%%/POD2/PT/POD2/Base.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POD2/Base/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POD2/Base
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POD2
-@dirrm %%SITE_PERL%%/POD2/PT/POD2
-@dirrm %%SITE_PERL%%/POD2/PT
-@dirrmtry %%SITE_PERL%%/POD2
diff --git a/textproc/p5-POE-Filter-XML/Makefile b/textproc/p5-POE-Filter-XML/Makefile
index 7ec552659b8f..0099f056d9ab 100644
--- a/textproc/p5-POE-Filter-XML/Makefile
+++ b/textproc/p5-POE-Filter-XML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Filter-XML
 PORTVERSION=	1.102960
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-POE-Filter-XML/pkg-plist b/textproc/p5-POE-Filter-XML/pkg-plist
index a9f07bf91287..8b6f4cbf3caf 100644
--- a/textproc/p5-POE-Filter-XML/pkg-plist
+++ b/textproc/p5-POE-Filter-XML/pkg-plist
@@ -6,10 +6,3 @@
 %%SITE_PERL%%/POE/Filter/XML/Handler.pm
 %%SITE_PERL%%/POE/Filter/XML/NS.pm
 %%SITE_PERL%%/POE/Filter/XML/Node.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/XML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter/XML
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/textproc/p5-POSIX-Regex/Makefile b/textproc/p5-POSIX-Regex/Makefile
index 5bc1ca556872..473aaefb1b95 100644
--- a/textproc/p5-POSIX-Regex/Makefile
+++ b/textproc/p5-POSIX-Regex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POSIX-Regex
 PORTVERSION=	1.0003
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-POSIX-Regex/pkg-plist b/textproc/p5-POSIX-Regex/pkg-plist
index cc32379d3574..6f23aede1fb3 100644
--- a/textproc/p5-POSIX-Regex/pkg-plist
+++ b/textproc/p5-POSIX-Regex/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/POSIX::Regex.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/POSIX/Regex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/POSIX/Regex.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/Regex/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/Regex/Regex.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX/Regex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POSIX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POSIX
+%%SITE_ARCH%%/POSIX/Regex.pm
+%%SITE_ARCH%%/POSIX/Regex.pod
+%%SITE_ARCH%%/auto/POSIX/Regex/Regex.so
diff --git a/textproc/p5-PPI-HTML/Makefile b/textproc/p5-PPI-HTML/Makefile
index 1d3283ac3d9b..0c2f1e585bf5 100644
--- a/textproc/p5-PPI-HTML/Makefile
+++ b/textproc/p5-PPI-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PPI-HTML
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/textproc/p5-PPI-HTML/pkg-plist b/textproc/p5-PPI-HTML/pkg-plist
index 0566275be614..a0608bdc9210 100644
--- a/textproc/p5-PPI-HTML/pkg-plist
+++ b/textproc/p5-PPI-HTML/pkg-plist
@@ -2,8 +2,3 @@ bin/ppi2html
 %%PERL5_MAN3%%/PPI::HTML.3.gz
 %%SITE_PERL%%/PPI/HTML.pm
 %%SITE_PERL%%/PPI/HTML/Fragment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/HTML/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI
-@dirrm %%SITE_PERL%%/PPI/HTML
-@dirrmtry %%SITE_PERL%%/PPI
diff --git a/textproc/p5-PPI-XS/Makefile b/textproc/p5-PPI-XS/Makefile
index 5d8d8957e44e..7bf4d3969e22 100644
--- a/textproc/p5-PPI-XS/Makefile
+++ b/textproc/p5-PPI-XS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	PPI-XS
 PORTVERSION=	0.902
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	PPI
diff --git a/textproc/p5-PPI-XS/pkg-plist b/textproc/p5-PPI-XS/pkg-plist
index f511648d3d5a..82c7796b803c 100644
--- a/textproc/p5-PPI-XS/pkg-plist
+++ b/textproc/p5-PPI-XS/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/PPI::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/PPI/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/XS/XS.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PPI
+%%SITE_ARCH%%/PPI/XS.pm
+%%SITE_ARCH%%/auto/PPI/XS/XS.so
diff --git a/textproc/p5-PPI/Makefile b/textproc/p5-PPI/Makefile
index 6faf2cc01389..1486e4e7f37e 100644
--- a/textproc/p5-PPI/Makefile
+++ b/textproc/p5-PPI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PPI
 PORTVERSION=	1.215
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/textproc/p5-PPI/pkg-plist b/textproc/p5-PPI/pkg-plist
index 2fb9365ed257..fadab8b57501 100644
--- a/textproc/p5-PPI/pkg-plist
+++ b/textproc/p5-PPI/pkg-plist
@@ -181,19 +181,3 @@
 %%SITE_PERL%%/PPI/Transform/UpdateCopyright.pm
 %%SITE_PERL%%/PPI/Util.pm
 %%SITE_PERL%%/PPI/XSAccessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/.packlist
-@dirrm %%SITE_PERL%%/PPI/Token/_QuoteEngine
-@dirrm %%SITE_PERL%%/PPI/Token/QuoteLike
-@dirrm %%SITE_PERL%%/PPI/Token/Regexp
-@dirrm %%SITE_PERL%%/PPI/Token/Quote
-@dirrm %%SITE_PERL%%/PPI/Token/Number
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI
-@dirrmtry %%SITE_PERL%%/PPI/Statement/Include
-@dirrmtry %%SITE_PERL%%/PPI/Statement
-@dirrmtry %%SITE_PERL%%/PPI/Structure
-@dirrmtry %%SITE_PERL%%/PPI/Exception
-@dirrmtry %%SITE_PERL%%/PPI/Document
-@dirrmtry %%SITE_PERL%%/PPI/Normal
-@dirrmtry %%SITE_PERL%%/PPI/Token
-@dirrmtry %%SITE_PERL%%/PPI/Transform
-@dirrmtry %%SITE_PERL%%/PPI
diff --git a/textproc/p5-PPIx-EditorTools/Makefile b/textproc/p5-PPIx-EditorTools/Makefile
index f8d1a07ad016..4ee913f78fe5 100644
--- a/textproc/p5-PPIx-EditorTools/Makefile
+++ b/textproc/p5-PPIx-EditorTools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PPIx-EditorTools
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SZABGAB
diff --git a/textproc/p5-PPIx-EditorTools/pkg-plist b/textproc/p5-PPIx-EditorTools/pkg-plist
index 92eec808e36c..490584f75398 100644
--- a/textproc/p5-PPIx-EditorTools/pkg-plist
+++ b/textproc/p5-PPIx-EditorTools/pkg-plist
@@ -18,8 +18,3 @@
 %%SITE_PERL%%/PPIx/EditorTools/RenamePackageFromPath.pm
 %%SITE_PERL%%/PPIx/EditorTools/RenameVariable.pm
 %%SITE_PERL%%/PPIx/EditorTools/ReturnObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPIx/EditorTools/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPIx/EditorTools
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPIx
-@dirrmtry %%SITE_PERL%%/PPIx/EditorTools
-@dirrmtry %%SITE_PERL%%/PPIx
diff --git a/textproc/p5-PPIx-Regexp/Makefile b/textproc/p5-PPIx-Regexp/Makefile
index 9ea8423ff195..cc8b442a80c5 100644
--- a/textproc/p5-PPIx-Regexp/Makefile
+++ b/textproc/p5-PPIx-Regexp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PPIx-Regexp
 PORTVERSION=	0.036
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/textproc/p5-PPIx-Regexp/pkg-plist b/textproc/p5-PPIx-Regexp/pkg-plist
index 81d083001396..8c1d629af8ed 100644
--- a/textproc/p5-PPIx-Regexp/pkg-plist
+++ b/textproc/p5-PPIx-Regexp/pkg-plist
@@ -57,7 +57,6 @@
 %%SITE_PERL%%/PPIx/Regexp/Token/Whitespace.pm
 %%SITE_PERL%%/PPIx/Regexp/Tokenizer.pm
 %%SITE_PERL%%/PPIx/Regexp/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPIx/Regexp/.packlist
 %%PERL5_MAN3%%/PPIx::Regexp::Tokenizer.3.gz
 %%PERL5_MAN3%%/PPIx::Regexp::Dumper.3.gz
 %%PERL5_MAN3%%/PPIx::Regexp::Token::Literal.3.gz
@@ -117,13 +116,3 @@
 %%PERL5_MAN3%%/PPIx::Regexp::Token::Whitespace.3.gz
 %%PERL5_MAN3%%/PPIx::Regexp::Structure::Subexpression.3.gz
 %%PERL5_MAN3%%/PPIx::Regexp::Structure.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPIx/Regexp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPIx
-@dirrm %%SITE_PERL%%/PPIx/Regexp/Token/GroupType
-@dirrm %%SITE_PERL%%/PPIx/Regexp/Token/CharClass/POSIX
-@dirrm %%SITE_PERL%%/PPIx/Regexp/Token/CharClass
-@dirrm %%SITE_PERL%%/PPIx/Regexp/Token
-@dirrm %%SITE_PERL%%/PPIx/Regexp/Structure
-@dirrm %%SITE_PERL%%/PPIx/Regexp/Node
-@dirrm %%SITE_PERL%%/PPIx/Regexp
-@dirrmtry %%SITE_PERL%%/PPIx
diff --git a/textproc/p5-PPIx-Utilities/Makefile b/textproc/p5-PPIx-Utilities/Makefile
index 141d3157c78f..ed2fa88f6452 100644
--- a/textproc/p5-PPIx-Utilities/Makefile
+++ b/textproc/p5-PPIx-Utilities/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PPIx-Utilities
 PORTVERSION=	1.001000
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ELLIOTJS
diff --git a/textproc/p5-PPIx-Utilities/pkg-plist b/textproc/p5-PPIx-Utilities/pkg-plist
index 21cd17f00bac..11adb2880940 100644
--- a/textproc/p5-PPIx-Utilities/pkg-plist
+++ b/textproc/p5-PPIx-Utilities/pkg-plist
@@ -6,6 +6,3 @@
 %%SITE_PERL%%/PPIx/Utilities/Exception/Bug.pm
 %%SITE_PERL%%/PPIx/Utilities/Node.pm
 %%SITE_PERL%%/PPIx/Utilities/Statement.pm
-@dirrmtry %%SITE_PERL%%/PPIx/Utilities/Exception
-@dirrmtry %%SITE_PERL%%/PPIx/Utilities
-@dirrmtry %%SITE_PERL%%/PPIx
diff --git a/textproc/p5-Parse-BooleanLogic/Makefile b/textproc/p5-Parse-BooleanLogic/Makefile
index 087374347b9d..7f0a2f2b7646 100644
--- a/textproc/p5-Parse-BooleanLogic/Makefile
+++ b/textproc/p5-Parse-BooleanLogic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-BooleanLogic
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Parse-BooleanLogic/pkg-plist b/textproc/p5-Parse-BooleanLogic/pkg-plist
index f3b73fc6b5ed..944120d9a8d8 100644
--- a/textproc/p5-Parse-BooleanLogic/pkg-plist
+++ b/textproc/p5-Parse-BooleanLogic/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Parse::BooleanLogic.3.gz
 %%SITE_PERL%%/Parse/BooleanLogic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/BooleanLogic/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/BooleanLogic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/textproc/p5-Parse-CSV/Makefile b/textproc/p5-Parse-CSV/Makefile
index 7ce2167897be..81d3bb3e3ec5 100644
--- a/textproc/p5-Parse-CSV/Makefile
+++ b/textproc/p5-Parse-CSV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-CSV
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Parse-CSV/pkg-plist b/textproc/p5-Parse-CSV/pkg-plist
index 36da7ff62e8a..377bb580bd13 100644
--- a/textproc/p5-Parse-CSV/pkg-plist
+++ b/textproc/p5-Parse-CSV/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Parse::CSV.3.gz
 %%SITE_PERL%%/Parse/CSV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/CSV/.packlist
-@dirrmtry %%SITE_PERL%%/Parse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/CSV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
diff --git a/textproc/p5-Parse-FixedLength/Makefile b/textproc/p5-Parse-FixedLength/Makefile
index 8ea43db5610f..b50beafcbc8f 100644
--- a/textproc/p5-Parse-FixedLength/Makefile
+++ b/textproc/p5-Parse-FixedLength/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-FixedLength
 PORTVERSION=	5.39
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Parse-FixedLength/pkg-plist b/textproc/p5-Parse-FixedLength/pkg-plist
index e968950ec8a1..709b6c299580 100644
--- a/textproc/p5-Parse-FixedLength/pkg-plist
+++ b/textproc/p5-Parse-FixedLength/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Parse::FixedLength.3.gz
 %%SITE_PERL%%/Parse/FixedLength.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/textproc/p5-Parse-Flex/Makefile b/textproc/p5-Parse-Flex/Makefile
index 105c584cdd29..dd60190d6f8b 100644
--- a/textproc/p5-Parse-Flex/Makefile
+++ b/textproc/p5-Parse-Flex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Flex
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Parse-Flex/pkg-plist b/textproc/p5-Parse-Flex/pkg-plist
index c1c176f973e5..0eeeaa7a12c4 100644
--- a/textproc/p5-Parse-Flex/pkg-plist
+++ b/textproc/p5-Parse-Flex/pkg-plist
@@ -3,8 +3,3 @@ bin/makelexer.pl
 %%PERL5_MAN3%%/Parse::Flex::Generate.3.gz
 %%SITE_PERL%%/Parse/Flex.pm
 %%SITE_PERL%%/Parse/Flex/Generate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Flex/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Flex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrmtry %%SITE_PERL%%/Parse/Flex
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/textproc/p5-Parse-PhoneNumber/Makefile b/textproc/p5-Parse-PhoneNumber/Makefile
index d5a1604e6b4c..817c818d451a 100644
--- a/textproc/p5-Parse-PhoneNumber/Makefile
+++ b/textproc/p5-Parse-PhoneNumber/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-PhoneNumber
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Parse-PhoneNumber/pkg-plist b/textproc/p5-Parse-PhoneNumber/pkg-plist
index c44e015f49ef..25c6061a2b64 100644
--- a/textproc/p5-Parse-PhoneNumber/pkg-plist
+++ b/textproc/p5-Parse-PhoneNumber/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Parse::PhoneNumber.3.gz
 %%SITE_PERL%%/Parse/PhoneNumber.pm
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/textproc/p5-Parse-Syslog/Makefile b/textproc/p5-Parse-Syslog/Makefile
index 77f9009d7658..75729fca4205 100644
--- a/textproc/p5-Parse-Syslog/Makefile
+++ b/textproc/p5-Parse-Syslog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-Syslog
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Parse-Syslog/pkg-plist b/textproc/p5-Parse-Syslog/pkg-plist
index eb9cf1d87654..69957ca254ce 100644
--- a/textproc/p5-Parse-Syslog/pkg-plist
+++ b/textproc/p5-Parse-Syslog/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Parse::Syslog.3.gz
 %%SITE_PERL%%/Parse/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/textproc/p5-Perl-Critic-Bangs/Makefile b/textproc/p5-Perl-Critic-Bangs/Makefile
index 43b155aceccc..a31710b5de8c 100644
--- a/textproc/p5-Perl-Critic-Bangs/Makefile
+++ b/textproc/p5-Perl-Critic-Bangs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-Critic-Bangs
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Perl-Critic-Bangs/pkg-plist b/textproc/p5-Perl-Critic-Bangs/pkg-plist
index 74938db419b2..c5ed5a7bb83e 100644
--- a/textproc/p5-Perl-Critic-Bangs/pkg-plist
+++ b/textproc/p5-Perl-Critic-Bangs/pkg-plist
@@ -7,7 +7,6 @@
 %%PERL5_MAN3%%/Perl::Critic::Policy::Bangs::ProhibitVagueNames.3.gz
 %%PERL5_MAN3%%/Perl::Critic::Policy::Bangs::ProhibitCommentedOutCode.3.gz
 %%PERL5_MAN3%%/Perl::Critic::Policy::Bangs::ProhibitBitwiseOperators.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Critic/Bangs/.packlist
 %%SITE_PERL%%/Perl/Critic/Bangs.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Bangs/ProhibitBitwiseOperators.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Bangs/ProhibitCommentedOutCode.pm
@@ -17,7 +16,3 @@
 %%SITE_PERL%%/Perl/Critic/Policy/Bangs/ProhibitRefProtoOrProto.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Bangs/ProhibitUselessRegexModifiers.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Bangs/ProhibitVagueNames.pm
-@dirrm %%SITE_PERL%%/Perl/Critic/Policy/Bangs
-@dirrmtry %%SITE_PERL%%/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Critic/Bangs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Critic
diff --git a/textproc/p5-Perl-Critic/Makefile b/textproc/p5-Perl-Critic/Makefile
index 352556487a23..89d15f72c883 100644
--- a/textproc/p5-Perl-Critic/Makefile
+++ b/textproc/p5-Perl-Critic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perl-Critic
 PORTVERSION=	1.12.1
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Perl-Critic/pkg-plist b/textproc/p5-Perl-Critic/pkg-plist
index 297301eb0d32..c5dfed9de682 100644
--- a/textproc/p5-Perl-Critic/pkg-plist
+++ b/textproc/p5-Perl-Critic/pkg-plist
@@ -390,36 +390,3 @@ bin/perlcritic
 %%PERL5_MAN3%%/Perl::Critic::Violation.3.gz
 %%PERL5_MAN3%%/Test::Perl::Critic::Policy.3.gz
 man/man1/perlcritic.1.gz
-@dirrmtry %%SITE_PERL%%/Test/Perl/Critic
-@dirrmtry %%SITE_PERL%%/Test/Perl
-@dirrmtry %%SITE_PERL%%/Test
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Utils/POD
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Utils
-@dirrmtry %%SITE_PERL%%/Perl/Critic/PolicyParameter/Behavior
-@dirrmtry %%SITE_PERL%%/Perl/Critic/PolicyParameter
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/Variables
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/Subroutines
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/RegularExpressions
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/References
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/Objects
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/NamingConventions
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/Modules
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/Miscellanea
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/InputOutput
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/ErrorHandling
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/Documentation
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/ControlStructures
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/CodeLayout
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/ClassHierarchies
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Policy
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Exception/Fatal
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Exception/Configuration/Option/Policy
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Exception/Configuration/Option/Global
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Exception/Configuration/Option
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Exception/Configuration
-@dirrmtry %%SITE_PERL%%/Perl/Critic/Exception
-@dirrmtry %%SITE_PERL%%/Perl/Critic
-@dirrmtry %%SITE_PERL%%/Perl
diff --git a/textproc/p5-Perl-MinimumVersion/Makefile b/textproc/p5-Perl-MinimumVersion/Makefile
index 9a68be1f6ac3..5c1910210780 100644
--- a/textproc/p5-Perl-MinimumVersion/Makefile
+++ b/textproc/p5-Perl-MinimumVersion/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Perl-MinimumVersion
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Perl-MinimumVersion/pkg-plist b/textproc/p5-Perl-MinimumVersion/pkg-plist
index c1a16d98221a..0fc248391259 100644
--- a/textproc/p5-Perl-MinimumVersion/pkg-plist
+++ b/textproc/p5-Perl-MinimumVersion/pkg-plist
@@ -2,9 +2,4 @@ bin/perlver
 %%PERL5_MAN3%%/Perl::MinimumVersion.3.gz
 %%SITE_PERL%%/Perl/MinimumVersion.pm
 %%SITE_PERL%%/Perl/MinimumVersion/Reason.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/MinimumVersion/.packlist
 man/man1/perlver.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/MinimumVersion
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl
-@dirrmtry %%SITE_PERL%%/Perl/MinimumVersion
-@dirrmtry %%SITE_PERL%%/Perl
diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile
index 1c36617c98b4..e8d65b407bbf 100644
--- a/textproc/p5-PerlPoint-Converters/Makefile
+++ b/textproc/p5-PerlPoint-Converters/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlPoint-Converters
 PORTVERSION=	1.02.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PerlPoint-Converters/pkg-plist b/textproc/p5-PerlPoint-Converters/pkg-plist
index 4b68cd6c0b46..bf336216ca16 100644
--- a/textproc/p5-PerlPoint-Converters/pkg-plist
+++ b/textproc/p5-PerlPoint-Converters/pkg-plist
@@ -8,10 +8,5 @@ bin/pp2latex
 %%SITE_PERL%%/PerlPoint/Converters.pm
 %%SITE_PERL%%/PerlPoint/Tags/HTML.pm
 %%SITE_PERL%%/PerlPoint/Tags/LaTeX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint-Converters/.packlist
 man/man1/pp2html.1.gz
 man/man1/pp2latex.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint-Converters
-@dirrmtry %%SITE_PERL%%/PerlPoint/Tags
-@dirrmtry %%SITE_PERL%%/PerlPoint
-@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 43f64383a080..08e1208d9415 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	PerlPoint-Package
 PORTVERSION=	0.45.2
 DISTVERSION=	${PORTVERSION:C/\.(.)$/\1/}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PerlPoint-Package/pkg-plist b/textproc/p5-PerlPoint-Package/pkg-plist
index 6eadb67ef402..8e85e70cdd0c 100644
--- a/textproc/p5-PerlPoint-Package/pkg-plist
+++ b/textproc/p5-PerlPoint-Package/pkg-plist
@@ -24,7 +24,6 @@ bin/pp2sdf
 %%SITE_PERL%%/PerlPoint/Tags/Basic.pm
 %%SITE_PERL%%/PerlPoint/Tags/SDF.pm
 %%SITE_PERL%%/PerlPoint/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint/Package/.packlist
 man/man1/perlpoint.1.gz
 man/man1/pp2sdf.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/.pp2sdf
@@ -36,10 +35,3 @@ man/man1/pp2sdf.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp2sdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp2tree
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint/Package
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint
-@dirrmtry %%SITE_PERL%%/PerlPoint/Tags
-@dirrmtry %%SITE_PERL%%/PerlPoint/Generator/SDF
-@dirrmtry %%SITE_PERL%%/PerlPoint/Generator/Object
-@dirrmtry %%SITE_PERL%%/PerlPoint/Generator
-@dirrmtry %%SITE_PERL%%/PerlPoint
diff --git a/textproc/p5-Petal-CodePerl/Makefile b/textproc/p5-Petal-CodePerl/Makefile
index 194468486be9..71254319ecb3 100644
--- a/textproc/p5-Petal-CodePerl/Makefile
+++ b/textproc/p5-Petal-CodePerl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Petal-CodePerl
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FDALY
diff --git a/textproc/p5-Petal-CodePerl/pkg-plist b/textproc/p5-Petal-CodePerl/pkg-plist
index 5cb774e6e42e..51b53979c7eb 100644
--- a/textproc/p5-Petal-CodePerl/pkg-plist
+++ b/textproc/p5-Petal-CodePerl/pkg-plist
@@ -12,9 +12,3 @@
 %%SITE_PERL%%/Petal/CodePerl/GrammarLoader.pm
 %%SITE_PERL%%/Petal/CodePerl/Modifiers.pm
 %%SITE_PERL%%/Petal/CodePerl/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal/CodePerl/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal/CodePerl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal
-@dirrmtry %%SITE_PERL%%/Petal/CodePerl/Expr
-@dirrmtry %%SITE_PERL%%/Petal/CodePerl
-@dirrmtry %%SITE_PERL%%/Petal
diff --git a/textproc/p5-Petal-Mail/Makefile b/textproc/p5-Petal-Mail/Makefile
index c975dd07128d..4bbc721d6184 100644
--- a/textproc/p5-Petal-Mail/Makefile
+++ b/textproc/p5-Petal-Mail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Petal-Mail
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BPOSTLE
diff --git a/textproc/p5-Petal-Mail/pkg-plist b/textproc/p5-Petal-Mail/pkg-plist
index 99f0c908562b..d33343823d8e 100644
--- a/textproc/p5-Petal-Mail/pkg-plist
+++ b/textproc/p5-Petal-Mail/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Petal::Mail.3.gz
 %%SITE_PERL%%/Petal/Mail.pm
 %%SITE_PERL%%/Petal/fake_sendmail.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal/Mail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal
-@dirrmtry %%SITE_PERL%%/Petal
diff --git a/textproc/p5-Petal-Utils/Makefile b/textproc/p5-Petal-Utils/Makefile
index dc571bfb914e..232c4aaaf7d2 100644
--- a/textproc/p5-Petal-Utils/Makefile
+++ b/textproc/p5-Petal-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Petal-Utils
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WMCKEE
diff --git a/textproc/p5-Petal-Utils/pkg-plist b/textproc/p5-Petal-Utils/pkg-plist
index c8c4a7d23f03..b890d45a178e 100644
--- a/textproc/p5-Petal-Utils/pkg-plist
+++ b/textproc/p5-Petal-Utils/pkg-plist
@@ -22,5 +22,3 @@
 %%SITE_PERL%%/Petal/Utils/US_Date.pm
 %%SITE_PERL%%/Petal/Utils/UpperCase.pm
 %%SITE_PERL%%/Petal/Utils/UriEscape.pm
-@dirrmtry %%SITE_PERL%%/Petal/Utils
-@dirrmtry %%SITE_PERL%%/Petal
diff --git a/textproc/p5-Petal/Makefile b/textproc/p5-Petal/Makefile
index 3c626fffb502..f1495ef326ea 100644
--- a/textproc/p5-Petal/Makefile
+++ b/textproc/p5-Petal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Petal
 PORTVERSION=	2.23
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NINE
diff --git a/textproc/p5-Petal/pkg-plist b/textproc/p5-Petal/pkg-plist
index 22e9da599803..b8a6cc8aaaba 100644
--- a/textproc/p5-Petal/pkg-plist
+++ b/textproc/p5-Petal/pkg-plist
@@ -23,10 +23,3 @@
 %%SITE_PERL%%/Petal/TranslationService/MOFile.pm
 %%SITE_PERL%%/Petal/TranslationService/Noop.pm
 %%SITE_PERL%%/Petal/TranslationService/h4x0r.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Petal
-@dirrmtry %%SITE_PERL%%/Petal/TranslationService
-@dirrmtry %%SITE_PERL%%/Petal/Hash
-@dirrmtry %%SITE_PERL%%/Petal/Canonicalizer
-@dirrmtry %%SITE_PERL%%/Petal/Cache
-@dirrmtry %%SITE_PERL%%/Petal
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index ae48e2a550b9..dbd7f4b1990c 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Plagger
 PORTVERSION=	0.7.17
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/textproc/p5-Plagger/pkg-plist b/textproc/p5-Plagger/pkg-plist
index 89d9be7852a9..89d65b44595b 100644
--- a/textproc/p5-Plagger/pkg-plist
+++ b/textproc/p5-Plagger/pkg-plist
@@ -412,7 +412,6 @@ bin/plagger-ircbot
 %%SITE_PERL%%/Plagger/UserAgent.pm
 %%SITE_PERL%%/Plagger/Util.pm
 %%SITE_PERL%%/Plagger/Walker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plagger/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/atode.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bloglines2gmail.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iefav2opml.yaml
@@ -652,36 +651,6 @@ bin/plagger-ircbot
 %%DATADIR%%/assets/plugins/Widget-Simple/mm.yaml
 %%DATADIR%%/assets/plugins/Widget-Simple/reddit.yaml
 %%DATADIR%%/assets/plugins/Widget-Simple/technorati.yaml
-@dirrm %%SITE_PERL%%/Plagger/TT/Plagger
-@dirrm %%SITE_PERL%%/Plagger/TT
-@dirrm %%SITE_PERL%%/Plagger/Rule/Deduped
-@dirrm %%SITE_PERL%%/Plagger/Rule
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Widget
-@dirrm %%SITE_PERL%%/Plagger/Plugin/UserAgent
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Summary
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Subscription/Bookmarks
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Subscription
-@dirrm %%SITE_PERL%%/Plagger/Plugin/SmartFeed
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Search
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Publish/Speech
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Publish
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Notify/OpenBrowser
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Notify/Eject
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Notify/Audio
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Notify
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Namespace
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Filter/Romanize
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Filter/FetchEnclosure
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Filter
-@dirrm %%SITE_PERL%%/Plagger/Plugin/CustomFeed/Frepa
-@dirrm %%SITE_PERL%%/Plagger/Plugin/CustomFeed
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Bundle
-@dirrm %%SITE_PERL%%/Plagger/Plugin/Aggregator
-@dirrm %%SITE_PERL%%/Plagger/Plugin
-@dirrm %%SITE_PERL%%/Plagger/Crypt
-@dirrm %%SITE_PERL%%/Plagger/Cache
-@dirrm %%SITE_PERL%%/Plagger
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plagger
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/assets/plugins/Widget-Simple
 @dirrm %%DATADIR%%/assets/plugins/Subscription-Planet
diff --git a/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile b/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
index 7a330bb45b6c..4bed7cc614e3 100644
--- a/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plucene-Analysis-CJKAnalyzer
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:XERN
diff --git a/textproc/p5-Plucene-Analysis-CJKAnalyzer/pkg-plist b/textproc/p5-Plucene-Analysis-CJKAnalyzer/pkg-plist
index cb38eb083ca3..9c4cf8c3901c 100644
--- a/textproc/p5-Plucene-Analysis-CJKAnalyzer/pkg-plist
+++ b/textproc/p5-Plucene-Analysis-CJKAnalyzer/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Plucene/Analysis/CJKAnalyzer.pm
 %%SITE_PERL%%/Plucene/Analysis/CJKTokenizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Analysis/CJKAnalyzer/.packlist
 %%PERL5_MAN3%%/Plucene::Analysis::CJKAnalyzer.3.gz
 %%PERL5_MAN3%%/Plucene::Analysis::CJKTokenizer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Analysis/CJKAnalyzer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Analysis
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene
-@dirrmtry %%SITE_PERL%%/Plucene/Analysis
-@dirrmtry %%SITE_PERL%%/Plucene
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
index 8a32078336eb..9c45efa828ea 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Plucene-Plugin-Analyzer-SnowballAnalyzer
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FABPOT
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist
index 3106ef8a1641..28ae95a7356d 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/Plucene::Plugin::Analyzer::SnowballFilter.3.gz
 %%SITE_PERL%%/Plucene/Plugin/Analyzer/SnowballAnalyzer.pm
 %%SITE_PERL%%/Plucene/Plugin/Analyzer/SnowballFilter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer/SnowballAnalyzer/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer/SnowballAnalyzer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin
-@dirrmtry %%SITE_PERL%%/Plucene/Plugin/Analyzer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene
-@dirrmtry %%SITE_PERL%%/Plucene/Plugin
-@dirrmtry %%SITE_PERL%%/Plucene
diff --git a/textproc/p5-Plucene-Simple/Makefile b/textproc/p5-Plucene-Simple/Makefile
index 7f2b920a0384..b8a13fc808a3 100644
--- a/textproc/p5-Plucene-Simple/Makefile
+++ b/textproc/p5-Plucene-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plucene-Simple
 DISTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STRYTOAST
diff --git a/textproc/p5-Plucene-Simple/pkg-plist b/textproc/p5-Plucene-Simple/pkg-plist
index 38d95cea19da..9bb2a1855654 100644
--- a/textproc/p5-Plucene-Simple/pkg-plist
+++ b/textproc/p5-Plucene-Simple/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Plucene::Simple.3.gz
 %%SITE_PERL%%/Plucene/Simple.pm
-@dirrmtry %%SITE_PERL%%/Plucene
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index d36bfdba90d8..7d5873e36f39 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Plucene
 PORTVERSION=	1.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TMTM
diff --git a/textproc/p5-Plucene/pkg-plist b/textproc/p5-Plucene/pkg-plist
index d7ddd5e3e530..10f9d94ee56a 100644
--- a/textproc/p5-Plucene/pkg-plist
+++ b/textproc/p5-Plucene/pkg-plist
@@ -65,7 +65,6 @@
 %%PERL5_MAN3%%/Plucene::Store::OutputStream.3.gz
 %%PERL5_MAN3%%/Plucene::TestCase.3.gz
 %%PERL5_MAN3%%/Plucene::Utils.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/.packlist
 %%SITE_PERL%%/Plucene.pm
 %%SITE_PERL%%/Plucene/Bitvector.pm
 %%SITE_PERL%%/Plucene/Document.pm
@@ -133,12 +132,3 @@
 %%SITE_PERL%%/Plucene/Document/DateSerializer.pm
 %%SITE_PERL%%/Plucene/Store/OutputStream.pm
 %%SITE_PERL%%/Plucene/Store/InputStream.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene
-@dirrm %%SITE_PERL%%/Plucene/Analysis/Standard
-@dirrmtry %%SITE_PERL%%/Plucene/Analysis
-@dirrmtry %%SITE_PERL%%/Plucene/Search/PhraseScorer
-@dirrmtry %%SITE_PERL%%/Plucene/Search
-@dirrmtry %%SITE_PERL%%/Plucene/Index
-@dirrmtry %%SITE_PERL%%/Plucene/Document
-@dirrmtry %%SITE_PERL%%/Plucene/Store
-@dirrmtry %%SITE_PERL%%/Plucene
diff --git a/textproc/p5-Pod-Abstract/Makefile b/textproc/p5-Pod-Abstract/Makefile
index 6d009a9506ce..a026a498e53e 100644
--- a/textproc/p5-Pod-Abstract/Makefile
+++ b/textproc/p5-Pod-Abstract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Abstract
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Abstract/pkg-plist b/textproc/p5-Pod-Abstract/pkg-plist
index a15be7b407b7..049d695a1299 100644
--- a/textproc/p5-Pod-Abstract/pkg-plist
+++ b/textproc/p5-Pod-Abstract/pkg-plist
@@ -35,10 +35,4 @@ bin/paf
 %%SITE_PERL%%/Pod/Abstract/Path.pm
 %%SITE_PERL%%/Pod/Abstract/Serial.pm
 %%SITE_PERL%%/Pod/Abstract/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Abstract/.packlist
 man/man1/paf.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Abstract
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/Abstract/Filter
-@dirrmtry %%SITE_PERL%%/Pod/Abstract
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Autopod/Makefile b/textproc/p5-Pod-Autopod/Makefile
index fba34f2946ad..6c46bb80b897 100644
--- a/textproc/p5-Pod-Autopod/Makefile
+++ b/textproc/p5-Pod-Autopod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Autopod
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AHERNIT
diff --git a/textproc/p5-Pod-Autopod/pkg-plist b/textproc/p5-Pod-Autopod/pkg-plist
index 5c32a37417d9..d61b6a151508 100644
--- a/textproc/p5-Pod-Autopod/pkg-plist
+++ b/textproc/p5-Pod-Autopod/pkg-plist
@@ -1,8 +1,4 @@
 bin/autopod
 %%PERL5_MAN3%%/Pod::Autopod.3.gz
 %%SITE_PERL%%/Pod/Autopod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Autopod/.packlist
 man/man1/autopod.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Autopod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile
index e7fc9a367999..bb10e1344baa 100644
--- a/textproc/p5-Pod-Constants/Makefile
+++ b/textproc/p5-Pod-Constants/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pod-Constants
 PORTVERSION=	0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAMV
diff --git a/textproc/p5-Pod-Constants/pkg-plist b/textproc/p5-Pod-Constants/pkg-plist
index cefac3d22879..1fcc87b76dc0 100644
--- a/textproc/p5-Pod-Constants/pkg-plist
+++ b/textproc/p5-Pod-Constants/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Pod::Constants.3.gz
 %%SITE_PERL%%/Pod/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-DocBook/Makefile b/textproc/p5-Pod-DocBook/Makefile
index aa3bf7eb8186..bd59e05f1dfb 100644
--- a/textproc/p5-Pod-DocBook/Makefile
+++ b/textproc/p5-Pod-DocBook/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pod-DocBook
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NANDU
diff --git a/textproc/p5-Pod-DocBook/pkg-plist b/textproc/p5-Pod-DocBook/pkg-plist
index caa677c756b0..5a46e5c65ec6 100644
--- a/textproc/p5-Pod-DocBook/pkg-plist
+++ b/textproc/p5-Pod-DocBook/pkg-plist
@@ -1,8 +1,4 @@
 bin/pod2docbook
 %%PERL5_MAN3%%/Pod::DocBook.3.gz
 %%SITE_PERL%%/Pod/DocBook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/DocBook/.packlist
 man/man1/pod2docbook.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/DocBook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Elemental/Makefile b/textproc/p5-Pod-Elemental/Makefile
index 83999b91aa6b..5ecc33bf5fd2 100644
--- a/textproc/p5-Pod-Elemental/Makefile
+++ b/textproc/p5-Pod-Elemental/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pod-Elemental
 PORTVERSION=	0.103001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Elemental/pkg-plist b/textproc/p5-Pod-Elemental/pkg-plist
index a4a353e59d5a..b7650b5410c7 100644
--- a/textproc/p5-Pod-Elemental/pkg-plist
+++ b/textproc/p5-Pod-Elemental/pkg-plist
@@ -24,7 +24,6 @@
 %%SITE_PERL%%/Pod/Elemental/Transformer/Nester.pm
 %%SITE_PERL%%/Pod/Elemental/Transformer/Pod5.pm
 %%SITE_PERL%%/Pod/Elemental/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Elemental/.packlist
 %%PERL5_MAN3%%/Pod::Elemental.3.gz
 %%PERL5_MAN3%%/Pod::Elemental::Autoblank.3.gz
 %%PERL5_MAN3%%/Pod::Elemental::Autochomp.3.gz
@@ -51,11 +50,3 @@
 %%PERL5_MAN3%%/Pod::Elemental::Transformer::Nester.3.gz
 %%PERL5_MAN3%%/Pod::Elemental::Transformer::Pod5.3.gz
 %%PERL5_MAN3%%/Pod::Elemental::Types.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Elemental
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrm %%SITE_PERL%%/Pod/Elemental/Transformer
-@dirrm %%SITE_PERL%%/Pod/Elemental/Element/Pod5
-@dirrm %%SITE_PERL%%/Pod/Elemental/Element/Generic
-@dirrm %%SITE_PERL%%/Pod/Elemental/Element
-@dirrm %%SITE_PERL%%/Pod/Elemental
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Escapes/Makefile b/textproc/p5-Pod-Escapes/Makefile
index a8d731b50542..5b8801b30649 100644
--- a/textproc/p5-Pod-Escapes/Makefile
+++ b/textproc/p5-Pod-Escapes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Escapes
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Escapes/pkg-plist b/textproc/p5-Pod-Escapes/pkg-plist
index ccb7d23b8378..fe7e3db27626 100644
--- a/textproc/p5-Pod-Escapes/pkg-plist
+++ b/textproc/p5-Pod-Escapes/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Pod::Escapes.3.gz
 %%SITE_PERL%%/Pod/Escapes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Escapes/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Escapes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Eventual/Makefile b/textproc/p5-Pod-Eventual/Makefile
index 588c862da290..39f29c7cf536 100644
--- a/textproc/p5-Pod-Eventual/Makefile
+++ b/textproc/p5-Pod-Eventual/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Eventual
 PORTVERSION=	0.094001
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Eventual/pkg-plist b/textproc/p5-Pod-Eventual/pkg-plist
index 6006171fc138..fc3267dea52b 100644
--- a/textproc/p5-Pod-Eventual/pkg-plist
+++ b/textproc/p5-Pod-Eventual/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/Pod/Eventual.pm
 %%SITE_PERL%%/Pod/Eventual/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Eventual/.packlist
 %%PERL5_MAN3%%/Pod::Eventual.3.gz
 %%PERL5_MAN3%%/Pod::Eventual::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Eventual
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/Eventual
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-HtmlEasy/Makefile b/textproc/p5-Pod-HtmlEasy/Makefile
index 3bff221512c5..9baf90efdfe1 100644
--- a/textproc/p5-Pod-HtmlEasy/Makefile
+++ b/textproc/p5-Pod-HtmlEasy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-HtmlEasy
 PORTVERSION=	1.0108
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-HtmlEasy/pkg-plist b/textproc/p5-Pod-HtmlEasy/pkg-plist
index 24bbc5b04746..f5d8d273ee31 100644
--- a/textproc/p5-Pod-HtmlEasy/pkg-plist
+++ b/textproc/p5-Pod-HtmlEasy/pkg-plist
@@ -6,9 +6,4 @@ bin/podhtmleasy.sh
 %%SITE_PERL%%/Pod/HtmlEasy/Data.pm
 %%SITE_PERL%%/Pod/HtmlEasy/Parser.pm
 %%SITE_PERL%%/Pod/HtmlEasy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/HtmlEasy/.packlist
 man/man1/pod2indexed_html.pl.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/HtmlEasy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrm %%SITE_PERL%%/Pod/HtmlEasy
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Markdown/Makefile b/textproc/p5-Pod-Markdown/Makefile
index 86d0ba4579ee..15e3c8aba900 100644
--- a/textproc/p5-Pod-Markdown/Makefile
+++ b/textproc/p5-Pod-Markdown/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Markdown
 PORTVERSION=	1.401000
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Markdown/pkg-plist b/textproc/p5-Pod-Markdown/pkg-plist
index cbfdfa594e2f..193fe1a0c690 100644
--- a/textproc/p5-Pod-Markdown/pkg-plist
+++ b/textproc/p5-Pod-Markdown/pkg-plist
@@ -1,8 +1,4 @@
 bin/pod2markdown
 %%SITE_PERL%%/Pod/Markdown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Markdown/.packlist
 %%PERL5_MAN3%%/Pod::Markdown.3.gz
 man/man1/pod2markdown.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Markdown
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
index 882705f710d4..eb29de9d0a8a 100644
--- a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
+++ b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-POM-View-HTML-Filter
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist b/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist
index d6c0b1a3cedb..888b08b1ff24 100644
--- a/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist
+++ b/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist
@@ -1,12 +1,2 @@
 %%PERL5_MAN3%%/Pod::POM::View::HTML::Filter.3.gz
 %%SITE_PERL%%/Pod/POM/View/HTML/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML/Filter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/POM/View/HTML
-@dirrmtry %%SITE_PERL%%/Pod/POM/View
-@dirrmtry %%SITE_PERL%%/Pod/POM
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index a7dc0a2ad9fe..b74fdbf9539b 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-POM
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-POM/pkg-plist b/textproc/p5-Pod-POM/pkg-plist
index 20a131533fed..4349980fbbc6 100644
--- a/textproc/p5-Pod-POM/pkg-plist
+++ b/textproc/p5-Pod-POM/pkg-plist
@@ -46,13 +46,6 @@ bin/podlint
 %%SITE_PERL%%/Pod/POM/View/HTML.pm
 %%SITE_PERL%%/Pod/POM/View/Pod.pm
 %%SITE_PERL%%/Pod/POM/View/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/.packlist
 man/man1/podlint.1.gz
 man/man1/pom2.1.gz
 man/man1/pomdump.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/POM/View
-@dirrmtry %%SITE_PERL%%/Pod/POM/Node
-@dirrmtry %%SITE_PERL%%/Pod/POM
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Parser/Makefile b/textproc/p5-Pod-Parser/Makefile
index 496cbf07b66e..3f3f08b52263 100644
--- a/textproc/p5-Pod-Parser/Makefile
+++ b/textproc/p5-Pod-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Parser
 PORTVERSION=	1.62
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Parser/pkg-plist b/textproc/p5-Pod-Parser/pkg-plist
index 5574ee29b6a0..734d14e653e0 100644
--- a/textproc/p5-Pod-Parser/pkg-plist
+++ b/textproc/p5-Pod-Parser/pkg-plist
@@ -10,7 +10,3 @@
 %%SITE_PERL%%/Pod/Parser.pm
 %%SITE_PERL%%/Pod/PlainText.pm
 %%SITE_PERL%%/Pod/Select.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Perldoc/Makefile b/textproc/p5-Pod-Perldoc/Makefile
index 352425cde0da..8ade1bc222a6 100644
--- a/textproc/p5-Pod-Perldoc/Makefile
+++ b/textproc/p5-Pod-Perldoc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Perldoc
 PORTVERSION=	3.21
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Perldoc/pkg-plist b/textproc/p5-Pod-Perldoc/pkg-plist
index 7585d4f9f85c..de33f53f61b3 100644
--- a/textproc/p5-Pod-Perldoc/pkg-plist
+++ b/textproc/p5-Pod-Perldoc/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/Pod/Perldoc/ToText.pm
 %%SITE_PERL%%/Pod/Perldoc/ToTk.pm
 %%SITE_PERL%%/Pod/Perldoc/ToXml.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Perldoc/.packlist
 %%SITE_PERL%%/perldoc.pod
 %%PERL5_MAN3%%/Pod::Perldoc::ToTerm.3.gz
 %%PERL5_MAN3%%/Pod::Perldoc::ToPod.3.gz
@@ -27,7 +26,3 @@
 %%PERL5_MAN3%%/Pod::Perldoc::ToXml.3.gz
 %%PERL5_MAN3%%/Pod::Perldoc::ToANSI.3.gz
 %%PERL5_MAN3%%/Pod::Perldoc.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Perldoc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrm %%SITE_PERL%%/Pod/Perldoc
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-ProjectDocs/Makefile b/textproc/p5-Pod-ProjectDocs/Makefile
index ad978f690e1e..c0d0ce42c8e6 100644
--- a/textproc/p5-Pod-ProjectDocs/Makefile
+++ b/textproc/p5-Pod-ProjectDocs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-ProjectDocs
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-ProjectDocs/pkg-plist b/textproc/p5-Pod-ProjectDocs/pkg-plist
index a9909de199fb..b0d953299402 100644
--- a/textproc/p5-Pod-ProjectDocs/pkg-plist
+++ b/textproc/p5-Pod-ProjectDocs/pkg-plist
@@ -12,10 +12,4 @@ bin/pod2projdocs
 %%SITE_PERL%%/Pod/ProjectDocs/Parser/JavaScriptPod.pm
 %%SITE_PERL%%/Pod/ProjectDocs/Parser/PerlPod.pm
 %%SITE_PERL%%/Pod/ProjectDocs/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/ProjectDocs/.packlist
 man/man1/pod2projdocs.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/ProjectDocs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/ProjectDocs/Parser
-@dirrmtry %%SITE_PERL%%/Pod/ProjectDocs
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Readme/Makefile b/textproc/p5-Pod-Readme/Makefile
index c434e2f6a811..2fb5786fd700 100644
--- a/textproc/p5-Pod-Readme/Makefile
+++ b/textproc/p5-Pod-Readme/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Pod-Readme
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Readme/pkg-plist b/textproc/p5-Pod-Readme/pkg-plist
index 7471073122ac..118857c780b3 100644
--- a/textproc/p5-Pod-Readme/pkg-plist
+++ b/textproc/p5-Pod-Readme/pkg-plist
@@ -1,8 +1,4 @@
 bin/pod2readme
 %%PERL5_MAN3%%/Pod::Readme.3.gz
 %%SITE_PERL%%/Pod/Readme.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Readme/.packlist
 man/man1/pod2readme.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Readme
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Simple/Makefile b/textproc/p5-Pod-Simple/Makefile
index 1ea4d9eddf79..46c8e8efe76c 100644
--- a/textproc/p5-Pod-Simple/Makefile
+++ b/textproc/p5-Pod-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Simple
 PORTVERSION=	3.28
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DWHEELER
diff --git a/textproc/p5-Pod-Simple/pkg-plist b/textproc/p5-Pod-Simple/pkg-plist
index 8d9f47e3175e..cdf2baa1f5d3 100644
--- a/textproc/p5-Pod-Simple/pkg-plist
+++ b/textproc/p5-Pod-Simple/pkg-plist
@@ -50,8 +50,3 @@
 %%SITE_PERL%%/Pod/Simple/TranscodeSmart.pm
 %%SITE_PERL%%/Pod/Simple/XHTML.pm
 %%SITE_PERL%%/Pod/Simple/XMLOutStream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/Simple
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Spell/Makefile b/textproc/p5-Pod-Spell/Makefile
index 247e5a2228d1..41d5cd941dad 100644
--- a/textproc/p5-Pod-Spell/Makefile
+++ b/textproc/p5-Pod-Spell/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Pod-Spell
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Spell/pkg-plist b/textproc/p5-Pod-Spell/pkg-plist
index 003b43eca6ad..69c2ee7f4c7a 100644
--- a/textproc/p5-Pod-Spell/pkg-plist
+++ b/textproc/p5-Pod-Spell/pkg-plist
@@ -1,12 +1,7 @@
 bin/podspell
 %%SITE_PERL%%/Pod/Spell.pm
 %%SITE_PERL%%/Pod/Wordlist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Spell/.packlist
 %%SITE_PERL%%/auto/share/dist/Pod-Spell/wordlist
 man/man1/podspell.1.gz
 %%PERL5_MAN3%%/Pod::Spell.3.gz
 %%PERL5_MAN3%%/Pod::Wordlist.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Spell
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Pod-Spell
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Strip/Makefile b/textproc/p5-Pod-Strip/Makefile
index f36459603784..f21cf4173d2e 100644
--- a/textproc/p5-Pod-Strip/Makefile
+++ b/textproc/p5-Pod-Strip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pod-Strip
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Pod
diff --git a/textproc/p5-Pod-Strip/pkg-plist b/textproc/p5-Pod-Strip/pkg-plist
index 0f215bbf1e6f..e2e06e1a6285 100644
--- a/textproc/p5-Pod-Strip/pkg-plist
+++ b/textproc/p5-Pod-Strip/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Pod::Strip.3.gz
 %%SITE_PERL%%/Pod/Strip.pm
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Stripper/Makefile b/textproc/p5-Pod-Stripper/Makefile
index 26d277b75fb8..45bc2008611c 100644
--- a/textproc/p5-Pod-Stripper/Makefile
+++ b/textproc/p5-Pod-Stripper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pod-Stripper
 PORTVERSION=	0.22
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Stripper/pkg-plist b/textproc/p5-Pod-Stripper/pkg-plist
index ba12fefd5da5..d0e04bb9c04d 100644
--- a/textproc/p5-Pod-Stripper/pkg-plist
+++ b/textproc/p5-Pod-Stripper/pkg-plist
@@ -1,8 +1,4 @@
 bin/podstrip
 %%PERL5_MAN3%%/Pod::Stripper.3.gz
 %%SITE_PERL%%/Pod/Stripper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Stripper/.packlist
 man/man1/podstrip.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Stripper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Tree/Makefile b/textproc/p5-Pod-Tree/Makefile
index 55b5d0fc7511..1d2acc36bab8 100644
--- a/textproc/p5-Pod-Tree/Makefile
+++ b/textproc/p5-Pod-Tree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Tree
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Tree/pkg-plist b/textproc/p5-Pod-Tree/pkg-plist
index 3ba31214749d..98d512f8d383 100644
--- a/textproc/p5-Pod-Tree/pkg-plist
+++ b/textproc/p5-Pod-Tree/pkg-plist
@@ -25,12 +25,7 @@ bin/podtree2html
 %%SITE_PERL%%/Pod/Tree/PerlTop.pm
 %%SITE_PERL%%/Pod/Tree/PerlUtil.pm
 %%SITE_PERL%%/Pod/Tree/Pod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tree/.packlist
 man/man1/mod2html.1.gz
 man/man1/perl2html.1.gz
 man/man1/pods2html.1.gz
 man/man1/podtree2html.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/Tree
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-WSDL/Makefile b/textproc/p5-Pod-WSDL/Makefile
index f2458b56cf7e..6ccf56b39bd2 100644
--- a/textproc/p5-Pod-WSDL/Makefile
+++ b/textproc/p5-Pod-WSDL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-WSDL
 PORTVERSION=	0.061
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-WSDL/pkg-plist b/textproc/p5-Pod-WSDL/pkg-plist
index 3523e288f6fc..82b76646a062 100644
--- a/textproc/p5-Pod-WSDL/pkg-plist
+++ b/textproc/p5-Pod-WSDL/pkg-plist
@@ -20,8 +20,3 @@
 %%SITE_PERL%%/Pod/WSDL/Type.pm
 %%SITE_PERL%%/Pod/WSDL/Utils.pm
 %%SITE_PERL%%/Pod/WSDL/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/WSDL/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/WSDL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/WSDL
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-WikiDoc/Makefile b/textproc/p5-Pod-WikiDoc/Makefile
index d49a964b0394..039fef062293 100644
--- a/textproc/p5-Pod-WikiDoc/Makefile
+++ b/textproc/p5-Pod-WikiDoc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-WikiDoc
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-WikiDoc/pkg-plist b/textproc/p5-Pod-WikiDoc/pkg-plist
index 65db697078eb..0c2454fffdb7 100644
--- a/textproc/p5-Pod-WikiDoc/pkg-plist
+++ b/textproc/p5-Pod-WikiDoc/pkg-plist
@@ -7,4 +7,3 @@ man/man1/wikidoc.1.gz
 %%SITE_PERL%%/Pod/WikiDoc/Cookbook.pod
 %%SITE_PERL%%/Pod/WikiDoc/Parser.pm
 %%SITE_PERL%%/Pod/WikiDoc/Parser.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/WikiDoc/.packlist
diff --git a/textproc/p5-Pod-XML/Makefile b/textproc/p5-Pod-XML/Makefile
index 7600a08f010f..26d257e8f789 100644
--- a/textproc/p5-Pod-XML/Makefile
+++ b/textproc/p5-Pod-XML/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pod-XML
 PORTVERSION=	0.99
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-XML/pkg-plist b/textproc/p5-Pod-XML/pkg-plist
index 8f641b052453..fdc42e6e3477 100644
--- a/textproc/p5-Pod-XML/pkg-plist
+++ b/textproc/p5-Pod-XML/pkg-plist
@@ -1,8 +1,4 @@
 bin/pod2xml
 %%PERL5_MAN3%%/Pod::XML.3.gz
 %%SITE_PERL%%/Pod/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/XML/.packlist
 man/man1/pod2xml.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Xhtml/Makefile b/textproc/p5-Pod-Xhtml/Makefile
index 1b0f2d2d925d..6395a0980162 100644
--- a/textproc/p5-Pod-Xhtml/Makefile
+++ b/textproc/p5-Pod-Xhtml/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pod-Xhtml
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Pod-Xhtml/pkg-plist b/textproc/p5-Pod-Xhtml/pkg-plist
index 9e88b6cd24ac..803b2fb74d2a 100644
--- a/textproc/p5-Pod-Xhtml/pkg-plist
+++ b/textproc/p5-Pod-Xhtml/pkg-plist
@@ -3,9 +3,4 @@ bin/pod2xhtml
 %%PERL5_MAN3%%/Pod::Xhtml.3.gz
 %%SITE_PERL%%/Pod/Hyperlink/BounceURL.pm
 %%SITE_PERL%%/Pod/Xhtml.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Xhtml/.packlist
 man/man1/pod2xhtml.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Xhtml
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/Hyperlink
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-RADIUS-UserFile/Makefile b/textproc/p5-RADIUS-UserFile/Makefile
index aec845ca9953..251c4e8feb24 100644
--- a/textproc/p5-RADIUS-UserFile/Makefile
+++ b/textproc/p5-RADIUS-UserFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RADIUS-UserFile
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RADIUS-UserFile/pkg-plist b/textproc/p5-RADIUS-UserFile/pkg-plist
index a60070930dba..0c1fdb12ad03 100644
--- a/textproc/p5-RADIUS-UserFile/pkg-plist
+++ b/textproc/p5-RADIUS-UserFile/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/RADIUS::UserFile.3.gz
 %%SITE_PERL%%/RADIUS/UserFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS
-@dirrmtry %%SITE_PERL%%/RADIUS
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index eb71829654dd..04314d0643a1 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RDF-Core
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RDF-Core/pkg-plist b/textproc/p5-RDF-Core/pkg-plist
index b641f1764241..fc6ea6d49ee1 100644
--- a/textproc/p5-RDF-Core/pkg-plist
+++ b/textproc/p5-RDF-Core/pkg-plist
@@ -48,7 +48,6 @@
 %%SITE_PERL%%/RDF/Core/Storage/DB_File.pm
 %%SITE_PERL%%/RDF/Core/Storage/Memory.pm
 %%SITE_PERL%%/RDF/Core/Storage/Postgres.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/RDF-Core.html
 %%PORTDOCS%%%%DOCSDIR%%/RDF/Core.pm.html
 %%PORTDOCS%%%%DOCSDIR%%/RDF/Core/Constants.pm.html
@@ -81,10 +80,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/RDF/Core
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/RDF
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
-@dirrmtry %%SITE_PERL%%/RDF/Core/Storage
-@dirrmtry %%SITE_PERL%%/RDF/Core/Model
-@dirrmtry %%SITE_PERL%%/RDF/Core/Enumerator
-@dirrmtry %%SITE_PERL%%/RDF/Core
-@dirrmtry %%SITE_PERL%%/RDF
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index d938e4842565..e1503cba8f01 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	RDF-Notation3
 PORTVERSION=	0.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RDF-Notation3/pkg-plist b/textproc/p5-RDF-Notation3/pkg-plist
index f48f113d1259..54f0a4aec79b 100644
--- a/textproc/p5-RDF-Notation3/pkg-plist
+++ b/textproc/p5-RDF-Notation3/pkg-plist
@@ -23,9 +23,3 @@
 %%SITE_PERL%%/RDF/Notation3/Template/TXML.pm
 %%SITE_PERL%%/RDF/Notation3/Triples.pm
 %%SITE_PERL%%/RDF/Notation3/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Notation3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Notation3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
-@dirrmtry %%SITE_PERL%%/RDF/Notation3/Template
-@dirrmtry %%SITE_PERL%%/RDF/Notation3
-@dirrmtry %%SITE_PERL%%/RDF
diff --git a/textproc/p5-RDF-Simple/Makefile b/textproc/p5-RDF-Simple/Makefile
index 82c86d20c65f..ee2d4c2bb6e3 100644
--- a/textproc/p5-RDF-Simple/Makefile
+++ b/textproc/p5-RDF-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RDF-Simple
 PORTVERSION=	0.41.5
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RDF-Simple/pkg-plist b/textproc/p5-RDF-Simple/pkg-plist
index e7b3ce27ccc4..91228eeacfeb 100644
--- a/textproc/p5-RDF-Simple/pkg-plist
+++ b/textproc/p5-RDF-Simple/pkg-plist
@@ -12,9 +12,3 @@
 %%SITE_PERL%%/RDF/Simple/Parser/Handler.pm
 %%SITE_PERL%%/RDF/Simple/Serialiser.pm
 %%SITE_PERL%%/RDF/Simple/Serializer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
-@dirrmtry %%SITE_PERL%%/RDF/Simple/Parser
-@dirrmtry %%SITE_PERL%%/RDF/Simple
-@dirrmtry %%SITE_PERL%%/RDF
diff --git a/textproc/p5-RDF-Trine/Makefile b/textproc/p5-RDF-Trine/Makefile
index 00b010d5daad..1ae5b46c5ae5 100644
--- a/textproc/p5-RDF-Trine/Makefile
+++ b/textproc/p5-RDF-Trine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RDF-Trine
 PORTVERSION=	1.008
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RDF-Trine/pkg-plist b/textproc/p5-RDF-Trine/pkg-plist
index 58cda82577c7..d59729864ed6 100644
--- a/textproc/p5-RDF-Trine/pkg-plist
+++ b/textproc/p5-RDF-Trine/pkg-plist
@@ -130,24 +130,3 @@ bin/srx2table
 %%SITE_PERL%%/RDF/Trine/Store/SPARQL.pm
 %%SITE_PERL%%/RDF/Trine/VariableBindings.pm
 %%SITE_PERL%%/Test/RDF/Trine/Store.pm
-%%SITE_PERL%%/mach/auto/RDF/Trine/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/RDF/Trine
-@dirrmtry %%SITE_PERL%%/mach/auto/RDF
-@dirrm %%SITE_PERL%%/Test/RDF/Trine
-@dirrmtry %%SITE_PERL%%/Test/RDF
-@dirrmtry %%SITE_PERL%%/Test
-@dirrm %%SITE_PERL%%/RDF/Trine/Store/DBI
-@dirrm %%SITE_PERL%%/RDF/Trine/Store
-@dirrm %%SITE_PERL%%/RDF/Trine/Statement
-@dirrm %%SITE_PERL%%/RDF/Trine/Serializer/NTriples
-@dirrm %%SITE_PERL%%/RDF/Trine/Serializer
-@dirrm %%SITE_PERL%%/RDF/Trine/Parser/Turtle
-@dirrm %%SITE_PERL%%/RDF/Trine/Parser
-@dirrm %%SITE_PERL%%/RDF/Trine/Node
-@dirrm %%SITE_PERL%%/RDF/Trine/Model
-@dirrm %%SITE_PERL%%/RDF/Trine/Iterator/Graph
-@dirrm %%SITE_PERL%%/RDF/Trine/Iterator/Bindings
-@dirrm %%SITE_PERL%%/RDF/Trine/Iterator
-@dirrm %%SITE_PERL%%/RDF/Trine/Exporter
-@dirrm %%SITE_PERL%%/RDF/Trine
-@dirrmtry %%SITE_PERL%%/RDF
diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index 93a9cf3c62db..850c61897ea4 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	RDFStore
 PORTVERSION=	0.51
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AREGGIORI
diff --git a/textproc/p5-RDFStore/pkg-plist b/textproc/p5-RDFStore/pkg-plist
index fd23f6fffdf1..472cd5650968 100644
--- a/textproc/p5-RDFStore/pkg-plist
+++ b/textproc/p5-RDFStore/pkg-plist
@@ -28,57 +28,43 @@ bin/rdfquery.pl
 %%PERL5_MAN3%%/RDFStore::Vocabulary::Generator.3.gz
 %%PERL5_MAN3%%/RDQL::Parser.3.gz
 %%PERL5_MAN3%%/Util::BLOB.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/RDFStore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBMS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Digest/Digestable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Literal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Model.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/NodeFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/NTriples.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/SiRPAC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/Styles/RDFStore/Model.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/Styles/RDFStore/Statement.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/RDFNode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Resource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/SchemaModel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer/NTriples.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer/RDFXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer/RSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Statement.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Util/Digest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Util/UTF8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/VirtualModel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DCQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DCT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/FOAF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/Generator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/OWL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RDF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RDFS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RDFStoreContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/RDQL/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Util/BLOB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBMS/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/RDFStore.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Util
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDQL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Util
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/Styles/RDFStore
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/Styles
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
+%%SITE_ARCH%%/DBD/RDFStore.pm
+%%SITE_ARCH%%/DBMS.pm
+%%SITE_ARCH%%/RDFStore.pm
+%%SITE_ARCH%%/RDFStore/Digest/Digestable.pm
+%%SITE_ARCH%%/RDFStore/Literal.pm
+%%SITE_ARCH%%/RDFStore/Model.pm
+%%SITE_ARCH%%/RDFStore/NodeFactory.pm
+%%SITE_ARCH%%/RDFStore/Object.pm
+%%SITE_ARCH%%/RDFStore/Parser.pm
+%%SITE_ARCH%%/RDFStore/Parser/NTriples.pm
+%%SITE_ARCH%%/RDFStore/Parser/SiRPAC.pm
+%%SITE_ARCH%%/RDFStore/Parser/Styles/RDFStore/Model.pm
+%%SITE_ARCH%%/RDFStore/Parser/Styles/RDFStore/Statement.pm
+%%SITE_ARCH%%/RDFStore/RDFNode.pm
+%%SITE_ARCH%%/RDFStore/Resource.pm
+%%SITE_ARCH%%/RDFStore/SchemaModel.pm
+%%SITE_ARCH%%/RDFStore/Serializer.pm
+%%SITE_ARCH%%/RDFStore/Serializer/NTriples.pm
+%%SITE_ARCH%%/RDFStore/Serializer/RDFXML.pm
+%%SITE_ARCH%%/RDFStore/Serializer/RSS.pm
+%%SITE_ARCH%%/RDFStore/Statement.pm
+%%SITE_ARCH%%/RDFStore/Util/Digest.pm
+%%SITE_ARCH%%/RDFStore/Util/UTF8.pm
+%%SITE_ARCH%%/RDFStore/VirtualModel.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/DAML.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/DC.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/DCQ.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/DCT.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/FOAF.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/Generator.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/OWL.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/RDF.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/RDFS.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/RDFStoreContext.pm
+%%SITE_ARCH%%/RDFStore/Vocabulary/RSS.pm
+%%SITE_ARCH%%/RDQL/Parser.pm
+%%SITE_ARCH%%/Util/BLOB.pm
+%%SITE_ARCH%%/auto/DBMS/autosplit.ix
+%%SITE_ARCH%%/auto/RDFStore/RDFStore.so
+%%SITE_ARCH%%/auto/RDFStore/autosplit.ix
diff --git a/textproc/p5-RTF-Parser/Makefile b/textproc/p5-RTF-Parser/Makefile
index bab8f6884b7b..17f6a222dd14 100644
--- a/textproc/p5-RTF-Parser/Makefile
+++ b/textproc/p5-RTF-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RTF-Parser
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RTF-Parser/pkg-plist b/textproc/p5-RTF-Parser/pkg-plist
index ae8f24069a42..004248dac31f 100644
--- a/textproc/p5-RTF-Parser/pkg-plist
+++ b/textproc/p5-RTF-Parser/pkg-plist
@@ -14,11 +14,3 @@ bin/rtf2text
 %%SITE_PERL%%/RTF/TEXT/Converter.pm
 %%SITE_PERL%%/RTF/TEXT/Converter/ansi.pm
 %%SITE_PERL%%/RTF/TEXT/Converter/charmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Parser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF
-@dirrmtry %%SITE_PERL%%/RTF/TEXT/Converter
-@dirrmtry %%SITE_PERL%%/RTF/TEXT
-@dirrmtry %%SITE_PERL%%/RTF/HTML/Converter
-@dirrmtry %%SITE_PERL%%/RTF/HTML
-@dirrmtry %%SITE_PERL%%/RTF
diff --git a/textproc/p5-RTF-Tokenizer/Makefile b/textproc/p5-RTF-Tokenizer/Makefile
index d765adb72a37..c507b1db0465 100644
--- a/textproc/p5-RTF-Tokenizer/Makefile
+++ b/textproc/p5-RTF-Tokenizer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RTF-Tokenizer
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RTF-Tokenizer/pkg-plist b/textproc/p5-RTF-Tokenizer/pkg-plist
index b19ce7d56777..309017ce13e5 100644
--- a/textproc/p5-RTF-Tokenizer/pkg-plist
+++ b/textproc/p5-RTF-Tokenizer/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/RTF::Tokenizer.3.gz
 %%SITE_PERL%%/RTF/Tokenizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Tokenizer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Tokenizer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF
-@dirrmtry %%SITE_PERL%%/RTF
diff --git a/textproc/p5-RTF-Writer/Makefile b/textproc/p5-RTF-Writer/Makefile
index daace2a4f0bc..82618a54e118 100644
--- a/textproc/p5-RTF-Writer/Makefile
+++ b/textproc/p5-RTF-Writer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RTF-Writer
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-RTF-Writer/pkg-plist b/textproc/p5-RTF-Writer/pkg-plist
index 951fb5d144a8..ee6a230db2a7 100644
--- a/textproc/p5-RTF-Writer/pkg-plist
+++ b/textproc/p5-RTF-Writer/pkg-plist
@@ -5,8 +5,3 @@
 %%SITE_PERL%%/RTF/Writer.pm
 %%SITE_PERL%%/RTF/Writer.pod
 %%SITE_PERL%%/RTF/Writer/TableRowDecl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Writer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Writer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF
-@dirrmtry %%SITE_PERL%%/RTF/Writer
-@dirrmtry %%SITE_PERL%%/RTF
diff --git a/textproc/p5-Regex-PreSuf/Makefile b/textproc/p5-Regex-PreSuf/Makefile
index c003584856e4..7fcb26ba1a44 100644
--- a/textproc/p5-Regex-PreSuf/Makefile
+++ b/textproc/p5-Regex-PreSuf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regex-PreSuf
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JHI
diff --git a/textproc/p5-Regex-PreSuf/pkg-plist b/textproc/p5-Regex-PreSuf/pkg-plist
index 30e4a2af71dd..4c374a3934dd 100644
--- a/textproc/p5-Regex-PreSuf/pkg-plist
+++ b/textproc/p5-Regex-PreSuf/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Regex::PreSuf.3.gz
 %%SITE_PERL%%/Regex/PreSuf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex/PreSuf/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex/PreSuf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex
-@dirrmtry %%SITE_PERL%%/Regex
diff --git a/textproc/p5-Regexp-Common-Email-Address/Makefile b/textproc/p5-Regexp-Common-Email-Address/Makefile
index 125962124d9e..ab3dbc3a473d 100644
--- a/textproc/p5-Regexp-Common-Email-Address/Makefile
+++ b/textproc/p5-Regexp-Common-Email-Address/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Common-Email-Address
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-Common-Email-Address/pkg-plist b/textproc/p5-Regexp-Common-Email-Address/pkg-plist
index 69c8f7def175..1a2e8d3c73f5 100644
--- a/textproc/p5-Regexp-Common-Email-Address/pkg-plist
+++ b/textproc/p5-Regexp-Common-Email-Address/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Regexp::Common::Email::Address.3.gz
 %%SITE_PERL%%/Regexp/Common/Email/Address.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/Email/Address/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/Email/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrmtry %%SITE_PERL%%/Regexp/Common/Email
-@dirrmtry %%SITE_PERL%%/Regexp/Common
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Common-net-CIDR/Makefile b/textproc/p5-Regexp-Common-net-CIDR/Makefile
index c0e4235ab149..f8222ed7f642 100644
--- a/textproc/p5-Regexp-Common-net-CIDR/Makefile
+++ b/textproc/p5-Regexp-Common-net-CIDR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Common-net-CIDR
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-Common-net-CIDR/pkg-plist b/textproc/p5-Regexp-Common-net-CIDR/pkg-plist
index c27f96ed897f..37e42852f070 100644
--- a/textproc/p5-Regexp-Common-net-CIDR/pkg-plist
+++ b/textproc/p5-Regexp-Common-net-CIDR/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Regexp::Common::net::CIDR.3.gz
 %%SITE_PERL%%/Regexp/Common/net/CIDR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/net/CIDR/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/net/CIDR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrmtry %%SITE_PERL%%/Regexp/Common/net
-@dirrmtry %%SITE_PERL%%/Regexp/Common
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Common-profanity_us/Makefile b/textproc/p5-Regexp-Common-profanity_us/Makefile
index 5e4f51360885..7473765cd5de 100644
--- a/textproc/p5-Regexp-Common-profanity_us/Makefile
+++ b/textproc/p5-Regexp-Common-profanity_us/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Common-profanity_us
 PORTVERSION=	4.112150
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-Common-profanity_us/pkg-plist b/textproc/p5-Regexp-Common-profanity_us/pkg-plist
index 1f6446761135..fe196a5a5805 100644
--- a/textproc/p5-Regexp-Common-profanity_us/pkg-plist
+++ b/textproc/p5-Regexp-Common-profanity_us/pkg-plist
@@ -1,11 +1,4 @@
 %%SITE_PERL%%/Regexp/Common/profanity_us.pm
 %%SITE_PERL%%/Regexp/Profanity/US.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/profanity_us/.packlist
 %%PERL5_MAN3%%/Regexp::Common::profanity_us.3.gz
 %%PERL5_MAN3%%/Regexp::Profanity::US.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/profanity_us
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrmtry %%SITE_PERL%%/Regexp/Profanity
-@dirrmtry %%SITE_PERL%%/Regexp/Common
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Common/Makefile b/textproc/p5-Regexp-Common/Makefile
index c87ce8ca42c4..0b8b58a007c3 100644
--- a/textproc/p5-Regexp-Common/Makefile
+++ b/textproc/p5-Regexp-Common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Common
 PORTVERSION=	2013031301
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-Common/pkg-plist b/textproc/p5-Regexp-Common/pkg-plist
index 612079e064c4..74bfb97791ed 100644
--- a/textproc/p5-Regexp-Common/pkg-plist
+++ b/textproc/p5-Regexp-Common/pkg-plist
@@ -31,7 +31,6 @@
 %%PERL5_MAN3%%/Regexp::Common::profanity.3.gz
 %%PERL5_MAN3%%/Regexp::Common::whitespace.3.gz
 %%PERL5_MAN3%%/Regexp::Common::zip.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common/.packlist
 %%SITE_PERL%%/Regexp/Common/CC.pm
 %%SITE_PERL%%/Regexp/Common/SEN.pm
 %%SITE_PERL%%/Regexp/Common/URI/fax.pm
@@ -65,8 +64,3 @@
 %%SITE_PERL%%/Regexp/Common/list.pm
 %%SITE_PERL%%/Regexp/Common/profanity.pm
 %%SITE_PERL%%/Regexp/Common.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrm %%SITE_PERL%%/Regexp/Common/URI
-@dirrm %%SITE_PERL%%/Regexp/Common
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Copy/Makefile b/textproc/p5-Regexp-Copy/Makefile
index 15aa1e48b058..9df6ed3a8f18 100644
--- a/textproc/p5-Regexp-Copy/Makefile
+++ b/textproc/p5-Regexp-Copy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Regexp-Copy
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JDUNCAN
diff --git a/textproc/p5-Regexp-Copy/pkg-plist b/textproc/p5-Regexp-Copy/pkg-plist
index 9d70253aeb3c..9d17fd8549ad 100644
--- a/textproc/p5-Regexp-Copy/pkg-plist
+++ b/textproc/p5-Regexp-Copy/pkg-plist
@@ -1,9 +1,5 @@
 %%PERL5_MAN3%%/Regexp::Copy.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Regexp/Copy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Regexp/Storable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Copy/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Copy/Copy.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Copy/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Copy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Regexp
+%%SITE_ARCH%%/Regexp/Copy.pm
+%%SITE_ARCH%%/Regexp/Storable.pm
+%%SITE_ARCH%%/auto/Regexp/Copy/Copy.so
+%%SITE_ARCH%%/auto/Regexp/Copy/autosplit.ix
diff --git a/textproc/p5-Regexp-DefaultFlags/Makefile b/textproc/p5-Regexp-DefaultFlags/Makefile
index 18be64b61743..d079698f0f7b 100644
--- a/textproc/p5-Regexp-DefaultFlags/Makefile
+++ b/textproc/p5-Regexp-DefaultFlags/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-DefaultFlags
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-DefaultFlags/pkg-plist b/textproc/p5-Regexp-DefaultFlags/pkg-plist
index 99f179aabe79..487f5629487a 100644
--- a/textproc/p5-Regexp-DefaultFlags/pkg-plist
+++ b/textproc/p5-Regexp-DefaultFlags/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Regexp/DefaultFlags.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/DefaultFlags/.packlist
 %%PERL5_MAN3%%/Regexp::DefaultFlags.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/DefaultFlags
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-IPv6/Makefile b/textproc/p5-Regexp-IPv6/Makefile
index d6537aeb29eb..309ddaf57fe0 100644
--- a/textproc/p5-Regexp-IPv6/Makefile
+++ b/textproc/p5-Regexp-IPv6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-IPv6
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-IPv6/pkg-plist b/textproc/p5-Regexp-IPv6/pkg-plist
index c719236d1d65..24c24b1ef7dc 100644
--- a/textproc/p5-Regexp-IPv6/pkg-plist
+++ b/textproc/p5-Regexp-IPv6/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Regexp::IPv6.3.gz
 %%SITE_PERL%%/Regexp/IPv6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/IPv6/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/IPv6
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Log-Common/Makefile b/textproc/p5-Regexp-Log-Common/Makefile
index 9b67c2cf9065..3d8daab36ceb 100644
--- a/textproc/p5-Regexp-Log-Common/Makefile
+++ b/textproc/p5-Regexp-Log-Common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Log-Common
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-Log-Common/pkg-plist b/textproc/p5-Regexp-Log-Common/pkg-plist
index 6c8496e7a144..d767098f4060 100644
--- a/textproc/p5-Regexp-Log-Common/pkg-plist
+++ b/textproc/p5-Regexp-Log-Common/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Regexp::Log::Common.3.gz
 %%SITE_PERL%%/Regexp/Log/Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp-Log-Common/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp-Log-Common
-@dirrmtry %%SITE_PERL%%/Regexp/Log
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Log/Makefile b/textproc/p5-Regexp-Log/Makefile
index 1eea5236f854..567527274ac3 100644
--- a/textproc/p5-Regexp-Log/Makefile
+++ b/textproc/p5-Regexp-Log/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Regexp-Log
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Regexp-Log/pkg-plist b/textproc/p5-Regexp-Log/pkg-plist
index 38eda81a1f24..ecec83321354 100644
--- a/textproc/p5-Regexp-Log/pkg-plist
+++ b/textproc/p5-Regexp-Log/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Regexp::Log.3.gz
 %%SITE_PERL%%/Regexp/Log.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
-@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-SGML-DTDParse/Makefile b/textproc/p5-SGML-DTDParse/Makefile
index ea85e17085c3..1f03c4d82460 100644
--- a/textproc/p5-SGML-DTDParse/Makefile
+++ b/textproc/p5-SGML-DTDParse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SGML-DTDParse
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-SGML-DTDParse/pkg-plist b/textproc/p5-SGML-DTDParse/pkg-plist
index e8cc74d5492d..4aba7e6de15f 100644
--- a/textproc/p5-SGML-DTDParse/pkg-plist
+++ b/textproc/p5-SGML-DTDParse/pkg-plist
@@ -15,14 +15,8 @@ bin/dtdparse
 %%SITE_PERL%%/SGML/DTDParse/Format/refentry.pl
 %%SITE_PERL%%/SGML/DTDParse/Tokenizer.pm
 %%SITE_PERL%%/SGML/DTDParse/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/DTDParse/.packlist
 man/man1/dtddiff.1.gz
 man/man1/dtddiff2html.1.gz
 man/man1/dtdflatten.1.gz
 man/man1/dtdformat.1.gz
 man/man1/dtdparse.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/DTDParse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML
-@dirrmtry %%SITE_PERL%%/SGML/DTDParse/Format
-@dirrmtry %%SITE_PERL%%/SGML/DTDParse
-@dirrmtry %%SITE_PERL%%/SGML
diff --git a/textproc/p5-SGML-Parser-OpenSP/Makefile b/textproc/p5-SGML-Parser-OpenSP/Makefile
index e6591c9c69da..379506748daa 100644
--- a/textproc/p5-SGML-Parser-OpenSP/Makefile
+++ b/textproc/p5-SGML-Parser-OpenSP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SGML-Parser-OpenSP
 PORTVERSION=	0.994
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-SGML-Parser-OpenSP/pkg-plist b/textproc/p5-SGML-Parser-OpenSP/pkg-plist
index ec19c32cc1ca..d71f503463bf 100644
--- a/textproc/p5-SGML-Parser-OpenSP/pkg-plist
+++ b/textproc/p5-SGML-Parser-OpenSP/pkg-plist
@@ -1,12 +1,5 @@
 %%PERL5_MAN3%%/SGML::Parser::OpenSP.3.gz
 %%PERL5_MAN3%%/SGML::Parser::OpenSP::Tools.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/Parser/OpenSP/OpenSP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/Parser/OpenSP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/SGML/Parser/OpenSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SGML/Parser/OpenSP/Tools.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/Parser/OpenSP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/SGML/Parser/OpenSP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/SGML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/SGML
+%%SITE_ARCH%%/auto/SGML/Parser/OpenSP/OpenSP.so
+%%SITE_ARCH%%/SGML/Parser/OpenSP.pm
+%%SITE_ARCH%%/SGML/Parser/OpenSP/Tools.pm
diff --git a/textproc/p5-SGMLSpm/Makefile b/textproc/p5-SGMLSpm/Makefile
index eca2b723eac9..ca4568f69a59 100644
--- a/textproc/p5-SGMLSpm/Makefile
+++ b/textproc/p5-SGMLSpm/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	SGMLSpm
 PORTVERSION=	1.03
 DISTVERSIONSUFFIX=	ii
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/SGMLS
 PKGNAMEPREFIX=	p5-
@@ -25,7 +25,7 @@ SHEBANG_FILES=	sgmlspl.pl \
 		DOC/HTML/SGMLSpm/example.html
 
 INSTALL_TARGET=	install BINDIR=${STAGEDIR}${PREFIX}/bin \
-		PERL5DIR=${STAGEDIR}${SITE_PERL} SPECDIR=${STAGEDIR}${EXAMPLESDIR}
+		PERL5DIR=${STAGEDIR}${PREFIX}/${SITE_PERL_REL} SPECDIR=${STAGEDIR}${EXAMPLESDIR}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/textproc/p5-SGMLSpm/pkg-plist b/textproc/p5-SGMLSpm/pkg-plist
index 726aba12d80d..f8d6590ac9f5 100644
--- a/textproc/p5-SGMLSpm/pkg-plist
+++ b/textproc/p5-SGMLSpm/pkg-plist
@@ -3,5 +3,4 @@ bin/sgmlspl
 %%SITE_PERL%%/SGMLS/Output.pm
 %%SITE_PERL%%/SGMLS/Refs.pm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/skel.pl
-@dirrm %%SITE_PERL%%/SGMLS
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/p5-SQL-Tokenizer/Makefile b/textproc/p5-SQL-Tokenizer/Makefile
index 50c6bbe73df5..cf5afcc7304a 100644
--- a/textproc/p5-SQL-Tokenizer/Makefile
+++ b/textproc/p5-SQL-Tokenizer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQL-Tokenizer
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:IZUT
diff --git a/textproc/p5-SQL-Tokenizer/pkg-plist b/textproc/p5-SQL-Tokenizer/pkg-plist
index 0a155d520de7..d91b1dc3bedc 100644
--- a/textproc/p5-SQL-Tokenizer/pkg-plist
+++ b/textproc/p5-SQL-Tokenizer/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/SQL::Tokenizer.3.gz
 %%SITE_PERL%%/SQL/Tokenizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Tokenizer/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Tokenizer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL
-@dirrmtry %%SITE_PERL%%/SQL
diff --git a/textproc/p5-SVG-Parser/Makefile b/textproc/p5-SVG-Parser/Makefile
index 90005e078af8..323b060b20d6 100644
--- a/textproc/p5-SVG-Parser/Makefile
+++ b/textproc/p5-SVG-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVG-Parser
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-SVG-Parser/pkg-plist b/textproc/p5-SVG-Parser/pkg-plist
index 84edc86c4d68..03ac38411c9c 100644
--- a/textproc/p5-SVG-Parser/pkg-plist
+++ b/textproc/p5-SVG-Parser/pkg-plist
@@ -7,6 +7,3 @@
 %%PERL5_MAN3%%/SVG::Parser::Expat.3.gz
 %%PERL5_MAN3%%/SVG::Parser::SAX.3.gz
 %%PERL5_MAN3%%/SVG::Parser::SAX::Handler.3.gz
-@dirrm %%SITE_PERL%%/SVG/Parser/SAX
-@dirrm %%SITE_PERL%%/SVG/Parser
-@dirrmtry %%SITE_PERL%%/SVG
diff --git a/textproc/p5-SVG/Makefile b/textproc/p5-SVG/Makefile
index 25175766617f..db29de9cc83e 100644
--- a/textproc/p5-SVG/Makefile
+++ b/textproc/p5-SVG/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SVG
 PORTVERSION=	2.59
+PORTREVISION=	1
 CATEGORIES=	textproc graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-SVG/pkg-plist b/textproc/p5-SVG/pkg-plist
index d96218a98a2b..7ae8d6509c6c 100644
--- a/textproc/p5-SVG/pkg-plist
+++ b/textproc/p5-SVG/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/SVG/Element.pm
 %%SITE_PERL%%/SVG/Extension.pm
 %%SITE_PERL%%/SVG/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/01_circle.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/02_circle_with_color.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/03_circle_and_square.pl
@@ -26,5 +25,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/svgtest2.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yaph5.cgi
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG
-@dirrmtry %%SITE_PERL%%/SVG
diff --git a/textproc/p5-Search-Elasticsearch/Makefile b/textproc/p5-Search-Elasticsearch/Makefile
index 96617a22dac6..4e7afb8fe9da 100644
--- a/textproc/p5-Search-Elasticsearch/Makefile
+++ b/textproc/p5-Search-Elasticsearch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Search-Elasticsearch
 PORTVERSION=	1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DRTECH
diff --git a/textproc/p5-Search-Elasticsearch/pkg-plist b/textproc/p5-Search-Elasticsearch/pkg-plist
index a4d82f8eaa11..2329f656654f 100644
--- a/textproc/p5-Search-Elasticsearch/pkg-plist
+++ b/textproc/p5-Search-Elasticsearch/pkg-plist
@@ -92,27 +92,3 @@
 %%SITE_PERL%%/Search/Elasticsearch/Util.pm
 %%SITE_PERL%%/Search/Elasticsearch/Util/API/Path.pm
 %%SITE_PERL%%/Search/Elasticsearch/Util/API/QS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Elasticsearch/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Elasticsearch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Util/API
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Util
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Serializer/JSON
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Serializer
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Role/Serializer
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Role/CxnPool/Static
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Role/CxnPool
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Role/Cxn
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Role/Client
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Role/API
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Role
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Logger
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/CxnPool/Static
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/CxnPool
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Cxn
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Client/Direct
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Client/0_90/Direct
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Client/0_90
-@dirrm %%SITE_PERL%%/Search/Elasticsearch/Client
-@dirrmtry %%SITE_PERL%%/Search/Elasticsearch
-@dirrmtry %%SITE_PERL%%/Search
diff --git a/textproc/p5-Search-Estraier/Makefile b/textproc/p5-Search-Estraier/Makefile
index c5e9c987eff5..06494423c1d2 100644
--- a/textproc/p5-Search-Estraier/Makefile
+++ b/textproc/p5-Search-Estraier/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Search-Estraier
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Search-Estraier/pkg-plist b/textproc/p5-Search-Estraier/pkg-plist
index 90f1bd287f66..a2fd91eadb0e 100644
--- a/textproc/p5-Search-Estraier/pkg-plist
+++ b/textproc/p5-Search-Estraier/pkg-plist
@@ -7,7 +7,3 @@ bin/example_indexer.pl
 bin/example_searcher.pl
 %%PERL5_MAN3%%/Search::Estraier.3.gz
 %%SITE_PERL%%/Search/Estraier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Estraier/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Estraier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
-@dirrmtry %%SITE_PERL%%/Search
diff --git a/textproc/p5-Search-Odeum/Makefile b/textproc/p5-Search-Odeum/Makefile
index 1a44adc19da4..a439ad9449be 100644
--- a/textproc/p5-Search-Odeum/Makefile
+++ b/textproc/p5-Search-Odeum/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Search-Odeum
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Search-Odeum/pkg-plist b/textproc/p5-Search-Odeum/pkg-plist
index a3e55f28181e..1a78e3eb0663 100644
--- a/textproc/p5-Search-Odeum/pkg-plist
+++ b/textproc/p5-Search-Odeum/pkg-plist
@@ -1,12 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Odeum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Odeum/Document.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Odeum/Result.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Odeum/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Odeum/Odeum.so
+%%SITE_ARCH%%/Search/Odeum.pm
+%%SITE_ARCH%%/Search/Odeum/Document.pm
+%%SITE_ARCH%%/Search/Odeum/Result.pm
+%%SITE_ARCH%%/auto/Search/Odeum/Odeum.so
 %%PERL5_MAN3%%/Search::Odeum.3.gz
 %%PERL5_MAN3%%/Search::Odeum::Document.3.gz
 %%PERL5_MAN3%%/Search::Odeum::Result.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Odeum
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/Odeum
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search
diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile
index e3a6c933f209..5f1bb3a6b559 100644
--- a/textproc/p5-Search-Saryer/Makefile
+++ b/textproc/p5-Search-Saryer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Search-Saryer
 PORTVERSION=	0.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://namazu.org/~tsuchiya/perl/
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Search-Saryer/pkg-plist b/textproc/p5-Search-Saryer/pkg-plist
index 0b8494aae198..b6157e8aa022 100644
--- a/textproc/p5-Search-Saryer/pkg-plist
+++ b/textproc/p5-Search-Saryer/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Search::Saryer.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Search/Saryer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search
+%%SITE_ARCH%%/Search/Saryer.pm
+%%SITE_ARCH%%/auto/Search/Saryer/Saryer.so
diff --git a/textproc/p5-Search-VectorSpace/Makefile b/textproc/p5-Search-VectorSpace/Makefile
index f67aa54f51cc..7bd28fb83d0a 100644
--- a/textproc/p5-Search-VectorSpace/Makefile
+++ b/textproc/p5-Search-VectorSpace/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Search-VectorSpace
 PORTVERSION=	0.02
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Search-VectorSpace/pkg-plist b/textproc/p5-Search-VectorSpace/pkg-plist
index 6cd6abb6bc76..f0bf233e16fb 100644
--- a/textproc/p5-Search-VectorSpace/pkg-plist
+++ b/textproc/p5-Search-VectorSpace/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Search::VectorSpace.3.gz
 %%SITE_PERL%%/Search/VectorSpace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/VectorSpace/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/VectorSpace
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
-@dirrmtry %%SITE_PERL%%/Search
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index e4af5a5b6300..12ae10d27369 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Senna
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/textproc/p5-Senna/pkg-plist b/textproc/p5-Senna/pkg-plist
index 260a1fb665fd..e9b78a411372 100644
--- a/textproc/p5-Senna/pkg-plist
+++ b/textproc/p5-Senna/pkg-plist
@@ -11,20 +11,17 @@
 %%PERL5_MAN3%%/Senna::Snippet.3.gz
 %%PERL5_MAN3%%/Senna::Symbol.3.gz
 %%PERL5_MAN3%%/Senna::Values.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Index.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/RC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Records.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Set.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Snippet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Symbol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/Values.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/OptArg/Select.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Senna/OptArg/Sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Senna/Senna.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Senna
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Senna/OptArg
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Senna
+%%SITE_ARCH%%/Senna.pm
+%%SITE_ARCH%%/Senna/Constants.pm
+%%SITE_ARCH%%/Senna/Index.pm
+%%SITE_ARCH%%/Senna/Query.pm
+%%SITE_ARCH%%/Senna/RC.pm
+%%SITE_ARCH%%/Senna/Record.pm
+%%SITE_ARCH%%/Senna/Records.pm
+%%SITE_ARCH%%/Senna/Set.pm
+%%SITE_ARCH%%/Senna/Snippet.pm
+%%SITE_ARCH%%/Senna/Symbol.pm
+%%SITE_ARCH%%/Senna/Values.pm
+%%SITE_ARCH%%/Senna/OptArg/Select.pm
+%%SITE_ARCH%%/Senna/OptArg/Sort.pm
+%%SITE_ARCH%%/auto/Senna/Senna.so
diff --git a/textproc/p5-Solr/Makefile b/textproc/p5-Solr/Makefile
index 17cb8971e5ff..9f833284c84b 100644
--- a/textproc/p5-Solr/Makefile
+++ b/textproc/p5-Solr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Solr
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GARAFOLA/Solr
diff --git a/textproc/p5-Solr/pkg-plist b/textproc/p5-Solr/pkg-plist
index 815d9e8f6116..cfd5ce39e4fc 100644
--- a/textproc/p5-Solr/pkg-plist
+++ b/textproc/p5-Solr/pkg-plist
@@ -1,9 +1,6 @@
 %%SITE_PERL%%/Solr.pm
 %%SITE_PERL%%/Solr/HTTPUpdateHandler.pm
 %%SITE_PERL%%/Solr/Schema.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Solr/.packlist
 %%PERL5_MAN3%%/Solr.3.gz
 %%PERL5_MAN3%%/Solr::HTTPUpdateHandler.3.gz
 %%PERL5_MAN3%%/Solr::Schema.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Solr
-@dirrmtry %%SITE_PERL%%/Solr
diff --git a/textproc/p5-Sort-ArbBiLex/Makefile b/textproc/p5-Sort-ArbBiLex/Makefile
index 8c7b1a093aa4..eaebb7400d98 100644
--- a/textproc/p5-Sort-ArbBiLex/Makefile
+++ b/textproc/p5-Sort-ArbBiLex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-ArbBiLex
 PORTVERSION=	4.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Sort-ArbBiLex/pkg-plist b/textproc/p5-Sort-ArbBiLex/pkg-plist
index 601070e9716d..c543813d1d28 100644
--- a/textproc/p5-Sort-ArbBiLex/pkg-plist
+++ b/textproc/p5-Sort-ArbBiLex/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Sort::ArbBiLex.3.gz
 %%SITE_PERL%%/Sort/ArbBiLex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
-@dirrmtry %%SITE_PERL%%/Sort
diff --git a/textproc/p5-Sort-Fields/Makefile b/textproc/p5-Sort-Fields/Makefile
index 5882d4fa3107..09eb670314f7 100644
--- a/textproc/p5-Sort-Fields/Makefile
+++ b/textproc/p5-Sort-Fields/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Fields
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Sort-Fields/pkg-plist b/textproc/p5-Sort-Fields/pkg-plist
index 12593cdb28b6..e795fac2174c 100644
--- a/textproc/p5-Sort-Fields/pkg-plist
+++ b/textproc/p5-Sort-Fields/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Sort::Fields.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields/.packlist
 %%SITE_PERL%%/Sort/Fields.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
-@dirrmtry %%SITE_PERL%%/Sort
diff --git a/textproc/p5-Sort-Naturally/Makefile b/textproc/p5-Sort-Naturally/Makefile
index ac5fedf92a9c..8370df48cf36 100644
--- a/textproc/p5-Sort-Naturally/Makefile
+++ b/textproc/p5-Sort-Naturally/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sort-Naturally
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Sort-Naturally/pkg-plist b/textproc/p5-Sort-Naturally/pkg-plist
index 58843a2e2a33..b09d6a4cb515 100644
--- a/textproc/p5-Sort-Naturally/pkg-plist
+++ b/textproc/p5-Sort-Naturally/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Sort::Naturally.3.gz
 %%SITE_PERL%%/Sort/Naturally.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Naturally/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Naturally
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
-@dirrmtry %%SITE_PERL%%/Sort
diff --git a/textproc/p5-Sphinx-Config/Makefile b/textproc/p5-Sphinx-Config/Makefile
index d3024f647912..2e0ddcdd399a 100644
--- a/textproc/p5-Sphinx-Config/Makefile
+++ b/textproc/p5-Sphinx-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sphinx-Config
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Sphinx-Config/pkg-plist b/textproc/p5-Sphinx-Config/pkg-plist
index 8df132ee9612..78f3faf10604 100644
--- a/textproc/p5-Sphinx-Config/pkg-plist
+++ b/textproc/p5-Sphinx-Config/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sphinx/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sphinx/Config/.packlist
 %%PERL5_MAN3%%/Sphinx::Config.3.gz
diff --git a/textproc/p5-Sphinx-Manager/Makefile b/textproc/p5-Sphinx-Manager/Makefile
index 476aa8a09fc3..f4a5669bfcc4 100644
--- a/textproc/p5-Sphinx-Manager/Makefile
+++ b/textproc/p5-Sphinx-Manager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sphinx-Manager
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Sphinx-Manager/pkg-plist b/textproc/p5-Sphinx-Manager/pkg-plist
index b016b4a9735a..8ecb32442540 100644
--- a/textproc/p5-Sphinx-Manager/pkg-plist
+++ b/textproc/p5-Sphinx-Manager/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Sphinx/Manager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sphinx/Manager/.packlist
 %%PERL5_MAN3%%/Sphinx::Manager.3.gz
diff --git a/textproc/p5-Sphinx-Search/Makefile b/textproc/p5-Sphinx-Search/Makefile
index d218d08e6eb3..43ffb7799886 100644
--- a/textproc/p5-Sphinx-Search/Makefile
+++ b/textproc/p5-Sphinx-Search/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sphinx-Search
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JJSCHUTZ
diff --git a/textproc/p5-Sphinx-Search/pkg-plist b/textproc/p5-Sphinx-Search/pkg-plist
index 617a0710ad1e..1dad35dbdca2 100644
--- a/textproc/p5-Sphinx-Search/pkg-plist
+++ b/textproc/p5-Sphinx-Search/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Sphinx::Search.3.gz
 %%SITE_PERL%%/Sphinx/Search.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sphinx/Search/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sphinx/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sphinx
-@dirrmtry %%SITE_PERL%%/Sphinx
diff --git a/textproc/p5-Spork/Makefile b/textproc/p5-Spork/Makefile
index 3e19d957b40c..b387628b0b96 100644
--- a/textproc/p5-Spork/Makefile
+++ b/textproc/p5-Spork/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spork
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/textproc/p5-Spork/pkg-plist b/textproc/p5-Spork/pkg-plist
index 59473ed76da8..27d75c24dd37 100644
--- a/textproc/p5-Spork/pkg-plist
+++ b/textproc/p5-Spork/pkg-plist
@@ -15,9 +15,4 @@ bin/spork
 %%SITE_PERL%%/Spork/Registry.pm
 %%SITE_PERL%%/Spork/Slides.pm
 %%SITE_PERL%%/Spork/Template/TT2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spork/.packlist
 man/man1/spork.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spork
-@dirrmtry %%SITE_PERL%%/Spork/Template
-@dirrmtry %%SITE_PERL%%/Spork/Formatter
-@dirrmtry %%SITE_PERL%%/Spork
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 674721d96748..7f7709cea434 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-ParseExcel
 PORTVERSION=	0.65
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-Spreadsheet-ParseExcel/pkg-plist b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
index 171f6ccfdb11..49b975976487 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
@@ -28,7 +28,6 @@
 %%SITE_PERL%%/Spreadsheet/ParseExcel/Utility.pm
 %%SITE_PERL%%/Spreadsheet/ParseExcel/Workbook.pm
 %%SITE_PERL%%/Spreadsheet/ParseExcel/Worksheet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Excel/AuthorK.xls
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Excel/AuthorK95.xls
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Excel/FmtTest.xls
@@ -61,8 +60,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xls2csv.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Excel
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
-@dirrmtry %%SITE_PERL%%/Spreadsheet/ParseExcel/SaveParser
-@dirrmtry %%SITE_PERL%%/Spreadsheet/ParseExcel
-@dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-Read/Makefile b/textproc/p5-Spreadsheet-Read/Makefile
index 444555ee6b20..9f2f21837cc1 100644
--- a/textproc/p5-Spreadsheet-Read/Makefile
+++ b/textproc/p5-Spreadsheet-Read/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-Read
 PORTVERSION=	0.54
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HMBRAND
diff --git a/textproc/p5-Spreadsheet-Read/pkg-plist b/textproc/p5-Spreadsheet-Read/pkg-plist
index e2017dff16a7..aa500d838ddb 100644
--- a/textproc/p5-Spreadsheet-Read/pkg-plist
+++ b/textproc/p5-Spreadsheet-Read/pkg-plist
@@ -3,6 +3,4 @@ bin/xls2csv
 bin/xlscat
 bin/xlsgrep
 %%PERL5_MAN3%%/Spreadsheet::Read.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/Read/.packlist
 %%SITE_PERL%%/Spreadsheet/Read.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/Read
diff --git a/textproc/p5-Spreadsheet-ReadSXC/Makefile b/textproc/p5-Spreadsheet-ReadSXC/Makefile
index 55b795e6ed13..7b49de9cbbf3 100644
--- a/textproc/p5-Spreadsheet-ReadSXC/Makefile
+++ b/textproc/p5-Spreadsheet-ReadSXC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-ReadSXC
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TERHECHTE
diff --git a/textproc/p5-Spreadsheet-ReadSXC/pkg-plist b/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
index 63ba6f63aaef..0dd2fafd00bc 100644
--- a/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
+++ b/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Spreadsheet::ReadSXC.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ReadSXC/.packlist
 %%SITE_PERL%%/Spreadsheet/ReadSXC.pm
-@dirrmtry %%SITE_PERL%%/Spreadsheet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ReadSXC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
index ac264fc7b5a2..e948dedc55d6 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-WriteExcel-FromXML
 PORTVERSION=	1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist
index c0ecbb3da5af..f67e07171ac6 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist
@@ -4,10 +4,3 @@
 %%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML/Workbook.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML/Worksheet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/FromXML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/FromXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
-@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML
-@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcel
-@dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-WriteExcel-Styler/Makefile b/textproc/p5-Spreadsheet-WriteExcel-Styler/Makefile
index 4e54dc3daf37..6eed0ca4c901 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-Styler/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel-Styler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-WriteExcel-Styler
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Spreadsheet-WriteExcel-Styler/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel-Styler/pkg-plist
index c8fff7ce00e8..b6eba84d6044 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-Styler/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel-Styler/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Spreadsheet::WriteExcel::Styler.3.gz
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Styler.pm
-@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcel
-@dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index b949742a4a71..11739386f6dd 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-WriteExcel
 PORTVERSION=	2.40
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
index 908f8e645653..348d347d175f 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
@@ -39,7 +39,6 @@ bin/chartex
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Utility.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Workbook.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Worksheet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/.packlist
 man/man1/chartex.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/Perl_Journal_Article.html
 %%PORTDOCS%%%%DOCSDIR%%/images/example.jpg
@@ -154,8 +153,3 @@ man/man1/chartex.1.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tpj_images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
-@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcel/Chart
-@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcel
-@dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-WriteExcelXML/Makefile b/textproc/p5-Spreadsheet-WriteExcelXML/Makefile
index ceefad1468c6..356a587c2800 100644
--- a/textproc/p5-Spreadsheet-WriteExcelXML/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcelXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-WriteExcelXML
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JMCNAMARA
diff --git a/textproc/p5-Spreadsheet-WriteExcelXML/pkg-plist b/textproc/p5-Spreadsheet-WriteExcelXML/pkg-plist
index e418e6215200..3fe7fd2bbc91 100644
--- a/textproc/p5-Spreadsheet-WriteExcelXML/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcelXML/pkg-plist
@@ -10,8 +10,3 @@
 %%SITE_PERL%%/Spreadsheet/WriteExcelXML/Workbook.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcelXML/Worksheet.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcelXML/XMLwriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcelXML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcelXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
-@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcelXML
-@dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-XLSX/Makefile b/textproc/p5-Spreadsheet-XLSX/Makefile
index d59dbaa6320a..57e3803bbfd5 100644
--- a/textproc/p5-Spreadsheet-XLSX/Makefile
+++ b/textproc/p5-Spreadsheet-XLSX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Spreadsheet-XLSX
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMOW
diff --git a/textproc/p5-Spreadsheet-XLSX/pkg-plist b/textproc/p5-Spreadsheet-XLSX/pkg-plist
index e0de40f59aaf..077ac6cc3c5d 100644
--- a/textproc/p5-Spreadsheet-XLSX/pkg-plist
+++ b/textproc/p5-Spreadsheet-XLSX/pkg-plist
@@ -4,6 +4,3 @@
 %%SITE_PERL%%/Spreadsheet/XLSX/Utility2007.pm
 %%SITE_PERL%%/Spreadsheet/XLSX/Fmt2007.pm
 %%SITE_PERL%%/Spreadsheet/XLSX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/XLSX/.packlist
-@dirrmtry %%SITE_PERL%%/Spreadsheet/XLSX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/XLSX
diff --git a/textproc/p5-String-BufferStack/Makefile b/textproc/p5-String-BufferStack/Makefile
index 9a00b8853989..b910301f5b7e 100644
--- a/textproc/p5-String-BufferStack/Makefile
+++ b/textproc/p5-String-BufferStack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-BufferStack
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	String
diff --git a/textproc/p5-String-BufferStack/pkg-plist b/textproc/p5-String-BufferStack/pkg-plist
index 31f6ca1ce83d..6ce5e9df6427 100644
--- a/textproc/p5-String-BufferStack/pkg-plist
+++ b/textproc/p5-String-BufferStack/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::BufferStack.3.gz
 %%SITE_PERL%%/String/BufferStack.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/BufferStack/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/BufferStack
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-CamelCase/Makefile b/textproc/p5-String-CamelCase/Makefile
index e5c0584c8700..7ad0adab8271 100644
--- a/textproc/p5-String-CamelCase/Makefile
+++ b/textproc/p5-String-CamelCase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-CamelCase
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-CamelCase/pkg-plist b/textproc/p5-String-CamelCase/pkg-plist
index 489bf0898ca2..1993832e446e 100644
--- a/textproc/p5-String-CamelCase/pkg-plist
+++ b/textproc/p5-String-CamelCase/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/String/CamelCase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CamelCase/.packlist
 %%PERL5_MAN3%%/String::CamelCase.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CamelCase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Compare-ConstantTime/Makefile b/textproc/p5-String-Compare-ConstantTime/Makefile
index 9ef4fe0e92df..a763c0b842b7 100644
--- a/textproc/p5-String-Compare-ConstantTime/Makefile
+++ b/textproc/p5-String-Compare-ConstantTime/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	String-Compare-ConstantTime
 PORTVERSION=	0.310
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -16,6 +17,6 @@ USES=	perl5
 USE_PERL5=	configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/String/Compare/ConstantTime/ConstantTime.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/String/Compare/ConstantTime/ConstantTime.so
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Compare-ConstantTime/pkg-plist b/textproc/p5-String-Compare-ConstantTime/pkg-plist
index bd892a7e04bc..7baebeecb92c 100644
--- a/textproc/p5-String-Compare-ConstantTime/pkg-plist
+++ b/textproc/p5-String-Compare-ConstantTime/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/String::Compare::ConstantTime.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Compare/ConstantTime/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Compare/ConstantTime/ConstantTime.so
-%%SITE_PERL%%/%%PERL_ARCH%%/String/Compare/ConstantTime.pm
+%%SITE_ARCH%%/auto/String/Compare/ConstantTime/ConstantTime.so
+%%SITE_ARCH%%/String/Compare/ConstantTime.pm
diff --git a/textproc/p5-String-Divert/Makefile b/textproc/p5-String-Divert/Makefile
index 34d0d6ac18b6..764817f66588 100644
--- a/textproc/p5-String-Divert/Makefile
+++ b/textproc/p5-String-Divert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Divert
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Divert/pkg-plist b/textproc/p5-String-Divert/pkg-plist
index 1e4080b4e7cc..71f2353a1a70 100644
--- a/textproc/p5-String-Divert/pkg-plist
+++ b/textproc/p5-String-Divert/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/String::Divert.3.gz
 %%SITE_PERL%%/String/Divert.pm
 %%SITE_PERL%%/String/Divert.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Escape/Makefile b/textproc/p5-String-Escape/Makefile
index 3fead69f328e..b9b41f0cce20 100644
--- a/textproc/p5-String-Escape/Makefile
+++ b/textproc/p5-String-Escape/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Escape
 PORTVERSION=	2010.002
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Escape/pkg-plist b/textproc/p5-String-Escape/pkg-plist
index 90392aa7edca..5e23cfa46850 100644
--- a/textproc/p5-String-Escape/pkg-plist
+++ b/textproc/p5-String-Escape/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::Escape.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Escape/.packlist
 %%SITE_PERL%%/String/Escape.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Escape
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Flogger/Makefile b/textproc/p5-String-Flogger/Makefile
index 9c19ed1ca07d..1b2622f8d672 100644
--- a/textproc/p5-String-Flogger/Makefile
+++ b/textproc/p5-String-Flogger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Flogger
 PORTVERSION=	1.101243
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/textproc/p5-String-Flogger/pkg-plist b/textproc/p5-String-Flogger/pkg-plist
index 8d292776b67d..0003c380ddc0 100644
--- a/textproc/p5-String-Flogger/pkg-plist
+++ b/textproc/p5-String-Flogger/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::Flogger.3.gz
 %%SITE_PERL%%/String/Flogger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Flogger/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Flogger
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Format/Makefile b/textproc/p5-String-Format/Makefile
index 533dff51c95c..d66f6755f00c 100644
--- a/textproc/p5-String-Format/Makefile
+++ b/textproc/p5-String-Format/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Format
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Format/pkg-plist b/textproc/p5-String-Format/pkg-plist
index 864365e523e3..8dce62278546 100644
--- a/textproc/p5-String-Format/pkg-plist
+++ b/textproc/p5-String-Format/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::Format.3.gz
 %%SITE_PERL%%/String/Format.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Format/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Format
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Fraction/Makefile b/textproc/p5-String-Fraction/Makefile
index 64ab181b729b..ebf09bb29b0e 100644
--- a/textproc/p5-String-Fraction/Makefile
+++ b/textproc/p5-String-Fraction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Fraction
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Fraction/pkg-plist b/textproc/p5-String-Fraction/pkg-plist
index 660a1579af8d..bcfe4b5dce69 100644
--- a/textproc/p5-String-Fraction/pkg-plist
+++ b/textproc/p5-String-Fraction/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::Fraction.3.gz
 %%SITE_PERL%%/String/Fraction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Fraction/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Fraction
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-HexConvert/Makefile b/textproc/p5-String-HexConvert/Makefile
index 50b7875d3bc2..78ea41752211 100644
--- a/textproc/p5-String-HexConvert/Makefile
+++ b/textproc/p5-String-HexConvert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-HexConvert
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AHERNIT
diff --git a/textproc/p5-String-HexConvert/pkg-plist b/textproc/p5-String-HexConvert/pkg-plist
index 31d42a70efaa..d0a698d47111 100644
--- a/textproc/p5-String-HexConvert/pkg-plist
+++ b/textproc/p5-String-HexConvert/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::HexConvert.3.gz
 %%SITE_PERL%%/String/HexConvert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/HexConvert/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/HexConvert
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Koremutake/Makefile b/textproc/p5-String-Koremutake/Makefile
index 316d62fc5746..22be9ac3fa8f 100644
--- a/textproc/p5-String-Koremutake/Makefile
+++ b/textproc/p5-String-Koremutake/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Koremutake
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Koremutake/pkg-plist b/textproc/p5-String-Koremutake/pkg-plist
index 0687e67f16d2..47aeff143266 100644
--- a/textproc/p5-String-Koremutake/pkg-plist
+++ b/textproc/p5-String-Koremutake/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::Koremutake.3.gz
 %%SITE_PERL%%/String/Koremutake.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-RewritePrefix/Makefile b/textproc/p5-String-RewritePrefix/Makefile
index a723485d23af..e2b93dcf87f2 100644
--- a/textproc/p5-String-RewritePrefix/Makefile
+++ b/textproc/p5-String-RewritePrefix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-RewritePrefix
 PORTVERSION=	0.007
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
diff --git a/textproc/p5-String-RewritePrefix/pkg-plist b/textproc/p5-String-RewritePrefix/pkg-plist
index b8a80ade62c0..7fdaab9d8174 100644
--- a/textproc/p5-String-RewritePrefix/pkg-plist
+++ b/textproc/p5-String-RewritePrefix/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::RewritePrefix.3.gz
 %%SITE_PERL%%/String/RewritePrefix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RewritePrefix/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RewritePrefix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Scanf/Makefile b/textproc/p5-String-Scanf/Makefile
index 9cf7072e0dd8..014512ae905f 100644
--- a/textproc/p5-String-Scanf/Makefile
+++ b/textproc/p5-String-Scanf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Scanf
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Scanf/pkg-plist b/textproc/p5-String-Scanf/pkg-plist
index f58f65cbeb07..4d4682d4cb9b 100644
--- a/textproc/p5-String-Scanf/pkg-plist
+++ b/textproc/p5-String-Scanf/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::Scanf.3.gz
 %%SITE_PERL%%/String/Scanf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 627d2f587d23..60930bc0ccb1 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-ShellQuote
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-ShellQuote/pkg-plist b/textproc/p5-String-ShellQuote/pkg-plist
index 083ce5df94ed..e200e44ff8ee 100644
--- a/textproc/p5-String-ShellQuote/pkg-plist
+++ b/textproc/p5-String-ShellQuote/pkg-plist
@@ -1,8 +1,4 @@
 bin/shell-quote
 %%PERL5_MAN3%%/String::ShellQuote.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist
 %%SITE_PERL%%/String/ShellQuote.pm
 man/man1/shell-quote.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-ShowDiff/Makefile b/textproc/p5-String-ShowDiff/Makefile
index 5194a193937e..8d6bee324b61 100644
--- a/textproc/p5-String-ShowDiff/Makefile
+++ b/textproc/p5-String-ShowDiff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-ShowDiff
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-ShowDiff/pkg-plist b/textproc/p5-String-ShowDiff/pkg-plist
index 7e26fde60696..b826dd559112 100644
--- a/textproc/p5-String-ShowDiff/pkg-plist
+++ b/textproc/p5-String-ShowDiff/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::ShowDiff.3.gz
 %%SITE_PERL%%/String/ShowDiff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShowDiff/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShowDiff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Strip/Makefile b/textproc/p5-String-Strip/Makefile
index 7186ead518fb..7df5496d4244 100644
--- a/textproc/p5-String-Strip/Makefile
+++ b/textproc/p5-String-Strip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Strip
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Strip/pkg-plist b/textproc/p5-String-Strip/pkg-plist
index 3d3eafc29310..a6cb315d18bb 100644
--- a/textproc/p5-String-Strip/pkg-plist
+++ b/textproc/p5-String-Strip/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/String::Strip.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/Strip.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/String/Strip.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
+%%SITE_ARCH%%/auto/String/Strip/Strip.so
+%%SITE_ARCH%%/auto/String/Strip/autosplit.ix
+%%SITE_ARCH%%/String/Strip.pm
diff --git a/textproc/p5-String-ToIdentifier-EN/Makefile b/textproc/p5-String-ToIdentifier-EN/Makefile
index bd0ba3f4fad1..3cee70adfd44 100644
--- a/textproc/p5-String-ToIdentifier-EN/Makefile
+++ b/textproc/p5-String-ToIdentifier-EN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-ToIdentifier-EN
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-ToIdentifier-EN/pkg-plist b/textproc/p5-String-ToIdentifier-EN/pkg-plist
index e1368ec5b08c..5d8932c38ebb 100644
--- a/textproc/p5-String-ToIdentifier-EN/pkg-plist
+++ b/textproc/p5-String-ToIdentifier-EN/pkg-plist
@@ -1,11 +1,4 @@
 %%SITE_PERL%%/String/ToIdentifier/EN.pm
 %%SITE_PERL%%/String/ToIdentifier/EN/Unicode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ToIdentifier/EN/.packlist
 %%PERL5_MAN3%%/String::ToIdentifier::EN.3.gz
 %%PERL5_MAN3%%/String::ToIdentifier::EN::Unicode.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ToIdentifier/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ToIdentifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrm %%SITE_PERL%%/String/ToIdentifier/EN
-@dirrmtry %%SITE_PERL%%/String/ToIdentifier
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Tokenizer/Makefile b/textproc/p5-String-Tokenizer/Makefile
index a23864ba1a85..a3b56da195e7 100644
--- a/textproc/p5-String-Tokenizer/Makefile
+++ b/textproc/p5-String-Tokenizer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Tokenizer
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Tokenizer/pkg-plist b/textproc/p5-String-Tokenizer/pkg-plist
index 4aae7f3ef3f5..40d528c31d44 100644
--- a/textproc/p5-String-Tokenizer/pkg-plist
+++ b/textproc/p5-String-Tokenizer/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/String::Tokenizer.3.gz
 %%SITE_PERL%%/String/Tokenizer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Tokenizer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Tokenizer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Truncate/Makefile b/textproc/p5-String-Truncate/Makefile
index a2dd77e886c7..3db31410280b 100644
--- a/textproc/p5-String-Truncate/Makefile
+++ b/textproc/p5-String-Truncate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	String-Truncate
 PORTVERSION=	1.100602
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Truncate/pkg-plist b/textproc/p5-String-Truncate/pkg-plist
index 89a3e08de40a..db5a5c3f5016 100644
--- a/textproc/p5-String-Truncate/pkg-plist
+++ b/textproc/p5-String-Truncate/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/String/Truncate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Truncate/.packlist
 %%PERL5_MAN3%%/String::Truncate.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Truncate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Urandom/Makefile b/textproc/p5-String-Urandom/Makefile
index 5729f1fa1ae6..8465ad964302 100644
--- a/textproc/p5-String-Urandom/Makefile
+++ b/textproc/p5-String-Urandom/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	String-Urandom
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-String-Urandom/pkg-plist b/textproc/p5-String-Urandom/pkg-plist
index 914ba23981d6..a25239a884db 100644
--- a/textproc/p5-String-Urandom/pkg-plist
+++ b/textproc/p5-String-Urandom/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/String::Urandom.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Urandom/.packlist
 %%SITE_PERL%%/String/Urandom.pm
 %%SITE_PERL%%/String/example.pl
-@dirrmtry %%SITE_PERL%%/String
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Urandom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
diff --git a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
index 902eb4b012b8..c4a76af09d4a 100644
--- a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
+++ b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Syntax-Highlight-Engine-Kate
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist b/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist
index 5da4b7e3c9c5..a654c495fb9c 100644
--- a/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist
+++ b/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist
@@ -272,17 +272,7 @@
 %%SITE_PERL%%/Syntax/Highlight/Engine/Kate/Xslt.pm
 %%SITE_PERL%%/Syntax/Highlight/Engine/Kate/Yacas.pm
 %%SITE_PERL%%/Syntax/Highlight/Engine/Kate/Yacc_Bison.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Engine/Kate/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hlansi.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hlhtml.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/regen.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Engine/Kate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Engine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight/Engine/Kate/Convert
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight/Engine/Kate
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight/Engine
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/Syntax
diff --git a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
index 4021b9da40d5..af74f0ffe641 100644
--- a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
+++ b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Syntax-Highlight-Perl-Improved
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAVIDCYL/Syntax-Highlight-Perl-Improved-101
diff --git a/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
index 7248e7a76046..a17974291467 100644
--- a/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
+++ b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Syntax::Highlight::Perl::Improved.3.gz
 %%SITE_PERL%%/Syntax/Highlight/Perl/Improved.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight/Perl
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/Syntax
diff --git a/textproc/p5-TOML/Makefile b/textproc/p5-TOML/Makefile
index 8f15e470eb86..25cbfce0fca4 100644
--- a/textproc/p5-TOML/Makefile
+++ b/textproc/p5-TOML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	TOML
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DARREN
diff --git a/textproc/p5-TOML/pkg-plist b/textproc/p5-TOML/pkg-plist
index 218f48f91d80..306ac742a6c2 100644
--- a/textproc/p5-TOML/pkg-plist
+++ b/textproc/p5-TOML/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/TOML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TOML/.packlist
 %%PERL5_MAN3%%/TOML.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/TOML
diff --git a/textproc/p5-TeX-Encode/Makefile b/textproc/p5-TeX-Encode/Makefile
index 2010254fbdc0..f835ab0aadcd 100644
--- a/textproc/p5-TeX-Encode/Makefile
+++ b/textproc/p5-TeX-Encode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	TeX-Encode
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TIMBRODY
diff --git a/textproc/p5-TeX-Encode/pkg-plist b/textproc/p5-TeX-Encode/pkg-plist
index f14307a00d0d..579bd0862b3e 100644
--- a/textproc/p5-TeX-Encode/pkg-plist
+++ b/textproc/p5-TeX-Encode/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/TeX/Encode.pm
 %%SITE_PERL%%/TeX/Encode/BibTeX.pm
 %%SITE_PERL%%/TeX/Encode/charmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Encode/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Encode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX
-@dirrmtry %%SITE_PERL%%/TeX/Encode
-@dirrmtry %%SITE_PERL%%/TeX
diff --git a/textproc/p5-TeX-Hyphen/Makefile b/textproc/p5-TeX-Hyphen/Makefile
index 7b55e3af0bc7..6e5e58763137 100644
--- a/textproc/p5-TeX-Hyphen/Makefile
+++ b/textproc/p5-TeX-Hyphen/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	TeX-Hyphen
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-TeX-Hyphen/pkg-plist b/textproc/p5-TeX-Hyphen/pkg-plist
index 4db167b43b46..ee8c5136976f 100644
--- a/textproc/p5-TeX-Hyphen/pkg-plist
+++ b/textproc/p5-TeX-Hyphen/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/TeX/Hyphen.pm
 %%SITE_PERL%%/TeX/Hyphen/czech.pm
 %%SITE_PERL%%/TeX/Hyphen/german.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen
-@dirrm %%SITE_PERL%%/TeX/Hyphen
-@dirrmtry %%SITE_PERL%%/TeX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX
diff --git a/textproc/p5-Template-Declare/Makefile b/textproc/p5-Template-Declare/Makefile
index d486cd000e17..1b395702656d 100644
--- a/textproc/p5-Template-Declare/Makefile
+++ b/textproc/p5-Template-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Declare
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Declare/pkg-plist b/textproc/p5-Template-Declare/pkg-plist
index e54e9179130c..d4980e0b6fa2 100644
--- a/textproc/p5-Template-Declare/pkg-plist
+++ b/textproc/p5-Template-Declare/pkg-plist
@@ -6,7 +6,6 @@
 %%PERL5_MAN3%%/Template::Declare::TagSet::RDF::EM.3.gz
 %%PERL5_MAN3%%/Template::Declare::TagSet::XUL.3.gz
 %%PERL5_MAN3%%/Template::Declare::Tags.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Declare/.packlist
 %%SITE_PERL%%/Template/Declare.pm
 %%SITE_PERL%%/Template/Declare/Buffer.pm
 %%SITE_PERL%%/Template/Declare/TagSet.pm
@@ -15,9 +14,3 @@
 %%SITE_PERL%%/Template/Declare/TagSet/RDF/EM.pm
 %%SITE_PERL%%/Template/Declare/TagSet/XUL.pm
 %%SITE_PERL%%/Template/Declare/Tags.pm
-@dirrmtry %%SITE_PERL%%/Template/Declare/TagSet/RDF
-@dirrmtry %%SITE_PERL%%/Template/Declare/TagSet
-@dirrmtry %%SITE_PERL%%/Template/Declare
-@dirrmtry %%SITE_PERL%%/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Declare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
diff --git a/textproc/p5-Template-Extract/Makefile b/textproc/p5-Template-Extract/Makefile
index a5e6f7177d57..3c899d5b5a6a 100644
--- a/textproc/p5-Template-Extract/Makefile
+++ b/textproc/p5-Template-Extract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Extract
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Extract/pkg-plist b/textproc/p5-Template-Extract/pkg-plist
index 2d17d3952fa1..5f8ccdae832a 100644
--- a/textproc/p5-Template-Extract/pkg-plist
+++ b/textproc/p5-Template-Extract/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/Template/Extract/Compile.pm
 %%SITE_PERL%%/Template/Extract/Parser.pm
 %%SITE_PERL%%/Template/Extract/Run.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Extract/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Extract
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Extract
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Magic/Makefile b/textproc/p5-Template-Magic/Makefile
index 6ffc0c1e3c51..1d686c9b70bd 100644
--- a/textproc/p5-Template-Magic/Makefile
+++ b/textproc/p5-Template-Magic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Magic
 PORTVERSION=	1.39
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Magic/pkg-plist b/textproc/p5-Template-Magic/pkg-plist
index 38032b7155a7..b45dd0b5dd62 100644
--- a/textproc/p5-Template-Magic/pkg-plist
+++ b/textproc/p5-Template-Magic/pkg-plist
@@ -8,10 +8,3 @@
 %%SITE_PERL%%/Template/Magic/HTML.pm
 %%SITE_PERL%%/Template/Magic/QuickStart.pm
 %%SITE_PERL%%/Template/Magic/Zone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Magic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Magic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Magic
-@dirrmtry %%SITE_PERL%%/Template
-@dirrmtry %%SITE_PERL%%/Bundle/Template
-@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/textproc/p5-Template-Plugin-Autoformat/Makefile b/textproc/p5-Template-Plugin-Autoformat/Makefile
index a99d147b4c8f..ff2f51780fb8 100644
--- a/textproc/p5-Template-Plugin-Autoformat/Makefile
+++ b/textproc/p5-Template-Plugin-Autoformat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Autoformat
 PORTVERSION=	2.71
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-Autoformat/pkg-plist b/textproc/p5-Template-Plugin-Autoformat/pkg-plist
index c53ac220d711..4fbe46867613 100644
--- a/textproc/p5-Template-Plugin-Autoformat/pkg-plist
+++ b/textproc/p5-Template-Plugin-Autoformat/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::Autoformat.3.gz
 %%SITE_PERL%%/Template/Plugin/Autoformat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template-Plugin-Autoformat/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template-Plugin-Autoformat
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
index a640697bf794..038a018fb1be 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Filter-Minify-CSS-XS
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/pkg-plist b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/pkg-plist
index 7cb684fa80df..a8c58422a250 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/pkg-plist
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/pkg-plist
@@ -1,14 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/Filter/Minify/CSS/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/CSS/XS/.packlist
 %%PERL5_MAN3%%/Template::Plugin::Filter::Minify::CSS::XS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/CSS/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/CSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter/Minify/CSS
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
index fc5d79b16f0d..e2bd245c0ed8 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Filter-Minify-CSS
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS/pkg-plist b/textproc/p5-Template-Plugin-Filter-Minify-CSS/pkg-plist
index ee12b371cbc7..83cd2531abbd 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS/pkg-plist
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS/pkg-plist
@@ -1,12 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/Filter/Minify/CSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/CSS/.packlist
 %%PERL5_MAN3%%/Template::Plugin::Filter::Minify::CSS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/CSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
index 3eab3166042a..a795039f4ca2 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Filter-Minify-JavaScript-XS
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/pkg-plist b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/pkg-plist
index d6842aa00358..8a50ec5015ff 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/pkg-plist
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/pkg-plist
@@ -1,14 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/Filter/Minify/JavaScript/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/JavaScript/XS/.packlist
 %%PERL5_MAN3%%/Template::Plugin::Filter::Minify::JavaScript::XS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/JavaScript/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/JavaScript
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter/Minify/JavaScript
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
index a92b8a09d6f5..df6aa4b2dc02 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Filter-Minify-JavaScript
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/pkg-plist b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/pkg-plist
index 68e039396bf4..126a3cdfb855 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/pkg-plist
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/pkg-plist
@@ -1,12 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/Filter/Minify/JavaScript.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/JavaScript/.packlist
 %%PERL5_MAN3%%/Template::Plugin::Filter::Minify::JavaScript.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify/JavaScript
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter/Minify
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Filter
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile b/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
index 767cbaf3c871..24306409998e 100644
--- a/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
+++ b/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Template-Plugin-HTML-SuperForm
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-HTML-SuperForm/pkg-plist b/textproc/p5-Template-Plugin-HTML-SuperForm/pkg-plist
index 92524a726261..e8ce66248055 100644
--- a/textproc/p5-Template-Plugin-HTML-SuperForm/pkg-plist
+++ b/textproc/p5-Template-Plugin-HTML-SuperForm/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::HTML::SuperForm.3.gz
 %%SITE_PERL%%/Template/Plugin/HTML/SuperForm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/HTML/SuperForm/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/HTML/SuperForm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin/HTML
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
index eac98417ec82..0c4508cad0b4 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Lingua-EN-Inflect
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist
index f2a6f185d1c1..8e7da25f1f49 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist
@@ -1,12 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::Lingua::EN::Inflect.3.gz
 %%SITE_PERL%%/Template/Plugin/Lingua/EN/Inflect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Lingua/EN/Inflect/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Lingua/EN/Inflect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Lingua/EN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Lingua/EN
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Plugin-XML-Escape/Makefile b/textproc/p5-Template-Plugin-XML-Escape/Makefile
index 544c7d2f35e0..07952866814b 100644
--- a/textproc/p5-Template-Plugin-XML-Escape/Makefile
+++ b/textproc/p5-Template-Plugin-XML-Escape/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-XML-Escape
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Plugin-XML-Escape/pkg-plist b/textproc/p5-Template-Plugin-XML-Escape/pkg-plist
index c5c3da040e12..70f5e6fccef5 100644
--- a/textproc/p5-Template-Plugin-XML-Escape/pkg-plist
+++ b/textproc/p5-Template-Plugin-XML-Escape/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::XML::Escape.3.gz
 %%SITE_PERL%%/Template/Plugin/XML/Escape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/XML/Escape/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/XML/Escape
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin/XML
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Template-Semantic/Makefile b/textproc/p5-Template-Semantic/Makefile
index 970d1f162f54..8283fab132f3 100644
--- a/textproc/p5-Template-Semantic/Makefile
+++ b/textproc/p5-Template-Semantic/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Template-Semantic
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Semantic/pkg-plist b/textproc/p5-Template-Semantic/pkg-plist
index f8689019965d..82e55f25848a 100644
--- a/textproc/p5-Template-Semantic/pkg-plist
+++ b/textproc/p5-Template-Semantic/pkg-plist
@@ -2,12 +2,7 @@
 %%PERL5_MAN3%%/Template::Semantic::Cookbook.3.gz
 %%PERL5_MAN3%%/Template::Semantic::Document.3.gz
 %%PERL5_MAN3%%/Template::Semantic::Filter.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Semantic/.packlist
 %%SITE_PERL%%/Template/Semantic.pm
 %%SITE_PERL%%/Template/Semantic/Cookbook.pod
 %%SITE_PERL%%/Template/Semantic/Document.pm
 %%SITE_PERL%%/Template/Semantic/Filter.pm
-@dirrm %%SITE_PERL%%/Template/Semantic
-@dirrmtry %%SITE_PERL%%/Template
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Semantic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
diff --git a/textproc/p5-Template-Tiny/Makefile b/textproc/p5-Template-Tiny/Makefile
index 6493fc6dc715..c50990cbd1fe 100644
--- a/textproc/p5-Template-Tiny/Makefile
+++ b/textproc/p5-Template-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Tiny
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Template-Tiny/pkg-plist b/textproc/p5-Template-Tiny/pkg-plist
index d3aa97b3fbbd..cf2568134793 100644
--- a/textproc/p5-Template-Tiny/pkg-plist
+++ b/textproc/p5-Template-Tiny/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Template::Tiny.3.gz
 %%SITE_PERL%%/Template/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Tiny/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Tiny
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/textproc/p5-Term-QRCode/Makefile b/textproc/p5-Term-QRCode/Makefile
index adbd0b8f9171..39438a6635f6 100644
--- a/textproc/p5-Term-QRCode/Makefile
+++ b/textproc/p5-Term-QRCode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Term-QRCode
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Term-QRCode/pkg-plist b/textproc/p5-Term-QRCode/pkg-plist
index 57778cd88fc7..9637b3b0a67a 100644
--- a/textproc/p5-Term-QRCode/pkg-plist
+++ b/textproc/p5-Term-QRCode/pkg-plist
@@ -1,9 +1,3 @@
 bin/term-qrcode
 %%PERL5_MAN3%%/Term::QRCode.3.gz
 %%SITE_PERL%%/Term/QRCode.pm
-%%SITE_PERL%%/mach/auto/Term/QRCode/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Term/QRCode
-@dirrm %%SITE_PERL%%/mach/auto/Term
-@dirrm %%SITE_PERL%%/mach/auto
-@dirrm %%SITE_PERL%%/mach
-@dirrm %%SITE_PERL%%/Term
diff --git a/textproc/p5-Test-Perl-Critic/Makefile b/textproc/p5-Test-Perl-Critic/Makefile
index 8fa921e6ac2c..4cc335a413f9 100644
--- a/textproc/p5-Test-Perl-Critic/Makefile
+++ b/textproc/p5-Test-Perl-Critic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Perl-Critic
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Test-Perl-Critic/pkg-plist b/textproc/p5-Test-Perl-Critic/pkg-plist
index e1040ce61365..8327e59d7dbe 100644
--- a/textproc/p5-Test-Perl-Critic/pkg-plist
+++ b/textproc/p5-Test-Perl-Critic/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Test::Perl::Critic.3.gz
 %%SITE_PERL%%/Test/Perl/Critic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Perl/Critic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Perl/Critic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
-@dirrmtry %%SITE_PERL%%/Test/Perl
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/textproc/p5-Text-ASCIIMathML/Makefile b/textproc/p5-Text-ASCIIMathML/Makefile
index 1d109333e1c3..1fe8680cb41c 100644
--- a/textproc/p5-Text-ASCIIMathML/Makefile
+++ b/textproc/p5-Text-ASCIIMathML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-ASCIIMathML
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-ASCIIMathML/pkg-plist b/textproc/p5-Text-ASCIIMathML/pkg-plist
index 559d89169440..3e014be65b6c 100644
--- a/textproc/p5-Text-ASCIIMathML/pkg-plist
+++ b/textproc/p5-Text-ASCIIMathML/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::ASCIIMathML.3.gz
 %%SITE_PERL%%/Text/ASCIIMathML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIIMathML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIIMathML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-ASCIITable/Makefile b/textproc/p5-Text-ASCIITable/Makefile
index 6f6616e70ad9..85065c464fa5 100644
--- a/textproc/p5-Text-ASCIITable/Makefile
+++ b/textproc/p5-Text-ASCIITable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-ASCIITable
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-ASCIITable/pkg-plist b/textproc/p5-Text-ASCIITable/pkg-plist
index 886ffc04a461..86fca8262c34 100644
--- a/textproc/p5-Text-ASCIITable/pkg-plist
+++ b/textproc/p5-Text-ASCIITable/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Text::ASCIITable::Wrap.3.gz
 %%SITE_PERL%%/Text/ASCIITable.pm
 %%SITE_PERL%%/Text/ASCIITable/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrm %%SITE_PERL%%/Text/ASCIITable
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Affixes/Makefile b/textproc/p5-Text-Affixes/Makefile
index 3c429713676c..3451bb93f1e1 100644
--- a/textproc/p5-Text-Affixes/Makefile
+++ b/textproc/p5-Text-Affixes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Affixes
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Affixes/pkg-plist b/textproc/p5-Text-Affixes/pkg-plist
index 8cce563fb3be..a308475f7e86 100644
--- a/textproc/p5-Text-Affixes/pkg-plist
+++ b/textproc/p5-Text-Affixes/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Text::Affixes.3.gz
 %%SITE_PERL%%/Text/Affixes.pm
 %%SITE_PERL%%/auto/Text/Affixes/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Affixes/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Affixes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/auto/Text/Affixes
-@dirrmtry %%SITE_PERL%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Aligner/Makefile b/textproc/p5-Text-Aligner/Makefile
index fcef149812bb..5b6b4357aadd 100644
--- a/textproc/p5-Text-Aligner/Makefile
+++ b/textproc/p5-Text-Aligner/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Aligner
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Aligner/pkg-plist b/textproc/p5-Text-Aligner/pkg-plist
index 34be8525783b..3f6b2c172ba5 100644
--- a/textproc/p5-Text-Aligner/pkg-plist
+++ b/textproc/p5-Text-Aligner/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Text/Aligner.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aligner/.packlist
 %%PERL5_MAN3%%/Text::Aligner.3.gz
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aligner
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Aspell/Makefile b/textproc/p5-Text-Aspell/Makefile
index 89d33e2ca9e4..1c638242f4f5 100644
--- a/textproc/p5-Text-Aspell/Makefile
+++ b/textproc/p5-Text-Aspell/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Aspell
 PORTVERSION=	0.09
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Aspell/pkg-plist b/textproc/p5-Text-Aspell/pkg-plist
index 929f79a713aa..6278e58976e4 100644
--- a/textproc/p5-Text-Aspell/pkg-plist
+++ b/textproc/p5-Text-Aspell/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::Aspell.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Aspell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell/Aspell.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/Aspell.pm
+%%SITE_ARCH%%/auto/Text/Aspell/Aspell.so
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index cce88e7bb254..22100c832956 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Autoformat
 PORTVERSION=	1.669.004
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/Text/DCONWAY
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Autoformat/pkg-plist b/textproc/p5-Text-Autoformat/pkg-plist
index ab83cdba924c..dd68122b09b9 100644
--- a/textproc/p5-Text-Autoformat/pkg-plist
+++ b/textproc/p5-Text-Autoformat/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Autoformat.3.gz
 %%SITE_PERL%%/Text/Autoformat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Balanced/Makefile b/textproc/p5-Text-Balanced/Makefile
index aa141cc2e83f..38f9c5451d8f 100644
--- a/textproc/p5-Text-Balanced/Makefile
+++ b/textproc/p5-Text-Balanced/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Balanced
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Balanced/pkg-plist b/textproc/p5-Text-Balanced/pkg-plist
index 226c69b9b74d..3c829026f6ff 100644
--- a/textproc/p5-Text-Balanced/pkg-plist
+++ b/textproc/p5-Text-Balanced/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Balanced.3.gz
 %%SITE_PERL%%/Text/Balanced.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Balanced/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Balanced
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Bastardize/Makefile b/textproc/p5-Text-Bastardize/Makefile
index 8cd8f5718465..856fb21e45cc 100644
--- a/textproc/p5-Text-Bastardize/Makefile
+++ b/textproc/p5-Text-Bastardize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Bastardize
 DISTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Bastardize/pkg-plist b/textproc/p5-Text-Bastardize/pkg-plist
index 748816bb392a..5ec2aa3708de 100644
--- a/textproc/p5-Text-Bastardize/pkg-plist
+++ b/textproc/p5-Text-Bastardize/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Bastardize.3.gz
 %%SITE_PERL%%/Text/Bastardize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bastardize/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bastardize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index 8e215a02ee21..6e4cb644068c 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-BibTeX
 PORTVERSION=	0.69
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AMBS/Text
diff --git a/textproc/p5-Text-BibTeX/pkg-plist b/textproc/p5-Text-BibTeX/pkg-plist
index f13a99a2d7f1..adb07694b1a3 100644
--- a/textproc/p5-Text-BibTeX/pkg-plist
+++ b/textproc/p5-Text-BibTeX/pkg-plist
@@ -12,17 +12,17 @@ lib/libbtparse.so
 %%PERL5_MAN3%%/Text::BibTeX::NameFormat.3.gz
 %%PERL5_MAN3%%/Text::BibTeX::Structure.3.gz
 %%PERL5_MAN3%%/Text::BibTeX::Value.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/Bib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/BibFormat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/BibSort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/Entry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/Name.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/NameFormat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/Structure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/BibTeX/BibTeX.so
+%%SITE_ARCH%%/Text/BibTeX.pm
+%%SITE_ARCH%%/Text/BibTeX/Bib.pm
+%%SITE_ARCH%%/Text/BibTeX/BibFormat.pm
+%%SITE_ARCH%%/Text/BibTeX/BibSort.pm
+%%SITE_ARCH%%/Text/BibTeX/Entry.pm
+%%SITE_ARCH%%/Text/BibTeX/File.pm
+%%SITE_ARCH%%/Text/BibTeX/Name.pm
+%%SITE_ARCH%%/Text/BibTeX/NameFormat.pm
+%%SITE_ARCH%%/Text/BibTeX/Structure.pm
+%%SITE_ARCH%%/Text/BibTeX/Value.pm
+%%SITE_ARCH%%/auto/Text/BibTeX/BibTeX.so
 man/man1/bt_format_names.1.gz
 man/man1/bt_input.1.gz
 man/man1/bt_language.1.gz
@@ -34,7 +34,3 @@ man/man1/bt_split_names.1.gz
 man/man1/bt_traversal.1.gz
 man/man1/btool_faq.1.gz
 man/man1/btparse.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/BibTeX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-Bind/Makefile b/textproc/p5-Text-Bind/Makefile
index 3495e510193b..685146b8d1c7 100644
--- a/textproc/p5-Text-Bind/Makefile
+++ b/textproc/p5-Text-Bind/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Bind
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Bind/pkg-plist b/textproc/p5-Text-Bind/pkg-plist
index 9b413baaba36..ff0a51e420ee 100644
--- a/textproc/p5-Text-Bind/pkg-plist
+++ b/textproc/p5-Text-Bind/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Bind.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist
 %%SITE_PERL%%/Text/Bind.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Brew/Makefile b/textproc/p5-Text-Brew/Makefile
index 4e5e3e78fdc1..226be6788e07 100644
--- a/textproc/p5-Text-Brew/Makefile
+++ b/textproc/p5-Text-Brew/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Brew
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Brew/pkg-plist b/textproc/p5-Text-Brew/pkg-plist
index 24e52117cc96..52616a3d0d9a 100644
--- a/textproc/p5-Text-Brew/pkg-plist
+++ b/textproc/p5-Text-Brew/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Brew.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Brew/.packlist
 %%SITE_PERL%%/Text/Brew.pm
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Brew
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-CSV-Encoded/Makefile b/textproc/p5-Text-CSV-Encoded/Makefile
index c6825cee33f2..d9fa194a568a 100644
--- a/textproc/p5-Text-CSV-Encoded/Makefile
+++ b/textproc/p5-Text-CSV-Encoded/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-CSV-Encoded
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-CSV-Encoded/pkg-plist b/textproc/p5-Text-CSV-Encoded/pkg-plist
index 4c45e74a744b..bdd9e631aae1 100644
--- a/textproc/p5-Text-CSV-Encoded/pkg-plist
+++ b/textproc/p5-Text-CSV-Encoded/pkg-plist
@@ -6,9 +6,3 @@
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/Base.pm
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/Encode.pm
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/EncodeGuess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Encoded/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Encoded
-@dirrm %%SITE_PERL%%/Text/CSV/Encoded/Coder
-@dirrm %%SITE_PERL%%/Text/CSV/Encoded
-@dirrmtry %%SITE_PERL%%/Text/CSV
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-CSV-Hashify/Makefile b/textproc/p5-Text-CSV-Hashify/Makefile
index 2292eb9d3c6a..681e91e78a35 100644
--- a/textproc/p5-Text-CSV-Hashify/Makefile
+++ b/textproc/p5-Text-CSV-Hashify/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-CSV-Hashify
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEENAN
diff --git a/textproc/p5-Text-CSV-Hashify/pkg-plist b/textproc/p5-Text-CSV-Hashify/pkg-plist
index 4878cac239ee..6f9a7312aac6 100644
--- a/textproc/p5-Text-CSV-Hashify/pkg-plist
+++ b/textproc/p5-Text-CSV-Hashify/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::CSV::Hashify.3.gz
 %%SITE_PERL%%/Text/CSV/Hashify.pm
-%%SITE_PERL%%/mach/auto/Text/CSV/Hashify/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Text/CSV/Hashify
-@dirrmtry %%SITE_PERL%%/mach/auto/Text/CSV
-@dirrmtry %%SITE_PERL%%/mach/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/CSV
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-CSV-Simple/Makefile b/textproc/p5-Text-CSV-Simple/Makefile
index abd3481f18a3..4647f98dbab8 100644
--- a/textproc/p5-Text-CSV-Simple/Makefile
+++ b/textproc/p5-Text-CSV-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-CSV-Simple
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-CSV-Simple/pkg-plist b/textproc/p5-Text-CSV-Simple/pkg-plist
index d2c4bc92ea65..4076eed3ebc2 100644
--- a/textproc/p5-Text-CSV-Simple/pkg-plist
+++ b/textproc/p5-Text-CSV-Simple/pkg-plist
@@ -1,7 +1,2 @@
 %%PERL5_MAN3%%/Text::CSV::Simple.3.gz
 %%SITE_PERL%%/Text/CSV/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV
-@dirrmtry %%SITE_PERL%%/Text/CSV
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-CSV/Makefile b/textproc/p5-Text-CSV/Makefile
index 7da84c4a6209..757ebd4ba6ed 100644
--- a/textproc/p5-Text-CSV/Makefile
+++ b/textproc/p5-Text-CSV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-CSV
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAKAMAKA
diff --git a/textproc/p5-Text-CSV/pkg-plist b/textproc/p5-Text-CSV/pkg-plist
index 31f642efa887..1a48c52ae937 100644
--- a/textproc/p5-Text-CSV/pkg-plist
+++ b/textproc/p5-Text-CSV/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Text::CSV_PP.3.gz
 %%SITE_PERL%%/Text/CSV.pm
 %%SITE_PERL%%/Text/CSV_PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index aef08d50b19c..6f1ed07c9252 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-CSV_XS
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HMBRAND
@@ -27,6 +28,6 @@ NO_ARCH=	yes
 #pre-install:	test
 
 post-install:
-		${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Text/CSV_XS/CSV_XS.so
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Text/CSV_XS/CSV_XS.so
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV_XS/pkg-plist b/textproc/p5-Text-CSV_XS/pkg-plist
index a6f98f5929f3..4aa1ed48f285 100644
--- a/textproc/p5-Text-CSV_XS/pkg-plist
+++ b/textproc/p5-Text-CSV_XS/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Text::CSV_XS.3.gz
 %%SITE_ARCH%%/Text/CSV_XS.pm
-%%SITE_ARCH%%/auto/Text/CSV_XS/.packlist
 %%SITE_ARCH%%/auto/Text/CSV_XS/CSV_XS.so
diff --git a/textproc/p5-Text-Capitalize/Makefile b/textproc/p5-Text-Capitalize/Makefile
index 6516e6f78877..2f9b64182f07 100644
--- a/textproc/p5-Text-Capitalize/Makefile
+++ b/textproc/p5-Text-Capitalize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Capitalize
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Capitalize/pkg-plist b/textproc/p5-Text-Capitalize/pkg-plist
index 6700e5d3f459..6ef4c9e557ad 100644
--- a/textproc/p5-Text-Capitalize/pkg-plist
+++ b/textproc/p5-Text-Capitalize/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Text::Capitalize.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Capitalize/.packlist
 %%SITE_PERL%%/Text/Capitalize.pm
diff --git a/textproc/p5-Text-CharWidth/Makefile b/textproc/p5-Text-CharWidth/Makefile
index 7e10ca22b0a5..c947a1586a67 100644
--- a/textproc/p5-Text-CharWidth/Makefile
+++ b/textproc/p5-Text-CharWidth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-CharWidth
 DISTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-CharWidth/pkg-plist b/textproc/p5-Text-CharWidth/pkg-plist
index fe5e038276d6..8650a5e62e0c 100644
--- a/textproc/p5-Text-CharWidth/pkg-plist
+++ b/textproc/p5-Text-CharWidth/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::CharWidth.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/CharWidth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CharWidth/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CharWidth/CharWidth.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CharWidth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/CharWidth.pm
+%%SITE_ARCH%%/auto/Text/CharWidth/CharWidth.so
diff --git a/textproc/p5-Text-Chomp/Makefile b/textproc/p5-Text-Chomp/Makefile
index d7e55cee1695..3490b71a0fe8 100644
--- a/textproc/p5-Text-Chomp/Makefile
+++ b/textproc/p5-Text-Chomp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Chomp
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Chomp/pkg-plist b/textproc/p5-Text-Chomp/pkg-plist
index 2407f0a0fcf7..8d368914ec9d 100644
--- a/textproc/p5-Text-Chomp/pkg-plist
+++ b/textproc/p5-Text-Chomp/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Chomp.3.gz
 %%SITE_PERL%%/Text/Chomp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Chomp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Chomp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-ClearSilver/Makefile b/textproc/p5-Text-ClearSilver/Makefile
index b0e747372bfe..11b26ca42e45 100644
--- a/textproc/p5-Text-ClearSilver/Makefile
+++ b/textproc/p5-Text-ClearSilver/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-ClearSilver
 PORTVERSION=	0.10.5.4
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-ClearSilver/pkg-plist b/textproc/p5-Text-ClearSilver/pkg-plist
index f93e7949c57f..fdf7a9790e5a 100644
--- a/textproc/p5-Text-ClearSilver/pkg-plist
+++ b/textproc/p5-Text-ClearSilver/pkg-plist
@@ -3,15 +3,9 @@
 %%PERL5_MAN3%%/Text::ClearSilver::FunctionSet.3.gz
 %%PERL5_MAN3%%/Text::ClearSilver::FunctionSet::html.3.gz
 %%PERL5_MAN3%%/Text::ClearSilver::FunctionSet::string.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ClearSilver/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ClearSilver/ClearSilver.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ClearSilver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ClearSilver/Compat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ClearSilver/FunctionSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ClearSilver/FunctionSet/html.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ClearSilver/FunctionSet/string.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text/ClearSilver/FunctionSet
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text/ClearSilver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ClearSilver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+%%SITE_ARCH%%/auto/Text/ClearSilver/ClearSilver.so
+%%SITE_ARCH%%/Text/ClearSilver.pm
+%%SITE_ARCH%%/Text/ClearSilver/Compat.pm
+%%SITE_ARCH%%/Text/ClearSilver/FunctionSet.pm
+%%SITE_ARCH%%/Text/ClearSilver/FunctionSet/html.pm
+%%SITE_ARCH%%/Text/ClearSilver/FunctionSet/string.pm
diff --git a/textproc/p5-Text-Context-EitherSide/Makefile b/textproc/p5-Text-Context-EitherSide/Makefile
index ff73e6bcb8f4..dde85c6d223f 100644
--- a/textproc/p5-Text-Context-EitherSide/Makefile
+++ b/textproc/p5-Text-Context-EitherSide/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Context-EitherSide
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Context-EitherSide/pkg-plist b/textproc/p5-Text-Context-EitherSide/pkg-plist
index 8267326e43d0..6afc1f25d6f9 100644
--- a/textproc/p5-Text-Context-EitherSide/pkg-plist
+++ b/textproc/p5-Text-Context-EitherSide/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::Context::EitherSide.3.gz
 %%SITE_PERL%%/Text/Context/EitherSide.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Context
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Context/Makefile b/textproc/p5-Text-Context/Makefile
index 4b5fc6316b0f..7c3a7a42d45b 100644
--- a/textproc/p5-Text-Context/Makefile
+++ b/textproc/p5-Text-Context/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Context
 PORTVERSION=	3.7
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Context/pkg-plist b/textproc/p5-Text-Context/pkg-plist
index 5b69d4890a60..fe8296c5d735 100644
--- a/textproc/p5-Text-Context/pkg-plist
+++ b/textproc/p5-Text-Context/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Text::Context::Para.3.gz
 %%SITE_PERL%%/Text/Context.pm
 %%SITE_PERL%%/Text/Context/Para.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Context
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-DHCPLeases/Makefile b/textproc/p5-Text-DHCPLeases/Makefile
index 82cc43ecb940..e645335bd9f8 100644
--- a/textproc/p5-Text-DHCPLeases/Makefile
+++ b/textproc/p5-Text-DHCPLeases/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-DHCPLeases
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-DHCPLeases/pkg-plist b/textproc/p5-Text-DHCPLeases/pkg-plist
index 5029068dc1fc..f5b153ce8fbb 100644
--- a/textproc/p5-Text-DHCPLeases/pkg-plist
+++ b/textproc/p5-Text-DHCPLeases/pkg-plist
@@ -4,6 +4,3 @@
 %%SITE_PERL%%/Text/DHCPLeases.pm
 %%SITE_PERL%%/Text/DHCPLeases/Object.pm
 %%SITE_PERL%%/Text/DHCPLeases/Object/Iterator.pm
-@dirrm %%SITE_PERL%%/Text/DHCPLeases/Object
-@dirrm %%SITE_PERL%%/Text/DHCPLeases
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Decorator/Makefile b/textproc/p5-Text-Decorator/Makefile
index 9b30f4215333..460b9effd87a 100644
--- a/textproc/p5-Text-Decorator/Makefile
+++ b/textproc/p5-Text-Decorator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Decorator
 PORTVERSION=	1.65
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Decorator/pkg-plist b/textproc/p5-Text-Decorator/pkg-plist
index d450e7156841..66afb861d474 100644
--- a/textproc/p5-Text-Decorator/pkg-plist
+++ b/textproc/p5-Text-Decorator/pkg-plist
@@ -14,6 +14,3 @@
 %%SITE_PERL%%/Text/Decorator/Filter/URIFind.pm
 %%SITE_PERL%%/Text/Decorator/Group.pm
 %%SITE_PERL%%/Text/Decorator/Node.pm
-@dirrmtry %%SITE_PERL%%/Text/Decorator/Filter
-@dirrmtry %%SITE_PERL%%/Text/Decorator
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Delimited/Makefile b/textproc/p5-Text-Delimited/Makefile
index 02b78f7d5148..0df420451497 100644
--- a/textproc/p5-Text-Delimited/Makefile
+++ b/textproc/p5-Text-Delimited/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Delimited
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Delimited/pkg-plist b/textproc/p5-Text-Delimited/pkg-plist
index ca68943e8590..3592063bf3e9 100644
--- a/textproc/p5-Text-Delimited/pkg-plist
+++ b/textproc/p5-Text-Delimited/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Text/Delimited.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Delimited/.packlist
 %%PERL5_MAN3%%/Text::Delimited.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Delimited
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Diff-HTML/Makefile b/textproc/p5-Text-Diff-HTML/Makefile
index 94f5e5faee1e..b06a463ff786 100644
--- a/textproc/p5-Text-Diff-HTML/Makefile
+++ b/textproc/p5-Text-Diff-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Diff-HTML
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Diff-HTML/pkg-plist b/textproc/p5-Text-Diff-HTML/pkg-plist
index e4aeee26c421..caa0a2b6ff6d 100644
--- a/textproc/p5-Text-Diff-HTML/pkg-plist
+++ b/textproc/p5-Text-Diff-HTML/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Text::Diff::HTML.3.gz
 %%SITE_PERL%%/Text/Diff/HTML.pm
-@dirrmtry %%SITE_PERL%%/Text/Diff
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Diff-Parser/Makefile b/textproc/p5-Text-Diff-Parser/Makefile
index acab4f19918f..a9b6d3ec9a16 100644
--- a/textproc/p5-Text-Diff-Parser/Makefile
+++ b/textproc/p5-Text-Diff-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Diff-Parser
 PORTVERSION=	0.1001
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Diff-Parser/pkg-plist b/textproc/p5-Text-Diff-Parser/pkg-plist
index 0da988cdc645..dea810469d8d 100644
--- a/textproc/p5-Text-Diff-Parser/pkg-plist
+++ b/textproc/p5-Text-Diff-Parser/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::Diff::Parser.3.gz
 %%SITE_PERL%%/Text/Diff/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff/Parser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Diff
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index daec8833caea..51a8c0d6a427 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Diff
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Diff/pkg-plist b/textproc/p5-Text-Diff/pkg-plist
index a1d66eeaa4c0..d4cf33ff7dbb 100644
--- a/textproc/p5-Text-Diff/pkg-plist
+++ b/textproc/p5-Text-Diff/pkg-plist
@@ -1,11 +1,6 @@
 %%PERL5_MAN3%%/Text::Diff.3.gz
 %%PERL5_MAN3%%/Text::Diff::Config.3.gz
 %%PERL5_MAN3%%/Text::Diff::Table.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff/.packlist
 %%SITE_PERL%%/Text/Diff.pm
 %%SITE_PERL%%/Text/Diff/Config.pm
 %%SITE_PERL%%/Text/Diff/Table.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrm %%SITE_PERL%%/Text/Diff
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Diff3/Makefile b/textproc/p5-Text-Diff3/Makefile
index 3989f0e38257..9b839a42e441 100644
--- a/textproc/p5-Text-Diff3/Makefile
+++ b/textproc/p5-Text-Diff3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Diff3
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Diff3/pkg-plist b/textproc/p5-Text-Diff3/pkg-plist
index 09434e574347..aa60b8975024 100644
--- a/textproc/p5-Text-Diff3/pkg-plist
+++ b/textproc/p5-Text-Diff3/pkg-plist
@@ -18,8 +18,3 @@
 %%SITE_PERL%%/Text/Diff3/Range2.pm
 %%SITE_PERL%%/Text/Diff3/Range3.pm
 %%SITE_PERL%%/Text/Diff3/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Diff3
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-DoubleMetaphone/Makefile b/textproc/p5-Text-DoubleMetaphone/Makefile
index 0eed57d9ee6b..c1a036b3f8a5 100644
--- a/textproc/p5-Text-DoubleMetaphone/Makefile
+++ b/textproc/p5-Text-DoubleMetaphone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-DoubleMetaphone
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-DoubleMetaphone/pkg-plist b/textproc/p5-Text-DoubleMetaphone/pkg-plist
index 308cfbf80689..e1ef6c53ce81 100644
--- a/textproc/p5-Text-DoubleMetaphone/pkg-plist
+++ b/textproc/p5-Text-DoubleMetaphone/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/Text::DoubleMetaphone.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/DoubleMetaphone.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.so
+%%SITE_ARCH%%/auto/Text/DoubleMetaphone/autosplit.ix
+%%SITE_ARCH%%/Text/DoubleMetaphone.pm
diff --git a/textproc/p5-Text-Emoticon-GoogleTalk/Makefile b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
index 505f332dd4f7..a1fb769ac103 100644
--- a/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
+++ b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Emoticon-GoogleTalk
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Emoticon-GoogleTalk/pkg-plist b/textproc/p5-Text-Emoticon-GoogleTalk/pkg-plist
index 8fb2623f319c..65fc5630d510 100644
--- a/textproc/p5-Text-Emoticon-GoogleTalk/pkg-plist
+++ b/textproc/p5-Text-Emoticon-GoogleTalk/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::Emoticon::GoogleTalk.3.gz
 %%SITE_PERL%%/Text/Emoticon/GoogleTalk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Emoticon/GoogleTalk/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Emoticon/GoogleTalk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Emoticon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Emoticon
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Emoticon/Makefile b/textproc/p5-Text-Emoticon/Makefile
index 66ff888bfe45..5aecfd32adfa 100644
--- a/textproc/p5-Text-Emoticon/Makefile
+++ b/textproc/p5-Text-Emoticon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Emoticon
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Emoticon/pkg-plist b/textproc/p5-Text-Emoticon/pkg-plist
index 5dc8aabeee88..a179d64b17dc 100644
--- a/textproc/p5-Text-Emoticon/pkg-plist
+++ b/textproc/p5-Text-Emoticon/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Text/Emoticon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Emoticon/.packlist
 %%PERL5_MAN3%%/Text::Emoticon.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Emoticon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-EtText/Makefile b/textproc/p5-Text-EtText/Makefile
index b351c88c05cc..027493ed952e 100644
--- a/textproc/p5-Text-EtText/Makefile
+++ b/textproc/p5-Text-EtText/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-EtText
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-EtText/pkg-plist b/textproc/p5-Text-EtText/pkg-plist
index bdbdfa878361..adf94cb6e51d 100644
--- a/textproc/p5-Text-EtText/pkg-plist
+++ b/textproc/p5-Text-EtText/pkg-plist
@@ -11,10 +11,5 @@ bin/ettext2html
 %%SITE_PERL%%/Text/EtText/HTML2EtText.pm
 %%SITE_PERL%%/Text/EtText/LinkGlossary.pm
 %%SITE_PERL%%/Text/EtText/Lists.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText/.packlist
 man/man1/ethtml2text.1.gz
 man/man1/ettext2html.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/EtText
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Extract-Word/Makefile b/textproc/p5-Text-Extract-Word/Makefile
index bc6b995c8c2b..51eee6609b61 100644
--- a/textproc/p5-Text-Extract-Word/Makefile
+++ b/textproc/p5-Text-Extract-Word/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Extract-Word
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Extract-Word/pkg-plist b/textproc/p5-Text-Extract-Word/pkg-plist
index c1603c7c0631..46342f0c8d75 100644
--- a/textproc/p5-Text-Extract-Word/pkg-plist
+++ b/textproc/p5-Text-Extract-Word/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::Extract::Word.3.gz
 %%SITE_PERL%%/Text/Extract/Word.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Extract/Word/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Extract/Word
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Extract
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Extract
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-ExtractWords/Makefile b/textproc/p5-Text-ExtractWords/Makefile
index 075433d2ef86..c445fbb95d05 100644
--- a/textproc/p5-Text-ExtractWords/Makefile
+++ b/textproc/p5-Text-ExtractWords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-ExtractWords
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-ExtractWords/pkg-plist b/textproc/p5-Text-ExtractWords/pkg-plist
index 61e511ce9d36..6a1ba5df9625 100644
--- a/textproc/p5-Text-ExtractWords/pkg-plist
+++ b/textproc/p5-Text-ExtractWords/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/Text::ExtractWords.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ExtractWords.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords/ExtractWords.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/ExtractWords.pm
+%%SITE_ARCH%%/auto/Text/ExtractWords/ExtractWords.so
+%%SITE_ARCH%%/auto/Text/ExtractWords/autosplit.ix
diff --git a/textproc/p5-Text-FillIn/Makefile b/textproc/p5-Text-FillIn/Makefile
index 60cf2529a462..e8fa638aee0c 100644
--- a/textproc/p5-Text-FillIn/Makefile
+++ b/textproc/p5-Text-FillIn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-FillIn
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-FillIn/pkg-plist b/textproc/p5-Text-FillIn/pkg-plist
index 8dabdc768d20..2170e8b2e00a 100644
--- a/textproc/p5-Text-FillIn/pkg-plist
+++ b/textproc/p5-Text-FillIn/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::FillIn.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn/.packlist
 %%SITE_PERL%%/Text/FillIn.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index 5e5af4d2da6b..51c01bb93511 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Filter-Chain
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Filter-Chain/pkg-plist b/textproc/p5-Text-Filter-Chain/pkg-plist
index 52a0adb6a83f..5bcdca0b7e8b 100644
--- a/textproc/p5-Text-Filter-Chain/pkg-plist
+++ b/textproc/p5-Text-Filter-Chain/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::Filter::Chain.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain/.packlist
 %%SITE_PERL%%/Text/Filter/Chain.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Filter
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Filter/Makefile b/textproc/p5-Text-Filter/Makefile
index 7452503a3587..b0e55516ed89 100644
--- a/textproc/p5-Text-Filter/Makefile
+++ b/textproc/p5-Text-Filter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Filter
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Filter/pkg-plist b/textproc/p5-Text-Filter/pkg-plist
index a71edc924baf..7b7b7d4f130f 100644
--- a/textproc/p5-Text-Filter/pkg-plist
+++ b/textproc/p5-Text-Filter/pkg-plist
@@ -1,9 +1,4 @@
 %%PERL5_MAN3%%/Text::Filter.3.gz
 %%PERL5_MAN3%%/Text::Filter::Cooked.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/.packlist
 %%SITE_PERL%%/Text/Filter.pm
 %%SITE_PERL%%/Text/Filter/Cooked.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Filter
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-FindIndent/Makefile b/textproc/p5-Text-FindIndent/Makefile
index 98b1660a7c42..40e5a2a35f0a 100644
--- a/textproc/p5-Text-FindIndent/Makefile
+++ b/textproc/p5-Text-FindIndent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-FindIndent
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SMUELLER
diff --git a/textproc/p5-Text-FindIndent/pkg-plist b/textproc/p5-Text-FindIndent/pkg-plist
index a9cef6559013..b6c6139be870 100644
--- a/textproc/p5-Text-FindIndent/pkg-plist
+++ b/textproc/p5-Text-FindIndent/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::FindIndent.3.gz
 %%SITE_PERL%%/Text/FindIndent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FindIndent/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FindIndent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-FixEOL/Makefile b/textproc/p5-Text-FixEOL/Makefile
index 2b691f04e4bb..41bcd98a0177 100644
--- a/textproc/p5-Text-FixEOL/Makefile
+++ b/textproc/p5-Text-FixEOL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-FixEOL
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Text
diff --git a/textproc/p5-Text-FixEOL/pkg-plist b/textproc/p5-Text-FixEOL/pkg-plist
index 1df35b8d134a..de946a8f0329 100644
--- a/textproc/p5-Text-FixEOL/pkg-plist
+++ b/textproc/p5-Text-FixEOL/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Text::FixEOL.3.gz
 %%SITE_PERL%%/Text/FixEOL.pm
 %%SITE_PERL%%/Text/FixEOL.pod
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index 169a8a34cdf8..6dc6ba4c24b1 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-FixedLength-Extra
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-FixedLength-Extra/pkg-plist b/textproc/p5-Text-FixedLength-Extra/pkg-plist
index cc7c6eb7adef..60b8a91a087a 100644
--- a/textproc/p5-Text-FixedLength-Extra/pkg-plist
+++ b/textproc/p5-Text-FixedLength-Extra/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Text::FixedLength::Extra.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra/.packlist
 %%SITE_PERL%%/Text/FixedLength/Extra.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra
-@dirrmtry %%SITE_PERL%%/Text/FixedLength
diff --git a/textproc/p5-Text-FixedLength/Makefile b/textproc/p5-Text-FixedLength/Makefile
index fb68aa143a3b..bc04b39f1f2c 100644
--- a/textproc/p5-Text-FixedLength/Makefile
+++ b/textproc/p5-Text-FixedLength/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-FixedLength
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-FixedLength/pkg-plist b/textproc/p5-Text-FixedLength/pkg-plist
index 0b5fe1a2cf42..671740a32830 100644
--- a/textproc/p5-Text-FixedLength/pkg-plist
+++ b/textproc/p5-Text-FixedLength/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::FixedLength.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/.packlist
 %%SITE_PERL%%/Text/FixedLength.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Flow/Makefile b/textproc/p5-Text-Flow/Makefile
index 4cfd30510ee1..0963e5eb70ce 100644
--- a/textproc/p5-Text-Flow/Makefile
+++ b/textproc/p5-Text-Flow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Flow
 DISTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Flow/pkg-plist b/textproc/p5-Text-Flow/pkg-plist
index af624f6e0a6c..dcac3a0bad8c 100644
--- a/textproc/p5-Text-Flow/pkg-plist
+++ b/textproc/p5-Text-Flow/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Text::Flow::Wrap.3.gz
 %%SITE_PERL%%/Text/Flow.pm
 %%SITE_PERL%%/Text/Flow/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flow/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flow
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Flow
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Flowchart/Makefile b/textproc/p5-Text-Flowchart/Makefile
index 696900b57464..9a1c9da51d87 100644
--- a/textproc/p5-Text-Flowchart/Makefile
+++ b/textproc/p5-Text-Flowchart/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Flowchart
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Flowchart/pkg-plist b/textproc/p5-Text-Flowchart/pkg-plist
index b5a5355ed54a..943e4e2960c7 100644
--- a/textproc/p5-Text-Flowchart/pkg-plist
+++ b/textproc/p5-Text-Flowchart/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Flowchart.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart/.packlist
 %%SITE_PERL%%/Text/Flowchart.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Flowed/Makefile b/textproc/p5-Text-Flowed/Makefile
index b0ebd7dab8a3..9b9121f52fe5 100644
--- a/textproc/p5-Text-Flowed/Makefile
+++ b/textproc/p5-Text-Flowed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Flowed
 DISTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Flowed/pkg-plist b/textproc/p5-Text-Flowed/pkg-plist
index 155925aaa448..9d2c030724d7 100644
--- a/textproc/p5-Text-Flowed/pkg-plist
+++ b/textproc/p5-Text-Flowed/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Flowed.3.gz
 %%SITE_PERL%%/Text/Flowed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowed/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Format+NWrap/Makefile b/textproc/p5-Text-Format+NWrap/Makefile
index 322a3a339947..d890e6e2a4b7 100644
--- a/textproc/p5-Text-Format+NWrap/Makefile
+++ b/textproc/p5-Text-Format+NWrap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Format+NWrap
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Format+NWrap/pkg-plist b/textproc/p5-Text-Format+NWrap/pkg-plist
index a54f283ac8ed..31e529ec808e 100644
--- a/textproc/p5-Text-Format+NWrap/pkg-plist
+++ b/textproc/p5-Text-Format+NWrap/pkg-plist
@@ -1,7 +1,4 @@
 %%PERL5_MAN3%%/Text::Format.3.gz
 %%PERL5_MAN3%%/Text::NWrap.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text-Format+NWrap/.packlist
 %%SITE_PERL%%/Text/Format.pm
 %%SITE_PERL%%/Text/NWrap.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text-Format+NWrap
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index 16fc5b2fab17..cbe631b51ceb 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Format
 PORTVERSION=	0.58
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Format/pkg-plist b/textproc/p5-Text-Format/pkg-plist
index 3319e8f5befe..f123eca409c9 100644
--- a/textproc/p5-Text-Format/pkg-plist
+++ b/textproc/p5-Text-Format/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Format.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format/.packlist
 %%SITE_PERL%%/Text/Format.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-FormatTable/Makefile b/textproc/p5-Text-FormatTable/Makefile
index 241699d6b552..9cc07e605008 100644
--- a/textproc/p5-Text-FormatTable/Makefile
+++ b/textproc/p5-Text-FormatTable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-FormatTable
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-FormatTable/pkg-plist b/textproc/p5-Text-FormatTable/pkg-plist
index c410576d42e5..c516bc1bafb8 100644
--- a/textproc/p5-Text-FormatTable/pkg-plist
+++ b/textproc/p5-Text-FormatTable/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::FormatTable.3.gz
 %%SITE_PERL%%/Text/FormatTable.pm
 %%SITE_PERL%%/Text/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-German/Makefile b/textproc/p5-Text-German/Makefile
index c3109663e128..f3bd3718b8de 100644
--- a/textproc/p5-Text-German/Makefile
+++ b/textproc/p5-Text-German/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-German
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ULPFR
diff --git a/textproc/p5-Text-German/pkg-plist b/textproc/p5-Text-German/pkg-plist
index dc51818ef507..8ba14a4dd3be 100644
--- a/textproc/p5-Text-German/pkg-plist
+++ b/textproc/p5-Text-German/pkg-plist
@@ -9,8 +9,3 @@
 %%SITE_PERL%%/Text/German/Util.pm
 %%SITE_PERL%%/Text/German/Verb.pm
 %%SITE_PERL%%/Text/German/Vorsilbe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/German/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/German
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/German
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Glob/Makefile b/textproc/p5-Text-Glob/Makefile
index 0fabd01f898e..7a23ba2b0bda 100644
--- a/textproc/p5-Text-Glob/Makefile
+++ b/textproc/p5-Text-Glob/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Glob
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Glob/pkg-plist b/textproc/p5-Text-Glob/pkg-plist
index 6f364d919d54..e57f7d44d5a6 100644
--- a/textproc/p5-Text-Glob/pkg-plist
+++ b/textproc/p5-Text-Glob/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Glob.3.gz
 %%SITE_PERL%%/Text/Glob.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Glob/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Glob
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index c77bbfc42498..4fc61bd70c64 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Graphics
 PORTVERSION=	1.0001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Graphics/pkg-plist b/textproc/p5-Text-Graphics/pkg-plist
index f8094b7529c3..fe42e340d772 100644
--- a/textproc/p5-Text-Graphics/pkg-plist
+++ b/textproc/p5-Text-Graphics/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Graphics.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics/.packlist
 %%SITE_PERL%%/Text/Graphics.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Greeking/Makefile b/textproc/p5-Text-Greeking/Makefile
index 53285fd2251d..20f6524f28e3 100644
--- a/textproc/p5-Text-Greeking/Makefile
+++ b/textproc/p5-Text-Greeking/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Greeking
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Greeking/pkg-plist b/textproc/p5-Text-Greeking/pkg-plist
index 697a1bbd2c67..1ee7949f711c 100644
--- a/textproc/p5-Text-Greeking/pkg-plist
+++ b/textproc/p5-Text-Greeking/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Greeking.3.gz
 %%SITE_PERL%%/Text/Greeking.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Haml/Makefile b/textproc/p5-Text-Haml/Makefile
index 7178942ecccb..2fcda4d472da 100644
--- a/textproc/p5-Text-Haml/Makefile
+++ b/textproc/p5-Text-Haml/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Haml
 PORTVERSION=	0.990116
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Hatena/Makefile b/textproc/p5-Text-Hatena/Makefile
index 162dff5aca56..01374836a5da 100644
--- a/textproc/p5-Text-Hatena/Makefile
+++ b/textproc/p5-Text-Hatena/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Hatena
 PORTVERSION=	0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Hatena/pkg-plist b/textproc/p5-Text-Hatena/pkg-plist
index f4d78ddb7c24..a9c598ed03fc 100644
--- a/textproc/p5-Text-Hatena/pkg-plist
+++ b/textproc/p5-Text-Hatena/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Text::Hatena::AutoLink.3.gz
 %%SITE_PERL%%/Text/Hatena.pm
 %%SITE_PERL%%/Text/Hatena/AutoLink.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Hatena/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Hatena
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Hatena
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Highlight/Makefile b/textproc/p5-Text-Highlight/Makefile
index 4a97195ed051..0d7ac1be0a33 100644
--- a/textproc/p5-Text-Highlight/Makefile
+++ b/textproc/p5-Text-Highlight/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Highlight
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ICRF
diff --git a/textproc/p5-Text-Highlight/pkg-plist b/textproc/p5-Text-Highlight/pkg-plist
index 28613d2bdf7b..db545b37dfaf 100644
--- a/textproc/p5-Text-Highlight/pkg-plist
+++ b/textproc/p5-Text-Highlight/pkg-plist
@@ -7,8 +7,3 @@
 %%SITE_PERL%%/Text/Highlight/PHP.pm
 %%SITE_PERL%%/Text/Highlight/Perl.pm
 %%SITE_PERL%%/Text/Highlight/SQL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Highlight/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Highlight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Highlight
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-HikiDoc/Makefile b/textproc/p5-Text-HikiDoc/Makefile
index 0682b5f19e26..5574c9c9528c 100644
--- a/textproc/p5-Text-HikiDoc/Makefile
+++ b/textproc/p5-Text-HikiDoc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-HikiDoc
 PORTVERSION=	1.021
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-HikiDoc/pkg-plist b/textproc/p5-Text-HikiDoc/pkg-plist
index 121299327b25..60f535b8c779 100644
--- a/textproc/p5-Text-HikiDoc/pkg-plist
+++ b/textproc/p5-Text-HikiDoc/pkg-plist
@@ -11,6 +11,3 @@
 %%SITE_PERL%%/Text/HikiDoc/Plugin/syntaxhighlighter.pm
 %%SITE_PERL%%/Text/HikiDoc/Plugin/texthighlight.pm
 %%SITE_PERL%%/Text/HikiDoc/Plugin/vimcolor.pm
-@dirrm %%SITE_PERL%%/Text/HikiDoc/Plugin
-@dirrm %%SITE_PERL%%/Text/HikiDoc
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Hyphen/Makefile b/textproc/p5-Text-Hyphen/Makefile
index 0816c7377279..5055bd1962f0 100644
--- a/textproc/p5-Text-Hyphen/Makefile
+++ b/textproc/p5-Text-Hyphen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Hyphen
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Hyphen/pkg-plist b/textproc/p5-Text-Hyphen/pkg-plist
index 2c5f5171fc94..dee5e29640ed 100644
--- a/textproc/p5-Text-Hyphen/pkg-plist
+++ b/textproc/p5-Text-Hyphen/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Hyphen.3.gz
 %%SITE_PERL%%/Text/Hyphen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Hyphen/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Hyphen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-LTSV/Makefile b/textproc/p5-Text-LTSV/Makefile
index 1939631ca3df..4c2681d5e4e0 100644
--- a/textproc/p5-Text-LTSV/Makefile
+++ b/textproc/p5-Text-LTSV/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-LTSV
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-LTSV/pkg-plist b/textproc/p5-Text-LTSV/pkg-plist
index a5e73720e5a5..585deea48217 100644
--- a/textproc/p5-Text-LTSV/pkg-plist
+++ b/textproc/p5-Text-LTSV/pkg-plist
@@ -1,6 +1,5 @@
 bin/ltsview
 man/man1/ltsview.1.gz
 %%PERL5_MAN3%%/Text::LTSV.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LTSV/.packlist
 %%SITE_PERL%%/Text/LTSV.pm
 %%SITE_PERL%%/Text/LTSV/Iterator.pm
diff --git a/textproc/p5-Text-Language-Guess/Makefile b/textproc/p5-Text-Language-Guess/Makefile
index afff0bc76db8..b48cb045c808 100644
--- a/textproc/p5-Text-Language-Guess/Makefile
+++ b/textproc/p5-Text-Language-Guess/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Language-Guess
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSCHILLI
diff --git a/textproc/p5-Text-Language-Guess/pkg-plist b/textproc/p5-Text-Language-Guess/pkg-plist
index 88ffe84be4d5..d64089fb4c16 100644
--- a/textproc/p5-Text-Language-Guess/pkg-plist
+++ b/textproc/p5-Text-Language-Guess/pkg-plist
@@ -1,10 +1,4 @@
 %%PERL5_MAN3%%/Text::Language::Guess.3.gz
 bin/language-guess
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Language/Guess/.packlist
 %%SITE_PERL%%/Text/Language/Guess.pm
 man/man1/language-guess.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Language/Guess
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Language
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Language
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Lorem/Makefile b/textproc/p5-Text-Lorem/Makefile
index 45d405c0c181..5d26c05b99e7 100644
--- a/textproc/p5-Text-Lorem/Makefile
+++ b/textproc/p5-Text-Lorem/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Lorem
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Lorem/pkg-plist b/textproc/p5-Text-Lorem/pkg-plist
index 163cc3c7111b..ec9dacab58d6 100644
--- a/textproc/p5-Text-Lorem/pkg-plist
+++ b/textproc/p5-Text-Lorem/pkg-plist
@@ -1,8 +1,4 @@
 bin/lorem
 %%PERL5_MAN3%%/Text::Lorem.3.gz
 %%SITE_PERL%%/Text/Lorem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Lorem/.packlist
 man/man1/lorem.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Lorem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Markdown/Makefile b/textproc/p5-Text-Markdown/Makefile
index d21747aafd84..58ea024f9e43 100644
--- a/textproc/p5-Text-Markdown/Makefile
+++ b/textproc/p5-Text-Markdown/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Markdown
 PORTVERSION=	1.000031
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Markdown/pkg-plist b/textproc/p5-Text-Markdown/pkg-plist
index a0bf609ef27a..48d8a0759440 100644
--- a/textproc/p5-Text-Markdown/pkg-plist
+++ b/textproc/p5-Text-Markdown/pkg-plist
@@ -1,8 +1,4 @@
 bin/Markdown.pl
 %%PERL5_MAN3%%/Text::Markdown.3.gz
 %%SITE_PERL%%/Text/Markdown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Markdown/.packlist
 man/man1/Markdown.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Markdown
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Match-FastAlternatives/Makefile b/textproc/p5-Text-Match-FastAlternatives/Makefile
index 541aef8944e9..4ab92e96c438 100644
--- a/textproc/p5-Text-Match-FastAlternatives/Makefile
+++ b/textproc/p5-Text-Match-FastAlternatives/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Match-FastAlternatives
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Match-FastAlternatives/pkg-plist b/textproc/p5-Text-Match-FastAlternatives/pkg-plist
index 66868d97aaf1..810ff34ff223 100644
--- a/textproc/p5-Text-Match-FastAlternatives/pkg-plist
+++ b/textproc/p5-Text-Match-FastAlternatives/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Text::Match::FastAlternatives.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Match/FastAlternatives/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Match/FastAlternatives/FastAlternatives.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Match/FastAlternatives.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text/Match
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Match/FastAlternatives
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Match
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+%%SITE_ARCH%%/auto/Text/Match/FastAlternatives/FastAlternatives.so
+%%SITE_ARCH%%/Text/Match/FastAlternatives.pm
diff --git a/textproc/p5-Text-Metaphone/Makefile b/textproc/p5-Text-Metaphone/Makefile
index c023dd15b979..338f7f8600d7 100644
--- a/textproc/p5-Text-Metaphone/Makefile
+++ b/textproc/p5-Text-Metaphone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Metaphone
 PORTVERSION=	20081017
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Metaphone/pkg-plist b/textproc/p5-Text-Metaphone/pkg-plist
index cb66db6556bf..c1afa34d5ea9 100644
--- a/textproc/p5-Text-Metaphone/pkg-plist
+++ b/textproc/p5-Text-Metaphone/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::Metaphone.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Metaphone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/Metaphone.pm
+%%SITE_ARCH%%/auto/Text/Metaphone/Metaphone.so
diff --git a/textproc/p5-Text-MicroMason/Makefile b/textproc/p5-Text-MicroMason/Makefile
index 5dc44afcfbc0..ea2d0866a336 100644
--- a/textproc/p5-Text-MicroMason/Makefile
+++ b/textproc/p5-Text-MicroMason/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-MicroMason
 PORTVERSION=	2.13
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-MicroMason/pkg-plist b/textproc/p5-Text-MicroMason/pkg-plist
index 8bff0dc8a02c..a8908220b4d0 100644
--- a/textproc/p5-Text-MicroMason/pkg-plist
+++ b/textproc/p5-Text-MicroMason/pkg-plist
@@ -32,7 +32,6 @@
 %%PERL5_MAN3%%/Text::MicroMason::TemplateDir.3.gz
 %%PERL5_MAN3%%/Text::MicroMason::TemplatePath.3.gz
 %%PERL5_MAN3%%/Text::MicroMason::TextTemplate.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MicroMason/.packlist
 %%SITE_PERL%%/Text/MicroMason.pm
 %%SITE_PERL%%/Text/MicroMason/AllowGlobals.pm
 %%SITE_PERL%%/Text/MicroMason/ApacheHandler.pm
@@ -68,9 +67,3 @@
 %%SITE_PERL%%/Text/MicroMason/TemplateDir.pm
 %%SITE_PERL%%/Text/MicroMason/TemplatePath.pm
 %%SITE_PERL%%/Text/MicroMason/TextTemplate.pm
-@dirrm %%SITE_PERL%%/Text/MicroMason/Docs
-@dirrm %%SITE_PERL%%/Text/MicroMason/Cache
-@dirrm %%SITE_PERL%%/Text/MicroMason
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MicroMason
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-MicroTemplate-Extended/Makefile b/textproc/p5-Text-MicroTemplate-Extended/Makefile
index c0b173d948d6..2f7b997a8a09 100644
--- a/textproc/p5-Text-MicroTemplate-Extended/Makefile
+++ b/textproc/p5-Text-MicroTemplate-Extended/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-MicroTemplate-Extended
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-MicroTemplate-Extended/pkg-plist b/textproc/p5-Text-MicroTemplate-Extended/pkg-plist
index 7495806c3f42..a6d78d70d3c8 100644
--- a/textproc/p5-Text-MicroTemplate-Extended/pkg-plist
+++ b/textproc/p5-Text-MicroTemplate-Extended/pkg-plist
@@ -1,10 +1,4 @@
 %%PERL5_MAN3%%/Text::MicroTemplate::Extended.3.gz
 %%PERL5_MAN3%%/Text::MicroTemplate::Extended.ja.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MicroTemplate/Extended/.packlist
 %%SITE_PERL%%/Text/MicroTemplate/Extended.ja.pod
 %%SITE_PERL%%/Text/MicroTemplate/Extended.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MicroTemplate/Extended
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MicroTemplate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/MicroTemplate
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-MicroTemplate/Makefile b/textproc/p5-Text-MicroTemplate/Makefile
index 7af898df44e6..b1d6248ee231 100644
--- a/textproc/p5-Text-MicroTemplate/Makefile
+++ b/textproc/p5-Text-MicroTemplate/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-MicroTemplate
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-MicroTemplate/pkg-plist b/textproc/p5-Text-MicroTemplate/pkg-plist
index 208cf01ce23a..915424ae9c72 100644
--- a/textproc/p5-Text-MicroTemplate/pkg-plist
+++ b/textproc/p5-Text-MicroTemplate/pkg-plist
@@ -1,10 +1,5 @@
 %%PERL5_MAN3%%/Text::MicroTemplate.3.gz
 %%PERL5_MAN3%%/Text::MicroTemplate::File.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MicroTemplate/.packlist
 %%SITE_PERL%%/Text/MicroTemplate.pm
 %%SITE_PERL%%/Text/MicroTemplate/EncodedString.pm
 %%SITE_PERL%%/Text/MicroTemplate/File.pm
-@dirrm %%SITE_PERL%%/Text/MicroTemplate
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MicroTemplate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-MultiMarkdown/Makefile b/textproc/p5-Text-MultiMarkdown/Makefile
index 34bb61420012..6e12f834bf6b 100644
--- a/textproc/p5-Text-MultiMarkdown/Makefile
+++ b/textproc/p5-Text-MultiMarkdown/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-MultiMarkdown
 PORTVERSION=	1.000035
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-MultiMarkdown/pkg-plist b/textproc/p5-Text-MultiMarkdown/pkg-plist
index 744ab782fed9..5ffd2fff52c0 100644
--- a/textproc/p5-Text-MultiMarkdown/pkg-plist
+++ b/textproc/p5-Text-MultiMarkdown/pkg-plist
@@ -1,8 +1,4 @@
 bin/MultiMarkdown.pl
 %%PERL5_MAN3%%/Text::MultiMarkdown.3.gz
 %%SITE_PERL%%/Text/MultiMarkdown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MultiMarkdown/.packlist
 man/man1/MultiMarkdown.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MultiMarkdown
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-NSP/Makefile b/textproc/p5-Text-NSP/Makefile
index 02673f05d8ee..a1a88855b42f 100644
--- a/textproc/p5-Text-NSP/Makefile
+++ b/textproc/p5-Text-NSP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-NSP
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-NSP/pkg-plist b/textproc/p5-Text-NSP/pkg-plist
index ef64b43716f6..f10a61e22031 100644
--- a/textproc/p5-Text-NSP/pkg-plist
+++ b/textproc/p5-Text-NSP/pkg-plist
@@ -79,7 +79,6 @@ bin/statistic.pl
 %%SITE_PERL%%/Text/NSP/Measures/4D.pm
 %%SITE_PERL%%/Text/NSP/Measures/4D/MI.pm
 %%SITE_PERL%%/Text/NSP/Measures/4D/MI/ll.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP/.packlist
 man/man1/combig.pl.1.gz
 man/man1/count.pl.1.gz
 man/man1/count2huge.pl.1.gz
@@ -92,18 +91,3 @@ man/man1/huge-split.pl.1.gz
 man/man1/kocos.pl.1.gz
 man/man1/rank.pl.1.gz
 man/man1/statistic.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/4D/MI
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/4D
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/3D/MI
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/3D
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/2D/MI
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/2D/Fisher2
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/2D/Fisher
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/2D/Dice
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/2D/CHI
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures/2D
-@dirrmtry %%SITE_PERL%%/Text/NSP/Measures
-@dirrmtry %%SITE_PERL%%/Text/NSP
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-NeatTemplate/Makefile b/textproc/p5-Text-NeatTemplate/Makefile
index 29e9a79c25dd..7d888f53f047 100644
--- a/textproc/p5-Text-NeatTemplate/Makefile
+++ b/textproc/p5-Text-NeatTemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-NeatTemplate
 PORTVERSION=	0.10.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-NeatTemplate/pkg-plist b/textproc/p5-Text-NeatTemplate/pkg-plist
index b952dd246178..2f0db5b0c225 100644
--- a/textproc/p5-Text-NeatTemplate/pkg-plist
+++ b/textproc/p5-Text-NeatTemplate/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Text::NeatTemplate.3.gz
 %%SITE_PERL%%/Text/NeatTemplate.pm
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Netstring/Makefile b/textproc/p5-Text-Netstring/Makefile
index 7047adf41cba..c4e4b3068dd2 100644
--- a/textproc/p5-Text-Netstring/Makefile
+++ b/textproc/p5-Text-Netstring/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Netstring
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Netstring/pkg-plist b/textproc/p5-Text-Netstring/pkg-plist
index 2dbf970e1a54..c061fd06bc3e 100644
--- a/textproc/p5-Text-Netstring/pkg-plist
+++ b/textproc/p5-Text-Netstring/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Netstring.3.gz
 %%SITE_PERL%%/Text/Netstring.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Netstring/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Netstring
-@dirrmtry %%SITE_PERL%%/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Ngram/Makefile b/textproc/p5-Text-Ngram/Makefile
index 396efb62354a..dee856d82774 100644
--- a/textproc/p5-Text-Ngram/Makefile
+++ b/textproc/p5-Text-Ngram/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Ngram
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,6 +21,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-		${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Text/Ngram/Ngram.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Text/Ngram/Ngram.so
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Ngram/pkg-plist b/textproc/p5-Text-Ngram/pkg-plist
index b0cddf4e5076..edbb0a42058a 100644
--- a/textproc/p5-Text-Ngram/pkg-plist
+++ b/textproc/p5-Text-Ngram/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::Ngram.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Ngram.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram/Ngram.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/Ngram.pm
+%%SITE_ARCH%%/auto/Text/Ngram/Ngram.so
diff --git a/textproc/p5-Text-Ngrams/Makefile b/textproc/p5-Text-Ngrams/Makefile
index aeb3b16f2d44..899a25bba8d9 100644
--- a/textproc/p5-Text-Ngrams/Makefile
+++ b/textproc/p5-Text-Ngrams/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Ngrams
 PORTVERSION=	2.003
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Ngrams/pkg-plist b/textproc/p5-Text-Ngrams/pkg-plist
index 6d409351ee7e..36a17780fc34 100644
--- a/textproc/p5-Text-Ngrams/pkg-plist
+++ b/textproc/p5-Text-Ngrams/pkg-plist
@@ -2,8 +2,4 @@ bin/ngrams.pl
 %%PERL5_MAN3%%/Text::Ngrams.3.gz
 %%SITE_PERL%%/Text/Ngrams.pm
 %%SITE_PERL%%/Text/ngrams.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngrams/.packlist
 man/man1/ngrams.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngrams
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Original/Makefile b/textproc/p5-Text-Original/Makefile
index cd262e4e0fe4..f456cf592f4d 100644
--- a/textproc/p5-Text-Original/Makefile
+++ b/textproc/p5-Text-Original/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Original
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Original/pkg-plist b/textproc/p5-Text-Original/pkg-plist
index 2ab3be792cfc..baf7cae8351d 100644
--- a/textproc/p5-Text-Original/pkg-plist
+++ b/textproc/p5-Text-Original/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Original.3.gz
 %%SITE_PERL%%/Text/Original.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Original/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Original
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Padding/Makefile b/textproc/p5-Text-Padding/Makefile
index 9eb03ee7e73b..564237dea480 100644
--- a/textproc/p5-Text-Padding/Makefile
+++ b/textproc/p5-Text-Padding/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Padding
 PORTVERSION=	1.110.170
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Padding/pkg-plist b/textproc/p5-Text-Padding/pkg-plist
index c18b6c6b538d..69e244954bc9 100644
--- a/textproc/p5-Text-Padding/pkg-plist
+++ b/textproc/p5-Text-Padding/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Text/Padding.pm
 %%PERL5_MAN3%%/Text::Padding.3.gz
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-ParagraphDiff/Makefile b/textproc/p5-Text-ParagraphDiff/Makefile
index 62eacb217056..d3c74a05f335 100644
--- a/textproc/p5-Text-ParagraphDiff/Makefile
+++ b/textproc/p5-Text-ParagraphDiff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-ParagraphDiff
 PORTVERSION=	2.70
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-ParagraphDiff/pkg-plist b/textproc/p5-Text-ParagraphDiff/pkg-plist
index a5ac4d66e696..0ba52af65f30 100644
--- a/textproc/p5-Text-ParagraphDiff/pkg-plist
+++ b/textproc/p5-Text-ParagraphDiff/pkg-plist
@@ -1,11 +1,7 @@
 %%PERL5_MAN3%%/Text::ParagraphDiff.3.gz
 %%SITE_PERL%%/Text/ParagraphDiff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/diff.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/new.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/old.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tdiff
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-ParseWords/Makefile b/textproc/p5-Text-ParseWords/Makefile
index ddae71b7ce78..a1a86de9ff94 100644
--- a/textproc/p5-Text-ParseWords/Makefile
+++ b/textproc/p5-Text-ParseWords/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-ParseWords
 PORTVERSION=	3.29
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-ParseWords/pkg-plist b/textproc/p5-Text-ParseWords/pkg-plist
index b6a2a453d26e..32391494b986 100644
--- a/textproc/p5-Text-ParseWords/pkg-plist
+++ b/textproc/p5-Text-ParseWords/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::ParseWords.3.gz
 %%SITE_PERL%%/Text/ParseWords.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParseWords/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParseWords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Patch/Makefile b/textproc/p5-Text-Patch/Makefile
index 4f98e6ae9cc1..015f751f5c57 100644
--- a/textproc/p5-Text-Patch/Makefile
+++ b/textproc/p5-Text-Patch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Patch
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Patch/pkg-plist b/textproc/p5-Text-Patch/pkg-plist
index 51582d0255a5..98d29b5bbd6f 100644
--- a/textproc/p5-Text-Patch/pkg-plist
+++ b/textproc/p5-Text-Patch/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Patch.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Patch/.packlist
 %%SITE_PERL%%/Text/Patch.pm
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Patch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Pipe/Makefile b/textproc/p5-Text-Pipe/Makefile
index 8f30735f7b61..452200dafefa 100644
--- a/textproc/p5-Text-Pipe/Makefile
+++ b/textproc/p5-Text-Pipe/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Pipe
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Pipe/pkg-plist b/textproc/p5-Text-Pipe/pkg-plist
index 417a897ce0b3..57480ff4635e 100644
--- a/textproc/p5-Text-Pipe/pkg-plist
+++ b/textproc/p5-Text-Pipe/pkg-plist
@@ -32,7 +32,6 @@
 %%PERL5_MAN3%%/Text::Pipe::Trim.3.gz
 %%PERL5_MAN3%%/Text::Pipe::Uppercase.3.gz
 %%PERL5_MAN3%%/Text::Pipe::UppercaseFirst.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Pipe/.packlist
 %%SITE_PERL%%/Text/Pipe.pm
 %%SITE_PERL%%/Text/Pipe/Append.pm
 %%SITE_PERL%%/Text/Pipe/Base.pm
@@ -67,8 +66,3 @@
 %%SITE_PERL%%/Text/Pipe/Trim.pm
 %%SITE_PERL%%/Text/Pipe/Uppercase.pm
 %%SITE_PERL%%/Text/Pipe/UppercaseFirst.pm
-@dirrm %%SITE_PERL%%/Text/Pipe/List
-@dirrm %%SITE_PERL%%/Text/Pipe
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Pipe
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Prefix-XS/Makefile b/textproc/p5-Text-Prefix-XS/Makefile
index 0a800fb5a5e0..414c41cc999b 100644
--- a/textproc/p5-Text-Prefix-XS/Makefile
+++ b/textproc/p5-Text-Prefix-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Prefix-XS
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Prefix-XS/pkg-plist b/textproc/p5-Text-Prefix-XS/pkg-plist
index 3b39b55ee8f0..4a41a6f79111 100644
--- a/textproc/p5-Text-Prefix-XS/pkg-plist
+++ b/textproc/p5-Text-Prefix-XS/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Prefix/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Prefix/trie.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Prefix/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Prefix/XS/XS.so
+%%SITE_ARCH%%/Text/Prefix/XS.pm
+%%SITE_ARCH%%/Text/Prefix/trie.pl
+%%SITE_ARCH%%/auto/Text/Prefix/XS/XS.so
 %%PERL5_MAN3%%/Text::Prefix::XS.3.gz
diff --git a/textproc/p5-Text-QRCode/Makefile b/textproc/p5-Text-QRCode/Makefile
index 033b134a0d91..3d0c5475e528 100644
--- a/textproc/p5-Text-QRCode/Makefile
+++ b/textproc/p5-Text-QRCode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-QRCode
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-QRCode/pkg-plist b/textproc/p5-Text-QRCode/pkg-plist
index de154747f759..ee27cb542b4e 100644
--- a/textproc/p5-Text-QRCode/pkg-plist
+++ b/textproc/p5-Text-QRCode/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/QRCode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/QRCode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/QRCode/QRCode.so
+%%SITE_ARCH%%/Text/QRCode.pm
+%%SITE_ARCH%%/auto/Text/QRCode/QRCode.so
 %%PERL5_MAN3%%/Text::QRCode.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/QRCode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-Query/Makefile b/textproc/p5-Text-Query/Makefile
index 5f3e38f38ec4..72977b44865f 100644
--- a/textproc/p5-Text-Query/Makefile
+++ b/textproc/p5-Text-Query/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Query
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Query/pkg-plist b/textproc/p5-Text-Query/pkg-plist
index ca680a11e23b..ac4fd97ef5ad 100644
--- a/textproc/p5-Text-Query/pkg-plist
+++ b/textproc/p5-Text-Query/pkg-plist
@@ -9,7 +9,6 @@
 %%PERL5_MAN3%%/Text::Query::Solve.3.gz
 %%PERL5_MAN3%%/Text::Query::SolveAdvancedString.3.gz
 %%PERL5_MAN3%%/Text::Query::SolveSimpleString.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query/.packlist
 %%SITE_PERL%%/Text/Query.pm
 %%SITE_PERL%%/Text/Query/Advanced.pm
 %%SITE_PERL%%/Text/Query/Build.pm
@@ -23,7 +22,3 @@
 %%SITE_PERL%%/Text/Query/Optimize.pm
 %%SITE_PERL%%/Text/Query/Simple.pm
 %%SITE_PERL%%/Text/Query/ParseSimple.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query
-@dirrm %%SITE_PERL%%/Text/Query
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Quote/Makefile b/textproc/p5-Text-Quote/Makefile
index f565db9e6c6d..b436f66afc05 100644
--- a/textproc/p5-Text-Quote/Makefile
+++ b/textproc/p5-Text-Quote/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Quote
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Quote/pkg-plist b/textproc/p5-Text-Quote/pkg-plist
index aaa33d1e6634..43f42a876aed 100644
--- a/textproc/p5-Text-Quote/pkg-plist
+++ b/textproc/p5-Text-Quote/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Quote.3.gz
 %%SITE_PERL%%/Text/Quote.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Quote/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Quote
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Quoted/Makefile b/textproc/p5-Text-Quoted/Makefile
index d2982b920d80..1bd987b0fee4 100644
--- a/textproc/p5-Text-Quoted/Makefile
+++ b/textproc/p5-Text-Quoted/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Quoted
 PORTVERSION=	2.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Quoted/pkg-plist b/textproc/p5-Text-Quoted/pkg-plist
index 344519527a78..8020494b479a 100644
--- a/textproc/p5-Text-Quoted/pkg-plist
+++ b/textproc/p5-Text-Quoted/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Quoted.3.gz
 %%SITE_PERL%%/Text/Quoted.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Quoted/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Quoted
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile
index f5b0c831cc7f..7fa80126cc37 100644
--- a/textproc/p5-Text-RecordParser/Makefile
+++ b/textproc/p5-Text-RecordParser/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Text-RecordParser
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-RecordParser/pkg-plist b/textproc/p5-Text-RecordParser/pkg-plist
index 8bfdeb49922e..559d029b1d0e 100644
--- a/textproc/p5-Text-RecordParser/pkg-plist
+++ b/textproc/p5-Text-RecordParser/pkg-plist
@@ -10,5 +10,3 @@ bin/tabmerge
 man/man1/tablify.1.gz
 man/man1/tabmerge.1.gz
 man/man1/tab2graph.1.gz
-@dirrm %%SITE_PERL%%/Text/RecordParser
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Reflow/Makefile b/textproc/p5-Text-Reflow/Makefile
index 3abbd68511cc..57743aecd54b 100644
--- a/textproc/p5-Text-Reflow/Makefile
+++ b/textproc/p5-Text-Reflow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Reflow
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Reflow/pkg-plist b/textproc/p5-Text-Reflow/pkg-plist
index 831bdc17a994..f918c3599c32 100644
--- a/textproc/p5-Text-Reflow/pkg-plist
+++ b/textproc/p5-Text-Reflow/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::Reflow.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Reflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow/Reflow.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/Reflow.pm
+%%SITE_ARCH%%/auto/Text/Reflow/Reflow.so
diff --git a/textproc/p5-Text-Reform/Makefile b/textproc/p5-Text-Reform/Makefile
index ed7278c20111..d453d104900b 100644
--- a/textproc/p5-Text-Reform/Makefile
+++ b/textproc/p5-Text-Reform/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Reform
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Text
diff --git a/textproc/p5-Text-Reform/pkg-plist b/textproc/p5-Text-Reform/pkg-plist
index 0fca09b8ae28..4b7852b8a2ae 100644
--- a/textproc/p5-Text-Reform/pkg-plist
+++ b/textproc/p5-Text-Reform/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Reform.3.gz
 %%SITE_PERL%%/Text/Reform.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reform/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reform
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Report/Makefile b/textproc/p5-Text-Report/Makefile
index d2d7b6fc4407..ee218f0e38a0 100644
--- a/textproc/p5-Text-Report/Makefile
+++ b/textproc/p5-Text-Report/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Report
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Report/pkg-plist b/textproc/p5-Text-Report/pkg-plist
index 31fa52ba9700..d62675dc371d 100644
--- a/textproc/p5-Text-Report/pkg-plist
+++ b/textproc/p5-Text-Report/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Report.3.gz
 %%SITE_PERL%%/Text/Report.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Report/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Report
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Repository/Makefile b/textproc/p5-Text-Repository/Makefile
index 0f6bffc0a3ec..436e8cf54746 100644
--- a/textproc/p5-Text-Repository/Makefile
+++ b/textproc/p5-Text-Repository/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Repository
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Repository/pkg-plist b/textproc/p5-Text-Repository/pkg-plist
index c0299d7df834..b4b525f96a15 100644
--- a/textproc/p5-Text-Repository/pkg-plist
+++ b/textproc/p5-Text-Repository/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Repository.3.gz
 %%SITE_PERL%%/Text/Repository.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Sass/Makefile b/textproc/p5-Text-Sass/Makefile
index 711ee1a6b209..c61201306d46 100644
--- a/textproc/p5-Text-Sass/Makefile
+++ b/textproc/p5-Text-Sass/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Sass
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RPETTETT
diff --git a/textproc/p5-Text-Sass/pkg-plist b/textproc/p5-Text-Sass/pkg-plist
index 33ba4c5f9ad3..694723017fef 100644
--- a/textproc/p5-Text-Sass/pkg-plist
+++ b/textproc/p5-Text-Sass/pkg-plist
@@ -5,5 +5,3 @@ bin/sass2css.pl
 %%SITE_PERL%%/Text/Sass.pm
 %%SITE_PERL%%/Text/Sass/Expr.pm
 %%SITE_PERL%%/Text/Sass/Functions.pm
-@dirrm %%SITE_PERL%%/Text/Sass
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Shellwords/Makefile b/textproc/p5-Text-Shellwords/Makefile
index 06f9ccee04c1..9d2ccc47e43a 100644
--- a/textproc/p5-Text-Shellwords/Makefile
+++ b/textproc/p5-Text-Shellwords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Shellwords
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Shellwords/pkg-plist b/textproc/p5-Text-Shellwords/pkg-plist
index 0d388398e830..4dc668e946cd 100644
--- a/textproc/p5-Text-Shellwords/pkg-plist
+++ b/textproc/p5-Text-Shellwords/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Shellwords.3.gz
 %%SITE_PERL%%/Text/Shellwords.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Similarity/Makefile b/textproc/p5-Text-Similarity/Makefile
index c074599f8e0f..643636efb93c 100644
--- a/textproc/p5-Text-Similarity/Makefile
+++ b/textproc/p5-Text-Similarity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Similarity
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Similarity/pkg-plist b/textproc/p5-Text-Similarity/pkg-plist
index f03aa462a0f3..66972fc1449c 100644
--- a/textproc/p5-Text-Similarity/pkg-plist
+++ b/textproc/p5-Text-Similarity/pkg-plist
@@ -5,9 +5,4 @@ bin/text_similarity.pl
 %%SITE_PERL%%/Text/OverlapFinder.pm
 %%SITE_PERL%%/Text/Similarity.pm
 %%SITE_PERL%%/Text/Similarity/Overlaps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Similarity/.packlist
 man/man1/text_similarity.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Similarity
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Similarity
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-SimpleTable/Makefile b/textproc/p5-Text-SimpleTable/Makefile
index 17a381bc4296..4b870de9800c 100644
--- a/textproc/p5-Text-SimpleTable/Makefile
+++ b/textproc/p5-Text-SimpleTable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-SimpleTable
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-SimpleTable/pkg-plist b/textproc/p5-Text-SimpleTable/pkg-plist
index b36df81f8cc5..dbab1cdf94be 100644
--- a/textproc/p5-Text-SimpleTable/pkg-plist
+++ b/textproc/p5-Text-SimpleTable/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::SimpleTable.3.gz
 %%SITE_PERL%%/Text/SimpleTable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTable/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-SimpleTemplate/Makefile b/textproc/p5-Text-SimpleTemplate/Makefile
index ea926cb9beeb..b8191e1e18cd 100644
--- a/textproc/p5-Text-SimpleTemplate/Makefile
+++ b/textproc/p5-Text-SimpleTemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-SimpleTemplate
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-SimpleTemplate/pkg-plist b/textproc/p5-Text-SimpleTemplate/pkg-plist
index dd4ca9bc6de8..1450c47aca15 100644
--- a/textproc/p5-Text-SimpleTemplate/pkg-plist
+++ b/textproc/p5-Text-SimpleTemplate/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::SimpleTemplate.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate/.packlist
 %%SITE_PERL%%/Text/SimpleTemplate.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-SpellChecker-GUI/Makefile b/textproc/p5-Text-SpellChecker-GUI/Makefile
index 4264681ae425..9489e137a0f4 100644
--- a/textproc/p5-Text-SpellChecker-GUI/Makefile
+++ b/textproc/p5-Text-SpellChecker-GUI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-SpellChecker-GUI
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/textproc/p5-Text-SpellChecker-GUI/pkg-plist b/textproc/p5-Text-SpellChecker-GUI/pkg-plist
index 08ec69a5fd17..957a555e378b 100644
--- a/textproc/p5-Text-SpellChecker-GUI/pkg-plist
+++ b/textproc/p5-Text-SpellChecker-GUI/pkg-plist
@@ -4,10 +4,3 @@ bin/curses-textspellchecker
 %%PERL5_MAN3%%/Text::SpellChecker::GUI::Curses.3.gz
 %%SITE_PERL%%/Text/SpellChecker/GUI.pm
 %%SITE_PERL%%/Text/SpellChecker/GUI/Curses.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SpellChecker/GUI/.packlist
-@dirrmtry %%SITE_PERL%%/Text/SpellChecker/GUI
-@dirrmtry %%SITE_PERL%%/Text/SpellChecker
-@dirrmtry %%SITE_PERL%%/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SpellChecker/GUI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SpellChecker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-SpellChecker/Makefile b/textproc/p5-Text-SpellChecker/Makefile
index e28e01ea8fca..e00c895d786d 100644
--- a/textproc/p5-Text-SpellChecker/Makefile
+++ b/textproc/p5-Text-SpellChecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-SpellChecker
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-SpellChecker/pkg-plist b/textproc/p5-Text-SpellChecker/pkg-plist
index 4db35347214e..e43fc40e2158 100644
--- a/textproc/p5-Text-SpellChecker/pkg-plist
+++ b/textproc/p5-Text-SpellChecker/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::SpellChecker.3.gz
 %%SITE_PERL%%/Text/SpellChecker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SpellChecker/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SpellChecker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Striphigh/Makefile b/textproc/p5-Text-Striphigh/Makefile
index 0f9c86f336b5..bb6bb9ee0916 100644
--- a/textproc/p5-Text-Striphigh/Makefile
+++ b/textproc/p5-Text-Striphigh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Striphigh
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Striphigh/pkg-plist b/textproc/p5-Text-Striphigh/pkg-plist
index 90f612e5a2be..a13cd4d57c20 100644
--- a/textproc/p5-Text-Striphigh/pkg-plist
+++ b/textproc/p5-Text-Striphigh/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Striphigh.3.gz
 %%SITE_PERL%%/Text/Striphigh.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Striphigh/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Striphigh
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Table/Makefile b/textproc/p5-Text-Table/Makefile
index 3d75d31eda2e..9f8f9b7ec7da 100644
--- a/textproc/p5-Text-Table/Makefile
+++ b/textproc/p5-Text-Table/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Table
 PORTVERSION=	1.130
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Table/pkg-plist b/textproc/p5-Text-Table/pkg-plist
index 9238131e3d9e..e7380791ffd1 100644
--- a/textproc/p5-Text-Table/pkg-plist
+++ b/textproc/p5-Text-Table/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Table.3.gz
 %%SITE_PERL%%/Text/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Table/.packlist
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Table
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Tabs+Wrap/Makefile b/textproc/p5-Text-Tabs+Wrap/Makefile
index c9b4df357360..3958b6687911 100644
--- a/textproc/p5-Text-Tabs+Wrap/Makefile
+++ b/textproc/p5-Text-Tabs+Wrap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Tabs+Wrap
 PORTVERSION=	2013.0523
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Tabs+Wrap/pkg-plist b/textproc/p5-Text-Tabs+Wrap/pkg-plist
index bf8b5816ac5c..73ae37df43df 100644
--- a/textproc/p5-Text-Tabs+Wrap/pkg-plist
+++ b/textproc/p5-Text-Tabs+Wrap/pkg-plist
@@ -2,6 +2,3 @@
 %%PERL5_MAN3%%/modern::Text::Wrap.3.gz
 %%SITE_PERL%%/Text/Tabs.pm
 %%SITE_PERL%%/Text/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text-Wrap/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text-Wrap
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-TabularDisplay/Makefile b/textproc/p5-Text-TabularDisplay/Makefile
index eae6cfdb2bbf..76c75c741549 100644
--- a/textproc/p5-Text-TabularDisplay/Makefile
+++ b/textproc/p5-Text-TabularDisplay/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-TabularDisplay
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-TabularDisplay/pkg-plist b/textproc/p5-Text-TabularDisplay/pkg-plist
index f74d11e97d0f..3a285bcb4546 100644
--- a/textproc/p5-Text-TabularDisplay/pkg-plist
+++ b/textproc/p5-Text-TabularDisplay/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::TabularDisplay.3.gz
 %%SITE_PERL%%/Text/TabularDisplay.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/TabularDisplay/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/TabularDisplay
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Tags/Makefile b/textproc/p5-Text-Tags/Makefile
index 6d52ba81636d..152fe02467ad 100644
--- a/textproc/p5-Text-Tags/Makefile
+++ b/textproc/p5-Text-Tags/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Tags
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Tags/pkg-plist b/textproc/p5-Text-Tags/pkg-plist
index 996c6696d038..c5bf1bd26ffd 100644
--- a/textproc/p5-Text-Tags/pkg-plist
+++ b/textproc/p5-Text-Tags/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/Text/Tags.pm
 %%SITE_PERL%%/Text/Tags/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tags/.packlist
 %%PERL5_MAN3%%/Text::Tags.3.gz
 %%PERL5_MAN3%%/Text::Tags::Parser.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tags
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrm %%SITE_PERL%%/Text/Tags
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index eb787b2d95a4..562b6ddb3c8f 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Template
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://perl.plover.com/Template/ \
 		CPAN
diff --git a/textproc/p5-Text-Template/pkg-plist b/textproc/p5-Text-Template/pkg-plist
index 942031ecef0c..2218988463d1 100644
--- a/textproc/p5-Text-Template/pkg-plist
+++ b/textproc/p5-Text-Template/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Text::Template::Preprocess.3.gz
 %%SITE_PERL%%/Text/Template.pm
 %%SITE_PERL%%/Text/Template/Preprocess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Template
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-TestBase/Makefile b/textproc/p5-Text-TestBase/Makefile
index 353a94b4170d..b418ab2a6ceb 100644
--- a/textproc/p5-Text-TestBase/Makefile
+++ b/textproc/p5-Text-TestBase/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-TestBase
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-TestBase/pkg-plist b/textproc/p5-Text-TestBase/pkg-plist
index dba72fbfaf76..338d8b20d014 100644
--- a/textproc/p5-Text-TestBase/pkg-plist
+++ b/textproc/p5-Text-TestBase/pkg-plist
@@ -6,9 +6,3 @@
 %%SITE_PERL%%/Test/Base/Less.pm
 %%SITE_PERL%%/Text/TestBase.pm
 %%SITE_PERL%%/Text/TestBase/Block.pm
-@dirrmtry %%SITE_PERL%%/Data/Section
-@dirrmtry %%SITE_PERL%%/Data
-@dirrmtry %%SITE_PERL%%/Test/Base
-@dirrmtry %%SITE_PERL%%/Test
-@dirrm %%SITE_PERL%%/Text/TestBase
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Textile/Makefile b/textproc/p5-Text-Textile/Makefile
index 26e47c0e2c3e..a5bc4dc9a719 100644
--- a/textproc/p5-Text-Textile/Makefile
+++ b/textproc/p5-Text-Textile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Textile
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Textile/pkg-plist b/textproc/p5-Text-Textile/pkg-plist
index 2cbb287372ff..2d24c143d895 100644
--- a/textproc/p5-Text-Textile/pkg-plist
+++ b/textproc/p5-Text-Textile/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Textile.3.gz
 %%SITE_PERL%%/Text/Textile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Textile/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Textile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Tmpl/Makefile b/textproc/p5-Text-Tmpl/Makefile
index 58a46ab5d291..b8116d24d089 100644
--- a/textproc/p5-Text-Tmpl/Makefile
+++ b/textproc/p5-Text-Tmpl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Tmpl
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Tmpl/pkg-plist b/textproc/p5-Text-Tmpl/pkg-plist
index 072635598943..90739d6ec462 100644
--- a/textproc/p5-Text-Tmpl/pkg-plist
+++ b/textproc/p5-Text-Tmpl/pkg-plist
@@ -1,13 +1,9 @@
 %%PERL5_MAN3%%/template_syntax.3.gz
 %%PERL5_MAN3%%/Text::Tmpl.3.gz
 %%PERL5_MAN3%%/template_extend.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/template_syntax.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/libtmpl.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/template_extend.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Tmpl.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/auto/Text/Tmpl/Tmpl.so
+%%SITE_ARCH%%/auto/Text/Tmpl/autosplit.ix
+%%SITE_ARCH%%/Text/template_syntax.pod
+%%SITE_ARCH%%/Text/libtmpl.pod
+%%SITE_ARCH%%/Text/template_extend.pod
+%%SITE_ARCH%%/Text/Tmpl.pm
diff --git a/textproc/p5-Text-Trac/Makefile b/textproc/p5-Text-Trac/Makefile
index 8ef620726e8a..0b1beadbbd24 100644
--- a/textproc/p5-Text-Trac/Makefile
+++ b/textproc/p5-Text-Trac/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Trac
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Trac/pkg-plist b/textproc/p5-Text-Trac/pkg-plist
index 5243f6334107..c9d7c93502c9 100644
--- a/textproc/p5-Text-Trac/pkg-plist
+++ b/textproc/p5-Text-Trac/pkg-plist
@@ -27,10 +27,3 @@
 %%SITE_PERL%%/Text/Trac/Table.pm
 %%SITE_PERL%%/Text/Trac/Text.pm
 %%SITE_PERL%%/Text/Trac/Ul.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Trac/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Trac
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/Trac/Macro
-@dirrmtry %%SITE_PERL%%/Text/Trac/LinkResolver
-@dirrmtry %%SITE_PERL%%/Text/Trac
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Trim/Makefile b/textproc/p5-Text-Trim/Makefile
index 4453905cefa0..b1a7fa573db6 100644
--- a/textproc/p5-Text-Trim/Makefile
+++ b/textproc/p5-Text-Trim/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Trim
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Text
diff --git a/textproc/p5-Text-Trim/pkg-plist b/textproc/p5-Text-Trim/pkg-plist
index 143221fffae4..c4b7c28019d3 100644
--- a/textproc/p5-Text-Trim/pkg-plist
+++ b/textproc/p5-Text-Trim/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Text::Trim.3.gz
 %%SITE_PERL%%/Text/Trim.pm
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Truncate/Makefile b/textproc/p5-Text-Truncate/Makefile
index 8a5805c01b14..2be26bd0b301 100644
--- a/textproc/p5-Text-Truncate/Makefile
+++ b/textproc/p5-Text-Truncate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Truncate
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Truncate/pkg-plist b/textproc/p5-Text-Truncate/pkg-plist
index 56f33278178a..35a5a9f241e4 100644
--- a/textproc/p5-Text-Truncate/pkg-plist
+++ b/textproc/p5-Text-Truncate/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Truncate.3.gz
 %%SITE_PERL%%/Text/Truncate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Truncate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Truncate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Typography/Makefile b/textproc/p5-Text-Typography/Makefile
index faddfbe7324a..5e87599e5844 100644
--- a/textproc/p5-Text-Typography/Makefile
+++ b/textproc/p5-Text-Typography/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Typography
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Typography/pkg-plist b/textproc/p5-Text-Typography/pkg-plist
index f1a6add67b8d..caca0a122dab 100644
--- a/textproc/p5-Text-Typography/pkg-plist
+++ b/textproc/p5-Text-Typography/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Typography.3.gz
 %%SITE_PERL%%/Text/Typography.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Typography/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Typography
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Unaccent/Makefile b/textproc/p5-Text-Unaccent/Makefile
index 027279d81b32..437816e26b61 100644
--- a/textproc/p5-Text-Unaccent/Makefile
+++ b/textproc/p5-Text-Unaccent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Unaccent
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Unaccent/pkg-plist b/textproc/p5-Text-Unaccent/pkg-plist
index db1eb2469f6e..a251b7a7755e 100644
--- a/textproc/p5-Text-Unaccent/pkg-plist
+++ b/textproc/p5-Text-Unaccent/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Text::Unaccent.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Unaccent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unaccent/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unaccent/Unaccent.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unaccent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/Unaccent.pm
+%%SITE_ARCH%%/auto/Text/Unaccent/Unaccent.so
diff --git a/textproc/p5-Text-VimColor/Makefile b/textproc/p5-Text-VimColor/Makefile
index e1ad8fa2f2b5..08176757903c 100644
--- a/textproc/p5-Text-VimColor/Makefile
+++ b/textproc/p5-Text-VimColor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-VimColor
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-VimColor/pkg-plist b/textproc/p5-Text-VimColor/pkg-plist
index 0bd82b2f31e9..90c66032961f 100644
--- a/textproc/p5-Text-VimColor/pkg-plist
+++ b/textproc/p5-Text-VimColor/pkg-plist
@@ -4,11 +4,4 @@ bin/text-vimcolor
 %%SITE_PERL%%/auto/share/dist/Text-VimColor/light.css
 %%SITE_PERL%%/auto/share/dist/Text-VimColor/light.xsl
 %%SITE_PERL%%/auto/share/dist/Text-VimColor/mark.vim
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor/.packlist
 man/man1/text-vimcolor.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrm %%SITE_PERL%%/auto/share/dist/Text-VimColor
-@dirrmtry %%SITE_PERL%%/auto/share/dist
-@dirrmtry %%SITE_PERL%%/auto/share
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-VisualWidth/Makefile b/textproc/p5-Text-VisualWidth/Makefile
index 46dbf2688e96..3c3746b7877f 100644
--- a/textproc/p5-Text-VisualWidth/Makefile
+++ b/textproc/p5-Text-VisualWidth/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-VisualWidth
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-VisualWidth/pkg-plist b/textproc/p5-Text-VisualWidth/pkg-plist
index f1c3ea0c1266..17d708394103 100644
--- a/textproc/p5-Text-VisualWidth/pkg-plist
+++ b/textproc/p5-Text-VisualWidth/pkg-plist
@@ -1,13 +1,8 @@
 %%PERL5_MAN3%%/Text::VisualWidth.3.gz
 %%PERL5_MAN3%%/Text::VisualWidth::EUC_JP.3.gz
 %%PERL5_MAN3%%/Text::VisualWidth::UTF8.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/VisualWidth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/VisualWidth/EUC_JP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/VisualWidth/UTF8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VisualWidth/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VisualWidth/VisualWidth.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VisualWidth/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VisualWidth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text/VisualWidth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+%%SITE_ARCH%%/Text/VisualWidth.pm
+%%SITE_ARCH%%/Text/VisualWidth/EUC_JP.pm
+%%SITE_ARCH%%/Text/VisualWidth/UTF8.pm
+%%SITE_ARCH%%/auto/Text/VisualWidth/VisualWidth.so
+%%SITE_ARCH%%/auto/Text/VisualWidth/autosplit.ix
diff --git a/textproc/p5-Text-WikiCreole/Makefile b/textproc/p5-Text-WikiCreole/Makefile
index 0605245df6cf..3d307e7fd8b8 100644
--- a/textproc/p5-Text-WikiCreole/Makefile
+++ b/textproc/p5-Text-WikiCreole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Text-WikiCreole
 PORTVERSION=		0.07
+PORTREVISION=	1
 CATEGORIES=		textproc perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/textproc/p5-Text-WikiCreole/pkg-plist b/textproc/p5-Text-WikiCreole/pkg-plist
index f14f1cc0a34f..4306f017522c 100644
--- a/textproc/p5-Text-WikiCreole/pkg-plist
+++ b/textproc/p5-Text-WikiCreole/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WikiCreole/.packlist
 %%SITE_PERL%%/Text/WikiCreole.pm
 %%PERL5_MAN3%%/Text::WikiCreole.3.gz
-@dirrmtry %%SITE_PERL%%/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WikiCreole
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-WikiFormat/Makefile b/textproc/p5-Text-WikiFormat/Makefile
index 66de71685c3d..0201745c953e 100644
--- a/textproc/p5-Text-WikiFormat/Makefile
+++ b/textproc/p5-Text-WikiFormat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-WikiFormat
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-WikiFormat/pkg-plist b/textproc/p5-Text-WikiFormat/pkg-plist
index 1a3f05dd708a..31dd21b61796 100644
--- a/textproc/p5-Text-WikiFormat/pkg-plist
+++ b/textproc/p5-Text-WikiFormat/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/Text/WikiFormat.pm
 %%SITE_PERL%%/Text/WikiFormat/Blocks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WikiFormat/.packlist
 %%PERL5_MAN3%%/Text::WikiFormat.3.gz
 %%PERL5_MAN3%%/Text::WikiFormat::Blocks.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WikiFormat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/WikiFormat
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-WordDiff/Makefile b/textproc/p5-Text-WordDiff/Makefile
index 6d6386d17060..e8ce0e20fadf 100644
--- a/textproc/p5-Text-WordDiff/Makefile
+++ b/textproc/p5-Text-WordDiff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-WordDiff
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-WordDiff/pkg-plist b/textproc/p5-Text-WordDiff/pkg-plist
index 80dbc7ad745c..d64dfd50a8dd 100644
--- a/textproc/p5-Text-WordDiff/pkg-plist
+++ b/textproc/p5-Text-WordDiff/pkg-plist
@@ -6,5 +6,3 @@
 %%SITE_PERL%%/Text/WordDiff/ANSIColor.pm
 %%SITE_PERL%%/Text/WordDiff/HTML.pm
 %%SITE_PERL%%/Text/WordDiff/HTMLTwoLines.pm
-@dirrmtry %%SITE_PERL%%/Text/WordDiff
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-WrapI18N/Makefile b/textproc/p5-Text-WrapI18N/Makefile
index 48eda4f3ac1d..de4ac6b759de 100644
--- a/textproc/p5-Text-WrapI18N/Makefile
+++ b/textproc/p5-Text-WrapI18N/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-WrapI18N
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-WrapI18N/pkg-plist b/textproc/p5-Text-WrapI18N/pkg-plist
index 6a2bb2708d4f..d1a92fba11cb 100644
--- a/textproc/p5-Text-WrapI18N/pkg-plist
+++ b/textproc/p5-Text-WrapI18N/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Text/WrapI18N.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WrapI18N/.packlist
 %%PERL5_MAN3%%/Text::WrapI18N.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/WrapI18N
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 36c7f55d6782..7f4b4ecb0a77 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Wrapper
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Wrapper/pkg-plist b/textproc/p5-Text-Wrapper/pkg-plist
index d974556bf1c8..9dc783d5c992 100644
--- a/textproc/p5-Text-Wrapper/pkg-plist
+++ b/textproc/p5-Text-Wrapper/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Text::Wrapper.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist
 %%SITE_PERL%%/Text/Wrapper.pm
-@dirrmtry %%SITE_PERL%%/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
index bd428fe6931f..9d79e2a3c3ca 100644
--- a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
+++ b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Text-Xslate-Bridge-TT2Like
 PORTVERSION=	0.00010
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist b/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist
index 667189067643..a665e5d060fe 100644
--- a/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist
+++ b/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/Text::Xslate::Bridge::TT2Like.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/Bridge/TT2Like/.packlist
 %%SITE_PERL%%/Text/Xslate/Bridge/TT2Like.pm
 %%SITE_PERL%%/Text/Xslate/Bridge/TT2Like.pod
-@dirrmtry %%SITE_PERL%%/Text/Xslate/Bridge
-@dirrmtry %%SITE_PERL%%/Text/Xslate
-@dirrmtry %%SITE_PERL%%/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/Bridge/TT2Like
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/Bridge
diff --git a/textproc/p5-Text-Xslate/Makefile b/textproc/p5-Text-Xslate/Makefile
index d9a24ddf1c4a..bb862ed864db 100644
--- a/textproc/p5-Text-Xslate/Makefile
+++ b/textproc/p5-Text-Xslate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Xslate
 PORTVERSION=	3.3.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SYOHEX
@@ -30,6 +31,6 @@ BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.59:${PORTSDIR}/devel/p5-ExtUtils-MakeMa
 .endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Text/Xslate/Xslate.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Text/Xslate/Xslate.so
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Text-Xslate/pkg-plist b/textproc/p5-Text-Xslate/pkg-plist
index ca1c547177b1..7e2b2705e8c7 100644
--- a/textproc/p5-Text-Xslate/pkg-plist
+++ b/textproc/p5-Text-Xslate/pkg-plist
@@ -25,32 +25,31 @@
 %%PERL5_MAN3%%/Text::Xslate::Type::Raw.3.gz
 %%PERL5_MAN3%%/Text::Xslate::Util.3.gz
 bin/xslate
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Bridge.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Bridge/Star.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Compiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/HashWithDefault.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Manual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Manual/Builtin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Manual/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Manual/Debugging.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Manual/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP/Method.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP/Opcode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP/State.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP/Type/Macro.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP/Type/Pair.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/PP/Type/Raw.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Runner.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Symbol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Syntax/Kolon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Syntax/Metakolon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Syntax/TTerse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Type/Raw.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/Xslate.so
+%%SITE_ARCH%%/Text/Xslate.pm
+%%SITE_ARCH%%/Text/Xslate/Bridge.pm
+%%SITE_ARCH%%/Text/Xslate/Bridge/Star.pm
+%%SITE_ARCH%%/Text/Xslate/Compiler.pm
+%%SITE_ARCH%%/Text/Xslate/HashWithDefault.pm
+%%SITE_ARCH%%/Text/Xslate/Manual.pod
+%%SITE_ARCH%%/Text/Xslate/Manual/Builtin.pod
+%%SITE_ARCH%%/Text/Xslate/Manual/Cookbook.pod
+%%SITE_ARCH%%/Text/Xslate/Manual/Debugging.pod
+%%SITE_ARCH%%/Text/Xslate/Manual/FAQ.pod
+%%SITE_ARCH%%/Text/Xslate/PP.pm
+%%SITE_ARCH%%/Text/Xslate/PP/Const.pm
+%%SITE_ARCH%%/Text/Xslate/PP/Method.pm
+%%SITE_ARCH%%/Text/Xslate/PP/Opcode.pm
+%%SITE_ARCH%%/Text/Xslate/PP/State.pm
+%%SITE_ARCH%%/Text/Xslate/PP/Type/Macro.pm
+%%SITE_ARCH%%/Text/Xslate/PP/Type/Pair.pm
+%%SITE_ARCH%%/Text/Xslate/PP/Type/Raw.pm
+%%SITE_ARCH%%/Text/Xslate/Parser.pm
+%%SITE_ARCH%%/Text/Xslate/Runner.pm
+%%SITE_ARCH%%/Text/Xslate/Symbol.pm
+%%SITE_ARCH%%/Text/Xslate/Syntax/Kolon.pm
+%%SITE_ARCH%%/Text/Xslate/Syntax/Metakolon.pm
+%%SITE_ARCH%%/Text/Xslate/Syntax/TTerse.pm
+%%SITE_ARCH%%/Text/Xslate/Type/Raw.pm
+%%SITE_ARCH%%/Text/Xslate/Util.pm
+%%SITE_ARCH%%/auto/Text/Xslate/Xslate.so
 man/man1/xslate.1.gz
diff --git a/textproc/p5-Text-vCard/Makefile b/textproc/p5-Text-vCard/Makefile
index cc9a830a622a..ac62e1403d41 100644
--- a/textproc/p5-Text-vCard/Makefile
+++ b/textproc/p5-Text-vCard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Text-vCard
 PORTVERSION=		3.06
+PORTREVISION=	1
 CATEGORIES=		textproc perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/textproc/p5-Text-vCard/pkg-plist b/textproc/p5-Text-vCard/pkg-plist
index 6f8207328f9e..874341303cb3 100644
--- a/textproc/p5-Text-vCard/pkg-plist
+++ b/textproc/p5-Text-vCard/pkg-plist
@@ -8,5 +8,4 @@
 %%SITE_PERL%%/Text/vCard.pm
 %%SITE_PERL%%/Text/vCard/Addressbook.pm
 %%SITE_PERL%%/Text/vCard/Node.pm
-%%SITE_PERL%%/mach/auto/Text/vCard/.packlist
 %%SITE_PERL%%/vCard/AddressBook.pm
diff --git a/textproc/p5-Tiffany/Makefile b/textproc/p5-Tiffany/Makefile
index e1e91e3f0c1c..bbda84c971dc 100644
--- a/textproc/p5-Tiffany/Makefile
+++ b/textproc/p5-Tiffany/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Tiffany
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/textproc/p5-Tiffany/pkg-plist b/textproc/p5-Tiffany/pkg-plist
index d3a38bdaea9a..5d46ea5e57fd 100644
--- a/textproc/p5-Tiffany/pkg-plist
+++ b/textproc/p5-Tiffany/pkg-plist
@@ -21,9 +21,3 @@
 %%SITE_PERL%%/Tiffany/Text/MicroTemplate/File.pm
 %%SITE_PERL%%/Tiffany/Text/Xslate.pm
 %%SITE_PERL%%/Tiffany/Util.pm
-@dirrmtry %%SITE_PERL%%/Tiffany/Text/MicroTemplate
-@dirrmtry %%SITE_PERL%%/Tiffany/Text
-@dirrmtry %%SITE_PERL%%/Tiffany/Template
-@dirrmtry %%SITE_PERL%%/Tiffany/HTML/Template
-@dirrmtry %%SITE_PERL%%/Tiffany/HTML
-@dirrmtry %%SITE_PERL%%/Tiffany
diff --git a/textproc/p5-Time-Human/Makefile b/textproc/p5-Time-Human/Makefile
index 25ac973a5c6e..58650129b8ec 100644
--- a/textproc/p5-Time-Human/Makefile
+++ b/textproc/p5-Time-Human/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Time-Human
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Time-Human/pkg-plist b/textproc/p5-Time-Human/pkg-plist
index af53bd57cf3b..65a72efbe0fe 100644
--- a/textproc/p5-Time-Human/pkg-plist
+++ b/textproc/p5-Time-Human/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Human/.packlist
 %%PERL5_MAN3%%/Time::Human.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Human
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
 %%SITE_PERL%%/Time/Human.pm
-@dirrmtry %%SITE_PERL%%/Time
diff --git a/textproc/p5-Tk-Pod/Makefile b/textproc/p5-Tk-Pod/Makefile
index 5dedca8462b5..8dbbfc6a05bc 100644
--- a/textproc/p5-Tk-Pod/Makefile
+++ b/textproc/p5-Tk-Pod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tk-Pod
 PORTVERSION=	0.9942
+PORTREVISION=	1
 CATEGORIES=	textproc tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Tk-Pod/pkg-plist b/textproc/p5-Tk-Pod/pkg-plist
index fa61d57da9ec..04b2bdafd19e 100644
--- a/textproc/p5-Tk-Pod/pkg-plist
+++ b/textproc/p5-Tk-Pod/pkg-plist
@@ -13,7 +13,6 @@ bin/tkpod
 %%SITE_PERL%%/Tk/Pod/Util.pm
 %%SITE_PERL%%/Tk/Pod/WWWBrowser.pm
 %%SITE_PERL%%/Tk/Pod_usage.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Pod/.packlist
 %%PERL5_MAN3%%/Tk::More.3.gz
 %%PERL5_MAN3%%/Tk::Pod.3.gz
 %%PERL5_MAN3%%/Tk::Pod::Cache.3.gz
@@ -27,7 +26,3 @@ bin/tkpod
 %%PERL5_MAN3%%/Tk::Pod_usage.3.gz
 man/man1/tkmore.1.gz
 man/man1/tkpod.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Pod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrm %%SITE_PERL%%/Tk/Pod
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index bb672605fe9b..4302b4ec7f8c 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-XMLViewer
 PORTVERSION=	0.21
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Tk-XMLViewer/pkg-plist b/textproc/p5-Tk-XMLViewer/pkg-plist
index 57f2d34bdec4..781046065738 100644
--- a/textproc/p5-Tk-XMLViewer/pkg-plist
+++ b/textproc/p5-Tk-XMLViewer/pkg-plist
@@ -1,8 +1,4 @@
 bin/tkxmlview
 %%PERL5_MAN3%%/Tk::XMLViewer.3.gz
 %%SITE_PERL%%/Tk/XMLViewer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer/.packlist
 man/man1/tkxmlview.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/textproc/p5-Tree-Nary/Makefile b/textproc/p5-Tree-Nary/Makefile
index 506ff6fc7f37..7476562e4047 100644
--- a/textproc/p5-Tree-Nary/Makefile
+++ b/textproc/p5-Tree-Nary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-Nary
 PORTVERSION=	1.30
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-Tree-Nary/pkg-plist b/textproc/p5-Tree-Nary/pkg-plist
index 6a783b48bc6d..2b4b2b225733 100644
--- a/textproc/p5-Tree-Nary/pkg-plist
+++ b/textproc/p5-Tree-Nary/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Tree::Nary.3.gz
 %%SITE_PERL%%/Tree/Nary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
-@dirrmtry %%SITE_PERL%%/Tree
diff --git a/textproc/p5-Tree-Suffix/Makefile b/textproc/p5-Tree-Suffix/Makefile
index 8aa38c337229..094e1f4d9fcf 100644
--- a/textproc/p5-Tree-Suffix/Makefile
+++ b/textproc/p5-Tree-Suffix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tree-Suffix
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Tree-Suffix/pkg-plist b/textproc/p5-Tree-Suffix/pkg-plist
index 683e4fe220e0..e42f52506c5d 100644
--- a/textproc/p5-Tree-Suffix/pkg-plist
+++ b/textproc/p5-Tree-Suffix/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Suffix/Suffix.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Suffix/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Tree/Suffix.pm
+%%SITE_ARCH%%/auto/Tree/Suffix/Suffix.so
+%%SITE_ARCH%%/Tree/Suffix.pm
 %%PERL5_MAN3%%/Tree::Suffix.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Suffix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tree
diff --git a/textproc/p5-UML-Class-Simple/Makefile b/textproc/p5-UML-Class-Simple/Makefile
index 6aa9bc69ae95..9175a4e81566 100644
--- a/textproc/p5-UML-Class-Simple/Makefile
+++ b/textproc/p5-UML-Class-Simple/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	UML-Class-Simple
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-UML-Class-Simple/pkg-plist b/textproc/p5-UML-Class-Simple/pkg-plist
index 8588b08898fd..1e285ffaab5d 100644
--- a/textproc/p5-UML-Class-Simple/pkg-plist
+++ b/textproc/p5-UML-Class-Simple/pkg-plist
@@ -1,10 +1,4 @@
 bin/umlclass.pl
 %%PERL5_MAN3%%/UML::Class::Simple.3.gz
 %%SITE_PERL%%/UML/Class/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Class/Simple/.packlist
 man/man1/umlclass.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Class/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML
-@dirrmtry %%SITE_PERL%%/UML/Class
-@dirrmtry %%SITE_PERL%%/UML
diff --git a/textproc/p5-UML-Sequence/Makefile b/textproc/p5-UML-Sequence/Makefile
index 1062b1c19283..c3c5e41ae53a 100644
--- a/textproc/p5-UML-Sequence/Makefile
+++ b/textproc/p5-UML-Sequence/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	UML-Sequence
 PORTVERSION=	0.08
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-UML-Sequence/pkg-plist b/textproc/p5-UML-Sequence/pkg-plist
index b93bb9ae7012..7a7adf91079d 100644
--- a/textproc/p5-UML-Sequence/pkg-plist
+++ b/textproc/p5-UML-Sequence/pkg-plist
@@ -27,12 +27,6 @@ bin/seq2svg.pl
 %%SITE_PERL%%/UML/genericseq.pl
 %%SITE_PERL%%/UML/seq2rast.pl
 %%SITE_PERL%%/UML/seq2svg.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Sequence/.packlist
 man/man1/genericseq.pl.1.gz
 man/man1/seq2rast.pl.1.gz
 man/man1/seq2svg.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Sequence
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML
-@dirrmtry %%SITE_PERL%%/UML/Sequence
-@dirrmtry %%SITE_PERL%%/UML
-@dirrmtry %%SITE_PERL%%/Devel
diff --git a/textproc/p5-UML-State/Makefile b/textproc/p5-UML-State/Makefile
index 4df56deb7805..1ac0a76ce4cd 100644
--- a/textproc/p5-UML-State/Makefile
+++ b/textproc/p5-UML-State/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UML-State
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-UML-State/pkg-plist b/textproc/p5-UML-State/pkg-plist
index 66d749f58adb..2af79a76b632 100644
--- a/textproc/p5-UML-State/pkg-plist
+++ b/textproc/p5-UML-State/pkg-plist
@@ -6,9 +6,5 @@ bin/drawstatexml.pl
 %%SITE_PERL%%/UML/State.pm
 %%SITE_PERL%%/UML/drawstate.pl
 %%SITE_PERL%%/UML/drawstatexml.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/State/.packlist
 man/man1/drawstate.pl.1.gz
 man/man1/drawstatexml.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/State
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML
-@dirrmtry %%SITE_PERL%%/UML
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index 391264ee8ff0..8bb91368c1ac 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Find
 PORTVERSION=	20140709
+PORTREVISION=	1
 CATEGORIES=	textproc net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-URI-Find/pkg-plist b/textproc/p5-URI-Find/pkg-plist
index 74744160f2f4..bba364810cbc 100644
--- a/textproc/p5-URI-Find/pkg-plist
+++ b/textproc/p5-URI-Find/pkg-plist
@@ -4,4 +4,3 @@ bin/urifind
 %%SITE_PERL%%/URI/Find.pm
 %%SITE_PERL%%/URI/Find/Schemeless.pm
 man/man1/urifind.1.gz
-@dirrmtry %%SITE_PERL%%/URI/Find
diff --git a/textproc/p5-Unicode-CaseFold/Makefile b/textproc/p5-Unicode-CaseFold/Makefile
index 1b9c7ba8b60c..dfcc6a4fa320 100644
--- a/textproc/p5-Unicode-CaseFold/Makefile
+++ b/textproc/p5-Unicode-CaseFold/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-CaseFold
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ARODLAND
@@ -17,16 +18,12 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	modbuild
 
-PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/CaseFold.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/CaseFoldPP.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/CaseFold/CaseFold.so \
+PLIST_FILES=	%%SITE_ARCH%%/Unicode/CaseFold.pm \
+		%%SITE_ARCH%%/Unicode/CaseFoldPP.pm \
+		%%SITE_ARCH%%/auto/Unicode/CaseFold/CaseFold.so \
 		%%PERL5_MAN3%%/Unicode::CaseFold.3.gz
 
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/CaseFold
-PLIST_DIRSTRY=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode \
-		%%SITE_PERL%%/%%PERL_ARCH%%/Unicode
-
 post-install:
-		${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Unicode/CaseFold/CaseFold.so
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Unicode/CaseFold/CaseFold.so
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Unicode-CheckUTF8/Makefile b/textproc/p5-Unicode-CheckUTF8/Makefile
index 92481a8a923c..7cad9ee8f0c4 100644
--- a/textproc/p5-Unicode-CheckUTF8/Makefile
+++ b/textproc/p5-Unicode-CheckUTF8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-CheckUTF8
 DISTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Unicode-CheckUTF8/pkg-plist b/textproc/p5-Unicode-CheckUTF8/pkg-plist
index aaa44e554d42..df5a659158b8 100644
--- a/textproc/p5-Unicode-CheckUTF8/pkg-plist
+++ b/textproc/p5-Unicode-CheckUTF8/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Unicode::CheckUTF8.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/CheckUTF8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/CheckUTF8/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/CheckUTF8/CheckUTF8.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/CheckUTF8
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
+%%SITE_ARCH%%/Unicode/CheckUTF8.pm
+%%SITE_ARCH%%/auto/Unicode/CheckUTF8/CheckUTF8.so
diff --git a/textproc/p5-Unicode-Collate/Makefile b/textproc/p5-Unicode-Collate/Makefile
index 8073613c8682..f230a295560c 100644
--- a/textproc/p5-Unicode-Collate/Makefile
+++ b/textproc/p5-Unicode-Collate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Collate
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	textproc converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SADAHIRO
diff --git a/textproc/p5-Unicode-Collate/pkg-plist b/textproc/p5-Unicode-Collate/pkg-plist
index e25c9bb81f95..20ce92ea2bb5 100644
--- a/textproc/p5-Unicode-Collate/pkg-plist
+++ b/textproc/p5-Unicode-Collate/pkg-plist
@@ -1,98 +1,97 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK/Big5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK/GB2312.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK/JISX0208.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK/Korean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK/Pinyin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK/Stroke.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK/Zhuyin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/af.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ar.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/as.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/az.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/be.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/bg.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/bn.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ca.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/cs.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/cy.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/da.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/de_phone.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ee.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/eo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/es.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/es_trad.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/et.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/fa.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/fi.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/fi_phone.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/fil.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/fo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/fr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/gu.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ha.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/haw.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/hi.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/hr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/hu.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/hy.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ig.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/is.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ja.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/kk.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/kl.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/kn.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ko.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/kok.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ln.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/lt.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/lv.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/mk.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ml.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/mr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/mt.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/nb.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/nn.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/nso.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/om.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/or.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/pa.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/pl.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ro.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ru.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/sa.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/se.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/si.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/si_dict.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/sk.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/sl.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/sq.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/sr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/sv.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/sv_refo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ta.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/te.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/th.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/tn.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/to.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/tr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/uk.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/ur.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/vi.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/wae.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/wo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/yo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/zh.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/zh_big5.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/zh_gb.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/zh_pin.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/zh_strk.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale/zh_zhu.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/allkeys.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/keys.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Collate/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Collate/Collate.so
+%%SITE_ARCH%%/Unicode/Collate.pm
+%%SITE_ARCH%%/Unicode/Collate/CJK/Big5.pm
+%%SITE_ARCH%%/Unicode/Collate/CJK/GB2312.pm
+%%SITE_ARCH%%/Unicode/Collate/CJK/JISX0208.pm
+%%SITE_ARCH%%/Unicode/Collate/CJK/Korean.pm
+%%SITE_ARCH%%/Unicode/Collate/CJK/Pinyin.pm
+%%SITE_ARCH%%/Unicode/Collate/CJK/Stroke.pm
+%%SITE_ARCH%%/Unicode/Collate/CJK/Zhuyin.pm
+%%SITE_ARCH%%/Unicode/Collate/Locale.pm
+%%SITE_ARCH%%/Unicode/Collate/Locale/af.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ar.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/as.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/az.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/be.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/bg.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/bn.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ca.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/cs.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/cy.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/da.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/de_phone.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ee.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/eo.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/es.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/es_trad.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/et.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/fa.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/fi.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/fi_phone.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/fil.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/fo.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/fr.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/gu.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ha.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/haw.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/hi.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/hr.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/hu.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/hy.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ig.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/is.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ja.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/kk.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/kl.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/kn.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ko.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/kok.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ln.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/lt.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/lv.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/mk.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ml.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/mr.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/mt.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/nb.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/nn.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/nso.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/om.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/or.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/pa.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/pl.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ro.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ru.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/sa.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/se.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/si.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/si_dict.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/sk.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/sl.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/sq.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/sr.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/sv.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/sv_refo.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ta.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/te.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/th.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/tn.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/to.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/tr.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/uk.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/ur.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/vi.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/wae.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/wo.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/yo.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/zh.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/zh_big5.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/zh_gb.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/zh_pin.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/zh_strk.pl
+%%SITE_ARCH%%/Unicode/Collate/Locale/zh_zhu.pl
+%%SITE_ARCH%%/Unicode/Collate/allkeys.txt
+%%SITE_ARCH%%/Unicode/Collate/keys.txt
+%%SITE_ARCH%%/auto/Unicode/Collate/Collate.so
 %%PERL5_MAN3%%/Unicode::Collate.3.gz
 %%PERL5_MAN3%%/Unicode::Collate::CJK::Big5.3.gz
 %%PERL5_MAN3%%/Unicode::Collate::CJK::GB2312.3.gz
@@ -102,9 +101,3 @@
 %%PERL5_MAN3%%/Unicode::Collate::CJK::Stroke.3.gz
 %%PERL5_MAN3%%/Unicode::Collate::CJK::Zhuyin.3.gz
 %%PERL5_MAN3%%/Unicode::Collate::Locale.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Collate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/Locale
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate/CJK
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Collate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
diff --git a/textproc/p5-Unicode-EastAsianWidth/Makefile b/textproc/p5-Unicode-EastAsianWidth/Makefile
index 5096acee1806..2c245546a9aa 100644
--- a/textproc/p5-Unicode-EastAsianWidth/Makefile
+++ b/textproc/p5-Unicode-EastAsianWidth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-EastAsianWidth
 PORTVERSION=	1.33
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Unicode-EastAsianWidth/pkg-plist b/textproc/p5-Unicode-EastAsianWidth/pkg-plist
index 6622477c057a..ecbd58163dc1 100644
--- a/textproc/p5-Unicode-EastAsianWidth/pkg-plist
+++ b/textproc/p5-Unicode-EastAsianWidth/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Unicode::EastAsianWidth.3.gz
 %%SITE_PERL%%/Unicode/EastAsianWidth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/EastAsianWidth/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/EastAsianWidth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
-@dirrmtry %%SITE_PERL%%/Unicode
diff --git a/textproc/p5-Unicode-Escape/Makefile b/textproc/p5-Unicode-Escape/Makefile
index 89c985f63092..88e14b2df0b6 100644
--- a/textproc/p5-Unicode-Escape/Makefile
+++ b/textproc/p5-Unicode-Escape/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Escape
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Unicode-Escape/pkg-plist b/textproc/p5-Unicode-Escape/pkg-plist
index cd6450d3dc38..1f950e5dda4f 100644
--- a/textproc/p5-Unicode-Escape/pkg-plist
+++ b/textproc/p5-Unicode-Escape/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Unicode::Escape.3.gz
 %%SITE_PERL%%/Unicode/Escape.pm
-@dirrmtry %%SITE_PERL%%/Unicode
diff --git a/textproc/p5-Unicode-LineBreak/Makefile b/textproc/p5-Unicode-LineBreak/Makefile
index efadf42cf24e..1b8ff21f429d 100644
--- a/textproc/p5-Unicode-LineBreak/Makefile
+++ b/textproc/p5-Unicode-LineBreak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Unicode-LineBreak
 PORTVERSION=	2013.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Unicode-LineBreak/pkg-plist b/textproc/p5-Unicode-LineBreak/pkg-plist
index fcff6bd0038c..f24162f392a2 100644
--- a/textproc/p5-Unicode-LineBreak/pkg-plist
+++ b/textproc/p5-Unicode-LineBreak/pkg-plist
@@ -1,29 +1,18 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/POD2/JA/Text/LineFold.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/POD2/JA/Unicode/GCString.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/POD2/JA/Unicode/LineBreak.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/LineFold.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/GCString.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/GCString.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/LineBreak.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/LineBreak.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/LineBreak/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/LineBreak/Defaults.pm.sample
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/LineBreak/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/LineBreak/LineBreak.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/sombok/extralibs.ld
+%%SITE_ARCH%%/POD2/JA/Text/LineFold.pod
+%%SITE_ARCH%%/POD2/JA/Unicode/GCString.pod
+%%SITE_ARCH%%/POD2/JA/Unicode/LineBreak.pod
+%%SITE_ARCH%%/Text/LineFold.pm
+%%SITE_ARCH%%/Unicode/GCString.pm
+%%SITE_ARCH%%/Unicode/GCString.pod
+%%SITE_ARCH%%/Unicode/LineBreak.pm
+%%SITE_ARCH%%/Unicode/LineBreak.pod
+%%SITE_ARCH%%/Unicode/LineBreak/Constants.pm
+%%SITE_ARCH%%/Unicode/LineBreak/Defaults.pm.sample
+%%SITE_ARCH%%/auto/Unicode/LineBreak/LineBreak.so
+%%SITE_ARCH%%/auto/sombok/extralibs.ld
 %%PERL5_MAN3%%/POD2::JA::Text::LineFold.3.gz
 %%PERL5_MAN3%%/POD2::JA::Unicode::GCString.3.gz
 %%PERL5_MAN3%%/POD2::JA::Unicode::LineBreak.3.gz
 %%PERL5_MAN3%%/Text::LineFold.3.gz
 %%PERL5_MAN3%%/Unicode::GCString.3.gz
 %%PERL5_MAN3%%/Unicode::LineBreak.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/sombok
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/LineBreak
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/LineBreak
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POD2/JA/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POD2/JA/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POD2/JA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POD2
diff --git a/textproc/p5-Unicode-Normalize/Makefile b/textproc/p5-Unicode-Normalize/Makefile
index f86a49d3de3e..a5224a93cdb1 100644
--- a/textproc/p5-Unicode-Normalize/Makefile
+++ b/textproc/p5-Unicode-Normalize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Normalize
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SADAHIRO
diff --git a/textproc/p5-Unicode-Normalize/pkg-plist b/textproc/p5-Unicode-Normalize/pkg-plist
index 06d931eb38c4..881d55658c2c 100644
--- a/textproc/p5-Unicode-Normalize/pkg-plist
+++ b/textproc/p5-Unicode-Normalize/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Unicode::Normalize.3.gz
 %%SITE_PERL%%/Unicode/Normalize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Normalize/.packlist
-@dirrmtry %%SITE_PERL%%/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Normalize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
diff --git a/textproc/p5-Unicode-Unihan/Makefile b/textproc/p5-Unicode-Unihan/Makefile
index dc9bc81362e1..ce1f4c6178a7 100644
--- a/textproc/p5-Unicode-Unihan/Makefile
+++ b/textproc/p5-Unicode-Unihan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Unihan
 DISTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Unicode-Unihan/pkg-plist b/textproc/p5-Unicode-Unihan/pkg-plist
index 3800959e09b8..2bdece667b93 100644
--- a/textproc/p5-Unicode-Unihan/pkg-plist
+++ b/textproc/p5-Unicode-Unihan/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Unicode::Unihan.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Unihan/.packlist
 %%SITE_PERL%%/Unicode/Unihan.pm
 %%SITE_PERL%%/Unicode/Unihan/AccountingNumeric.db
 %%SITE_PERL%%/Unicode/Unihan/BigFive.db
@@ -89,7 +88,3 @@
 %%SITE_PERL%%/Unicode/Unihan/XHC1983.db
 %%SITE_PERL%%/Unicode/Unihan/Xerox.db
 %%SITE_PERL%%/Unicode/Unihan/ZVariant.db
-@dirrmtry %%SITE_PERL%%/Unicode/Unihan
-@dirrmtry %%SITE_PERL%%/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Unihan
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
diff --git a/textproc/p5-Validator-Custom/Makefile b/textproc/p5-Validator-Custom/Makefile
index 462d2f4ba1c0..912ee9001164 100644
--- a/textproc/p5-Validator-Custom/Makefile
+++ b/textproc/p5-Validator-Custom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Validator-Custom
 PORTVERSION=	0.2200
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KIMOTO
diff --git a/textproc/p5-Validator-Custom/pkg-plist b/textproc/p5-Validator-Custom/pkg-plist
index a35336aad2cf..7a3ca825fa9d 100644
--- a/textproc/p5-Validator-Custom/pkg-plist
+++ b/textproc/p5-Validator-Custom/pkg-plist
@@ -3,13 +3,9 @@
 %%SITE_PERL%%/Validator/Custom/Guide.pod
 %%SITE_PERL%%/Validator/Custom/Guide/Ja.pod
 %%SITE_PERL%%/Validator/Custom/Result.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Validator/Custom/.packlist
+%%SITE_PERL%%/Validator/Custom/Rule.pm
 %%PERL5_MAN3%%/Validator::Custom.3.gz
 %%PERL5_MAN3%%/Validator::Custom::Guide.3.gz
 %%PERL5_MAN3%%/Validator::Custom::Guide::Ja.3.gz
 %%PERL5_MAN3%%/Validator::Custom::Result.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validator/Custom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validator
-@dirrm %%SITE_PERL%%/Validator/Custom/Guide
-@dirrm %%SITE_PERL%%/Validator/Custom
-@dirrmtry %%SITE_PERL%%/Validator
+%%PERL5_MAN3%%/Validator::Custom::Rule.3.gz
diff --git a/textproc/p5-Version-Next/Makefile b/textproc/p5-Version-Next/Makefile
index 4957f8ffbd9e..c9c2d74802bd 100644
--- a/textproc/p5-Version-Next/Makefile
+++ b/textproc/p5-Version-Next/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Version-Next
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/textproc/p5-Version-Next/pkg-plist b/textproc/p5-Version-Next/pkg-plist
index a17be1b3e217..13eca146f26b 100644
--- a/textproc/p5-Version-Next/pkg-plist
+++ b/textproc/p5-Version-Next/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Version::Next.3.gz
 %%SITE_PERL%%/Version/Next.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Version/Next/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Version/Next
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Version
-@dirrmtry %%SITE_PERL%%/Version
diff --git a/textproc/p5-Vroom/Makefile b/textproc/p5-Vroom/Makefile
index f9501f09451c..2ad09a355ea6 100644
--- a/textproc/p5-Vroom/Makefile
+++ b/textproc/p5-Vroom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Vroom
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/textproc/p5-Vroom/pkg-plist b/textproc/p5-Vroom/pkg-plist
index d72d73a6dadf..8dc4168c7643 100644
--- a/textproc/p5-Vroom/pkg-plist
+++ b/textproc/p5-Vroom/pkg-plist
@@ -3,6 +3,3 @@ bin/vroom
 %%SITE_PERL%%/Vroom.pm
 %%SITE_PERL%%/Vroom.pod
 %%SITE_PERL%%/Vroom/Mo.pm
-%%SITE_PERL%%/mach/auto/Vroom/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Vroom
-@dirrm %%SITE_PERL%%/Vroom
diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile
index 614e07bb4c8e..af2564f5eaee 100644
--- a/textproc/p5-WDDX/Makefile
+++ b/textproc/p5-WDDX/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WDDX
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PETDANCE
diff --git a/textproc/p5-WDDX/pkg-plist b/textproc/p5-WDDX/pkg-plist
index 9e7d11c048a0..0c1ad50cba54 100644
--- a/textproc/p5-WDDX/pkg-plist
+++ b/textproc/p5-WDDX/pkg-plist
@@ -10,8 +10,5 @@
 %%SITE_PERL%%/WDDX/Recordset.pm
 %%SITE_PERL%%/WDDX/String.pm
 %%SITE_PERL%%/WDDX/Struct.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WDDX/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/Changes
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WDDX
-@dirrmtry %%SITE_PERL%%/WDDX
diff --git a/textproc/p5-WWW-Google-SiteMap/Makefile b/textproc/p5-WWW-Google-SiteMap/Makefile
index ae0e61f3aca2..91667d377ab4 100644
--- a/textproc/p5-WWW-Google-SiteMap/Makefile
+++ b/textproc/p5-WWW-Google-SiteMap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Google-SiteMap
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JASONK
diff --git a/textproc/p5-WWW-Google-SiteMap/pkg-plist b/textproc/p5-WWW-Google-SiteMap/pkg-plist
index 9b1925ff1c6b..f920b0f7165a 100644
--- a/textproc/p5-WWW-Google-SiteMap/pkg-plist
+++ b/textproc/p5-WWW-Google-SiteMap/pkg-plist
@@ -8,10 +8,3 @@
 %%SITE_PERL%%/WWW/Google/SiteMap/Ping.pm
 %%SITE_PERL%%/WWW/Google/SiteMap/Robot.pm
 %%SITE_PERL%%/WWW/Google/SiteMap/URL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/SiteMap/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/SiteMap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Google/SiteMap
-@dirrmtry %%SITE_PERL%%/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/textproc/p5-WWW-Wordnik-API/Makefile b/textproc/p5-WWW-Wordnik-API/Makefile
index 667b4a0b77ef..2fec6e594719 100644
--- a/textproc/p5-WWW-Wordnik-API/Makefile
+++ b/textproc/p5-WWW-Wordnik-API/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Wordnik-API
 PORTVERSION=	0.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PSILVA
@@ -21,12 +21,7 @@ TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wordnik/API/.packlist \
-		%%SITE_PERL%%/WWW/Wordnik/API.pm \
+PLIST_FILES=	%%SITE_PERL%%/WWW/Wordnik/API.pm \
 		%%PERL5_MAN3%%/WWW::Wordnik::API.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/WWW/Wordnik %%SITE_PERL%%/WWW \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wordnik/API \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wordnik \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-WordNet-QueryData/Makefile b/textproc/p5-WordNet-QueryData/Makefile
index c103321e4416..4fd2082e3810 100644
--- a/textproc/p5-WordNet-QueryData/Makefile
+++ b/textproc/p5-WordNet-QueryData/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WordNet-QueryData
 PORTVERSION=	1.49
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-WordNet-QueryData/pkg-plist b/textproc/p5-WordNet-QueryData/pkg-plist
index d079087f65b9..bc12c7a16320 100644
--- a/textproc/p5-WordNet-QueryData/pkg-plist
+++ b/textproc/p5-WordNet-QueryData/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/WordNet::QueryData.3.gz
 %%SITE_PERL%%/WordNet/QueryData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet
-@dirrmtry %%SITE_PERL%%/WordNet
diff --git a/textproc/p5-WordNet-Similarity/Makefile b/textproc/p5-WordNet-Similarity/Makefile
index 0e04d27633a0..372a4eff67f3 100644
--- a/textproc/p5-WordNet-Similarity/Makefile
+++ b/textproc/p5-WordNet-Similarity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WordNet-Similarity
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-WordNet-Similarity/pkg-plist b/textproc/p5-WordNet-Similarity/pkg-plist
index f304ac7bc7db..e1d0e6ea1714 100644
--- a/textproc/p5-WordNet-Similarity/pkg-plist
+++ b/textproc/p5-WordNet-Similarity/pkg-plist
@@ -58,7 +58,6 @@ bin/wordVectors.pl
 %%SITE_PERL%%/WordNet/vector-relation.dat
 %%SITE_PERL%%/WordNet/vectorFile.pm
 %%SITE_PERL%%/WordNet/wordvectors.dat
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity/.packlist
 man/man1/BNCFreq.pl.1.gz
 man/man1/brownFreq.pl.1.gz
 man/man1/compounds.pl.1.gz
@@ -70,7 +69,3 @@ man/man1/similarity_server.pl.1.gz
 man/man1/treebankFreq.pl.1.gz
 man/man1/wnDepths.pl.1.gz
 man/man1/wordVectors.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet
-@dirrmtry %%SITE_PERL%%/WordNet/Similarity
-@dirrmtry %%SITE_PERL%%/WordNet
diff --git a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
index d767d773f35b..4f0b98119564 100644
--- a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
+++ b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Atom-Ext-OpenSearch
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Atom-Ext-OpenSearch/pkg-plist b/textproc/p5-XML-Atom-Ext-OpenSearch/pkg-plist
index a7ea17c65a16..e63f05150201 100644
--- a/textproc/p5-XML-Atom-Ext-OpenSearch/pkg-plist
+++ b/textproc/p5-XML-Atom-Ext-OpenSearch/pkg-plist
@@ -1,13 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Ext/OpenSearch/.packlist
 %%SITE_PERL%%/XML/Atom/Ext/OpenSearch.pm
 %%SITE_PERL%%/XML/Atom/Ext/OpenSearch/Query.pm
 %%PERL5_MAN3%%/XML::Atom::Ext::OpenSearch.3.gz
 %%PERL5_MAN3%%/XML::Atom::Ext::OpenSearch::Query.3.gz
-@dirrmtry %%SITE_PERL%%/XML/Atom/Ext/OpenSearch
-@dirrmtry %%SITE_PERL%%/XML/Atom/Ext
-@dirrmtry %%SITE_PERL%%/XML/Atom
-@dirrmtry %%SITE_PERL%%/XML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Ext/OpenSearch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Ext
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Atom-Filter/Makefile b/textproc/p5-XML-Atom-Filter/Makefile
index 8cb91f3a0327..e1a53d940c14 100644
--- a/textproc/p5-XML-Atom-Filter/Makefile
+++ b/textproc/p5-XML-Atom-Filter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Atom-Filter
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Atom-Filter/pkg-plist b/textproc/p5-XML-Atom-Filter/pkg-plist
index 66bb97815633..8aa9442bac1f 100644
--- a/textproc/p5-XML-Atom-Filter/pkg-plist
+++ b/textproc/p5-XML-Atom-Filter/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Atom::Filter.3.gz
 %%SITE_PERL%%/XML/Atom/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Atom
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Atom-SimpleFeed/Makefile b/textproc/p5-XML-Atom-SimpleFeed/Makefile
index 851a07e3fb37..4e09920de544 100644
--- a/textproc/p5-XML-Atom-SimpleFeed/Makefile
+++ b/textproc/p5-XML-Atom-SimpleFeed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Atom-SimpleFeed
 PORTVERSION=	0.86
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
index f51148905cae..c139f2a798a2 100644
--- a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
+++ b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Atom::SimpleFeed.3.gz
 %%SITE_PERL%%/XML/Atom/SimpleFeed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Atom
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Atom-Stream/Makefile b/textproc/p5-XML-Atom-Stream/Makefile
index 6d80e02b19e2..7e956ca90cd9 100644
--- a/textproc/p5-XML-Atom-Stream/Makefile
+++ b/textproc/p5-XML-Atom-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Atom-Stream
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Atom-Stream/pkg-plist b/textproc/p5-XML-Atom-Stream/pkg-plist
index d4043b9e3d97..eb00a978ce9c 100644
--- a/textproc/p5-XML-Atom-Stream/pkg-plist
+++ b/textproc/p5-XML-Atom-Stream/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Atom::Stream.3.gz
 %%SITE_PERL%%/XML/Atom/Stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Stream/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Stream
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Atom
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Atom-Syndication/Makefile b/textproc/p5-XML-Atom-Syndication/Makefile
index 3839d1c4b1c0..26faeb909e9e 100644
--- a/textproc/p5-XML-Atom-Syndication/Makefile
+++ b/textproc/p5-XML-Atom-Syndication/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Atom-Syndication
 PORTVERSION=	0.94.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-XML-Atom-Syndication/pkg-plist b/textproc/p5-XML-Atom-Syndication/pkg-plist
index 2d9e3dd4fa0b..29719c24bc5b 100644
--- a/textproc/p5-XML-Atom-Syndication/pkg-plist
+++ b/textproc/p5-XML-Atom-Syndication/pkg-plist
@@ -24,10 +24,3 @@
 %%SITE_PERL%%/XML/Atom/Syndication/Thing.pm
 %%SITE_PERL%%/XML/Atom/Syndication/Util.pm
 %%SITE_PERL%%/XML/Atom/Syndication/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Syndication/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Syndication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Atom/Syndication
-@dirrmtry %%SITE_PERL%%/XML/Atom
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Atom/Makefile b/textproc/p5-XML-Atom/Makefile
index 98901e021394..2952a2845067 100644
--- a/textproc/p5-XML-Atom/Makefile
+++ b/textproc/p5-XML-Atom/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Atom
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Atom/pkg-plist b/textproc/p5-XML-Atom/pkg-plist
index c5622c2e0671..fe780ac17431 100644
--- a/textproc/p5-XML-Atom/pkg-plist
+++ b/textproc/p5-XML-Atom/pkg-plist
@@ -18,8 +18,3 @@
 %%SITE_PERL%%/XML/Atom/Server.pm
 %%SITE_PERL%%/XML/Atom/Thing.pm
 %%SITE_PERL%%/XML/Atom/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Atom
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-AutoWriter/Makefile b/textproc/p5-XML-AutoWriter/Makefile
index 13b2496b2066..9fe09020fdfe 100644
--- a/textproc/p5-XML-AutoWriter/Makefile
+++ b/textproc/p5-XML-AutoWriter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	XML-AutoWriter
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-AutoWriter/pkg-plist b/textproc/p5-XML-AutoWriter/pkg-plist
index 226007159892..87e5d356d8ad 100644
--- a/textproc/p5-XML-AutoWriter/pkg-plist
+++ b/textproc/p5-XML-AutoWriter/pkg-plist
@@ -8,8 +8,3 @@
 %%SITE_PERL%%/XML/Doctype/AttDef.pm
 %%SITE_PERL%%/XML/Doctype/ElementDecl.pm
 %%SITE_PERL%%/XML/ValidWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/AutoWriter/.packlist
-@dirrm %%SITE_PERL%%/XML/Doctype
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/AutoWriter
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Bare/Makefile b/textproc/p5-XML-Bare/Makefile
index e580770cc2a3..bb94f36df355 100644
--- a/textproc/p5-XML-Bare/Makefile
+++ b/textproc/p5-XML-Bare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Bare
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Bare/pkg-plist b/textproc/p5-XML-Bare/pkg-plist
index acb57904f6f1..70091422e28c 100644
--- a/textproc/p5-XML-Bare/pkg-plist
+++ b/textproc/p5-XML-Bare/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/XML::Bare.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Bare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Bare/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Bare/Bare.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Bare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+%%SITE_ARCH%%/XML/Bare.pm
+%%SITE_ARCH%%/auto/XML/Bare/Bare.so
diff --git a/textproc/p5-XML-Canonical/Makefile b/textproc/p5-XML-Canonical/Makefile
index 8e539bd32921..35541c98b97f 100644
--- a/textproc/p5-XML-Canonical/Makefile
+++ b/textproc/p5-XML-Canonical/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Canonical
 PORTVERSION=	0.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Canonical/pkg-plist b/textproc/p5-XML-Canonical/pkg-plist
index 3be4e5d59e42..0721fff01792 100644
--- a/textproc/p5-XML-Canonical/pkg-plist
+++ b/textproc/p5-XML-Canonical/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Canonical.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Canonical/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Canonical/Canonical.so
+%%SITE_ARCH%%/XML/Canonical.pm
+%%SITE_ARCH%%/auto/XML/Canonical/Canonical.so
 %%PERL5_MAN3%%/XML::Canonical.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Canonical
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-CanonicalizeXML/Makefile b/textproc/p5-XML-CanonicalizeXML/Makefile
index 782c260298dd..0ec44796ee90 100644
--- a/textproc/p5-XML-CanonicalizeXML/Makefile
+++ b/textproc/p5-XML-CanonicalizeXML/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-CanonicalizeXML
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-CanonicalizeXML/pkg-plist b/textproc/p5-XML-CanonicalizeXML/pkg-plist
index 748ec2817afd..cf5ba14445d8 100644
--- a/textproc/p5-XML-CanonicalizeXML/pkg-plist
+++ b/textproc/p5-XML-CanonicalizeXML/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/CanonicalizeXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML/CanonicalizeXML.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML/autosplit.ix
+%%SITE_ARCH%%/XML/CanonicalizeXML.pm
+%%SITE_ARCH%%/auto/XML/CanonicalizeXML/CanonicalizeXML.so
+%%SITE_ARCH%%/auto/XML/CanonicalizeXML/autosplit.ix
 %%PERL5_MAN3%%/XML::CanonicalizeXML.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile
index 43f8193dc83b..f9c5a59552c5 100644
--- a/textproc/p5-XML-Catalog/Makefile
+++ b/textproc/p5-XML-Catalog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Catalog
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Catalog/pkg-plist b/textproc/p5-XML-Catalog/pkg-plist
index 90cb53ebb647..badb603c15b2 100644
--- a/textproc/p5-XML-Catalog/pkg-plist
+++ b/textproc/p5-XML-Catalog/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/XML/Catalog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog/.packlist
 %%PERL5_MAN3%%/XML::Catalog.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Clean/Makefile b/textproc/p5-XML-Clean/Makefile
index ae499efdffe9..7adec10dfbc3 100644
--- a/textproc/p5-XML-Clean/Makefile
+++ b/textproc/p5-XML-Clean/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Clean
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Clean/pkg-plist b/textproc/p5-XML-Clean/pkg-plist
index 8aaf7e584de0..45b7ad098a6a 100644
--- a/textproc/p5-XML-Clean/pkg-plist
+++ b/textproc/p5-XML-Clean/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Clean.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean/.packlist
 %%SITE_PERL%%/XML/Clean.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Code/Makefile b/textproc/p5-XML-Code/Makefile
index 8fb3ea035339..c9ee9a4e0fe1 100644
--- a/textproc/p5-XML-Code/Makefile
+++ b/textproc/p5-XML-Code/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	XML-Code
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Code/pkg-plist b/textproc/p5-XML-Code/pkg-plist
index cbed4ce904e0..02e75ee33742 100644
--- a/textproc/p5-XML-Code/pkg-plist
+++ b/textproc/p5-XML-Code/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Code.3.gz
 %%SITE_PERL%%/XML/Code.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Code/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Code
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-CommonNS/Makefile b/textproc/p5-XML-CommonNS/Makefile
index 340d774a9f43..e5b9d2bd8d0d 100644
--- a/textproc/p5-XML-CommonNS/Makefile
+++ b/textproc/p5-XML-CommonNS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-CommonNS
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-CommonNS/pkg-plist b/textproc/p5-XML-CommonNS/pkg-plist
index 31af720f2957..83a4464f1d52 100644
--- a/textproc/p5-XML-CommonNS/pkg-plist
+++ b/textproc/p5-XML-CommonNS/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::CommonNS.3.gz
 %%SITE_PERL%%/XML/CommonNS.pm
-%%SITE_PERL%%/mach/auto/XML/CommonNS/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/XML/CommonNS
-@dirrmtry %%SITE_PERL%%/mach/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Compile-Cache/Makefile b/textproc/p5-XML-Compile-Cache/Makefile
index 87b069640e85..d0ce678abe9b 100644
--- a/textproc/p5-XML-Compile-Cache/Makefile
+++ b/textproc/p5-XML-Compile-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Compile-Cache
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Compile-Cache/pkg-plist b/textproc/p5-XML-Compile-Cache/pkg-plist
index a2a3f5233495..d925d38432bf 100644
--- a/textproc/p5-XML-Compile-Cache/pkg-plist
+++ b/textproc/p5-XML-Compile-Cache/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/XML/Compile/Cache.pm
 %%SITE_PERL%%/XML/Compile/Cache.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/Cache/.packlist
 %%PERL5_MAN3%%/XML::Compile::Cache.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Compile
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Compile-Dumper/Makefile b/textproc/p5-XML-Compile-Dumper/Makefile
index 32de5890ae44..0a20390d3fc2 100644
--- a/textproc/p5-XML-Compile-Dumper/Makefile
+++ b/textproc/p5-XML-Compile-Dumper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Compile-Dumper
 PORTVERSION=	0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Compile-Dumper/pkg-plist b/textproc/p5-XML-Compile-Dumper/pkg-plist
index f0f1cb203310..c3fb6863fbad 100644
--- a/textproc/p5-XML-Compile-Dumper/pkg-plist
+++ b/textproc/p5-XML-Compile-Dumper/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/XML::Compile::Dumper.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/Dumper/.packlist
 %%SITE_PERL%%/XML/Compile/Dumper.pod
 %%SITE_PERL%%/XML/Compile/Dumper.pm
-@dirrmtry %%SITE_PERL%%/XML/Compile
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/Dumper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Compile/Makefile b/textproc/p5-XML-Compile/Makefile
index 4c709fef896b..db5bd3fefa1c 100644
--- a/textproc/p5-XML-Compile/Makefile
+++ b/textproc/p5-XML-Compile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Compile
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Compile/pkg-plist b/textproc/p5-XML-Compile/pkg-plist
index 675ebe0a9b66..c8ddb0e7ca73 100644
--- a/textproc/p5-XML-Compile/pkg-plist
+++ b/textproc/p5-XML-Compile/pkg-plist
@@ -35,7 +35,6 @@ bin/xml2yaml
 %%SITE_PERL%%/XML/Compile/xsd/2001-XMLSchema.dtd
 %%SITE_PERL%%/XML/Compile/xsd/2001-XMLSchema.xsd
 %%SITE_PERL%%/XML/Compile/xsd/2001-datatypes.dtd
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/.packlist
 %%PERL5_MAN3%%/XML::Compile.3.gz
 %%PERL5_MAN3%%/XML::Compile::FAQ.3.gz
 %%PERL5_MAN3%%/XML::Compile::Iterator.3.gz
@@ -52,10 +51,3 @@ bin/xml2yaml
 %%PERL5_MAN3%%/XML::Compile::Util.3.gz
 man/man1/schema2example.1.gz
 man/man1/xml2yaml.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Compile/xsd
-@dirrmtry %%SITE_PERL%%/XML/Compile/Translate
-@dirrmtry %%SITE_PERL%%/XML/Compile/Schema
-@dirrmtry %%SITE_PERL%%/XML/Compile
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DBMS/Makefile b/textproc/p5-XML-DBMS/Makefile
index 7fcc764df9c0..2f3fe499490b 100644
--- a/textproc/p5-XML-DBMS/Makefile
+++ b/textproc/p5-XML-DBMS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DBMS
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc databases perl5
 MASTER_SITES=	http://www.rpbourret.com/xmldbms/
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DBMS/pkg-plist b/textproc/p5-XML-DBMS/pkg-plist
index 961cbfb65cb4..53036c7b6bd3 100644
--- a/textproc/p5-XML-DBMS/pkg-plist
+++ b/textproc/p5-XML-DBMS/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/XML/XMLtoDBMS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XMLtoDBMS/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales.map
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales.sql
@@ -7,6 +6,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales1.map
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales2.map
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XMLtoDBMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DOM-Lite/Makefile b/textproc/p5-XML-DOM-Lite/Makefile
index eb82e2817c9f..3712c0780874 100644
--- a/textproc/p5-XML-DOM-Lite/Makefile
+++ b/textproc/p5-XML-DOM-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DOM-Lite
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DOM-Lite/pkg-plist b/textproc/p5-XML-DOM-Lite/pkg-plist
index 1c97c40eaa9f..0a80d4872ca9 100644
--- a/textproc/p5-XML-DOM-Lite/pkg-plist
+++ b/textproc/p5-XML-DOM-Lite/pkg-plist
@@ -14,10 +14,3 @@
 %%SITE_PERL%%/XML/DOM/Lite/Serializer.pm
 %%SITE_PERL%%/XML/DOM/Lite/XPath.pm
 %%SITE_PERL%%/XML/DOM/Lite/XSLT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/Lite/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/DOM/Lite
-@dirrmtry %%SITE_PERL%%/XML/DOM
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DOM-XPath/Makefile b/textproc/p5-XML-DOM-XPath/Makefile
index eb6f8b5f9ab5..e7151d37f0e0 100644
--- a/textproc/p5-XML-DOM-XPath/Makefile
+++ b/textproc/p5-XML-DOM-XPath/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DOM-XPath
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DOM-XPath/pkg-plist b/textproc/p5-XML-DOM-XPath/pkg-plist
index c83a1ed6216f..dab9d0f61a1e 100644
--- a/textproc/p5-XML-DOM-XPath/pkg-plist
+++ b/textproc/p5-XML-DOM-XPath/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/XML/DOM/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/XPath/.packlist
 %%PERL5_MAN3%%/XML::DOM::XPath.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/XPath
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/DOM
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 4c4f7de5f954..070693f3311b 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	XML-DOM
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DOM/pkg-plist b/textproc/p5-XML-DOM/pkg-plist
index 71b32a70f67b..72f462d6ea3c 100644
--- a/textproc/p5-XML-DOM/pkg-plist
+++ b/textproc/p5-XML-DOM/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-DOM/.packlist
 %%SITE_PERL%%/XML/DOM.pm
 %%SITE_PERL%%/XML/DOM/AttDef.pod
 %%SITE_PERL%%/XML/DOM/AttlistDecl.pod
@@ -52,5 +51,3 @@
 %%PERL5_MAN3%%/XML::DOM::Text.3.gz
 %%PERL5_MAN3%%/XML::DOM::XMLDecl.3.gz
 %%PERL5_MAN3%%/XML::Handler::BuildDOM.3.gz
-@dirrm %%SITE_PERL%%/XML/DOM
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-DOM
diff --git a/textproc/p5-XML-DOM2/Makefile b/textproc/p5-XML-DOM2/Makefile
index be057144d7bc..baf965221592 100644
--- a/textproc/p5-XML-DOM2/Makefile
+++ b/textproc/p5-XML-DOM2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-DOM2
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	XML
diff --git a/textproc/p5-XML-DOM2/pkg-plist b/textproc/p5-XML-DOM2/pkg-plist
index 94add45b4ad8..46db324b8e3d 100644
--- a/textproc/p5-XML-DOM2/pkg-plist
+++ b/textproc/p5-XML-DOM2/pkg-plist
@@ -26,11 +26,3 @@
 %%SITE_PERL%%/XML/DOM2/Element/DocumentType.pm
 %%SITE_PERL%%/XML/DOM2/Parser.pm
 %%SITE_PERL%%/XML/DOM2/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM2/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/DOM2/Element
-@dirrmtry %%SITE_PERL%%/XML/DOM2/DOM
-@dirrmtry %%SITE_PERL%%/XML/DOM2/Attribute
-@dirrmtry %%SITE_PERL%%/XML/DOM2
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DOMHandler/Makefile b/textproc/p5-XML-DOMHandler/Makefile
index 742d16c674ac..d6e5696fb717 100644
--- a/textproc/p5-XML-DOMHandler/Makefile
+++ b/textproc/p5-XML-DOMHandler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DOMHandler
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DOMHandler/pkg-plist b/textproc/p5-XML-DOMHandler/pkg-plist
index 6e8ee0056291..1688e52dba05 100644
--- a/textproc/p5-XML-DOMHandler/pkg-plist
+++ b/textproc/p5-XML-DOMHandler/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOMHandler/.packlist
 %%SITE_PERL%%/XML/DOMHandler.pm
 %%PERL5_MAN3%%/XML::DOMHandler.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOMHandler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 7547a68a4b99..4f1d97507f4c 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DT
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DT/pkg-plist b/textproc/p5-XML-DT/pkg-plist
index 57bd8bb920bd..131625bfd4bd 100644
--- a/textproc/p5-XML-DT/pkg-plist
+++ b/textproc/p5-XML-DT/pkg-plist
@@ -5,7 +5,4 @@ man/man1/mkdtdskel.1.gz
 man/man1/mkdtskel.1.gz
 man/man1/mkxmltype.1.gz
 %%PERL5_MAN3%%/XML::DT.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT/.packlist
 %%SITE_PERL%%/XML/DT.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DTDParser/Makefile b/textproc/p5-XML-DTDParser/Makefile
index 13646854453c..c5e85f9ad4c6 100644
--- a/textproc/p5-XML-DTDParser/Makefile
+++ b/textproc/p5-XML-DTDParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DTDParser
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DTDParser/pkg-plist b/textproc/p5-XML-DTDParser/pkg-plist
index bf746ce683f2..093bdd2bbc0c 100644
--- a/textproc/p5-XML-DTDParser/pkg-plist
+++ b/textproc/p5-XML-DTDParser/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::DTDParser.3.gz
 %%SITE_PERL%%/XML/DTDParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DTDParser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DTDParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Declare/Makefile b/textproc/p5-XML-Declare/Makefile
index 52bfd3300e3b..d3f398db34cf 100644
--- a/textproc/p5-XML-Declare/Makefile
+++ b/textproc/p5-XML-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Declare
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Declare/pkg-plist b/textproc/p5-XML-Declare/pkg-plist
index 5ab7fbb99413..9e9fb1e44cac 100644
--- a/textproc/p5-XML-Declare/pkg-plist
+++ b/textproc/p5-XML-Declare/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/XML/Declare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Declare/.packlist
 %%PERL5_MAN3%%/XML::Declare.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Declare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Descent/Makefile b/textproc/p5-XML-Descent/Makefile
index 42270a7bbdf0..c49e87c9a3ba 100644
--- a/textproc/p5-XML-Descent/Makefile
+++ b/textproc/p5-XML-Descent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Descent
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/XML
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Descent/pkg-plist b/textproc/p5-XML-Descent/pkg-plist
index b15ab36438d9..56f5e2acb4d2 100644
--- a/textproc/p5-XML-Descent/pkg-plist
+++ b/textproc/p5-XML-Descent/pkg-plist
@@ -1,4 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Descent/.packlist
 %%SITE_PERL%%/XML/Descent.pm
 %%PERL5_MAN3%%/XML::Descent.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Descent
diff --git a/textproc/p5-XML-DifferenceMarkup/Makefile b/textproc/p5-XML-DifferenceMarkup/Makefile
index bed856a634d1..79742de798bb 100644
--- a/textproc/p5-XML-DifferenceMarkup/Makefile
+++ b/textproc/p5-XML-DifferenceMarkup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DifferenceMarkup
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DifferenceMarkup/pkg-plist b/textproc/p5-XML-DifferenceMarkup/pkg-plist
index b2e55c1dc5cf..544fbb499935 100644
--- a/textproc/p5-XML-DifferenceMarkup/pkg-plist
+++ b/textproc/p5-XML-DifferenceMarkup/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::DifferenceMarkup.3.gz
 %%SITE_PERL%%/XML/DifferenceMarkup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DifferenceMarkup/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DifferenceMarkup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index 233ec7457054..a60672281200 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Directory
 PORTVERSION=	1.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Directory/pkg-plist b/textproc/p5-XML-Directory/pkg-plist
index fc4ed7f0cdb8..dcc6c105f6a7 100644
--- a/textproc/p5-XML-Directory/pkg-plist
+++ b/textproc/p5-XML-Directory/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/XML/Directory/Apache.pm
 %%SITE_PERL%%/XML/Directory/SAX.pm
 %%SITE_PERL%%/XML/Directory/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Directory
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DoubleEncodedEntities/Makefile b/textproc/p5-XML-DoubleEncodedEntities/Makefile
index f47731ef6f37..fe114712a9ad 100644
--- a/textproc/p5-XML-DoubleEncodedEntities/Makefile
+++ b/textproc/p5-XML-DoubleEncodedEntities/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-DoubleEncodedEntities
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-DoubleEncodedEntities/pkg-plist b/textproc/p5-XML-DoubleEncodedEntities/pkg-plist
index 71125c995251..2b8c5540999b 100644
--- a/textproc/p5-XML-DoubleEncodedEntities/pkg-plist
+++ b/textproc/p5-XML-DoubleEncodedEntities/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DoubleEncodedEntities/.packlist
 %%SITE_PERL%%/XML/DoubleEncodedEntities.pm
 %%PERL5_MAN3%%/XML::DoubleEncodedEntities.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DoubleEncodedEntities
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Driver-HTML/Makefile b/textproc/p5-XML-Driver-HTML/Makefile
index f3fe28dcd930..ce44e244c3a4 100644
--- a/textproc/p5-XML-Driver-HTML/Makefile
+++ b/textproc/p5-XML-Driver-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Driver-HTML
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Driver-HTML/pkg-plist b/textproc/p5-XML-Driver-HTML/pkg-plist
index 0da3f2a49003..3c17a107d0a2 100644
--- a/textproc/p5-XML-Driver-HTML/pkg-plist
+++ b/textproc/p5-XML-Driver-HTML/pkg-plist
@@ -1,10 +1,4 @@
 bin/html2xhtml
 %%PERL5_MAN3%%/XML::Driver::HTML.3.gz
 %%SITE_PERL%%/XML/Driver/HTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML/.packlist
 man/man1/html2xhtml.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Driver
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index 895d08935358..05d0ea9dbbc4 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Dumper
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Dumper/pkg-plist b/textproc/p5-XML-Dumper/pkg-plist
index 3ba3c085b339..6afa86611920 100644
--- a/textproc/p5-XML-Dumper/pkg-plist
+++ b/textproc/p5-XML-Dumper/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Dumper.3.gz
 %%SITE_PERL%%/XML/Dumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Elemental/Makefile b/textproc/p5-XML-Elemental/Makefile
index aa60265ad08a..28f6cd304f9b 100644
--- a/textproc/p5-XML-Elemental/Makefile
+++ b/textproc/p5-XML-Elemental/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Elemental
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Elemental/pkg-plist b/textproc/p5-XML-Elemental/pkg-plist
index c678bd2fc496..4817914afff0 100644
--- a/textproc/p5-XML-Elemental/pkg-plist
+++ b/textproc/p5-XML-Elemental/pkg-plist
@@ -14,10 +14,3 @@
 %%SITE_PERL%%/XML/Elemental/SAXHandler.pm
 %%SITE_PERL%%/XML/Elemental/Util.pm
 %%SITE_PERL%%/XML/Parser/Style/Elemental.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Elemental/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Elemental
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Parser/Style
-@dirrmtry %%SITE_PERL%%/XML/Parser
-@dirrmtry %%SITE_PERL%%/XML/Elemental
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Encoding/Makefile b/textproc/p5-XML-Encoding/Makefile
index 5cb621b9dd20..aa9d39784094 100644
--- a/textproc/p5-XML-Encoding/Makefile
+++ b/textproc/p5-XML-Encoding/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Encoding
 PORTVERSION=	2.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Encoding/pkg-plist b/textproc/p5-XML-Encoding/pkg-plist
index d7c8b693d9fa..e793abe0a428 100644
--- a/textproc/p5-XML-Encoding/pkg-plist
+++ b/textproc/p5-XML-Encoding/pkg-plist
@@ -2,8 +2,5 @@ bin/compile_encoding
 bin/make_encmap
 %%PERL5_MAN3%%/XML::Encoding.3.gz
 %%SITE_PERL%%/XML/Encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding/.packlist
 man/man1/compile_encoding.1.gz
 man/man1/make_encmap.1.gz
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding
diff --git a/textproc/p5-XML-Entities/Makefile b/textproc/p5-XML-Entities/Makefile
index c55e45298ec9..05332d86f542 100644
--- a/textproc/p5-XML-Entities/Makefile
+++ b/textproc/p5-XML-Entities/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Entities
 PORTVERSION=	1.0001
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Entities/pkg-plist b/textproc/p5-XML-Entities/pkg-plist
index 057e1511412b..eca4013c8b26 100644
--- a/textproc/p5-XML-Entities/pkg-plist
+++ b/textproc/p5-XML-Entities/pkg-plist
@@ -1,5 +1,4 @@
 bin/download-entities.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Entities/.packlist
 %%SITE_PERL%%/XML/Entities.pm
 %%SITE_PERL%%/XML/Entities/Data.pm
 %%SITE_PERL%%/XML/Entities/Data.pod
@@ -7,8 +6,3 @@ bin/download-entities.pl
 %%PERL5_MAN3%%/XML::Entities::Data.3pm.gz
 %%PERL5_MAN3%%/download-entities.pl.3pm.gz
 man/man1/download-entities.pl.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Entities
-@dirrm %%SITE_PERL%%/XML/Entities
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
diff --git a/textproc/p5-XML-FOAF/Makefile b/textproc/p5-XML-FOAF/Makefile
index f4c8b2e56428..ea3fc7855041 100644
--- a/textproc/p5-XML-FOAF/Makefile
+++ b/textproc/p5-XML-FOAF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-FOAF
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BTROTT
diff --git a/textproc/p5-XML-FOAF/pkg-plist b/textproc/p5-XML-FOAF/pkg-plist
index 93ff320a7ab1..a3839e7143c0 100644
--- a/textproc/p5-XML-FOAF/pkg-plist
+++ b/textproc/p5-XML-FOAF/pkg-plist
@@ -1,10 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/FOAF/.packlist
 %%SITE_PERL%%/XML/FOAF.pm
 %%SITE_PERL%%/XML/FOAF/ErrorHandler.pm
 %%SITE_PERL%%/XML/FOAF/Person.pm
 %%PERL5_MAN3%%/XML::FOAF.3.gz
 %%PERL5_MAN3%%/XML::FOAF::Person.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/FOAF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/FOAF
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Feed-Deduper/Makefile b/textproc/p5-XML-Feed-Deduper/Makefile
index e341c3fdf911..3b612eec9f79 100644
--- a/textproc/p5-XML-Feed-Deduper/Makefile
+++ b/textproc/p5-XML-Feed-Deduper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Feed-Deduper
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Feed-Deduper/pkg-plist b/textproc/p5-XML-Feed-Deduper/pkg-plist
index 92b595c45ef5..a505d1a9b1f5 100644
--- a/textproc/p5-XML-Feed-Deduper/pkg-plist
+++ b/textproc/p5-XML-Feed-Deduper/pkg-plist
@@ -2,6 +2,3 @@
 %%SITE_PERL%%/XML/Feed/Deduper/DB_File.pm
 %%SITE_PERL%%/XML/Feed/Deduper.pm
 %%PERL5_MAN3%%/XML::Feed::Deduper.3.gz
-@dirrmtry %%SITE_PERL%%/XML/Feed/Deduper
-@dirrmtry %%SITE_PERL%%/XML/Feed
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Feed/Makefile b/textproc/p5-XML-Feed/Makefile
index 7c5531597a2c..1d188f4d5837 100644
--- a/textproc/p5-XML-Feed/Makefile
+++ b/textproc/p5-XML-Feed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Feed
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Feed/pkg-plist b/textproc/p5-XML-Feed/pkg-plist
index 47c6bdec2765..b12fa0fbbb8f 100644
--- a/textproc/p5-XML-Feed/pkg-plist
+++ b/textproc/p5-XML-Feed/pkg-plist
@@ -10,11 +10,3 @@
 %%SITE_PERL%%/XML/Feed/Entry/Format/RSS.pm
 %%SITE_PERL%%/XML/Feed/Format/Atom.pm
 %%SITE_PERL%%/XML/Feed/Format/RSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Feed/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Feed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Feed/Format
-@dirrmtry %%SITE_PERL%%/XML/Feed/Entry/Format
-@dirrmtry %%SITE_PERL%%/XML/Feed/Entry
-@dirrmtry %%SITE_PERL%%/XML/Feed
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-FeedPP/Makefile b/textproc/p5-XML-FeedPP/Makefile
index cb302bb0aa1b..0d50d17ee573 100644
--- a/textproc/p5-XML-FeedPP/Makefile
+++ b/textproc/p5-XML-FeedPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-FeedPP
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-FeedPP/pkg-plist b/textproc/p5-XML-FeedPP/pkg-plist
index 458bdfddd579..9ff5f12f9540 100644
--- a/textproc/p5-XML-FeedPP/pkg-plist
+++ b/textproc/p5-XML-FeedPP/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/XML/FeedPP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-FeedPP/.packlist
 %%PERL5_MAN3%%/XML::FeedPP.3.gz
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-FeedPP
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-BufferText/Makefile b/textproc/p5-XML-Filter-BufferText/Makefile
index e6f809d73a4c..30d677276a34 100644
--- a/textproc/p5-XML-Filter-BufferText/Makefile
+++ b/textproc/p5-XML-Filter-BufferText/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-BufferText
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-BufferText/pkg-plist b/textproc/p5-XML-Filter-BufferText/pkg-plist
index 405cea1f7aea..3de315d1b300 100644
--- a/textproc/p5-XML-Filter-BufferText/pkg-plist
+++ b/textproc/p5-XML-Filter-BufferText/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Filter::BufferText.3.gz
 %%SITE_PERL%%/XML/Filter/BufferText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/BufferText/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/BufferText
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
index 94f114f9dc34..ac2968faf094 100644
--- a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
+++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-DOMFilter-LibXML
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist b/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist
index 6f597fcf5868..b60a4c6562a0 100644
--- a/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist
+++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist
@@ -1,9 +1,2 @@
 %%SITE_PERL%%/XML/Filter/DOMFilter/LibXML.pm
 %%PERL5_MAN3%%/XML::Filter::DOMFilter::LibXML.3.gz
-@dirrm %%SITE_PERL%%/XML/Filter/DOMFilter
-@dirrm %%SITE_PERL%%/XML/Filter
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DOMFilter/LibXML/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DOMFilter/LibXML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DOMFilter
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index 4682f03bbdb4..d125232a496f 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-DetectWS
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-DetectWS/pkg-plist b/textproc/p5-XML-Filter-DetectWS/pkg-plist
index d1a89829a60a..8c147ee258bc 100644
--- a/textproc/p5-XML-Filter-DetectWS/pkg-plist
+++ b/textproc/p5-XML-Filter-DetectWS/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Filter::DetectWS.3.gz
 %%SITE_PERL%%/XML/Filter/DetectWS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-GenericChunk/Makefile b/textproc/p5-XML-Filter-GenericChunk/Makefile
index 02ae53ab8909..634464c9daec 100644
--- a/textproc/p5-XML-Filter-GenericChunk/Makefile
+++ b/textproc/p5-XML-Filter-GenericChunk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-GenericChunk
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-GenericChunk/pkg-plist b/textproc/p5-XML-Filter-GenericChunk/pkg-plist
index 4c9256021d94..c3a6299f998a 100644
--- a/textproc/p5-XML-Filter-GenericChunk/pkg-plist
+++ b/textproc/p5-XML-Filter-GenericChunk/pkg-plist
@@ -2,9 +2,3 @@
 %%PERL5_MAN3%%/XML::Filter::GenericChunk.3.gz
 %%SITE_PERL%%/XML/Filter/CharacterChunk.pm
 %%SITE_PERL%%/XML/Filter/GenericChunk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index 5388ec7b597d..2e4a3b9042fa 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-Reindent
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-Reindent/pkg-plist b/textproc/p5-XML-Filter-Reindent/pkg-plist
index 35393d29f47a..48f2e8e8ac52 100644
--- a/textproc/p5-XML-Filter-Reindent/pkg-plist
+++ b/textproc/p5-XML-Filter-Reindent/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Filter::Reindent.3.gz
 %%SITE_PERL%%/XML/Filter/Reindent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
index d696ecd3c04f..20bec80dfff2 100644
--- a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
+++ b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-SAX1toSAX2
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist b/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist
index a177bd7e2aca..3e95f2904b18 100644
--- a/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist
+++ b/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist
@@ -2,9 +2,3 @@
 %%PERL5_MAN3%%/XML::Filter::SAX2toSAX1.3.gz
 %%SITE_PERL%%/XML/Filter/SAX1toSAX2.pm
 %%SITE_PERL%%/XML/Filter/SAX2toSAX1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAX1toSAX2/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAX1toSAX2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-SAXT/Makefile b/textproc/p5-XML-Filter-SAXT/Makefile
index 25ca1084cbf4..ea6e0cec289b 100644
--- a/textproc/p5-XML-Filter-SAXT/Makefile
+++ b/textproc/p5-XML-Filter-SAXT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-SAXT
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-SAXT/pkg-plist b/textproc/p5-XML-Filter-SAXT/pkg-plist
index e14145580947..7189772c6e73 100644
--- a/textproc/p5-XML-Filter-SAXT/pkg-plist
+++ b/textproc/p5-XML-Filter-SAXT/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Filter::SAXT.3.gz
 %%SITE_PERL%%/XML/Filter/SAXT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-XInclude/Makefile b/textproc/p5-XML-Filter-XInclude/Makefile
index 0d1435636432..8093ec387a63 100644
--- a/textproc/p5-XML-Filter-XInclude/Makefile
+++ b/textproc/p5-XML-Filter-XInclude/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Filter-XInclude
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-XInclude/pkg-plist b/textproc/p5-XML-Filter-XInclude/pkg-plist
index 2b80090bc12d..dd12ef788058 100644
--- a/textproc/p5-XML-Filter-XInclude/pkg-plist
+++ b/textproc/p5-XML-Filter-XInclude/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Filter::XInclude.3.gz
 %%SITE_PERL%%/XML/Filter/XInclude.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-XSLT/Makefile b/textproc/p5-XML-Filter-XSLT/Makefile
index 8a65b0df2bc4..f3b7b2276324 100644
--- a/textproc/p5-XML-Filter-XSLT/Makefile
+++ b/textproc/p5-XML-Filter-XSLT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Filter-XSLT
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Filter-XSLT/pkg-plist b/textproc/p5-XML-Filter-XSLT/pkg-plist
index dbdc5d4647fa..6f90b37c9303 100644
--- a/textproc/p5-XML-Filter-XSLT/pkg-plist
+++ b/textproc/p5-XML-Filter-XSLT/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/XML::Filter::XSLT::LibXSLT.3.gz
 %%SITE_PERL%%/XML/Filter/XSLT.pm
 %%SITE_PERL%%/XML/Filter/XSLT/LibXSLT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Filter/XSLT
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Flow/Makefile b/textproc/p5-XML-Flow/Makefile
index 8d2ff1a9fde1..b8029d376196 100644
--- a/textproc/p5-XML-Flow/Makefile
+++ b/textproc/p5-XML-Flow/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Flow
 PORTVERSION=	0.86
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Flow/pkg-plist b/textproc/p5-XML-Flow/pkg-plist
index c79410aa3f08..2a2135a1a50e 100644
--- a/textproc/p5-XML-Flow/pkg-plist
+++ b/textproc/p5-XML-Flow/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Flow.3.gz
 %%SITE_PERL%%/XML/Flow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Flow/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Flow
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index b5b65171030e..2620b548ac79 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-GDOME
 PORTVERSION=	0.86
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-GDOME/pkg-plist b/textproc/p5-XML-GDOME/pkg-plist
index b6da5321e93b..ff7398a17466 100644
--- a/textproc/p5-XML-GDOME/pkg-plist
+++ b/textproc/p5-XML-GDOME/pkg-plist
@@ -22,36 +22,29 @@
 %%PERL5_MAN3%%/XML::GDOME::XPath::NSResolver.3.gz
 %%PERL5_MAN3%%/XML::GDOME::XPath::Namespace.3.gz
 %%PERL5_MAN3%%/XML::GDOME::XPath::Result.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Attr.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/CDATASection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/CharacterData.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Comment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Document.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/DocumentFragment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/DocumentType.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Element.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Entity.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/EntityReference.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/NamedNodeMap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Node.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/NodeList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Notation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/ProcessingInstruction.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/SAX/Builder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/SAX/Generator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/SAX/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/Text.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/XPath/Evaluator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/XPath/NSResolver.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/XPath/Namespace.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/XPath/Result.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/GDOME/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/GDOME/GDOME.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/GDOME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/XPath
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/GDOME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+%%SITE_ARCH%%/XML/GDOME.pm
+%%SITE_ARCH%%/XML/GDOME.pod
+%%SITE_ARCH%%/XML/GDOME/Attr.pod
+%%SITE_ARCH%%/XML/GDOME/CDATASection.pod
+%%SITE_ARCH%%/XML/GDOME/CharacterData.pod
+%%SITE_ARCH%%/XML/GDOME/Comment.pod
+%%SITE_ARCH%%/XML/GDOME/Document.pod
+%%SITE_ARCH%%/XML/GDOME/DocumentFragment.pod
+%%SITE_ARCH%%/XML/GDOME/DocumentType.pod
+%%SITE_ARCH%%/XML/GDOME/Element.pod
+%%SITE_ARCH%%/XML/GDOME/Entity.pod
+%%SITE_ARCH%%/XML/GDOME/EntityReference.pod
+%%SITE_ARCH%%/XML/GDOME/NamedNodeMap.pod
+%%SITE_ARCH%%/XML/GDOME/Node.pod
+%%SITE_ARCH%%/XML/GDOME/NodeList.pod
+%%SITE_ARCH%%/XML/GDOME/Notation.pod
+%%SITE_ARCH%%/XML/GDOME/ProcessingInstruction.pod
+%%SITE_ARCH%%/XML/GDOME/SAX/Builder.pm
+%%SITE_ARCH%%/XML/GDOME/SAX/Generator.pm
+%%SITE_ARCH%%/XML/GDOME/SAX/Parser.pm
+%%SITE_ARCH%%/XML/GDOME/Text.pod
+%%SITE_ARCH%%/XML/GDOME/XPath/Evaluator.pod
+%%SITE_ARCH%%/XML/GDOME/XPath/NSResolver.pod
+%%SITE_ARCH%%/XML/GDOME/XPath/Namespace.pod
+%%SITE_ARCH%%/XML/GDOME/XPath/Result.pod
+%%SITE_ARCH%%/auto/XML/GDOME/GDOME.so
diff --git a/textproc/p5-XML-Generator-DBI/Makefile b/textproc/p5-XML-Generator-DBI/Makefile
index 3174b237897c..4a681195cf5b 100644
--- a/textproc/p5-XML-Generator-DBI/Makefile
+++ b/textproc/p5-XML-Generator-DBI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Generator-DBI
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Generator-DBI/pkg-plist b/textproc/p5-XML-Generator-DBI/pkg-plist
index 56b8782a78d5..5bcd1be917be 100644
--- a/textproc/p5-XML-Generator-DBI/pkg-plist
+++ b/textproc/p5-XML-Generator-DBI/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Generator::DBI.3.gz
 %%SITE_PERL%%/XML/Generator/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/DBI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/DBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Generator
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Generator-PerlData/Makefile b/textproc/p5-XML-Generator-PerlData/Makefile
index 0b40765b695a..69b75af8e2c0 100644
--- a/textproc/p5-XML-Generator-PerlData/Makefile
+++ b/textproc/p5-XML-Generator-PerlData/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Generator-PerlData
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Generator-PerlData/pkg-plist b/textproc/p5-XML-Generator-PerlData/pkg-plist
index b2a0d873683a..5ba0c6563a39 100644
--- a/textproc/p5-XML-Generator-PerlData/pkg-plist
+++ b/textproc/p5-XML-Generator-PerlData/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Generator::PerlData.3.gz
 %%SITE_PERL%%/XML/Generator/PerlData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/PerlData/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/PerlData
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Generator
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Generator/Makefile b/textproc/p5-XML-Generator/Makefile
index 35ca8fee9033..bc4fa7eb0fbb 100644
--- a/textproc/p5-XML-Generator/Makefile
+++ b/textproc/p5-XML-Generator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Generator
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Generator/pkg-plist b/textproc/p5-XML-Generator/pkg-plist
index 7d9bdf8241d8..6b86139d5fa1 100644
--- a/textproc/p5-XML-Generator/pkg-plist
+++ b/textproc/p5-XML-Generator/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/XML/Generator.pm
 %%SITE_PERL%%/XML/Generator/DOM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/.packlist
 %%PERL5_MAN3%%/XML::Generator.3.gz
 %%PERL5_MAN3%%/XML::Generator::DOM.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Generator
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index f9b70be724ff..4da69a4d3fa6 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Grove
 DISTVERSION=	0.46alpha
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Grove/pkg-plist b/textproc/p5-XML-Grove/pkg-plist
index 0d3a4e54f821..9c1b78348526 100644
--- a/textproc/p5-XML-Grove/pkg-plist
+++ b/textproc/p5-XML-Grove/pkg-plist
@@ -22,8 +22,3 @@
 %%SITE_PERL%%/XML/Grove/Sub.pm
 %%SITE_PERL%%/XML/Grove/Subst.pm
 %%SITE_PERL%%/XML/Grove/XPointer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Grove
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
index c3bdad2178b2..16f2ab0e6281 100644
--- a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Handler-Dtd2DocBook
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist b/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist
index f9d3a870d1fd..720b4f5162ca 100644
--- a/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist
+++ b/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist
@@ -17,13 +17,4 @@ bin/dtd2db.pl
 %%SITE_PERL%%/XML/Handler/Dtd2DocBook/fr/index.tmpl
 %%SITE_PERL%%/XML/Handler/Dtd2DocBook/fr/notation.tmpl
 %%SITE_PERL%%/XML/Handler/Dtd2DocBook/fr/prolog.tmpl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Dtd2DocBook/.packlist
 man/man1/dtd2db.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Dtd2DocBook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Handler/Dtd2DocBook/fr
-@dirrmtry %%SITE_PERL%%/XML/Handler/Dtd2DocBook/en
-@dirrmtry %%SITE_PERL%%/XML/Handler/Dtd2DocBook
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Handler-Dtd2Html/Makefile b/textproc/p5-XML-Handler-Dtd2Html/Makefile
index 910a068ab7a6..fda8e27c078e 100644
--- a/textproc/p5-XML-Handler-Dtd2Html/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2Html/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Handler-Dtd2Html
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Handler-Dtd2Html/pkg-plist b/textproc/p5-XML-Handler-Dtd2Html/pkg-plist
index d323f5433b2d..34dfa19c479e 100644
--- a/textproc/p5-XML-Handler-Dtd2Html/pkg-plist
+++ b/textproc/p5-XML-Handler-Dtd2Html/pkg-plist
@@ -40,13 +40,4 @@ bin/dtd2html.pl
 %%SITE_PERL%%/XML/Handler/Dtd2Html/prev.png
 %%SITE_PERL%%/XML/Handler/Dtd2Html/simple.css
 %%SITE_PERL%%/XML/Handler/Dtd2Html/up.png
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Dtd2Html/.packlist
 man/man1/dtd2html.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Dtd2Html
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Handler/Dtd2Html/fr
-@dirrmtry %%SITE_PERL%%/XML/Handler/Dtd2Html/en
-@dirrmtry %%SITE_PERL%%/XML/Handler/Dtd2Html
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Handler-HTMLWriter/Makefile b/textproc/p5-XML-Handler-HTMLWriter/Makefile
index 92349ad99d63..0bf0d2cca444 100644
--- a/textproc/p5-XML-Handler-HTMLWriter/Makefile
+++ b/textproc/p5-XML-Handler-HTMLWriter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Handler-HTMLWriter
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Handler-HTMLWriter/pkg-plist b/textproc/p5-XML-Handler-HTMLWriter/pkg-plist
index 3c4499ab3757..7375436d39f5 100644
--- a/textproc/p5-XML-Handler-HTMLWriter/pkg-plist
+++ b/textproc/p5-XML-Handler-HTMLWriter/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Handler::HTMLWriter.3.gz
 %%SITE_PERL%%/XML/Handler/HTMLWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/HTMLWriter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/HTMLWriter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Handler-Trees/Makefile b/textproc/p5-XML-Handler-Trees/Makefile
index c737979465d1..3bdfcdda7363 100644
--- a/textproc/p5-XML-Handler-Trees/Makefile
+++ b/textproc/p5-XML-Handler-Trees/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Handler-Trees
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Handler-Trees/pkg-plist b/textproc/p5-XML-Handler-Trees/pkg-plist
index 431c81adb62c..0954d630658f 100644
--- a/textproc/p5-XML-Handler-Trees/pkg-plist
+++ b/textproc/p5-XML-Handler-Trees/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Handler::Trees.3.gz
 %%SITE_PERL%%/XML/Handler/Trees.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Trees/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Trees
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index 8214b5675e2b..f40a1f995814 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Handler-YAWriter
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Handler-YAWriter/pkg-plist b/textproc/p5-XML-Handler-YAWriter/pkg-plist
index be670b5c35e8..38399ee181fd 100644
--- a/textproc/p5-XML-Handler-YAWriter/pkg-plist
+++ b/textproc/p5-XML-Handler-YAWriter/pkg-plist
@@ -1,10 +1,4 @@
 bin/xmlpretty
 %%PERL5_MAN3%%/XML::Handler::YAWriter.3.gz
 %%SITE_PERL%%/XML/Handler/YAWriter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter/.packlist
 man/man1/xmlpretty.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Hash-LX/Makefile b/textproc/p5-XML-Hash-LX/Makefile
index 49afbf85b8b9..1d686a2d2a83 100644
--- a/textproc/p5-XML-Hash-LX/Makefile
+++ b/textproc/p5-XML-Hash-LX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Hash-LX
 PORTVERSION=	0.0603
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Hash-LX/pkg-plist b/textproc/p5-XML-Hash-LX/pkg-plist
index 60d665c3bae5..ac81821f2b2b 100644
--- a/textproc/p5-XML-Hash-LX/pkg-plist
+++ b/textproc/p5-XML-Hash-LX/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Hash::LX.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Hash/LX/.packlist
 %%SITE_PERL%%/XML/Hash/LX.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Hash/LX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Hash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Hash
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-LibXML-Cache/Makefile b/textproc/p5-XML-LibXML-Cache/Makefile
index 174eeb0688db..2228661064b6 100644
--- a/textproc/p5-XML-LibXML-Cache/Makefile
+++ b/textproc/p5-XML-LibXML-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-LibXML-Cache
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-LibXML-Cache/pkg-plist b/textproc/p5-XML-LibXML-Cache/pkg-plist
index 1b0ceb4696c7..23e3a0865dc0 100644
--- a/textproc/p5-XML-LibXML-Cache/pkg-plist
+++ b/textproc/p5-XML-LibXML-Cache/pkg-plist
@@ -1,14 +1,6 @@
 %%SITE_PERL%%/XML/LibXML/Cache.pm
 %%SITE_PERL%%/XML/LibXML/Cache/Base.pm
 %%SITE_PERL%%/XML/LibXSLT/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Cache/.packlist
 %%PERL5_MAN3%%/XML::LibXML::Cache.3.gz
 %%PERL5_MAN3%%/XML::LibXML::Cache::Base.3.gz
 %%PERL5_MAN3%%/XML::LibXSLT::Cache.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/LibXSLT
-@dirrm %%SITE_PERL%%/XML/LibXML/Cache
-@dirrmtry %%SITE_PERL%%/XML/LibXML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-LibXML-Iterator/Makefile b/textproc/p5-XML-LibXML-Iterator/Makefile
index 3aeed664fcc3..013def6b9a82 100644
--- a/textproc/p5-XML-LibXML-Iterator/Makefile
+++ b/textproc/p5-XML-LibXML-Iterator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-LibXML-Iterator
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-LibXML-Iterator/pkg-plist b/textproc/p5-XML-LibXML-Iterator/pkg-plist
index 6a4ad623e6e2..5ffcff4fc22d 100644
--- a/textproc/p5-XML-LibXML-Iterator/pkg-plist
+++ b/textproc/p5-XML-LibXML-Iterator/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/XML::LibXML::NodeList::Iterator.3.gz
 %%SITE_PERL%%/XML/LibXML/Iterator.pm
 %%SITE_PERL%%/XML/LibXML/NodeList/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Iterator/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Iterator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/LibXML/NodeList
-@dirrmtry %%SITE_PERL%%/XML/LibXML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-LibXML-PrettyPrint/Makefile b/textproc/p5-XML-LibXML-PrettyPrint/Makefile
index 76bd05b9251b..9ce62165535b 100644
--- a/textproc/p5-XML-LibXML-PrettyPrint/Makefile
+++ b/textproc/p5-XML-LibXML-PrettyPrint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-LibXML-PrettyPrint
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist b/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist
index 3120ed2da107..06c095d25c1b 100644
--- a/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist
+++ b/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist
@@ -1,10 +1,4 @@
 bin/xml-pretty
 %%SITE_PERL%%/XML/LibXML/PrettyPrint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/PrettyPrint/.packlist
 %%PERL5_MAN3%%/XML::LibXML::PrettyPrint.3.gz
 man/man1/xml-pretty.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/PrettyPrint
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/LibXML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile b/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
index 3c8f7cb8cb4f..88b50caa3792 100644
--- a/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
+++ b/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-LibXML-SAX-ChunkParser
 PORTVERSION=	0.00006
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-LibXML-SAX-ChunkParser/pkg-plist b/textproc/p5-XML-LibXML-SAX-ChunkParser/pkg-plist
index baeb41403486..c12dcc56f24f 100644
--- a/textproc/p5-XML-LibXML-SAX-ChunkParser/pkg-plist
+++ b/textproc/p5-XML-LibXML-SAX-ChunkParser/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/XML/LibXML/SAX/ChunkParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/SAX/ChunkParser/.packlist
 %%PERL5_MAN3%%/XML::LibXML::SAX::ChunkParser.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/SAX/ChunkParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
-@dirrmtry %%SITE_PERL%%/XML/LibXML/SAX
-@dirrmtry %%SITE_PERL%%/XML/LibXML
diff --git a/textproc/p5-XML-LibXML-Simple/Makefile b/textproc/p5-XML-LibXML-Simple/Makefile
index 828bcae63b33..640d1358af16 100644
--- a/textproc/p5-XML-LibXML-Simple/Makefile
+++ b/textproc/p5-XML-LibXML-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-LibXML-Simple
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-LibXML-Simple/pkg-plist b/textproc/p5-XML-LibXML-Simple/pkg-plist
index 0f977baeccde..2cf8ab8d16a4 100644
--- a/textproc/p5-XML-LibXML-Simple/pkg-plist
+++ b/textproc/p5-XML-LibXML-Simple/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Simple/.packlist
 %%SITE_PERL%%/XML/LibXML/Simple.pm
 %%SITE_PERL%%/XML/LibXML/Simple.pod
 %%PERL5_MAN3%%/XML::LibXML::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Simple
-@dirrmtry %%SITE_PERL%%/XML/LibXML
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 0a7de0d67888..21c1d2ad51d5 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-LibXML
 PORTVERSION=	2.0116
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
@@ -30,6 +31,6 @@ PKGDEINSTALL=	${PKGINSTALL}
 CONFLICTS=	p5-XML-LibXML-XPathContext-[0-9]* p5-XML-LibXML-Common-[0-9]*
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/XML/LibXML/LibXML.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XML/LibXML/LibXML.so
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-LibXML/pkg-plist b/textproc/p5-XML-LibXML/pkg-plist
index dcc9ce0c3a1a..c8da582df481 100644
--- a/textproc/p5-XML-LibXML/pkg-plist
+++ b/textproc/p5-XML-LibXML/pkg-plist
@@ -1,48 +1,47 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Attr.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/AttributeHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/CDATASection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Comment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/DOM.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Devel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Document.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/DocumentFragment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Dtd.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Element.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/ErrNo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/ErrNo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/InputCallback.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Literal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Namespace.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Node.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/NodeList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Number.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/PI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Parser.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Pattern.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Reader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Reader.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/RegExp.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/RelaxNG.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Builder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Builder.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Generator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Schema.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Text.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/XPathContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/XPathContext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/XPathExpression.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/LibXML.so
+%%SITE_ARCH%%/XML/LibXML.pm
+%%SITE_ARCH%%/XML/LibXML.pod
+%%SITE_ARCH%%/XML/LibXML/Attr.pod
+%%SITE_ARCH%%/XML/LibXML/AttributeHash.pm
+%%SITE_ARCH%%/XML/LibXML/Boolean.pm
+%%SITE_ARCH%%/XML/LibXML/CDATASection.pod
+%%SITE_ARCH%%/XML/LibXML/Comment.pod
+%%SITE_ARCH%%/XML/LibXML/Common.pm
+%%SITE_ARCH%%/XML/LibXML/Common.pod
+%%SITE_ARCH%%/XML/LibXML/DOM.pod
+%%SITE_ARCH%%/XML/LibXML/Devel.pm
+%%SITE_ARCH%%/XML/LibXML/Document.pod
+%%SITE_ARCH%%/XML/LibXML/DocumentFragment.pod
+%%SITE_ARCH%%/XML/LibXML/Dtd.pod
+%%SITE_ARCH%%/XML/LibXML/Element.pod
+%%SITE_ARCH%%/XML/LibXML/ErrNo.pm
+%%SITE_ARCH%%/XML/LibXML/ErrNo.pod
+%%SITE_ARCH%%/XML/LibXML/Error.pm
+%%SITE_ARCH%%/XML/LibXML/Error.pod
+%%SITE_ARCH%%/XML/LibXML/InputCallback.pod
+%%SITE_ARCH%%/XML/LibXML/Literal.pm
+%%SITE_ARCH%%/XML/LibXML/Namespace.pod
+%%SITE_ARCH%%/XML/LibXML/Node.pod
+%%SITE_ARCH%%/XML/LibXML/NodeList.pm
+%%SITE_ARCH%%/XML/LibXML/Number.pm
+%%SITE_ARCH%%/XML/LibXML/PI.pod
+%%SITE_ARCH%%/XML/LibXML/Parser.pod
+%%SITE_ARCH%%/XML/LibXML/Pattern.pod
+%%SITE_ARCH%%/XML/LibXML/Reader.pm
+%%SITE_ARCH%%/XML/LibXML/Reader.pod
+%%SITE_ARCH%%/XML/LibXML/RegExp.pod
+%%SITE_ARCH%%/XML/LibXML/RelaxNG.pod
+%%SITE_ARCH%%/XML/LibXML/SAX.pm
+%%SITE_ARCH%%/XML/LibXML/SAX.pod
+%%SITE_ARCH%%/XML/LibXML/SAX/Builder.pm
+%%SITE_ARCH%%/XML/LibXML/SAX/Builder.pod
+%%SITE_ARCH%%/XML/LibXML/SAX/Generator.pm
+%%SITE_ARCH%%/XML/LibXML/SAX/Parser.pm
+%%SITE_ARCH%%/XML/LibXML/Schema.pod
+%%SITE_ARCH%%/XML/LibXML/Text.pod
+%%SITE_ARCH%%/XML/LibXML/XPathContext.pm
+%%SITE_ARCH%%/XML/LibXML/XPathContext.pod
+%%SITE_ARCH%%/XML/LibXML/XPathExpression.pod
+%%SITE_ARCH%%/auto/XML/LibXML/LibXML.so
 %%PERL5_MAN3%%/XML::LibXML.3.gz
 %%PERL5_MAN3%%/XML::LibXML::Attr.3.gz
 %%PERL5_MAN3%%/XML::LibXML::AttributeHash.3.gz
@@ -77,8 +76,3 @@
 %%PERL5_MAN3%%/XML::LibXML::Text.3.gz
 %%PERL5_MAN3%%/XML::LibXML::XPathContext.3.gz
 %%PERL5_MAN3%%/XML::LibXML::XPathExpression.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index 0628d2afddf6..4dd07bace079 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-LibXSLT
 PORTVERSION=	1.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-LibXSLT/pkg-plist b/textproc/p5-XML-LibXSLT/pkg-plist
index 12f944be340e..8f40f6eeaa58 100644
--- a/textproc/p5-XML-LibXSLT/pkg-plist
+++ b/textproc/p5-XML-LibXSLT/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/XML::LibXSLT.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXSLT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+%%SITE_ARCH%%/XML/LibXSLT.pm
+%%SITE_ARCH%%/auto/XML/LibXSLT/LibXSLT.so
diff --git a/textproc/p5-XML-Liberal/Makefile b/textproc/p5-XML-Liberal/Makefile
index 35d65f5998ca..7b4a1a278eb8 100644
--- a/textproc/p5-XML-Liberal/Makefile
+++ b/textproc/p5-XML-Liberal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Liberal
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Liberal/pkg-plist b/textproc/p5-XML-Liberal/pkg-plist
index 0885fdf6250c..7422fd5b8c54 100644
--- a/textproc/p5-XML-Liberal/pkg-plist
+++ b/textproc/p5-XML-Liberal/pkg-plist
@@ -19,9 +19,3 @@
 %%SITE_PERL%%/XML/Liberal/Remedy/UndeclaredNS.pm
 %%SITE_PERL%%/XML/Liberal/Remedy/UnquotedAttribute.pm
 %%SITE_PERL%%/XML/Liberal/Remedy/XHTMLEmptyTag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Liberal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Liberal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Liberal/Remedy
-@dirrmtry %%SITE_PERL%%/XML/Liberal
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Literal/Makefile b/textproc/p5-XML-Literal/Makefile
index 8fb5981fafa8..4a160817af4b 100644
--- a/textproc/p5-XML-Literal/Makefile
+++ b/textproc/p5-XML-Literal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Literal
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Literal/pkg-plist b/textproc/p5-XML-Literal/pkg-plist
index 6138b9a6edf9..07888450f395 100644
--- a/textproc/p5-XML-Literal/pkg-plist
+++ b/textproc/p5-XML-Literal/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Literal.3.gz
 %%SITE_PERL%%/XML/Literal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Literal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Literal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Mini/Makefile b/textproc/p5-XML-Mini/Makefile
index 601bb94a906b..6c1e683d76a8 100644
--- a/textproc/p5-XML-Mini/Makefile
+++ b/textproc/p5-XML-Mini/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Mini
 PORTVERSION=	1.38
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Mini/pkg-plist b/textproc/p5-XML-Mini/pkg-plist
index 37f569a09137..c04a3b369113 100644
--- a/textproc/p5-XML-Mini/pkg-plist
+++ b/textproc/p5-XML-Mini/pkg-plist
@@ -18,9 +18,3 @@
 %%SITE_PERL%%/XML/Mini/Element/Header.pm
 %%SITE_PERL%%/XML/Mini/Node.pm
 %%SITE_PERL%%/XML/Mini/TreeComponent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Mini/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Mini
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrm %%SITE_PERL%%/XML/Mini/Element
-@dirrm %%SITE_PERL%%/XML/Mini
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-MyXML/Makefile b/textproc/p5-XML-MyXML/Makefile
index a9ec40db582f..116a0c51beba 100644
--- a/textproc/p5-XML-MyXML/Makefile
+++ b/textproc/p5-XML-MyXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-MyXML
 PORTVERSION=	0.10.02
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-XML-MyXML/pkg-plist b/textproc/p5-XML-MyXML/pkg-plist
index ca2baa1e1a5d..3b5c0de4322d 100644
--- a/textproc/p5-XML-MyXML/pkg-plist
+++ b/textproc/p5-XML-MyXML/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/XML::MyXML::II.3.gz
 %%SITE_PERL%%/XML/MyXML.pm
 %%SITE_PERL%%/XML/MyXML/II.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/MyXML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/MyXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/MyXML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Namespace/Makefile b/textproc/p5-XML-Namespace/Makefile
index 82521c539bf1..bec3156a3bab 100644
--- a/textproc/p5-XML-Namespace/Makefile
+++ b/textproc/p5-XML-Namespace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Namespace
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Namespace/pkg-plist b/textproc/p5-XML-Namespace/pkg-plist
index c002d0392b5b..2a61a404027c 100644
--- a/textproc/p5-XML-Namespace/pkg-plist
+++ b/textproc/p5-XML-Namespace/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Namespace.3.gz
 %%SITE_PERL%%/XML/Namespace.pm
-%%SITE_PERL%%/mach/auto/XML/Namespace/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/XML/Namespace
-@dirrmtry %%SITE_PERL%%/mach/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-NamespaceFactory/Makefile b/textproc/p5-XML-NamespaceFactory/Makefile
index 350b5195d5a0..3dfd45f3c406 100644
--- a/textproc/p5-XML-NamespaceFactory/Makefile
+++ b/textproc/p5-XML-NamespaceFactory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-NamespaceFactory
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-NamespaceFactory/pkg-plist b/textproc/p5-XML-NamespaceFactory/pkg-plist
index a79d8b3b914a..32356d60c823 100644
--- a/textproc/p5-XML-NamespaceFactory/pkg-plist
+++ b/textproc/p5-XML-NamespaceFactory/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::NamespaceFactory.3.gz
 %%SITE_PERL%%/XML/NamespaceFactory.pm
-%%SITE_PERL%%/mach/auto/XML/NamespaceFactory/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/XML/NamespaceFactory
-@dirrmtry %%SITE_PERL%%/mach/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-NamespaceSupport/Makefile b/textproc/p5-XML-NamespaceSupport/Makefile
index 87601382d7ae..0be52eed2957 100644
--- a/textproc/p5-XML-NamespaceSupport/Makefile
+++ b/textproc/p5-XML-NamespaceSupport/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-NamespaceSupport
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-NamespaceSupport/pkg-plist b/textproc/p5-XML-NamespaceSupport/pkg-plist
index b3640dadd845..1c5d40c964ca 100644
--- a/textproc/p5-XML-NamespaceSupport/pkg-plist
+++ b/textproc/p5-XML-NamespaceSupport/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::NamespaceSupport.3.gz
 %%SITE_PERL%%/XML/NamespaceSupport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NamespaceSupport/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NamespaceSupport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 0184079ec99f..c1850711e667 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Node
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Node/pkg-plist b/textproc/p5-XML-Node/pkg-plist
index c051381ee2f5..08e85ce82098 100644
--- a/textproc/p5-XML-Node/pkg-plist
+++ b/textproc/p5-XML-Node/pkg-plist
@@ -3,7 +3,3 @@
 %%SITE_PERL%%/XML/parse-foo.pl
 %%SITE_PERL%%/XML/parse-orders.pl
 %%SITE_PERL%%/XML/parse-testsuite.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Node/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Node
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-NodeFilter/Makefile b/textproc/p5-XML-NodeFilter/Makefile
index 4cdb40aa425c..e098e7a7871e 100644
--- a/textproc/p5-XML-NodeFilter/Makefile
+++ b/textproc/p5-XML-NodeFilter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-NodeFilter
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-NodeFilter/pkg-plist b/textproc/p5-XML-NodeFilter/pkg-plist
index 1d653edd9aab..fbb45c6e9fb3 100644
--- a/textproc/p5-XML-NodeFilter/pkg-plist
+++ b/textproc/p5-XML-NodeFilter/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::NodeFilter.3.gz
 %%SITE_PERL%%/XML/NodeFilter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NodeFilter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NodeFilter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-OPML-LibXML/Makefile b/textproc/p5-XML-OPML-LibXML/Makefile
index a2496069afed..87adef84850f 100644
--- a/textproc/p5-XML-OPML-LibXML/Makefile
+++ b/textproc/p5-XML-OPML-LibXML/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	XML-OPML-LibXML
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/textproc/p5-XML-OPML-LibXML/pkg-plist b/textproc/p5-XML-OPML-LibXML/pkg-plist
index 0abe1c64d90d..05f88985b29e 100644
--- a/textproc/p5-XML-OPML-LibXML/pkg-plist
+++ b/textproc/p5-XML-OPML-LibXML/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/XML/OPML/LibXML.pm
 %%SITE_PERL%%/XML/OPML/LibXML/Document.pm
 %%SITE_PERL%%/XML/OPML/LibXML/Outline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/OPML/LibXML/.packlist
 %%PERL5_MAN3%%/XML::OPML::LibXML.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/OPML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/OPML
-@dirrm %%SITE_PERL%%/XML/OPML/LibXML
-@dirrmtry %%SITE_PERL%%/XML/OPML
diff --git a/textproc/p5-XML-OPML/Makefile b/textproc/p5-XML-OPML/Makefile
index 0010a25d7050..ef6cc97fca51 100644
--- a/textproc/p5-XML-OPML/Makefile
+++ b/textproc/p5-XML-OPML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-OPML
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-OPML/pkg-plist b/textproc/p5-XML-OPML/pkg-plist
index 6bd1c943b252..ef9c24536554 100644
--- a/textproc/p5-XML-OPML/pkg-plist
+++ b/textproc/p5-XML-OPML/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::OPML.3.gz
 %%SITE_PERL%%/XML/OPML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/OPML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/OPML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Parsepp/Makefile b/textproc/p5-XML-Parsepp/Makefile
index 213a223cbd29..4c88d2e04a62 100644
--- a/textproc/p5-XML-Parsepp/Makefile
+++ b/textproc/p5-XML-Parsepp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Parsepp
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Parsepp/pkg-plist b/textproc/p5-XML-Parsepp/pkg-plist
index 3bec76f12cd6..7429dfd56ad9 100644
--- a/textproc/p5-XML-Parsepp/pkg-plist
+++ b/textproc/p5-XML-Parsepp/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/XML/Parsepp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parsepp/.packlist
 %%PERL5_MAN3%%/XML::Parsepp.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parsepp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Parser-EasyTree/Makefile b/textproc/p5-XML-Parser-EasyTree/Makefile
index a6c818ae0719..72ef263ced7f 100644
--- a/textproc/p5-XML-Parser-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-EasyTree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Parser-EasyTree
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Parser-EasyTree/pkg-plist b/textproc/p5-XML-Parser-EasyTree/pkg-plist
index cf939d25ba9b..1fb880b2b93f 100644
--- a/textproc/p5-XML-Parser-EasyTree/pkg-plist
+++ b/textproc/p5-XML-Parser-EasyTree/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::Parser::EasyTree.3.gz
 %%SITE_PERL%%/XML/Parser/EasyTree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/EasyTree/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/EasyTree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Parser
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Parser-Lite-Tree/Makefile b/textproc/p5-XML-Parser-Lite-Tree/Makefile
index fff82d360a99..3419ad5b7381 100644
--- a/textproc/p5-XML-Parser-Lite-Tree/Makefile
+++ b/textproc/p5-XML-Parser-Lite-Tree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Parser-Lite-Tree
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Parser-Lite-Tree/pkg-plist b/textproc/p5-XML-Parser-Lite-Tree/pkg-plist
index 9f68b4a6da23..5d6f6db6fd99 100644
--- a/textproc/p5-XML-Parser-Lite-Tree/pkg-plist
+++ b/textproc/p5-XML-Parser-Lite-Tree/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/XML::Parser::LiteCopy.3.gz
 %%SITE_PERL%%/XML/Parser/Lite/Tree.pm
 %%SITE_PERL%%/XML/Parser/LiteCopy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite/Tree/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite/Tree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Parser/Lite
-@dirrmtry %%SITE_PERL%%/XML/Parser
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Parser-Style-EasyTree/Makefile b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
index a44a54adf46d..112029f7d81c 100644
--- a/textproc/p5-XML-Parser-Style-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Parser-Style-EasyTree
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	XML
diff --git a/textproc/p5-XML-Parser-Style-EasyTree/pkg-plist b/textproc/p5-XML-Parser-Style-EasyTree/pkg-plist
index a2e4ec2c090f..ecafd69207c2 100644
--- a/textproc/p5-XML-Parser-Style-EasyTree/pkg-plist
+++ b/textproc/p5-XML-Parser-Style-EasyTree/pkg-plist
@@ -1,13 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/EasyTree/.packlist
 %%SITE_PERL%%/XML/Parser/Style/ETree.pm
 %%SITE_PERL%%/XML/Parser/Style/EasyTree.pm
 %%SITE_PERL%%/XML/Parser/Style/cpants.pl
 %%PERL5_MAN3%%/XML::Parser::Style::EasyTree.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::ETree.3.gz
-@dirrmtry %%SITE_PERL%%/XML/Parser/Style
-@dirrmtry %%SITE_PERL%%/XML/Parser
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/EasyTree
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Parser-Style-Elemental/Makefile b/textproc/p5-XML-Parser-Style-Elemental/Makefile
index ad2cb39608ea..d4492667134a 100644
--- a/textproc/p5-XML-Parser-Style-Elemental/Makefile
+++ b/textproc/p5-XML-Parser-Style-Elemental/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Parser-Style-Elemental
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TIMA
diff --git a/textproc/p5-XML-Parser-Style-Elemental/pkg-plist b/textproc/p5-XML-Parser-Style-Elemental/pkg-plist
index 1e8942f6e1f9..f869f3c4acde 100644
--- a/textproc/p5-XML-Parser-Style-Elemental/pkg-plist
+++ b/textproc/p5-XML-Parser-Style-Elemental/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/XML::Parser::Style::Elemental.3.gz
 %%SITE_PERL%%/XML/Parser/Style/Elemental.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/Elemental/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/Elemental
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Parser/Style
-@dirrmtry %%SITE_PERL%%/XML/Parser
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 4da0a08a0d52..f3a8f454e777 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	XML-Parser
 PORTVERSION=	2.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Parser/pkg-plist b/textproc/p5-XML-Parser/pkg-plist
index 02e5ef3269f3..9782bea14662 100644
--- a/textproc/p5-XML-Parser/pkg-plist
+++ b/textproc/p5-XML-Parser/pkg-plist
@@ -1,45 +1,44 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Expat/Expat.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/Japanese_Encodings.msg
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/README
-%%SJIS%%%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/shift_jis.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/big5.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-kr.enc
-%%EUCJP%%%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-jp.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/ibm866.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-1.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-10.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-11.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-13.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-14.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-15.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-2.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-3.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-4.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-5.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-6.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-7.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-8.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-9.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1250.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1252.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1255.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-euc-jp-unicode.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-cp932.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-jdk117.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-jisx0221.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-unicode.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Debug.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Objects.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Subs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Expat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/LWPExternEnt.pl
+%%SITE_ARCH%%/auto/XML/Parser/Expat/Expat.so
+%%SITE_ARCH%%/XML/Parser/Encodings/Japanese_Encodings.msg
+%%SITE_ARCH%%/XML/Parser/Encodings/README
+%%SJIS%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/big5.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/euc-kr.enc
+%%EUCJP%%%%SITE_ARCH%%/XML/Parser/Encodings/euc-jp.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/ibm866.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-1.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-10.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-11.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-13.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-14.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-15.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-2.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-3.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-4.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-5.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-6.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-7.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-8.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-9.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/koi8-r.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/windows-1250.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/windows-1251.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/windows-1252.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/windows-1255.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/x-euc-jp-unicode.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-cp932.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-jdk117.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-jisx0221.enc
+%%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-unicode.enc
+%%SITE_ARCH%%/XML/Parser/Style/Debug.pm
+%%SITE_ARCH%%/XML/Parser/Style/Objects.pm
+%%SITE_ARCH%%/XML/Parser/Style/Stream.pm
+%%SITE_ARCH%%/XML/Parser/Style/Subs.pm
+%%SITE_ARCH%%/XML/Parser/Style/Tree.pm
+%%SITE_ARCH%%/XML/Parser.pm
+%%SITE_ARCH%%/XML/Parser/Expat.pm
+%%SITE_ARCH%%/XML/Parser/LWPExternEnt.pl
 %%PERL5_MAN3%%/XML::Parser.3.gz
 %%PERL5_MAN3%%/XML::Parser::Expat.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Debug.3.gz
@@ -47,10 +46,3 @@
 %%PERL5_MAN3%%/XML::Parser::Style::Stream.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Subs.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Tree.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Expat
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-Quote/Makefile b/textproc/p5-XML-Quote/Makefile
index f5b473f2faba..26ce00cd76b1 100644
--- a/textproc/p5-XML-Quote/Makefile
+++ b/textproc/p5-XML-Quote/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Quote
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Quote/pkg-plist b/textproc/p5-XML-Quote/pkg-plist
index a67bd5728b71..0806180a6658 100644
--- a/textproc/p5-XML-Quote/pkg-plist
+++ b/textproc/p5-XML-Quote/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/XML::Quote.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Quote.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote/Quote.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+%%SITE_ARCH%%/XML/Quote.pm
+%%SITE_ARCH%%/auto/XML/Quote/Quote.so
+%%SITE_ARCH%%/auto/XML/Quote/autosplit.ix
diff --git a/textproc/p5-XML-RAI/Makefile b/textproc/p5-XML-RAI/Makefile
index f507726f1eef..48b2d5bb29fe 100644
--- a/textproc/p5-XML-RAI/Makefile
+++ b/textproc/p5-XML-RAI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RAI
 PORTVERSION=	1.30.31
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
diff --git a/textproc/p5-XML-RAI/pkg-plist b/textproc/p5-XML-RAI/pkg-plist
index 288c2b0d039f..b112e20aa45d 100644
--- a/textproc/p5-XML-RAI/pkg-plist
+++ b/textproc/p5-XML-RAI/pkg-plist
@@ -8,8 +8,3 @@
 %%SITE_PERL%%/XML/RAI/Image.pm
 %%SITE_PERL%%/XML/RAI/Item.pm
 %%SITE_PERL%%/XML/RAI/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RAI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RAI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/RAI
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS-Feed/Makefile b/textproc/p5-XML-RSS-Feed/Makefile
index 456bbdf67656..6ef914ea0b0e 100644
--- a/textproc/p5-XML-RSS-Feed/Makefile
+++ b/textproc/p5-XML-RSS-Feed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RSS-Feed
 PORTVERSION=	2.40
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSS-Feed/pkg-plist b/textproc/p5-XML-RSS-Feed/pkg-plist
index 8a00d55a1b0e..52afc752e1dc 100644
--- a/textproc/p5-XML-RSS-Feed/pkg-plist
+++ b/textproc/p5-XML-RSS-Feed/pkg-plist
@@ -8,10 +8,3 @@
 %%SITE_PERL%%/XML/RSS/Headline/Fark.pm
 %%SITE_PERL%%/XML/RSS/Headline/PerlJobs.pm
 %%SITE_PERL%%/XML/RSS/Headline/UsePerlJournals.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/Feed/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/Feed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/RSS/Headline
-@dirrmtry %%SITE_PERL%%/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS-JavaScript/Makefile b/textproc/p5-XML-RSS-JavaScript/Makefile
index c3f6de1b40d9..e1517162d829 100644
--- a/textproc/p5-XML-RSS-JavaScript/Makefile
+++ b/textproc/p5-XML-RSS-JavaScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RSS-JavaScript
 PORTVERSION=	0.65
+PORTREVISION=	1
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSS-JavaScript/pkg-plist b/textproc/p5-XML-RSS-JavaScript/pkg-plist
index 338f28c3569f..b52d9beeeb7c 100644
--- a/textproc/p5-XML-RSS-JavaScript/pkg-plist
+++ b/textproc/p5-XML-RSS-JavaScript/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/JavaScript/.packlist
 %%SITE_PERL%%/XML/RSS/JavaScript.pm
 %%PERL5_MAN3%%/XML::RSS::JavaScript.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/JavaScript
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS-LibXML/Makefile b/textproc/p5-XML-RSS-LibXML/Makefile
index a91921c3e01e..612c04418d41 100644
--- a/textproc/p5-XML-RSS-LibXML/Makefile
+++ b/textproc/p5-XML-RSS-LibXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RSS-LibXML
 PORTVERSION=	0.31.03
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSS-LibXML/pkg-plist b/textproc/p5-XML-RSS-LibXML/pkg-plist
index 8ac580a361fc..578f41916c53 100644
--- a/textproc/p5-XML-RSS-LibXML/pkg-plist
+++ b/textproc/p5-XML-RSS-LibXML/pkg-plist
@@ -12,6 +12,3 @@
 %%SITE_PERL%%/XML/RSS/LibXML/V0_92.pm
 %%SITE_PERL%%/XML/RSS/LibXML/V1_0.pm
 %%SITE_PERL%%/XML/RSS/LibXML/V2_0.pm
-@dirrmtry %%SITE_PERL%%/XML/RSS/LibXML
-@dirrmtry %%SITE_PERL%%/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS-Liberal/Makefile b/textproc/p5-XML-RSS-Liberal/Makefile
index 9b6bd8e54c8d..f4e4bff2a095 100644
--- a/textproc/p5-XML-RSS-Liberal/Makefile
+++ b/textproc/p5-XML-RSS-Liberal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RSS-Liberal
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSS-Liberal/pkg-plist b/textproc/p5-XML-RSS-Liberal/pkg-plist
index da5c13dc1ed6..8c972123e27b 100644
--- a/textproc/p5-XML-RSS-Liberal/pkg-plist
+++ b/textproc/p5-XML-RSS-Liberal/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/XML::RSS::Liberal.3.gz
 %%SITE_PERL%%/XML/RSS/Liberal.pm
-@dirrmtry %%SITE_PERL%%/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS-Parser/Makefile b/textproc/p5-XML-RSS-Parser/Makefile
index 72901988e0d0..c0547340fd09 100644
--- a/textproc/p5-XML-RSS-Parser/Makefile
+++ b/textproc/p5-XML-RSS-Parser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-RSS-Parser
 PORTVERSION=	4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSS-Parser/pkg-plist b/textproc/p5-XML-RSS-Parser/pkg-plist
index 6b0b38c746b3..bd582af762ba 100644
--- a/textproc/p5-XML-RSS-Parser/pkg-plist
+++ b/textproc/p5-XML-RSS-Parser/pkg-plist
@@ -3,15 +3,8 @@
 %%SITE_PERL%%/XML/RSS/Parser/Element.pm
 %%SITE_PERL%%/XML/RSS/Parser/Feed.pm
 %%SITE_PERL%%/XML/RSS/Parser/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/Parser/.packlist
 %%PERL5_MAN3%%/XML::RSS::Parser.3.gz
 %%PERL5_MAN3%%/XML::RSS::Parser::Characters.3.gz
 %%PERL5_MAN3%%/XML::RSS::Parser::Element.3.gz
 %%PERL5_MAN3%%/XML::RSS::Parser::Feed.3.gz
 %%PERL5_MAN3%%/XML::RSS::Parser::Util.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/RSS/Parser
-@dirrmtry %%SITE_PERL%%/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS-SimpleGen/Makefile b/textproc/p5-XML-RSS-SimpleGen/Makefile
index d73a7a47cce8..cef3e304bce2 100644
--- a/textproc/p5-XML-RSS-SimpleGen/Makefile
+++ b/textproc/p5-XML-RSS-SimpleGen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RSS-SimpleGen
 PORTVERSION=	11.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSS-SimpleGen/pkg-plist b/textproc/p5-XML-RSS-SimpleGen/pkg-plist
index 784b14057f55..2f4fd81a5e4a 100644
--- a/textproc/p5-XML-RSS-SimpleGen/pkg-plist
+++ b/textproc/p5-XML-RSS-SimpleGen/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::RSS::SimpleGen.3.gz
 %%SITE_PERL%%/XML/RSS/SimpleGen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/SimpleGen/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/SimpleGen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index b8559a8f24f2..563e66f3e102 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RSS
 PORTVERSION=	1.55
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSS/pkg-plist b/textproc/p5-XML-RSS/pkg-plist
index 1622f3be4e2e..9393588a596d 100644
--- a/textproc/p5-XML-RSS/pkg-plist
+++ b/textproc/p5-XML-RSS/pkg-plist
@@ -6,11 +6,4 @@
 %%SITE_PERL%%/XML/RSS/Private/Output/V1_0.pm
 %%SITE_PERL%%/XML/RSS/Private/Output/Roles/ImageDims.pm
 %%SITE_PERL%%/XML/RSS/Private/Output/Roles/ModulesElems.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/.packlist
 %%PERL5_MAN3%%/XML::RSS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML/RSS/Private/Output/Roles
-@dirrmtry %%SITE_PERL%%/XML/RSS/Private/Output
-@dirrmtry %%SITE_PERL%%/XML/RSS/Private
-@dirrmtry %%SITE_PERL%%/XML/RSS
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSSLite/Makefile b/textproc/p5-XML-RSSLite/Makefile
index 5b7b1ba7a532..509cc4c7b09e 100644
--- a/textproc/p5-XML-RSSLite/Makefile
+++ b/textproc/p5-XML-RSSLite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RSSLite
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RSSLite/pkg-plist b/textproc/p5-XML-RSSLite/pkg-plist
index 771fa495760d..9bcdf5425aff 100644
--- a/textproc/p5-XML-RSSLite/pkg-plist
+++ b/textproc/p5-XML-RSSLite/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::RSSLite.3.gz
 %%SITE_PERL%%/XML/RSSLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSSLite/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSSLite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Reader/Makefile b/textproc/p5-XML-Reader/Makefile
index 9d11ea9bc5c7..407670e383ad 100644
--- a/textproc/p5-XML-Reader/Makefile
+++ b/textproc/p5-XML-Reader/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	XML-Reader
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Reader/pkg-plist b/textproc/p5-XML-Reader/pkg-plist
index 3f5e062bc7bb..7acd9b52710d 100644
--- a/textproc/p5-XML-Reader/pkg-plist
+++ b/textproc/p5-XML-Reader/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/XML/Reader/Testcases.pm
 %%SITE_PERL%%/XML/Reader_de.pod
 %%SITE_PERL%%/XML/Reader_fr.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Reader/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Reader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Reader
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index aae9870fbf0e..f86e245d84fd 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-RegExp
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-RegExp/pkg-plist b/textproc/p5-XML-RegExp/pkg-plist
index 589906418a92..59aed6a992b2 100644
--- a/textproc/p5-XML-RegExp/pkg-plist
+++ b/textproc/p5-XML-RegExp/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::RegExp.3.gz
 %%SITE_PERL%%/XML/RegExp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Rewrite/Makefile b/textproc/p5-XML-Rewrite/Makefile
index d54824549b97..9e9be62f8041 100644
--- a/textproc/p5-XML-Rewrite/Makefile
+++ b/textproc/p5-XML-Rewrite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Rewrite
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Rewrite/pkg-plist b/textproc/p5-XML-Rewrite/pkg-plist
index edacc7825bfe..bbdeaf1cabb6 100644
--- a/textproc/p5-XML-Rewrite/pkg-plist
+++ b/textproc/p5-XML-Rewrite/pkg-plist
@@ -4,10 +4,5 @@ man/man1/xmlrewrite.1.gz
 %%SITE_PERL%%/XML/Rewrite.pod
 %%SITE_PERL%%/XML/Rewrite/Schema.pm
 %%SITE_PERL%%/XML/Rewrite/Schema.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Rewrite/.packlist
 %%PERL5_MAN3%%/XML::Rewrite.3.gz
 %%PERL5_MAN3%%/XML::Rewrite::Schema.3.gz
-@dirrmtry %%SITE_PERL%%/XML/Rewrite
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Rewrite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Rules/Makefile b/textproc/p5-XML-Rules/Makefile
index d77f81d1c825..ce8d915a8b74 100644
--- a/textproc/p5-XML-Rules/Makefile
+++ b/textproc/p5-XML-Rules/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	XML-Rules
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Rules/pkg-plist b/textproc/p5-XML-Rules/pkg-plist
index c163b1267834..639c95f3c384 100644
--- a/textproc/p5-XML-Rules/pkg-plist
+++ b/textproc/p5-XML-Rules/pkg-plist
@@ -2,4 +2,3 @@ bin/dtd2XMLRules.pl
 bin/xml2XMLRules.pl
 %%SITE_PERL%%/XML/Rules.pm
 %%PERL5_MAN3%%/XML::Rules.3.gz
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX-Base/Makefile b/textproc/p5-XML-SAX-Base/Makefile
index 21698e6a323e..bcc41c910bd8 100644
--- a/textproc/p5-XML-SAX-Base/Makefile
+++ b/textproc/p5-XML-SAX-Base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SAX-Base
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAX-Base/pkg-plist b/textproc/p5-XML-SAX-Base/pkg-plist
index c12bb1e63871..ccda62a207cc 100644
--- a/textproc/p5-XML-SAX-Base/pkg-plist
+++ b/textproc/p5-XML-SAX-Base/pkg-plist
@@ -1,12 +1,6 @@
 %%SITE_PERL%%/XML/SAX/Base.pm
 %%SITE_PERL%%/XML/SAX/BuildSAXBase.pl
 %%SITE_PERL%%/XML/SAX/Exception.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Base/.packlist
 %%PERL5_MAN3%%/XML::SAX::Base.3.gz
 %%PERL5_MAN3%%/XML::SAX::BuildSAXBase.3.gz
 %%PERL5_MAN3%%/XML::SAX::Exception.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Base
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX-Expat-Incremental/Makefile b/textproc/p5-XML-SAX-Expat-Incremental/Makefile
index 83edb147dc1c..674b4640dfa4 100644
--- a/textproc/p5-XML-SAX-Expat-Incremental/Makefile
+++ b/textproc/p5-XML-SAX-Expat-Incremental/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SAX-Expat-Incremental
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist b/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist
index 97eb9c761efe..1315d068ac24 100644
--- a/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist
+++ b/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/XML/SAX/Expat/Incremental.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/Incremental/.packlist
 %%PERL5_MAN3%%/XML::SAX::Expat::Incremental.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/Incremental
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAX/Expat
-@dirrmtry %%SITE_PERL%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index 217894d4a9dd..f0272594a3bc 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SAX-Expat
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAX-Expat/pkg-plist b/textproc/p5-XML-SAX-Expat/pkg-plist
index df193e29ece7..85e09d4af379 100644
--- a/textproc/p5-XML-SAX-Expat/pkg-plist
+++ b/textproc/p5-XML-SAX-Expat/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::SAX::Expat.3.gz
 %%SITE_PERL%%/XML/SAX/Expat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX-ExpatXS/Makefile b/textproc/p5-XML-SAX-ExpatXS/Makefile
index ff4ecff26099..a1fcce788071 100644
--- a/textproc/p5-XML-SAX-ExpatXS/Makefile
+++ b/textproc/p5-XML-SAX-ExpatXS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SAX-ExpatXS
 PORTVERSION=	1.33
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAX-ExpatXS/pkg-plist b/textproc/p5-XML-SAX-ExpatXS/pkg-plist
index 34edfeded948..169a5d37cc34 100644
--- a/textproc/p5-XML-SAX-ExpatXS/pkg-plist
+++ b/textproc/p5-XML-SAX-ExpatXS/pkg-plist
@@ -1,32 +1,24 @@
 %%PERL5_MAN3%%/XML::SAX::ExpatXS.3.gz
 %%PERL5_MAN3%%/XML::SAX::ExpatXS::Encoding.3.gz
 %%PERL5_MAN3%%/XML::SAX::ExpatXS::Preload.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/big5.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/euc-kr.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-2.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-3.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-4.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-5.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-7.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-8.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-9.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/windows-1250.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/windows-1252.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/x-euc-jp-jisx0221.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/x-euc-jp-unicode.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-cp932.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-jdk117.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-jisx0221.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-unicode.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Preload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/ExpatXS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/ExpatXS/ExpatXS.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/ExpatXS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+%%SITE_ARCH%%/XML/SAX/ExpatXS.pm
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encoding.pm
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/big5.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/euc-kr.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-2.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-3.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-4.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-5.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-7.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-8.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/iso-8859-9.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/windows-1250.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/windows-1252.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/x-euc-jp-jisx0221.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/x-euc-jp-unicode.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-cp932.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-jdk117.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-jisx0221.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Encodings/x-sjis-unicode.enc
+%%SITE_ARCH%%/XML/SAX/ExpatXS/Preload.pm
+%%SITE_ARCH%%/auto/XML/SAX/ExpatXS/ExpatXS.so
diff --git a/textproc/p5-XML-SAX-Machines/Makefile b/textproc/p5-XML-SAX-Machines/Makefile
index 4b45dc55c871..53b360bc253c 100644
--- a/textproc/p5-XML-SAX-Machines/Makefile
+++ b/textproc/p5-XML-SAX-Machines/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-SAX-Machines
 PORTVERSION=	0.46
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PERIGRIN
diff --git a/textproc/p5-XML-SAX-Machines/pkg-plist b/textproc/p5-XML-SAX-Machines/pkg-plist
index ddbc75d42bc2..0af9d6795827 100644
--- a/textproc/p5-XML-SAX-Machines/pkg-plist
+++ b/textproc/p5-XML-SAX-Machines/pkg-plist
@@ -24,16 +24,8 @@
 %%SITE_PERL%%/XML/SAX/Manifold.pm
 %%SITE_PERL%%/XML/SAX/Pipeline.pm
 %%SITE_PERL%%/XML/SAX/Tap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Machines/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/append_to_xml_file
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/output_to_process
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml_records_thru_libxslt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml_records_to_data_structures
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Machines
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAX/Machines
-@dirrmtry %%SITE_PERL%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/XML/Filter
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX-Simple/Makefile b/textproc/p5-XML-SAX-Simple/Makefile
index 4b559b3eb88f..807227b948c8 100644
--- a/textproc/p5-XML-SAX-Simple/Makefile
+++ b/textproc/p5-XML-SAX-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SAX-Simple
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAX-Simple/pkg-plist b/textproc/p5-XML-SAX-Simple/pkg-plist
index a9dfbe85425b..f368f5115e5a 100644
--- a/textproc/p5-XML-SAX-Simple/pkg-plist
+++ b/textproc/p5-XML-SAX-Simple/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::SAX::Simple.3.gz
 %%SITE_PERL%%/XML/SAX/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX-Writer/Makefile b/textproc/p5-XML-SAX-Writer/Makefile
index 815f0ad9ee02..2c330a4140f8 100644
--- a/textproc/p5-XML-SAX-Writer/Makefile
+++ b/textproc/p5-XML-SAX-Writer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SAX-Writer
 PORTVERSION=	0.54
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAX-Writer/pkg-plist b/textproc/p5-XML-SAX-Writer/pkg-plist
index 0cd878be69fd..e763de5337f8 100644
--- a/textproc/p5-XML-SAX-Writer/pkg-plist
+++ b/textproc/p5-XML-SAX-Writer/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/XML::SAX::Writer::XML.3.gz
 %%SITE_PERL%%/XML/SAX/Writer.pm
 %%SITE_PERL%%/XML/SAX/Writer/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Writer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Writer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAX/Writer
-@dirrmtry %%SITE_PERL%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 55ca682230cb..a89ac591d519 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-SAX
 PORTVERSION=	0.99
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAX/pkg-plist b/textproc/p5-XML-SAX/pkg-plist
index 4a65f4986e98..bfa90b84129e 100644
--- a/textproc/p5-XML-SAX/pkg-plist
+++ b/textproc/p5-XML-SAX/pkg-plist
@@ -25,10 +25,3 @@
 %%SITE_PERL%%/XML/SAX/PurePerl/Reader/UnicodeExt.pm
 %%SITE_PERL%%/XML/SAX/PurePerl/UnicodeExt.pm
 %%SITE_PERL%%/XML/SAX/PurePerl/XMLDecl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAX/PurePerl/Reader
-@dirrmtry %%SITE_PERL%%/XML/SAX/PurePerl
-@dirrmtry %%SITE_PERL%%/XML/SAX
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAXDriver-CSV/Makefile b/textproc/p5-XML-SAXDriver-CSV/Makefile
index 526b48c2c06a..ff2ee0e0a149 100644
--- a/textproc/p5-XML-SAXDriver-CSV/Makefile
+++ b/textproc/p5-XML-SAXDriver-CSV/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-SAXDriver-CSV
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAXDriver-CSV/pkg-plist b/textproc/p5-XML-SAXDriver-CSV/pkg-plist
index 238d38cf4a86..4c157c800889 100644
--- a/textproc/p5-XML-SAXDriver-CSV/pkg-plist
+++ b/textproc/p5-XML-SAXDriver-CSV/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::SAXDriver::CSV.3.gz
 %%SITE_PERL%%/XML/SAXDriver/CSV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/CSV/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/CSV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAXDriver
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAXDriver-Excel/Makefile b/textproc/p5-XML-SAXDriver-Excel/Makefile
index 004b0b3ab8e6..547a8895b849 100644
--- a/textproc/p5-XML-SAXDriver-Excel/Makefile
+++ b/textproc/p5-XML-SAXDriver-Excel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SAXDriver-Excel
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SAXDriver-Excel/pkg-plist b/textproc/p5-XML-SAXDriver-Excel/pkg-plist
index 6b3385587b48..cce763d16498 100644
--- a/textproc/p5-XML-SAXDriver-Excel/pkg-plist
+++ b/textproc/p5-XML-SAXDriver-Excel/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/XML::SAXDriver::Excel.3.gz
 %%SITE_PERL%%/XML/SAXDriver/Excel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Excel/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Excel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SAXDriver
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-STX/Makefile b/textproc/p5-XML-STX/Makefile
index a829b455c46b..aaaacb439e89 100644
--- a/textproc/p5-XML-STX/Makefile
+++ b/textproc/p5-XML-STX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-STX
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-STX/pkg-plist b/textproc/p5-XML-STX/pkg-plist
index 105e9d1d6109..24602be98919 100644
--- a/textproc/p5-XML-STX/pkg-plist
+++ b/textproc/p5-XML-STX/pkg-plist
@@ -20,7 +20,6 @@ bin/stxview.pl
 %%SITE_PERL%%/XML/STX/Stylesheet.pm
 %%SITE_PERL%%/XML/STX/TrAX.pm
 %%SITE_PERL%%/XML/STX/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/STX/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/STX.html
 %%PORTDOCS%%%%DOCSDIR%%/TrAXref.html
 %%PORTDOCS%%%%DOCSDIR%%/TrAXref.pod
@@ -28,7 +27,3 @@ bin/stxview.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tester.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/STX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/STX
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Schematron/Makefile b/textproc/p5-XML-Schematron/Makefile
index 5d0c74c16a97..fdc58a805958 100644
--- a/textproc/p5-XML-Schematron/Makefile
+++ b/textproc/p5-XML-Schematron/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Schematron
 PORTVERSION=	1.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Schematron/pkg-plist b/textproc/p5-XML-Schematron/pkg-plist
index 2733cb07a2e4..63429bda46e2 100644
--- a/textproc/p5-XML-Schematron/pkg-plist
+++ b/textproc/p5-XML-Schematron/pkg-plist
@@ -8,8 +8,3 @@
 %%SITE_PERL%%/XML/Schematron/Test.pm
 %%SITE_PERL%%/XML/Schematron/XPath.pm
 %%SITE_PERL%%/XML/Schematron/XSLTProcessor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Schematron
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SemanticDiff/Makefile b/textproc/p5-XML-SemanticDiff/Makefile
index 3e16bc0751cd..d4f447a6f7f3 100644
--- a/textproc/p5-XML-SemanticDiff/Makefile
+++ b/textproc/p5-XML-SemanticDiff/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	XML-SemanticDiff
 PORTVERSION=	1.0004
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SemanticDiff/pkg-plist b/textproc/p5-XML-SemanticDiff/pkg-plist
index 79f17ceb930b..6bfc0a2fcc98 100644
--- a/textproc/p5-XML-SemanticDiff/pkg-plist
+++ b/textproc/p5-XML-SemanticDiff/pkg-plist
@@ -2,5 +2,3 @@
 %%SITE_PERL%%/XML/SemanticDiff/BasicHandler.pm
 %%PERL5_MAN3%%/XML::SemanticDiff.3.gz
 %%PERL5_MAN3%%/XML::SemanticDiff::BasicHandler.3.gz
-@dirrmtry %%SITE_PERL%%/XML/SemanticDiff
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 4c3e25992ef7..3181ba254a4b 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Simple
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Simple/pkg-plist b/textproc/p5-XML-Simple/pkg-plist
index 9631021eaae8..a34438825ea4 100644
--- a/textproc/p5-XML-Simple/pkg-plist
+++ b/textproc/p5-XML-Simple/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/XML::Simple::FAQ.3.gz
 %%SITE_PERL%%/XML/Simple.pm
 %%SITE_PERL%%/XML/Simple/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Simple
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SimpleObject-LibXML/Makefile b/textproc/p5-XML-SimpleObject-LibXML/Makefile
index caa53465e518..bebc1e60b7b4 100644
--- a/textproc/p5-XML-SimpleObject-LibXML/Makefile
+++ b/textproc/p5-XML-SimpleObject-LibXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-SimpleObject-LibXML
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SimpleObject-LibXML/pkg-plist b/textproc/p5-XML-SimpleObject-LibXML/pkg-plist
index 31d6991708b4..9b87fb56d0fd 100644
--- a/textproc/p5-XML-SimpleObject-LibXML/pkg-plist
+++ b/textproc/p5-XML-SimpleObject-LibXML/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/XML::SimpleObject::LibXML.3.gz
 %%SITE_PERL%%/XML/SimpleObject/LibXML.pm
 %%SITE_PERL%%/XML/SimpleObject/ex.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject/LibXML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SimpleObject
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SimpleObject/Makefile b/textproc/p5-XML-SimpleObject/Makefile
index 4d66ab636dd2..eb95f3ba25e4 100644
--- a/textproc/p5-XML-SimpleObject/Makefile
+++ b/textproc/p5-XML-SimpleObject/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-SimpleObject
 PORTVERSION=	0.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-SimpleObject/pkg-plist b/textproc/p5-XML-SimpleObject/pkg-plist
index e1ae3c51e59e..d7cf1b8e5717 100644
--- a/textproc/p5-XML-SimpleObject/pkg-plist
+++ b/textproc/p5-XML-SimpleObject/pkg-plist
@@ -2,8 +2,3 @@
 %%SITE_PERL%%/XML/SimpleObject.pm
 %%SITE_PERL%%/XML/SimpleObject/Enhanced.pm
 %%SITE_PERL%%/XML/ex.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/SimpleObject
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Smart/Makefile b/textproc/p5-XML-Smart/Makefile
index 210226228aa4..3a136c94ad4f 100644
--- a/textproc/p5-XML-Smart/Makefile
+++ b/textproc/p5-XML-Smart/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Smart
 PORTVERSION=	1.79
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TMHARISH
diff --git a/textproc/p5-XML-Smart/pkg-plist b/textproc/p5-XML-Smart/pkg-plist
index 44c338d931a9..03248fa341d2 100644
--- a/textproc/p5-XML-Smart/pkg-plist
+++ b/textproc/p5-XML-Smart/pkg-plist
@@ -13,13 +13,8 @@
 %%SITE_PERL%%/XML/Smart/Tutorial.epod
 %%SITE_PERL%%/XML/Smart/Tutorial.pod
 %%SITE_PERL%%/XML/Smart/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Smart/.packlist
 %%PERL5_MAN3%%/XML::Smart.3.gz
 %%PERL5_MAN3%%/XML::Smart::DTD.3.gz
 %%PERL5_MAN3%%/XML::Smart::FAQ.3.gz
 %%PERL5_MAN3%%/XML::Smart::Shared.3.gz
 %%PERL5_MAN3%%/XML::Smart::Tutorial.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Smart
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Smart
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index de9e0a988ac8..ac3022af42bf 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Stream
 DISTVERSION=	1.23_06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAPATRICK
diff --git a/textproc/p5-XML-Stream/pkg-plist b/textproc/p5-XML-Stream/pkg-plist
index e76e2a37a2ea..593226bfb126 100644
--- a/textproc/p5-XML-Stream/pkg-plist
+++ b/textproc/p5-XML-Stream/pkg-plist
@@ -17,12 +17,3 @@
 %%SITE_PERL%%/XML/Stream/XPath/Op.pm
 %%SITE_PERL%%/XML/Stream/XPath/Query.pm
 %%SITE_PERL%%/XML/Stream/XPath/Value.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Stream/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Stream
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Stream/XPath
-@dirrmtry %%SITE_PERL%%/XML/Stream/Parser
-@dirrmtry %%SITE_PERL%%/XML/Stream/IO/Select
-@dirrmtry %%SITE_PERL%%/XML/Stream/IO
-@dirrmtry %%SITE_PERL%%/XML/Stream
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Tiny/Makefile b/textproc/p5-XML-Tiny/Makefile
index 84f12b13169c..24876730ef31 100644
--- a/textproc/p5-XML-Tiny/Makefile
+++ b/textproc/p5-XML-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Tiny
 PORTVERSION=	2.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Tiny/pkg-plist b/textproc/p5-XML-Tiny/pkg-plist
index 1c7dfe5a4c11..38a7cbf51493 100644
--- a/textproc/p5-XML-Tiny/pkg-plist
+++ b/textproc/p5-XML-Tiny/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Tiny.3.gz
 %%SITE_PERL%%/XML/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Tiny/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Tiny
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-TinyXML/Makefile b/textproc/p5-XML-TinyXML/Makefile
index 4d4990576bf7..5a8c40f31bd1 100644
--- a/textproc/p5-XML-TinyXML/Makefile
+++ b/textproc/p5-XML-TinyXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-TinyXML
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-TinyXML/pkg-plist b/textproc/p5-XML-TinyXML/pkg-plist
index 7b7f1f3c07fa..01fc5412bd8a 100644
--- a/textproc/p5-XML-TinyXML/pkg-plist
+++ b/textproc/p5-XML-TinyXML/pkg-plist
@@ -1,22 +1,15 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Node.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Selector/XPath/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Selector/XPath/Axes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Selector/XPath/Functions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Selector/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Selector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/NodeAttribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TinyXML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TinyXML/TinyXML.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TinyXML/autosplit.ix
+%%SITE_ARCH%%/XML/TinyXML.pm
+%%SITE_ARCH%%/XML/TinyXML/Node.pm
+%%SITE_ARCH%%/XML/TinyXML/Selector/XPath/Context.pm
+%%SITE_ARCH%%/XML/TinyXML/Selector/XPath/Axes.pm
+%%SITE_ARCH%%/XML/TinyXML/Selector/XPath/Functions.pm
+%%SITE_ARCH%%/XML/TinyXML/Selector/XPath.pm
+%%SITE_ARCH%%/XML/TinyXML/Selector.pm
+%%SITE_ARCH%%/XML/TinyXML/NodeAttribute.pm
+%%SITE_ARCH%%/auto/XML/TinyXML/TinyXML.so
+%%SITE_ARCH%%/auto/XML/TinyXML/autosplit.ix
 %%PERL5_MAN3%%/XML::TinyXML.3.gz
 %%PERL5_MAN3%%/XML::TinyXML::Node.3.gz
 %%PERL5_MAN3%%/XML::TinyXML::NodeAttribute.3.gz
 %%PERL5_MAN3%%/XML::TinyXML::Selector.3.gz
 %%PERL5_MAN3%%/XML::TinyXML::Selector::XPath.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TinyXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Selector/XPath
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML/Selector
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/TinyXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-TokeParser/Makefile b/textproc/p5-XML-TokeParser/Makefile
index af013b7bd243..dc75aa48033b 100644
--- a/textproc/p5-XML-TokeParser/Makefile
+++ b/textproc/p5-XML-TokeParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-TokeParser
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/XML
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-TokeParser/pkg-plist b/textproc/p5-XML-TokeParser/pkg-plist
index 60d5a0f08e3a..04c012050e84 100644
--- a/textproc/p5-XML-TokeParser/pkg-plist
+++ b/textproc/p5-XML-TokeParser/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TokeParser/.packlist
 %%SITE_PERL%%/XML/TokeParser.pm
 %%PERL5_MAN3%%/XML::TokeParser.3.gz
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TokeParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Toolkit/Makefile b/textproc/p5-XML-Toolkit/Makefile
index 8882503b3596..a643235ac94b 100644
--- a/textproc/p5-XML-Toolkit/Makefile
+++ b/textproc/p5-XML-Toolkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Toolkit
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PERIGRIN
diff --git a/textproc/p5-XML-Toolkit/pkg-plist b/textproc/p5-XML-Toolkit/pkg-plist
index 84c28fbac07c..5e214ca94ab8 100644
--- a/textproc/p5-XML-Toolkit/pkg-plist
+++ b/textproc/p5-XML-Toolkit/pkg-plist
@@ -24,7 +24,6 @@ bin/xmltk
 %%SITE_PERL%%/XML/Toolkit/MetaDescription/Attribute.pm
 %%SITE_PERL%%/XML/Toolkit/MetaDescription/Trait.pm
 %%SITE_PERL%%/XML/Toolkit/Trait/NoXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Toolkit/.packlist
 %%PERL5_MAN3%%/XML::Filter::Moose.3.gz
 %%PERL5_MAN3%%/XML::Generator::Moose.3.gz
 %%PERL5_MAN3%%/XML::Toolkit.3.gz
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index 4ca0e89246fe..5cf13b3f111a 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-TreeBuilder
 PORTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-TreeBuilder/pkg-plist b/textproc/p5-XML-TreeBuilder/pkg-plist
index 928e926776e5..2025fcffcd2e 100644
--- a/textproc/p5-XML-TreeBuilder/pkg-plist
+++ b/textproc/p5-XML-TreeBuilder/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/XML/TreeBuilder.pm
 %%SITE_PERL%%/XML/Element.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TreeBuilder/.packlist
 %%PERL5_MAN3%%/XML::TreeBuilder.3.gz
 %%PERL5_MAN3%%/XML::Element.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TreeBuilder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-TreePP/Makefile b/textproc/p5-XML-TreePP/Makefile
index b3a5140fb99b..11a4fabe4b42 100644
--- a/textproc/p5-XML-TreePP/Makefile
+++ b/textproc/p5-XML-TreePP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-TreePP
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-TreePP/pkg-plist b/textproc/p5-XML-TreePP/pkg-plist
index c5234423b6c8..b0f67b9feb48 100644
--- a/textproc/p5-XML-TreePP/pkg-plist
+++ b/textproc/p5-XML-TreePP/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/XML::TreePP.3.gz
 %%SITE_PERL%%/XML/TreePP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TreePP/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/envxml.cgi
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/TreePP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index abd5fcf8752c..c0649e85b8da 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Twig
 PORTVERSION=	3.48
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Twig/pkg-plist b/textproc/p5-XML-Twig/pkg-plist
index 869f1e386bc4..21a7d82c486c 100644
--- a/textproc/p5-XML-Twig/pkg-plist
+++ b/textproc/p5-XML-Twig/pkg-plist
@@ -6,13 +6,8 @@ bin/xml_split
 %%PERL5_MAN3%%/XML::Twig.3.gz
 %%SITE_PERL%%/XML/Twig.pm
 %%SITE_PERL%%/XML/Twig/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig/.packlist
 man/man1/xml_grep.1.gz
 man/man1/xml_merge.1.gz
 man/man1/xml_pp.1.gz
 man/man1/xml_spellcheck.1.gz
 man/man1/xml_split.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Twig
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Validate/Makefile b/textproc/p5-XML-Validate/Makefile
index 225d52052100..80fc943c0013 100644
--- a/textproc/p5-XML-Validate/Makefile
+++ b/textproc/p5-XML-Validate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Validate
 PORTVERSION=	1.025
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Validate/pkg-plist b/textproc/p5-XML-Validate/pkg-plist
index 4f8ac8578262..f0e8b5f224cc 100644
--- a/textproc/p5-XML-Validate/pkg-plist
+++ b/textproc/p5-XML-Validate/pkg-plist
@@ -5,13 +5,8 @@ man/man1/validxml.pl.1.gz
 %%SITE_PERL%%/XML/Validate/LibXML.pm
 %%SITE_PERL%%/XML/Validate/MSXML.pm
 %%SITE_PERL%%/XML/Validate/Xerces.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validate/.packlist
 %%PERL5_MAN3%%/XML::Validate.3.gz
 %%PERL5_MAN3%%/XML::Validate::Base.3.gz
 %%PERL5_MAN3%%/XML::Validate::LibXML.3.gz
 %%PERL5_MAN3%%/XML::Validate::MSXML.3.gz
 %%PERL5_MAN3%%/XML::Validate::Xerces.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Validate
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Validator-Schema/Makefile b/textproc/p5-XML-Validator-Schema/Makefile
index 0db89188b43b..6bc291c41617 100644
--- a/textproc/p5-XML-Validator-Schema/Makefile
+++ b/textproc/p5-XML-Validator-Schema/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-Validator-Schema
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-Validator-Schema/pkg-plist b/textproc/p5-XML-Validator-Schema/pkg-plist
index 7d76ad5dbe37..d34be0fdf0b7 100644
--- a/textproc/p5-XML-Validator-Schema/pkg-plist
+++ b/textproc/p5-XML-Validator-Schema/pkg-plist
@@ -32,10 +32,3 @@
 %%SITE_PERL%%/XML/Validator/Schema/SimpleTypeNode.pm
 %%SITE_PERL%%/XML/Validator/Schema/TypeLibrary.pm
 %%SITE_PERL%%/XML/Validator/Schema/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator/Schema/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator/Schema
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/Validator/Schema
-@dirrmtry %%SITE_PERL%%/XML/Validator
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Writer/Makefile b/textproc/p5-XML-Writer/Makefile
index 42b7bce5e1ee..8cf4ad726c19 100644
--- a/textproc/p5-XML-Writer/Makefile
+++ b/textproc/p5-XML-Writer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-Writer
 PORTVERSION=	0.625
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JOSEPHW
diff --git a/textproc/p5-XML-Writer/pkg-plist b/textproc/p5-XML-Writer/pkg-plist
index 7d68636f37d9..d97b92afceac 100644
--- a/textproc/p5-XML-Writer/pkg-plist
+++ b/textproc/p5-XML-Writer/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/XML::Writer.3.gz
 %%SITE_PERL%%/XML/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Writer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Writer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XBEL/Makefile b/textproc/p5-XML-XBEL/Makefile
index 593aa45b776a..cf302073663b 100644
--- a/textproc/p5-XML-XBEL/Makefile
+++ b/textproc/p5-XML-XBEL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-XBEL
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-XBEL/pkg-plist b/textproc/p5-XML-XBEL/pkg-plist
index d9dd12fc501a..caeb87300840 100644
--- a/textproc/p5-XML-XBEL/pkg-plist
+++ b/textproc/p5-XML-XBEL/pkg-plist
@@ -22,5 +22,3 @@
 %%SITE_PERL%%/XML/XBEL/serialize.pm
 %%SITE_PERL%%/XML/XBEL/thingy.pm
 %%SITE_PERL%%/XML/XBEL/url.pm
-@dirrmtry %%SITE_PERL%%/XML/XBEL
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XML2JSON/Makefile b/textproc/p5-XML-XML2JSON/Makefile
index 177e0c115a8b..e235d92d5fda 100644
--- a/textproc/p5-XML-XML2JSON/Makefile
+++ b/textproc/p5-XML-XML2JSON/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-XML2JSON
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-XML2JSON/pkg-plist b/textproc/p5-XML-XML2JSON/pkg-plist
index 1c9d33c5db23..90ad247cddae 100644
--- a/textproc/p5-XML-XML2JSON/pkg-plist
+++ b/textproc/p5-XML-XML2JSON/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/XML/XML2JSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XML2JSON/.packlist
 %%PERL5_MAN3%%/XML::XML2JSON.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XML2JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 06da5a2d67a4..c5c070fe3648 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-XPath
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-XPath/pkg-plist b/textproc/p5-XML-XPath/pkg-plist
index 9301617ea796..b8498620fa26 100644
--- a/textproc/p5-XML-XPath/pkg-plist
+++ b/textproc/p5-XML-XPath/pkg-plist
@@ -36,9 +36,3 @@ bin/xpath
 %%SITE_PERL%%/XML/XPath/Step.pm
 %%SITE_PERL%%/XML/XPath/Variable.pm
 %%SITE_PERL%%/XML/XPath/XMLParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/XPath/Node
-@dirrmtry %%SITE_PERL%%/XML/XPath
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XPathEngine/Makefile b/textproc/p5-XML-XPathEngine/Makefile
index 50535e6fb5f1..efe381613df1 100644
--- a/textproc/p5-XML-XPathEngine/Makefile
+++ b/textproc/p5-XML-XPathEngine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-XPathEngine
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-XPathEngine/pkg-plist b/textproc/p5-XML-XPathEngine/pkg-plist
index 9adcdad64dc2..7d7f2bed7741 100644
--- a/textproc/p5-XML-XPathEngine/pkg-plist
+++ b/textproc/p5-XML-XPathEngine/pkg-plist
@@ -14,8 +14,3 @@
 %%SITE_PERL%%/XML/XPathEngine/Root.pm
 %%SITE_PERL%%/XML/XPathEngine/Step.pm
 %%SITE_PERL%%/XML/XPathEngine/Variable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPathEngine/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPathEngine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/XPathEngine
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 2f4efde460bd..f30353a5113b 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-XQL
 PORTVERSION=	0.68
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-XQL/pkg-plist b/textproc/p5-XML-XQL/pkg-plist
index c30da4c32268..b0e0488d336b 100644
--- a/textproc/p5-XML-XQL/pkg-plist
+++ b/textproc/p5-XML-XQL/pkg-plist
@@ -14,4 +14,3 @@ bin/xql.pl
 %%SITE_PERL%%/XML/XQL/Query.pod
 %%SITE_PERL%%/XML/XQL/Strict.pm
 %%SITE_PERL%%/XML/XQL/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XQL/.packlist
diff --git a/textproc/p5-XML-XSH/Makefile b/textproc/p5-XML-XSH/Makefile
index 26f200f6924c..612cd2d6e837 100644
--- a/textproc/p5-XML-XSH/Makefile
+++ b/textproc/p5-XML-XSH/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-XSH
 PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/XML \
 		SF/xsh/xsh/${PORTNAME}-${PORTVERSION}%20%28linux_unix%29
diff --git a/textproc/p5-XML-XSH/pkg-plist b/textproc/p5-XML-XSH/pkg-plist
index 71199f3bfed6..542a75d148e4 100644
--- a/textproc/p5-XML-XSH/pkg-plist
+++ b/textproc/p5-XML-XSH/pkg-plist
@@ -13,10 +13,4 @@ bin/xsh
 %%SITE_PERL%%/XML/XSH/Iterators.pm
 %%SITE_PERL%%/XML/XSH/LibXMLCompat.pm
 %%SITE_PERL%%/XML/XSH/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH/.packlist
 man/man1/xsh.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/XSH
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/Inline
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index 3f61b2d9da05..08ce15f40384 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-XSLT
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-XSLT/pkg-plist b/textproc/p5-XML-XSLT/pkg-plist
index a951263c6692..53b9d86dc707 100644
--- a/textproc/p5-XML-XSLT/pkg-plist
+++ b/textproc/p5-XML-XSLT/pkg-plist
@@ -1,8 +1,4 @@
 bin/xslt-parser
 %%PERL5_MAN3%%/XML::XSLT.3.gz
 %%SITE_PERL%%/XML/XSLT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSLT/.packlist
 man/man1/xslt-parser.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSLT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index ccb05e1c77fb..9499c49c5740 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-XUpdate-LibXML
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-XML-XUpdate-LibXML/pkg-plist b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
index 0f91228e7286..6cd822057985 100644
--- a/textproc/p5-XML-XUpdate-LibXML/pkg-plist
+++ b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
@@ -4,10 +4,3 @@ man/man1/xupdate.1.gz
 %%PERL5_MAN3%%/XML::XUpdate::LibXML.3.gz
 %%SITE_PERL%%/XML/Normalize/LibXML.pm
 %%SITE_PERL%%/XML/XUpdate/LibXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML/XUpdate
-@dirrmtry %%SITE_PERL%%/XML/Normalize
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-YAML-LibYAML/Makefile b/textproc/p5-YAML-LibYAML/Makefile
index 16b90e2fb110..55f0a36f733e 100644
--- a/textproc/p5-YAML-LibYAML/Makefile
+++ b/textproc/p5-YAML-LibYAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	YAML-LibYAML
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-YAML-LibYAML/pkg-plist b/textproc/p5-YAML-LibYAML/pkg-plist
index 2ca9f7765f4c..ae9696c304ff 100644
--- a/textproc/p5-YAML-LibYAML/pkg-plist
+++ b/textproc/p5-YAML-LibYAML/pkg-plist
@@ -1,16 +1,9 @@
 %%PERL5_MAN3%%/YAML::LibYAML.3.gz
 %%PERL5_MAN3%%/YAML::XS.3.gz
 %%PERL5_MAN3%%/YAML::XS::LibYAML.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/LibYAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/LibYAML.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/XS.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/XS/LibYAML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/LibYAML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/XS/LibYAML/LibYAML.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/LibYAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/XS/LibYAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
+%%SITE_ARCH%%/YAML/LibYAML.pm
+%%SITE_ARCH%%/YAML/LibYAML.pod
+%%SITE_ARCH%%/YAML/XS.pm
+%%SITE_ARCH%%/YAML/XS.pod
+%%SITE_ARCH%%/YAML/XS/LibYAML.pm
+%%SITE_ARCH%%/auto/YAML/XS/LibYAML/LibYAML.so
diff --git a/textproc/p5-YAML-Shell/Makefile b/textproc/p5-YAML-Shell/Makefile
index 3117f77f624b..0e07a9cc17b4 100644
--- a/textproc/p5-YAML-Shell/Makefile
+++ b/textproc/p5-YAML-Shell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	YAML-Shell
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/textproc/p5-YAML-Shell/pkg-plist b/textproc/p5-YAML-Shell/pkg-plist
index 6553b7ba06b5..9fc336131d07 100644
--- a/textproc/p5-YAML-Shell/pkg-plist
+++ b/textproc/p5-YAML-Shell/pkg-plist
@@ -1,8 +1,4 @@
 bin/ysh
 man/man1/ysh.1.gz
 %%PERL5_MAN3%%/YAML::Shell.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Shell/.packlist
 %%SITE_PERL%%/YAML/Shell.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Shell
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
-@dirrmtry %%SITE_PERL%%/YAML
diff --git a/textproc/p5-YAML-Syck/Makefile b/textproc/p5-YAML-Syck/Makefile
index 8ea77785694e..461e2f5cf6c4 100644
--- a/textproc/p5-YAML-Syck/Makefile
+++ b/textproc/p5-YAML-Syck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	YAML-Syck
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-YAML-Syck/pkg-plist b/textproc/p5-YAML-Syck/pkg-plist
index a117d2d0162d..897ea20b6256 100644
--- a/textproc/p5-YAML-Syck/pkg-plist
+++ b/textproc/p5-YAML-Syck/pkg-plist
@@ -1,14 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck/Syck.so
-%%SITE_PERL%%/%%PERL_ARCH%%/JSON/Syck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Syck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader/Syck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper/Syck.pm
+%%SITE_ARCH%%/auto/YAML/Syck/Syck.so
+%%SITE_ARCH%%/JSON/Syck.pm
+%%SITE_ARCH%%/YAML/Syck.pm
+%%SITE_ARCH%%/YAML/Loader/Syck.pm
+%%SITE_ARCH%%/YAML/Dumper/Syck.pm
 %%PERL5_MAN3%%/JSON::Syck.3.gz
 %%PERL5_MAN3%%/YAML::Syck.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON
diff --git a/textproc/p5-YAML-Tiny-Color/Makefile b/textproc/p5-YAML-Tiny-Color/Makefile
index 16514ade927b..cfd89869c1fc 100644
--- a/textproc/p5-YAML-Tiny-Color/Makefile
+++ b/textproc/p5-YAML-Tiny-Color/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	YAML-Tiny-Color
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-YAML-Tiny-Color/pkg-plist b/textproc/p5-YAML-Tiny-Color/pkg-plist
index 78a92fbf814f..bc2dabb968a2 100644
--- a/textproc/p5-YAML-Tiny-Color/pkg-plist
+++ b/textproc/p5-YAML-Tiny-Color/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/YAML::Tiny::Color.3.gz
-%%SITE_ARCH%%/auto/YAML/Tiny/Color/.packlist
 %%SITE_PERL%%/YAML/Tiny/Color.pm
diff --git a/textproc/p5-YAML-Tiny/Makefile b/textproc/p5-YAML-Tiny/Makefile
index bb58b58d580f..19d0d7d499b8 100644
--- a/textproc/p5-YAML-Tiny/Makefile
+++ b/textproc/p5-YAML-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	YAML-Tiny
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-YAML-Tiny/pkg-plist b/textproc/p5-YAML-Tiny/pkg-plist
index a58c1ce8d639..663a84244b62 100644
--- a/textproc/p5-YAML-Tiny/pkg-plist
+++ b/textproc/p5-YAML-Tiny/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/YAML/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Tiny/.packlist
 %%PERL5_MAN3%%/YAML::Tiny.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Tiny
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
-@dirrmtry %%SITE_PERL%%/YAML
diff --git a/textproc/p5-YAML/Makefile b/textproc/p5-YAML/Makefile
index bdf3856bb749..87971eb7d72e 100644
--- a/textproc/p5-YAML/Makefile
+++ b/textproc/p5-YAML/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	YAML
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-YAML/pkg-plist b/textproc/p5-YAML/pkg-plist
index 86e9a70df595..9d45bb5aac67 100644
--- a/textproc/p5-YAML/pkg-plist
+++ b/textproc/p5-YAML/pkg-plist
@@ -32,8 +32,3 @@
 %%SITE_PERL%%/YAML/Tag.pod
 %%SITE_PERL%%/YAML/Types.pm
 %%SITE_PERL%%/YAML/Types.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/.packlist
-@dirrmtry %%SITE_PERL%%/YAML/Dumper
-@dirrmtry %%SITE_PERL%%/YAML/Loader
-@dirrmtry %%SITE_PERL%%/YAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
diff --git a/textproc/p5-YAPE-HTML/Makefile b/textproc/p5-YAPE-HTML/Makefile
index 1acc037f25d6..a18e36200b79 100644
--- a/textproc/p5-YAPE-HTML/Makefile
+++ b/textproc/p5-YAPE-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	YAPE-HTML
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PINYAN
diff --git a/textproc/p5-YAPE-HTML/pkg-plist b/textproc/p5-YAPE-HTML/pkg-plist
index eca74c396e21..9ab3d5d5fa94 100644
--- a/textproc/p5-YAPE-HTML/pkg-plist
+++ b/textproc/p5-YAPE-HTML/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/YAPE::HTML::Element.3.gz
 %%SITE_PERL%%/YAPE/HTML.pm
 %%SITE_PERL%%/YAPE/HTML/Element.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/HTML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
-@dirrmtry %%SITE_PERL%%/YAPE/HTML
-@dirrmtry %%SITE_PERL%%/YAPE
diff --git a/textproc/p5-YAPE-Regex-Explain/Makefile b/textproc/p5-YAPE-Regex-Explain/Makefile
index 4b4ddcc23d91..234171092199 100644
--- a/textproc/p5-YAPE-Regex-Explain/Makefile
+++ b/textproc/p5-YAPE-Regex-Explain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	YAPE-Regex-Explain
 PORTVERSION=	4.01
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSULLIVAN
diff --git a/textproc/p5-YAPE-Regex-Explain/pkg-plist b/textproc/p5-YAPE-Regex-Explain/pkg-plist
index 1716085dd561..b85c1a616ddc 100644
--- a/textproc/p5-YAPE-Regex-Explain/pkg-plist
+++ b/textproc/p5-YAPE-Regex-Explain/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/YAPE::Regex::Explain.3.gz
 %%SITE_PERL%%/YAPE/Regex/Explain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
-@dirrmtry %%SITE_PERL%%/YAPE/Regex
-@dirrmtry %%SITE_PERL%%/YAPE
diff --git a/textproc/p5-YAPE-Regex/Makefile b/textproc/p5-YAPE-Regex/Makefile
index 99587995217f..3bc58abf3129 100644
--- a/textproc/p5-YAPE-Regex/Makefile
+++ b/textproc/p5-YAPE-Regex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	YAPE-Regex
 PORTVERSION=	4.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GSULLIVAN
diff --git a/textproc/p5-YAPE-Regex/pkg-plist b/textproc/p5-YAPE-Regex/pkg-plist
index a02d87213846..91a203633072 100644
--- a/textproc/p5-YAPE-Regex/pkg-plist
+++ b/textproc/p5-YAPE-Regex/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/YAPE::Regex::Element.3.gz
 %%SITE_PERL%%/YAPE/Regex.pm
 %%SITE_PERL%%/YAPE/Regex/Element.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
-@dirrmtry %%SITE_PERL%%/YAPE/Regex
-@dirrmtry %%SITE_PERL%%/YAPE
diff --git a/textproc/p5-dTemplate/Makefile b/textproc/p5-dTemplate/Makefile
index b4205251adb7..c3dc2cf54003 100644
--- a/textproc/p5-dTemplate/Makefile
+++ b/textproc/p5-dTemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dTemplate
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-dTemplate/pkg-plist b/textproc/p5-dTemplate/pkg-plist
index 1979c4e54d97..4ba65aee5752 100644
--- a/textproc/p5-dTemplate/pkg-plist
+++ b/textproc/p5-dTemplate/pkg-plist
@@ -1,6 +1,4 @@
 %%PERL5_MAN3%%/dTemplate.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate/dTemplate.so
-%%SITE_PERL%%/%%PERL_ARCH%%/dTemplate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/dTemplate.pod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate
+%%SITE_ARCH%%/auto/dTemplate/dTemplate.so
+%%SITE_ARCH%%/dTemplate.pm
+%%SITE_ARCH%%/dTemplate.pod
diff --git a/textproc/p5-libsoldout/Makefile b/textproc/p5-libsoldout/Makefile
index 9534a92f30a4..2d9d114aea98 100644
--- a/textproc/p5-libsoldout/Makefile
+++ b/textproc/p5-libsoldout/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libsoldout
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROS
@@ -21,6 +21,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/libsoldout/libsoldout.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/libsoldout/libsoldout.so
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-libsoldout/pkg-plist b/textproc/p5-libsoldout/pkg-plist
index bc540565584e..12050d348e89 100644
--- a/textproc/p5-libsoldout/pkg-plist
+++ b/textproc/p5-libsoldout/pkg-plist
@@ -1,5 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libsoldout/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libsoldout/libsoldout.so
-%%SITE_PERL%%/%%PERL_ARCH%%/libsoldout.pm
+%%SITE_ARCH%%/auto/libsoldout/libsoldout.so
+%%SITE_ARCH%%/libsoldout.pm
 %%PERL5_MAN3%%/libsoldout.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libsoldout
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index bfbf0038f2f9..079e4112a7f2 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/XML
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-libxml/pkg-plist b/textproc/p5-libxml/pkg-plist
index c49f32261f6a..ef484ab17f2e 100644
--- a/textproc/p5-libxml/pkg-plist
+++ b/textproc/p5-libxml/pkg-plist
@@ -30,11 +30,3 @@
 %%SITE_PERL%%/XML/PatAct/ToObjects.pm
 %%SITE_PERL%%/XML/Perl2SAX.pm
 %%SITE_PERL%%/XML/SAX2Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl
-@dirrmtry %%SITE_PERL%%/XML/PatAct
-@dirrmtry %%SITE_PERL%%/XML/Parser
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/Data/Grove
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-pod2pdf/Makefile b/textproc/p5-pod2pdf/Makefile
index f856dab129f8..bcafb85f4f79 100644
--- a/textproc/p5-pod2pdf/Makefile
+++ b/textproc/p5-pod2pdf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pod2pdf
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JONALLEN
diff --git a/textproc/p5-pod2pdf/pkg-plist b/textproc/p5-pod2pdf/pkg-plist
index e7505320cee2..319d55067fc6 100644
--- a/textproc/p5-pod2pdf/pkg-plist
+++ b/textproc/p5-pod2pdf/pkg-plist
@@ -1,6 +1,3 @@
 bin/pod2pdf
 man/man1/pod2pdf.1.gz
 %%SITE_PERL%%/App/pod2pdf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pod2pdf/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/pod2pdf
-@dirrmtry %%SITE_PERL%%/App
diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile
index e38a7e6bb1f1..a66c7500cfae 100644
--- a/textproc/p5-podlators/Makefile
+++ b/textproc/p5-podlators/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	podlators
 PORTVERSION=	2.5.3
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Pod
diff --git a/textproc/p5-podlators/pkg-plist b/textproc/p5-podlators/pkg-plist
index 82c993ffffee..032f31757d1e 100644
--- a/textproc/p5-podlators/pkg-plist
+++ b/textproc/p5-podlators/pkg-plist
@@ -10,7 +10,3 @@
 %%SITE_PERL%%/Pod/Text/Color.pm
 %%SITE_PERL%%/Pod/Text/Overstrike.pm
 %%SITE_PERL%%/Pod/Text/Termcap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrmtry %%SITE_PERL%%/Pod/Text
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index d935d25aa0c5..b25c61b59c90 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xmltv
 PORTVERSION=	0.5.65
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index 959962f36453..02b846510ed0 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -97,7 +97,6 @@ bin/tv_validate_grabber
 %%SITE_PERL%%/XMLTV/ValidateFile.pm
 %%SITE_PERL%%/XMLTV/ValidateGrabber.pm
 %%SITE_PERL%%/XMLTV/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
 man/man1/tv_augment_tz.1.gz
 man/man1/tv_cat.1.gz
 man/man1/tv_check.1.gz
@@ -191,13 +190,6 @@ man/man1/tv_validate_grabber.1.gz
 %%DATADIR%%/xmltv-lineups.xsd
 %%DATADIR%%/xmltv.dtd
 %%CGIDIR%%/tv_pick.cgi
-@dirrm %%SITE_PERL%%/XMLTV/Ask
-@dirrm %%SITE_PERL%%/XMLTV/Configure
-@dirrm %%SITE_PERL%%/XMLTV/Data/Recursive
-@dirrm %%SITE_PERL%%/XMLTV/Data
-@dirrm %%SITE_PERL%%/XMLTV/ProgressBar
-@dirrm %%SITE_PERL%%/XMLTV
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
 @dirrm %%DATADIR%%/tv_grab_eu_epgdata
 @dirrm %%DATADIR%%/tv_grab_huro
 @dirrm %%DATADIR%%/tv_grab_it
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index c5a012396c84..e79f30904a8e 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	po4a
 PORTVERSION=	0.45
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	LOCAL/garga/po4a
 
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index a4bbdb1691aa..1efcf2ff92ff 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	redland-bindings
 PORTVERSION=	1.0.17.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
@@ -25,6 +26,7 @@ OPTIONS_SUB=	yes
 
 PERL_CONFIGURE_WITH=	perl
 PERL_USES=		perl5
+PERL_USE=		PERL5=build,run
 PHP_CONFIGURE_WITH=	php
 PHP_USE=		PHP=yes PHP_BUILD=yes
 PYTHON_CONFIGURE_WITH=	python
@@ -32,12 +34,4 @@ PYTHON_USE=		PYTHON=yes
 RUBY_CONFIGURE_WITH=	ruby
 RUBY_USE=		RUBY=yes
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MPERL}
-	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
-	${SED} -i '' -e 's,^${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/RDF/Redland/CORE/.packlist
-.endif
-
 .include <bsd.port.mk>
diff --git a/textproc/redland-bindings/pkg-plist b/textproc/redland-bindings/pkg-plist
index 714149d276dd..ceeacbcbb608 100644
--- a/textproc/redland-bindings/pkg-plist
+++ b/textproc/redland-bindings/pkg-plist
@@ -15,26 +15,25 @@
 %%PERL%%%%PERL5_MAN3%%/RDF::Redland::URI.3.gz
 %%PERL%%%%PERL5_MAN3%%/RDF::Redland::URINode.3.gz
 %%PERL%%%%PERL5_MAN3%%/RDF::Redland::XMLLiteralNode.3.gz
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/BlankNode.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/CORE.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Iterator.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/LiteralNode.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Model.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Node.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Parser.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Query.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/QueryResults.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/RSS.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Serializer.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Statement.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Storage.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Stream.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/URI.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/URINode.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/XMLLiteralNode.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.so
+%%PERL%%%%SITE_ARCH%%/RDF/Redland.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/BlankNode.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/CORE.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Iterator.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/LiteralNode.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Model.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Node.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Parser.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Query.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/QueryResults.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/RSS.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Serializer.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Statement.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Storage.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Stream.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/URI.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/URINode.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/XMLLiteralNode.pm
+%%PERL%%%%SITE_ARCH%%/auto/RDF/Redland/CORE/CORE.so
 %%PHP%%lib/php/%%PHP_EXT_DIR%%/redland.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/RDF.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/Redland.py
@@ -66,8 +65,3 @@
 %%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
 %%PYTHON%%@dirrmtry %%PYTHON_LIBDIR%%
 %%PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDF
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index 11f4ed7fe070..470fb18c63f4 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xmlparser
 PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.yoshidam.net/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -22,7 +23,7 @@ USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-CONFIGURE_ARGS=	--with-perl-enc-map=${SITE_PERL}/${PERL_ARCH}/XML/Parser/Encodings
+CONFIGURE_ARGS=	--with-perl-enc-map=${SITE_ARCH}/XML/Parser/Encodings
 INSTALL_TARGET=	site-install
 MAKE_ARGS=	INSTALL_PROG="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}"
diff --git a/textproc/sdf/Makefile b/textproc/sdf/Makefile
index 339deb07cf9e..299ad0c00999 100644
--- a/textproc/sdf/Makefile
+++ b/textproc/sdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdf
 PORTVERSION=	2.001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:IANC
diff --git a/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist
index 294d633f8213..6ed038384ccb 100644
--- a/textproc/sdf/pkg-plist
+++ b/textproc/sdf/pkg-plist
@@ -9,7 +9,6 @@ bin/sdfbatch
 bin/sdfcli
 bin/sdfget
 bin/sdngen
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF/.packlist
 %%SITE_PERL%%/Pod/Diff.pm
 %%SITE_PERL%%/Pod/Sdf.pm
 %%SITE_PERL%%/sdf/apiperl.pl
@@ -640,17 +639,3 @@ man/man1/pod2sdf.1.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/genhtml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/sdf/home/stdlib
-@dirrm %%SITE_PERL%%/sdf/home/sdf
-@dirrm %%SITE_PERL%%/sdf/home/perl
-@dirrm %%SITE_PERL%%/sdf/home/look/simple
-@dirrm %%SITE_PERL%%/sdf/home/look/overhead
-@dirrm %%SITE_PERL%%/sdf/home/look/infomap
-@dirrm %%SITE_PERL%%/sdf/home/look/fancy
-@dirrm %%SITE_PERL%%/sdf/home/look
-@dirrm %%SITE_PERL%%/sdf/home/locale
-@dirrm %%SITE_PERL%%/sdf/home/images
-@dirrm %%SITE_PERL%%/sdf/home
-@dirrm %%SITE_PERL%%/sdf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/texi2db/Makefile b/textproc/texi2db/Makefile
index 5655358cbf47..68bb2f92ade1 100644
--- a/textproc/texi2db/Makefile
+++ b/textproc/texi2db/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	texi2db
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tldp.org/downloads/
 
@@ -15,9 +16,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	bin/texi2db \
-		${SITE_PERL_REL}/${PERL_ARCH}/auto/texi2db/.packlist \
-		man/man1/${PORTNAME}.1.gz
-PLIST_DIRS=	${SITE_PERL_REL}/${PERL_ARCH}/auto/texi2db
+PLIST_FILES=	bin/texi2db man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
diff --git a/textproc/txt2html/Makefile b/textproc/txt2html/Makefile
index 298faa93a0bf..c3a6b08ad4a0 100644
--- a/textproc/txt2html/Makefile
+++ b/textproc/txt2html/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	txt2html
 PORTVERSION=	2.51
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/txt2html/pkg-plist b/textproc/txt2html/pkg-plist
index d306dadee7e2..340ea34dc036 100644
--- a/textproc/txt2html/pkg-plist
+++ b/textproc/txt2html/pkg-plist
@@ -2,4 +2,3 @@ bin/txt2html
 %%SITE_PERL%%/HTML/TextToHTML.pm
 %%PERL5_MAN3%%/HTML::TextToHTML.3.gz
 man/man1/txt2html.1.gz
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index c3dc24e952fd..018ef6475a68 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -3,7 +3,9 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p25
+PORTREVISION=	1
 DISTVERSION=	2.03pre25
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION}
@@ -41,7 +43,7 @@ X11_CONFIGURE_ENV_OFF=	with_x=no
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	@if [ ! -f ${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm ]; then \
+	@if [ ! -f ${SITE_ARCH}/Image/Magick.pm ]; then \
 		${ECHO_CMD} ERROR: ImageMagick must be installed with the PERL option enabled; \
 		${FALSE}; \
 	fi
diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index eb2a16187606..fbba83ed69a8 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amphetadesk
 PORTVERSION=	0.93.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-v${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-v${PORTVERSION}
diff --git a/www/amphetadesk/pkg-plist b/www/amphetadesk/pkg-plist
index e236b9a62179..00444e3736fe 100644
--- a/www/amphetadesk/pkg-plist
+++ b/www/amphetadesk/pkg-plist
@@ -39,12 +39,6 @@ bin/AmphetaDesk-real
 %%DATADIR%%/templates/default/popup.html
 %%DATADIR%%/templates/default/tpl_footer.html
 %%DATADIR%%/templates/default/tpl_header.html
-@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS
-@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk
-@dirrm %%SITE_PERL%%/AmphetaDesk/Text/Template
-@dirrm %%SITE_PERL%%/AmphetaDesk/Text
-@dirrm %%SITE_PERL%%/AmphetaDesk/XML
-@dirrm %%SITE_PERL%%/AmphetaDesk
 @dirrm %%DATADIR%%/lists
 @dirrm %%DATADIR%%/templates/default/gui
 @dirrm %%DATADIR%%/templates/default/images
diff --git a/www/cgi-lib.pl/Makefile b/www/cgi-lib.pl/Makefile
index 946aa8d10b6e..ff90c8e5f90b 100644
--- a/www/cgi-lib.pl/Makefile
+++ b/www/cgi-lib.pl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cgi-lib_pl
 PORTVERSION=	2.18
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sada
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index ad378a8c88bb..05f3539efa1b 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	checkbot
 PORTVERSION=	1.80
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Checkbot%20${PORTVERSION}
 
@@ -24,9 +24,6 @@ RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	bin/checkbot \
-		${SITE_PERL:S!${LOCALBASE}/!!}/${PERL_ARCH}/auto/checkbot/.packlist \
-		man/man1/checkbot.1.gz
-PLIST_DIRS=	${SITE_PERL:S!${LOCALBASE}/!!}/${PERL_ARCH}/auto/checkbot
+PLIST_FILES=	bin/checkbot man/man1/checkbot.1.gz
 
 .include <bsd.port.mk>
diff --git a/www/chtml/Makefile b/www/chtml/Makefile
index 880a4cbebb3a..61b18a1b1ad2 100644
--- a/www/chtml/Makefile
+++ b/www/chtml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	chtml
 PORTVERSION=	0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel lang
 MASTER_SITES=	http://people.delphiforums.com/gjc/
 DISTNAME=	chtml
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index e983927a278b..cb181f09e256 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	htmlpp
 PORTVERSION=	4.2a
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://legacy.imatix.com/pub/tools/
 DISTNAME=	htmlp42a
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 27f45fd469ff..d7942031f8f9 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ikiwiki
 PORTVERSION=	3.20140815
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/ \
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index b9291832abf4..d7168df1c527 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -134,7 +134,6 @@ lib/ikiwiki/plugins/rst
 %%SITE_PERL%%/IkiWiki/Setup/Yaml.pm
 %%SITE_PERL%%/IkiWiki/UserInfo.pm
 %%SITE_PERL%%/IkiWiki/Wrapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki/.packlist
 %%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
 man/man1/ikiwiki-calendar.1.gz
 man/man1/ikiwiki-makerepo.1.gz
@@ -892,10 +891,6 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo
 @dirrm %%DATADIR%%
 %%W3M%%@dirrmtry libexec/w3m/cgi-bin
 %%W3M%%@dirrmtry libexec/w3m
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki
-@dirrm %%SITE_PERL%%/IkiWiki/Setup
-@dirrm %%SITE_PERL%%/IkiWiki/Plugin
-@dirrm %%SITE_PERL%%/IkiWiki
 @dirrmtry lib/ikiwiki/plugins
 @dirrmtry lib/ikiwiki
 @dirrmtry %%ETCDIR%%
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index 418e51322fde..a9b23503fb1c 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	interchange
 PORTVERSION=	5.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www perl5
 MASTER_SITES=	http://ftp.icdevgroup.org/interchange/5.6/tar/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 tar:bzip2
-USE_PERL5=	configure fixpacklist
+USE_PERL5=	configure
 
 OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
diff --git a/www/interchange/pkg-plist b/www/interchange/pkg-plist
index 2f2f7c43e58c..e554e135970d 100644
--- a/www/interchange/pkg-plist
+++ b/www/interchange/pkg-plist
@@ -1729,19 +1729,7 @@ interchange/subdomains.cfg
 %%SITE_PERL%%/auto/Vend/Tags/autosplit.ix
 %%SITE_PERL%%/hints.pl
 %%SITE_PERL%%/install_lsb.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange/.packlist
 %%SITE_PERL%%/relocate.pl
-@dirrm %%SITE_PERL%%/Vend/Table
-@dirrm %%SITE_PERL%%/Vend/Ship
-@dirrm %%SITE_PERL%%/Vend/SOAP
-@dirrm %%SITE_PERL%%/Vend/Options
-@dirrm %%SITE_PERL%%/Vend/Payment
-@dirrm %%SITE_PERL%%/Vend/Accounting
-@dirrm %%SITE_PERL%%/Vend
-@dirrm %%SITE_PERL%%/auto/Vend/Tags
-@dirrm %%SITE_PERL%%/auto/Vend/SOAP
-@dirrm %%SITE_PERL%%/auto/Vend
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange
 man/man1/compile_link.1.gz
 man/man1/config_prog.1.gz
 man/man1/configdump.1.gz
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index e3c4fa25629d..1e2ac0bddf63 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	llgal
 PORTVERSION=	0.13.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.gna.org/llgal/
 
@@ -25,7 +25,7 @@ RUN_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
 
 USES=		gettext perl5 gmake tar:bzip2 shebangfix
 SHEBANG_FILES=	llgal.in
-USE_PERL5=	run fixpacklist
+USE_PERL5=	run
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
diff --git a/www/llgal/pkg-plist b/www/llgal/pkg-plist
index 718b6f6bdf05..f20b2de2c518 100644
--- a/www/llgal/pkg-plist
+++ b/www/llgal/pkg-plist
@@ -3,7 +3,6 @@ bin/llgal
 %%SITE_PERL%%/Llgal/Messages.pm
 %%SITE_PERL%%/Llgal/Templates.pm
 %%SITE_PERL%%/Llgal/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Llgal/.packlist
 man/man1/llgal.1.gz
 man/man5/llgalrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/examples/dynamic_comments_in_slides/README
@@ -29,7 +28,5 @@ share/locale/it/LC_MESSAGES/llgal.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/dynamic_comments_in_slides
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Llgal
-@dirrm %%SITE_PERL%%/Llgal
 @dirrmtry %%ETCDIR%%
 @exec mkdir -p %D/%%ETCDIR%%
diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index 816ab010eaca..c2c601399ac0 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mhonarc
 PORTVERSION=	2.6.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www mail
 MASTER_SITES=	http://www.mhonarc.org/release/MHonArc/tar/ \
 		http://www.oac.uci.edu/indiv/ehood/tar/
@@ -16,7 +16,7 @@ USES=		tar:bzip2 perl5
 NO_BUILD=	Yes
 
 INSTALL_ARGS=	-prefix ${STAGEDIR} -binpath ${STAGEDIR}${PREFIX}/bin \
-		-libpath ${STAGEDIR}${SITE_PERL} \
+		-libpath ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} \
 		-manpath ${STAGEDIR}${PREFIX}/man \
 		-batch
 
diff --git a/www/mhonarc/pkg-plist b/www/mhonarc/pkg-plist
index 26587cad4cdf..9423d13151fd 100644
--- a/www/mhonarc/pkg-plist
+++ b/www/mhonarc/pkg-plist
@@ -477,7 +477,3 @@ man/man1/mhonarc.1.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/rcfileexs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/MHonArc/UTF8
-@dirrm %%SITE_PERL%%/MHonArc/CharEnt
-@dirrm %%SITE_PERL%%/MHonArc/Char
-@dirrm %%SITE_PERL%%/MHonArc
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index a6a664486d28..5909a9606e53 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_perl
 PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	APACHE/perl
@@ -102,7 +102,7 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_perl.so
 
-	-for f in `${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name \*.so` ; do \
+	-for f in `${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto -name \*.so` ; do \
 		${CHMOD} u+w $${f}; \
 		${STRIP_CMD} $${f}; \
 		${CHMOD} u-w $${f}; \
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index ac6c7435b08f..e16f806f89f4 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -144,268 +144,199 @@ bin/mp2bug
 %%PERL5_MAN3%%/ModPerl::Util.3.gz
 %%AP24%%%%PERL5_MAN3%%/MyTest::Util.3.gz
 %%PERL5_MAN3%%/mod_perl2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/APR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Base64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Brigade.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Bucket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/BucketAlloc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/BucketType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Finfo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/IpSubnet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/OS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/PerlIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Pool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/SockAddr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Status.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Table.pm
-%%THREADMUTEX%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/ThreadMutex.pm
-%%THREADRWLOCK%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/ThreadRWLock.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/URI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/UUID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/XSLoader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Reload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test5005compat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestBuild.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestClient.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestCommon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestCommonPost.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigPHP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigParrot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigParse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigPerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestHarness.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestHarnessPHP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestMB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestMM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestPerlDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestReport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestReportPerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRequest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRun.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRunPHP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRunParrot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRunPerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestSSLCA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestSmoke.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestSmokePerl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestSort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestTrace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Access.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Build.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/BuildConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/CmdParms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Command.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Connection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ConnectionUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Directive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/FilterRec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/HookRun.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Log.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/MPM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Module.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ParseSource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm
-%%AP22%%%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Provider.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Resource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ServerRec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ServerUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/SizeLimit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/SourceTables.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Status.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/SubProcess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/SubRequest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/URI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/XSLoader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/compat.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/porting.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Apache2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/BuildMM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/BuildOptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/CScan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Code.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/FunctionMap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Global.pm
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/InterpPool.pm
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Interpreter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Manifest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MapUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MethodLookup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/ParseSource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/PerlRun.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/PerlRunPrefork.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Registry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/RegistryBB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/RegistryCooker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/RegistryLoader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/RegistryPrefork.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/StructureMap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestReport.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestRun.pm
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TiPool.pm
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TiPoolConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TypeMap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/WrapXS.pm
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/MyTest/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/APR.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64/Base64.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade/Brigade.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Bucket/Bucket.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketAlloc/BucketAlloc.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketType/BucketType.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Const/Const.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Date/Date.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Error/Error.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Finfo/Finfo.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/IpSubnet/IpSubnet.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/OS/OS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/PerlIO/PerlIO.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Pool/Pool.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr/SockAddr.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket/Socket.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status/Status.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table/Table.so
-%%THREADMUTEX%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.so
-%%THREADRWLOCK%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock/ThreadRWLock.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI/URI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID/UUID.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Util/Util.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Access/Access.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Build/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/CmdParms/CmdParms.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Command/Command.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Connection/Connection.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ConnectionUtil/ConnectionUtil.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Const/Const.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Directive/Directive.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Filter/Filter.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/FilterRec/FilterRec.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/HookRun/HookRun.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Log/Log.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM/MPM.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module/Module.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process/Process.so
-%%AP22%%%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Provider/Provider.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO/RequestIO.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec/RequestRec.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil/RequestUtil.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Response/Response.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerRec/ServerRec.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerUtil/ServerUtil.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubProcess/SubProcess.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubRequest/SubRequest.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/URI/URI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Util/Util.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const/Const.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global/Global.so
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPool/TiPool.so
-%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util/Util.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl2.pm
+%%SITE_ARCH%%/APR.pm
+%%SITE_ARCH%%/APR/Base64.pm
+%%SITE_ARCH%%/APR/Brigade.pm
+%%SITE_ARCH%%/APR/Bucket.pm
+%%SITE_ARCH%%/APR/BucketAlloc.pm
+%%SITE_ARCH%%/APR/BucketType.pm
+%%SITE_ARCH%%/APR/Const.pm
+%%SITE_ARCH%%/APR/Date.pm
+%%SITE_ARCH%%/APR/Error.pm
+%%SITE_ARCH%%/APR/Finfo.pm
+%%SITE_ARCH%%/APR/IpSubnet.pm
+%%SITE_ARCH%%/APR/OS.pm
+%%SITE_ARCH%%/APR/PerlIO.pm
+%%SITE_ARCH%%/APR/Pool.pm
+%%SITE_ARCH%%/APR/SockAddr.pm
+%%SITE_ARCH%%/APR/Socket.pm
+%%SITE_ARCH%%/APR/Status.pm
+%%SITE_ARCH%%/APR/String.pm
+%%SITE_ARCH%%/APR/Table.pm
+%%THREADMUTEX%%%%SITE_ARCH%%/APR/ThreadMutex.pm
+%%THREADRWLOCK%%%%SITE_ARCH%%/APR/ThreadRWLock.pm
+%%SITE_ARCH%%/APR/URI.pm
+%%SITE_ARCH%%/APR/UUID.pm
+%%SITE_ARCH%%/APR/Util.pm
+%%SITE_ARCH%%/APR/XSLoader.pm
+%%SITE_ARCH%%/Apache/Reload.pm
+%%SITE_ARCH%%/Apache/SizeLimit.pm
+%%SITE_ARCH%%/Apache/SizeLimit/Core.pm
+%%SITE_ARCH%%/Apache/Test.pm
+%%SITE_ARCH%%/Apache/Test5005compat.pm
+%%SITE_ARCH%%/Apache/TestBuild.pm
+%%SITE_ARCH%%/Apache/TestClient.pm
+%%SITE_ARCH%%/Apache/TestCommon.pm
+%%SITE_ARCH%%/Apache/TestCommonPost.pm
+%%SITE_ARCH%%/Apache/TestConfig.pm
+%%SITE_ARCH%%/Apache/TestConfigC.pm
+%%SITE_ARCH%%/Apache/TestConfigPHP.pm
+%%SITE_ARCH%%/Apache/TestConfigParrot.pm
+%%SITE_ARCH%%/Apache/TestConfigParse.pm
+%%SITE_ARCH%%/Apache/TestConfigPerl.pm
+%%SITE_ARCH%%/Apache/TestHandler.pm
+%%SITE_ARCH%%/Apache/TestHarness.pm
+%%SITE_ARCH%%/Apache/TestHarnessPHP.pm
+%%SITE_ARCH%%/Apache/TestMB.pm
+%%SITE_ARCH%%/Apache/TestMM.pm
+%%SITE_ARCH%%/Apache/TestPerlDB.pm
+%%SITE_ARCH%%/Apache/TestReport.pm
+%%SITE_ARCH%%/Apache/TestReportPerl.pm
+%%SITE_ARCH%%/Apache/TestRequest.pm
+%%SITE_ARCH%%/Apache/TestRun.pm
+%%SITE_ARCH%%/Apache/TestRunPHP.pm
+%%SITE_ARCH%%/Apache/TestRunParrot.pm
+%%SITE_ARCH%%/Apache/TestRunPerl.pm
+%%SITE_ARCH%%/Apache/TestSSLCA.pm
+%%SITE_ARCH%%/Apache/TestServer.pm
+%%SITE_ARCH%%/Apache/TestSmoke.pm
+%%SITE_ARCH%%/Apache/TestSmokePerl.pm
+%%SITE_ARCH%%/Apache/TestSort.pm
+%%SITE_ARCH%%/Apache/TestTrace.pm
+%%SITE_ARCH%%/Apache/TestUtil.pm
+%%SITE_ARCH%%/Apache2/Access.pm
+%%SITE_ARCH%%/Apache2/Build.pm
+%%SITE_ARCH%%/Apache2/BuildConfig.pm
+%%SITE_ARCH%%/Apache2/CmdParms.pm
+%%SITE_ARCH%%/Apache2/Command.pm
+%%SITE_ARCH%%/Apache2/Connection.pm
+%%SITE_ARCH%%/Apache2/ConnectionUtil.pm
+%%SITE_ARCH%%/Apache2/Const.pm
+%%SITE_ARCH%%/Apache2/Directive.pm
+%%SITE_ARCH%%/Apache2/Filter.pm
+%%SITE_ARCH%%/Apache2/FilterRec.pm
+%%SITE_ARCH%%/Apache2/HookRun.pm
+%%SITE_ARCH%%/Apache2/Log.pm
+%%SITE_ARCH%%/Apache2/MPM.pm
+%%SITE_ARCH%%/Apache2/Module.pm
+%%SITE_ARCH%%/Apache2/ParseSource.pm
+%%SITE_ARCH%%/Apache2/PerlSections.pm
+%%SITE_ARCH%%/Apache2/PerlSections/Dump.pm
+%%SITE_ARCH%%/Apache2/Process.pm
+%%AP22%%%%AP24%%%%SITE_ARCH%%/Apache2/Provider.pm
+%%SITE_ARCH%%/Apache2/Reload.pm
+%%SITE_ARCH%%/Apache2/RequestIO.pm
+%%SITE_ARCH%%/Apache2/RequestRec.pm
+%%SITE_ARCH%%/Apache2/RequestUtil.pm
+%%SITE_ARCH%%/Apache2/Resource.pm
+%%SITE_ARCH%%/Apache2/Response.pm
+%%SITE_ARCH%%/Apache2/ServerRec.pm
+%%SITE_ARCH%%/Apache2/ServerUtil.pm
+%%SITE_ARCH%%/Apache2/SizeLimit.pm
+%%SITE_ARCH%%/Apache2/SourceTables.pm
+%%SITE_ARCH%%/Apache2/Status.pm
+%%SITE_ARCH%%/Apache2/SubProcess.pm
+%%SITE_ARCH%%/Apache2/SubRequest.pm
+%%SITE_ARCH%%/Apache2/URI.pm
+%%SITE_ARCH%%/Apache2/Util.pm
+%%SITE_ARCH%%/Apache2/XSLoader.pm
+%%SITE_ARCH%%/Apache2/compat.pm
+%%SITE_ARCH%%/Apache2/porting.pm
+%%SITE_ARCH%%/Bundle/Apache2.pm
+%%SITE_ARCH%%/Bundle/ApacheTest.pm
+%%SITE_ARCH%%/ModPerl/BuildMM.pm
+%%SITE_ARCH%%/ModPerl/BuildOptions.pm
+%%SITE_ARCH%%/ModPerl/CScan.pm
+%%SITE_ARCH%%/ModPerl/Code.pm
+%%SITE_ARCH%%/ModPerl/Config.pm
+%%SITE_ARCH%%/ModPerl/Const.pm
+%%SITE_ARCH%%/ModPerl/FunctionMap.pm
+%%SITE_ARCH%%/ModPerl/Global.pm
+%%AP24%%%%SITE_ARCH%%/ModPerl/InterpPool.pm
+%%AP24%%%%SITE_ARCH%%/ModPerl/Interpreter.pm
+%%SITE_ARCH%%/ModPerl/MM.pm
+%%SITE_ARCH%%/ModPerl/Manifest.pm
+%%SITE_ARCH%%/ModPerl/MapUtil.pm
+%%SITE_ARCH%%/ModPerl/MethodLookup.pm
+%%SITE_ARCH%%/ModPerl/ParseSource.pm
+%%SITE_ARCH%%/ModPerl/PerlRun.pm
+%%SITE_ARCH%%/ModPerl/PerlRunPrefork.pm
+%%SITE_ARCH%%/ModPerl/Registry.pm
+%%SITE_ARCH%%/ModPerl/RegistryBB.pm
+%%SITE_ARCH%%/ModPerl/RegistryCooker.pm
+%%SITE_ARCH%%/ModPerl/RegistryLoader.pm
+%%SITE_ARCH%%/ModPerl/RegistryPrefork.pm
+%%SITE_ARCH%%/ModPerl/StructureMap.pm
+%%SITE_ARCH%%/ModPerl/TestReport.pm
+%%SITE_ARCH%%/ModPerl/TestRun.pm
+%%AP24%%%%SITE_ARCH%%/ModPerl/TiPool.pm
+%%AP24%%%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm
+%%SITE_ARCH%%/ModPerl/TypeMap.pm
+%%SITE_ARCH%%/ModPerl/Util.pm
+%%SITE_ARCH%%/ModPerl/WrapXS.pm
+%%AP24%%%%SITE_ARCH%%/MyTest/Util.pm
+%%SITE_ARCH%%/auto/APR/APR.so
+%%SITE_ARCH%%/auto/APR/Base64/Base64.so
+%%SITE_ARCH%%/auto/APR/Brigade/Brigade.so
+%%SITE_ARCH%%/auto/APR/Bucket/Bucket.so
+%%SITE_ARCH%%/auto/APR/BucketAlloc/BucketAlloc.so
+%%SITE_ARCH%%/auto/APR/BucketType/BucketType.so
+%%SITE_ARCH%%/auto/APR/Const/Const.so
+%%SITE_ARCH%%/auto/APR/Date/Date.so
+%%SITE_ARCH%%/auto/APR/Error/Error.so
+%%SITE_ARCH%%/auto/APR/Finfo/Finfo.so
+%%SITE_ARCH%%/auto/APR/IpSubnet/IpSubnet.so
+%%SITE_ARCH%%/auto/APR/OS/OS.so
+%%SITE_ARCH%%/auto/APR/PerlIO/PerlIO.so
+%%SITE_ARCH%%/auto/APR/Pool/Pool.so
+%%SITE_ARCH%%/auto/APR/SockAddr/SockAddr.so
+%%SITE_ARCH%%/auto/APR/Socket/Socket.so
+%%SITE_ARCH%%/auto/APR/Status/Status.so
+%%SITE_ARCH%%/auto/APR/String/String.so
+%%SITE_ARCH%%/auto/APR/Table/Table.so
+%%THREADMUTEX%%%%SITE_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.so
+%%THREADRWLOCK%%%%SITE_ARCH%%/auto/APR/ThreadRWLock/ThreadRWLock.so
+%%SITE_ARCH%%/auto/APR/URI/URI.so
+%%SITE_ARCH%%/auto/APR/UUID/UUID.so
+%%SITE_ARCH%%/auto/APR/Util/Util.so
+%%SITE_ARCH%%/auto/Apache2/Access/Access.so
+%%SITE_ARCH%%/auto/Apache2/Build/autosplit.ix
+%%SITE_ARCH%%/auto/Apache2/CmdParms/CmdParms.so
+%%SITE_ARCH%%/auto/Apache2/Command/Command.so
+%%SITE_ARCH%%/auto/Apache2/Connection/Connection.so
+%%SITE_ARCH%%/auto/Apache2/ConnectionUtil/ConnectionUtil.so
+%%SITE_ARCH%%/auto/Apache2/Const/Const.so
+%%SITE_ARCH%%/auto/Apache2/Directive/Directive.so
+%%SITE_ARCH%%/auto/Apache2/Filter/Filter.so
+%%SITE_ARCH%%/auto/Apache2/FilterRec/FilterRec.so
+%%SITE_ARCH%%/auto/Apache2/HookRun/HookRun.so
+%%SITE_ARCH%%/auto/Apache2/Log/Log.so
+%%SITE_ARCH%%/auto/Apache2/MPM/MPM.so
+%%SITE_ARCH%%/auto/Apache2/Module/Module.so
+%%SITE_ARCH%%/auto/Apache2/Process/Process.so
+%%AP22%%%%AP24%%%%SITE_ARCH%%/auto/Apache2/Provider/Provider.so
+%%SITE_ARCH%%/auto/Apache2/RequestIO/RequestIO.so
+%%SITE_ARCH%%/auto/Apache2/RequestRec/RequestRec.so
+%%SITE_ARCH%%/auto/Apache2/RequestUtil/RequestUtil.so
+%%SITE_ARCH%%/auto/Apache2/Response/Response.so
+%%SITE_ARCH%%/auto/Apache2/ServerRec/ServerRec.so
+%%SITE_ARCH%%/auto/Apache2/ServerUtil/ServerUtil.so
+%%SITE_ARCH%%/auto/Apache2/SubProcess/SubProcess.so
+%%SITE_ARCH%%/auto/Apache2/SubRequest/SubRequest.so
+%%SITE_ARCH%%/auto/Apache2/URI/URI.so
+%%SITE_ARCH%%/auto/Apache2/Util/Util.so
+%%SITE_ARCH%%/auto/Apache2/typemap
+%%SITE_ARCH%%/auto/ModPerl/Const/Const.so
+%%SITE_ARCH%%/auto/ModPerl/Global/Global.so
+%%AP24%%%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
+%%AP24%%%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
+%%AP24%%%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so
+%%AP24%%%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
+%%SITE_ARCH%%/auto/ModPerl/Util/Util.so
+%%SITE_ARCH%%/mod_perl2.pm
 @unexec sed -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 @unexec echo "Don't forget to remove all mod_perl2-related directives in your httpd.conf"
 %%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F
 @dirrm %%APACHEINCLUDEDIR%%/modules/perl
 @dirrmtry %%APACHEINCLUDEDIR%%/modules
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
-%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/MyTest
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Bucket
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketAlloc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketType
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Const
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Date
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Error
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Finfo
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/IpSubnet
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/OS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/PerlIO
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Pool
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table
-%%THREADMUTEX%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex
-%%THREADRWLOCK%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Util
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Access
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Build
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/CmdParms
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Command
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Connection
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ConnectionUtil
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Const
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Directive
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Filter
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/FilterRec
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/HookRun
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Log
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process
-%%AP22%%%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Provider
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Response
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerRec
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerUtil
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubProcess
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubRequest
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/URI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Util
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global
-%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/InterpPool
-%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Interpreter
-%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPool
-%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPoolConfig
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index e7a90d7087f8..f5e50dbb9d56 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.7.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -985,11 +986,11 @@ do-install:
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
-	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
@@ -1000,9 +1001,9 @@ do-install:
 
 post-install:
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
-	${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx/nginx.so >> ${TMPPLIST}
-	${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/nginx.pm >> ${TMPPLIST}
-	${ECHO_CMD} @dirrm ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx >> ${TMPPLIST}
+	${ECHO_CMD} ${SITE_ARCH_REL}/auto/nginx/nginx.so >> ${TMPPLIST}
+	${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST}
+	${ECHO_CMD} @dirrm ${SITE_ARCH_REL}/auto/nginx >> ${TMPPLIST}
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 799dc21188f0..a01731e6ffe9 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -1002,11 +1003,11 @@ do-install:
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
-	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
@@ -1017,9 +1018,9 @@ do-install:
 
 post-install:
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
-	${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx/nginx.so >> ${TMPPLIST}
-	${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/nginx.pm >> ${TMPPLIST}
-	${ECHO_CMD} @dirrm ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx >> ${TMPPLIST}
+	${ECHO_CMD} ${SITE_ARCH_REL}/auto/nginx/nginx.so >> ${TMPPLIST}
+	${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST}
+	${ECHO_CMD} @dirrm ${SITE_ARCH_REL}/auto/nginx >> ${TMPPLIST}
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
diff --git a/www/p5-AMF-Perl/Makefile b/www/p5-AMF-Perl/Makefile
index cceafe2d4ccd..634c02f86713 100644
--- a/www/p5-AMF-Perl/Makefile
+++ b/www/p5-AMF-Perl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	AMF-Perl
 PORTVERSION=	0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SIMONF
diff --git a/www/p5-AMF-Perl/pkg-plist b/www/p5-AMF-Perl/pkg-plist
index bf86df2f518d..a575584f3c63 100644
--- a/www/p5-AMF-Perl/pkg-plist
+++ b/www/p5-AMF-Perl/pkg-plist
@@ -16,12 +16,3 @@
 %%SITE_PERL%%/AMF/Perl/Sql/MysqlRecordSet.pm
 %%SITE_PERL%%/AMF/Perl/Util/Object.pm
 %%SITE_PERL%%/AMF/Perl/Util/RemotingService.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF
-@dirrmtry %%SITE_PERL%%/AMF/Perl/Util
-@dirrmtry %%SITE_PERL%%/AMF/Perl/Sql
-@dirrmtry %%SITE_PERL%%/AMF/Perl/IO
-@dirrmtry %%SITE_PERL%%/AMF/Perl/App
-@dirrmtry %%SITE_PERL%%/AMF/Perl
-@dirrmtry %%SITE_PERL%%/AMF
diff --git a/www/p5-Acme-Monta/Makefile b/www/p5-Acme-Monta/Makefile
index 0213309831e1..69810f331ef8 100644
--- a/www/p5-Acme-Monta/Makefile
+++ b/www/p5-Acme-Monta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Acme-Monta
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Acme-Monta/pkg-plist b/www/p5-Acme-Monta/pkg-plist
index eeb9e3353262..3518b8b12ee4 100644
--- a/www/p5-Acme-Monta/pkg-plist
+++ b/www/p5-Acme-Monta/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Acme/Monta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Monta/.packlist
 %%PERL5_MAN3%%/Acme::Monta.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Monta
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme
-@dirrmtry %%SITE_PERL%%/Acme
diff --git a/www/p5-Amon2-Lite/Makefile b/www/p5-Amon2-Lite/Makefile
index 3357600f702b..fd01d0f52807 100644
--- a/www/p5-Amon2-Lite/Makefile
+++ b/www/p5-Amon2-Lite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Amon2-Lite
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Amon2-Lite/pkg-plist b/www/p5-Amon2-Lite/pkg-plist
index f1b86ea57706..db58e84f4020 100644
--- a/www/p5-Amon2-Lite/pkg-plist
+++ b/www/p5-Amon2-Lite/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Amon2::Setup::Flavor::Lite.3.gz
 %%SITE_PERL%%/Amon2/Lite.pm
 %%SITE_PERL%%/Amon2/Setup/Flavor/Lite.pm
-@dirrmtry %%SITE_PERL%%/Amon2/Setup/Flavor
diff --git a/www/p5-Amon2-Plugin-LogDispatch/Makefile b/www/p5-Amon2-Plugin-LogDispatch/Makefile
index f81fc5a5c4fb..60e7f25bb396 100644
--- a/www/p5-Amon2-Plugin-LogDispatch/Makefile
+++ b/www/p5-Amon2-Plugin-LogDispatch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Amon2-Plugin-LogDispatch
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Amon2-Plugin-LogDispatch/pkg-plist b/www/p5-Amon2-Plugin-LogDispatch/pkg-plist
index b805f4a7a08f..8cae2b7f6446 100644
--- a/www/p5-Amon2-Plugin-LogDispatch/pkg-plist
+++ b/www/p5-Amon2-Plugin-LogDispatch/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2/Plugin/LogDispatch/.packlist
 %%SITE_PERL%%/Amon2/Plugin/LogDispatch.pm
 %%SITE_PERL%%/Amon2/Plugin/README.pod
 %%PERL5_MAN3%%/Amon2::Plugin::LogDispatch.3.gz
 %%PERL5_MAN3%%/Amon2::Plugin::README.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2/Plugin/LogDispatch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2
diff --git a/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile b/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
index b1806b3c7b3b..b00420c1825d 100644
--- a/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
+++ b/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Amon2-Plugin-Web-CSRFDefender
 PORTVERSION=	7.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Amon2-Plugin-Web-CSRFDefender/pkg-plist b/www/p5-Amon2-Plugin-Web-CSRFDefender/pkg-plist
index ab41286b0942..4bcf50466562 100644
--- a/www/p5-Amon2-Plugin-Web-CSRFDefender/pkg-plist
+++ b/www/p5-Amon2-Plugin-Web-CSRFDefender/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Amon2::Plugin::Web::CSRFDefender::Random.3.gz
 %%SITE_PERL%%/Amon2/Plugin/Web/CSRFDefender.pm
 %%SITE_PERL%%/Amon2/Plugin/Web/CSRFDefender/Random.pm
-%%SITE_ARCH%%/auto/Amon2/Plugin/Web/CSRFDefender/.packlist
diff --git a/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile b/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
index 1986063135cc..b3c260162fb3 100644
--- a/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
+++ b/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Amon2-Plugin-Web-MobileAgent
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Amon2/Makefile b/www/p5-Amon2/Makefile
index a228449a8b40..d2d41a22117b 100644
--- a/www/p5-Amon2/Makefile
+++ b/www/p5-Amon2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Amon2
 PORTVERSION=	6.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Any-Template/Makefile b/www/p5-Any-Template/Makefile
index 05d2e6fae6c8..a0f71b7a2b96 100644
--- a/www/p5-Any-Template/Makefile
+++ b/www/p5-Any-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Any-Template
 PORTVERSION=	1.015
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Any-Template/pkg-plist b/www/p5-Any-Template/pkg-plist
index 3c3cc3e493b8..55a3beb691c2 100644
--- a/www/p5-Any-Template/pkg-plist
+++ b/www/p5-Any-Template/pkg-plist
@@ -4,17 +4,9 @@
 %%SITE_PERL%%/Any/Template/Backend/TemplateToolkit.pm
 %%SITE_PERL%%/Any/Template/Backend.pm
 %%SITE_PERL%%/Any/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Any/Template/.packlist
 %%PERL5_MAN3%%/Any::Template.3.gz
 %%PERL5_MAN3%%/Any::Template::Backend.3.gz
 %%PERL5_MAN3%%/Any::Template::Backend::HTML::Template.3.gz
 %%PERL5_MAN3%%/Any::Template::Backend::TemplateToolkit.3.gz
 %%PERL5_MAN3%%/Any::Template::Backend::Text::MicroMason.3.gz
 %%PERL5_MAN3%%/Any::Template::Backend::Text::Template.3.gz
-@dirrmtry %%SITE_PERL%%/Any/Template/Backend/HTML
-@dirrmtry %%SITE_PERL%%/Any/Template/Backend/Text
-@dirrmtry %%SITE_PERL%%/Any/Template/Backend
-@dirrmtry %%SITE_PERL%%/Any/Template
-@dirrmtry %%SITE_PERL%%/Any
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Any/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Any
diff --git a/www/p5-Any-URI-Escape/Makefile b/www/p5-Any-URI-Escape/Makefile
index 63a0f517c7e3..2c77ac4ffc08 100644
--- a/www/p5-Any-URI-Escape/Makefile
+++ b/www/p5-Any-URI-Escape/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Any-URI-Escape
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Any-URI-Escape/pkg-plist b/www/p5-Any-URI-Escape/pkg-plist
index da144e27db36..429d911858f6 100644
--- a/www/p5-Any-URI-Escape/pkg-plist
+++ b/www/p5-Any-URI-Escape/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Any/URI/Escape.pm
-%%SITE_PERL%%/mach/auto/Any/URI/Escape/.packlist
 %%PERL5_MAN3%%/Any::URI::Escape.3.gz
-@dirrm %%SITE_PERL%%/mach/auto/Any/URI/Escape
-@dirrmtry %%SITE_PERL%%/mach/auto/Any/URI
-@dirrmtry %%SITE_PERL%%/mach/auto/Any
-@dirrmtry %%SITE_PERL%%/Any/URI
-@dirrmtry %%SITE_PERL%%/Any
diff --git a/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile b/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
index 3ca5ed7db585..3e0dd8af00c1 100644
--- a/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
+++ b/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-HTTP-LWP-UserAgent
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-AnyEvent-HTTP-LWP-UserAgent/pkg-plist b/www/p5-AnyEvent-HTTP-LWP-UserAgent/pkg-plist
index ddd7c3ca8ad0..5953446bb7c8 100644
--- a/www/p5-AnyEvent-HTTP-LWP-UserAgent/pkg-plist
+++ b/www/p5-AnyEvent-HTTP-LWP-UserAgent/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/HTTP/LWP/UserAgent/.packlist
 %%SITE_PERL%%/AnyEvent/HTTP/LWP/UserAgent.pm
 %%PERL5_MAN3%%/AnyEvent::HTTP::LWP::UserAgent.3.gz
-@dirrmtry %%SITE_PERL%%/AnyEvent/HTTP/LWP
-@dirrmtry %%SITE_PERL%%/AnyEvent/HTTP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/HTTP/LWP/UserAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/HTTP/LWP
diff --git a/www/p5-AnyEvent-HTTP/Makefile b/www/p5-AnyEvent-HTTP/Makefile
index 80fba6ae3ff1..3a9507c3ad4b 100644
--- a/www/p5-AnyEvent-HTTP/Makefile
+++ b/www/p5-AnyEvent-HTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-HTTP
 PORTVERSION=	2.15
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-AnyEvent-HTTP/pkg-plist b/www/p5-AnyEvent-HTTP/pkg-plist
index 3e4f0ecfc277..857ce365148e 100644
--- a/www/p5-AnyEvent-HTTP/pkg-plist
+++ b/www/p5-AnyEvent-HTTP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/AnyEvent/HTTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/HTTP/.packlist
 %%PERL5_MAN3%%/AnyEvent::HTTP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/www/p5-AnyEvent-HTTPD/Makefile b/www/p5-AnyEvent-HTTPD/Makefile
index 4460d9fcc7e5..07d927ec11c2 100644
--- a/www/p5-AnyEvent-HTTPD/Makefile
+++ b/www/p5-AnyEvent-HTTPD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-HTTPD
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ELMEX
diff --git a/www/p5-AnyEvent-HTTPD/pkg-plist b/www/p5-AnyEvent-HTTPD/pkg-plist
index 423bdd80c4c7..93b7b9d92f94 100644
--- a/www/p5-AnyEvent-HTTPD/pkg-plist
+++ b/www/p5-AnyEvent-HTTPD/pkg-plist
@@ -3,12 +3,8 @@
 %%SITE_PERL%%/AnyEvent/HTTPD/Request.pm
 %%SITE_PERL%%/AnyEvent/HTTPD/Util.pm
 %%SITE_PERL%%/AnyEvent/HTTPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/HTTPD/.packlist
 %%PERL5_MAN3%%/AnyEvent::HTTPD.3.gz
 %%PERL5_MAN3%%/AnyEvent::HTTPD::Request.3.gz
 %%PERL5_MAN3%%/AnyEvent::HTTPD::Util.3.gz
 %%PERL5_MAN3%%/AnyEvent::HTTPD::HTTPServer.3.gz
 %%PERL5_MAN3%%/AnyEvent::HTTPD::HTTPConnection.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/HTTPD
-@dirrmtry %%SITE_PERL%%/AnyEvent/HTTPD
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/www/p5-AnyEvent-Mojo/Makefile b/www/p5-AnyEvent-Mojo/Makefile
index dc54bf19448b..bdd905ea4faf 100644
--- a/www/p5-AnyEvent-Mojo/Makefile
+++ b/www/p5-AnyEvent-Mojo/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	AnyEvent-Mojo
 PORTVERSION=	0.8003
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-AnyEvent-Mojo/pkg-plist b/www/p5-AnyEvent-Mojo/pkg-plist
index c653e8bddc83..32c3d94b11d8 100644
--- a/www/p5-AnyEvent-Mojo/pkg-plist
+++ b/www/p5-AnyEvent-Mojo/pkg-plist
@@ -1,11 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Mojo/.packlist
 %%SITE_PERL%%/AnyEvent/Mojo.pm
 %%SITE_PERL%%/AnyEvent/Mojo/Server.pm
 %%SITE_PERL%%/AnyEvent/Mojo/Server/Connection.pm
 %%PERL5_MAN3%%/AnyEvent::Mojo.3.gz
 %%PERL5_MAN3%%/AnyEvent::Mojo::Server.3.gz
 %%PERL5_MAN3%%/AnyEvent::Mojo::Server::Connection.3.gz
-@dirrmtry %%SITE_PERL%%/AnyEvent/Mojo/Server
-@dirrmtry %%SITE_PERL%%/AnyEvent/Mojo
-@dirrmtry %%SITE_PERL%%/AnyEvent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/Mojo
diff --git a/www/p5-AnyEvent-ReverseHTTP/Makefile b/www/p5-AnyEvent-ReverseHTTP/Makefile
index ab4a55dd4cdb..4ce739d0c080 100644
--- a/www/p5-AnyEvent-ReverseHTTP/Makefile
+++ b/www/p5-AnyEvent-ReverseHTTP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-ReverseHTTP
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-AnyEvent-ReverseHTTP/pkg-plist b/www/p5-AnyEvent-ReverseHTTP/pkg-plist
index 6ba2496d8351..03426d23ec81 100644
--- a/www/p5-AnyEvent-ReverseHTTP/pkg-plist
+++ b/www/p5-AnyEvent-ReverseHTTP/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/ReverseHTTP/.packlist
 %%SITE_PERL%%/AnyEvent/ReverseHTTP.pm
 %%PERL5_MAN3%%/AnyEvent::ReverseHTTP.3.gz
-@dirrmtry %%SITE_PERL%%/AnyEvent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/ReverseHTTP
diff --git a/www/p5-AnyEvent-SCGI/Makefile b/www/p5-AnyEvent-SCGI/Makefile
index 14f4fdfc2750..d5c7b4753ecf 100644
--- a/www/p5-AnyEvent-SCGI/Makefile
+++ b/www/p5-AnyEvent-SCGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	AnyEvent-SCGI
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-AnyEvent-SCGI/pkg-plist b/www/p5-AnyEvent-SCGI/pkg-plist
index 3282ef35e16c..de854ffdf2ea 100644
--- a/www/p5-AnyEvent-SCGI/pkg-plist
+++ b/www/p5-AnyEvent-SCGI/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/SCGI/.packlist
 %%SITE_PERL%%/AnyEvent/SCGI.pm
 %%PERL5_MAN3%%/AnyEvent::SCGI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/SCGI
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 2347fa06b664..b8cbf8e702c4 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-ASP
 PORTVERSION=	2.62
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-ASP/pkg-plist b/www/p5-Apache-ASP/pkg-plist
index bd362755eed2..8671131d6a59 100644
--- a/www/p5-Apache-ASP/pkg-plist
+++ b/www/p5-Apache-ASP/pkg-plist
@@ -29,16 +29,4 @@ bin/asp-perl
 %%SITE_PERL%%/Apache/ASP/StateManager.pm
 %%SITE_PERL%%/Bundle/Apache/ASP.pm
 %%SITE_PERL%%/Bundle/Apache/ASP/Extra.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ASP/.packlist
 man/man1/asp-perl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ASP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Bundle/Apache/ASP
-@dirrmtry %%SITE_PERL%%/Bundle/Apache
-@dirrmtry %%SITE_PERL%%/Bundle
-@dirrmtry %%SITE_PERL%%/Apache/ASP/Share/CORE
-@dirrmtry %%SITE_PERL%%/Apache/ASP/Share
-@dirrmtry %%SITE_PERL%%/Apache/ASP/Lang
-@dirrmtry %%SITE_PERL%%/Apache/ASP/CGI
-@dirrmtry %%SITE_PERL%%/Apache/ASP
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Admin-Config/Makefile b/www/p5-Apache-Admin-Config/Makefile
index a6535bf61895..57d702a56413 100644
--- a/www/p5-Apache-Admin-Config/Makefile
+++ b/www/p5-Apache-Admin-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Admin-Config
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Admin-Config/pkg-plist b/www/p5-Apache-Admin-Config/pkg-plist
index e59e29010b3d..79a84d782670 100644
--- a/www/p5-Apache-Admin-Config/pkg-plist
+++ b/www/p5-Apache-Admin-Config/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Apache::Admin::Config.3.gz
 %%SITE_PERL%%/Apache/Admin/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/Admin
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index fd18fc1eb33c..da31483664e7 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-AuthCookie
 PORTVERSION=	3.22
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-AuthCookie/pkg-plist b/www/p5-Apache-AuthCookie/pkg-plist
index e126d6a9aec8..dd817d1d613c 100644
--- a/www/p5-Apache-AuthCookie/pkg-plist
+++ b/www/p5-Apache-AuthCookie/pkg-plist
@@ -14,11 +14,3 @@
 %%SITE_PERL%%/Apache/AuthCookie/Util.pm
 %%SITE_PERL%%/Apache2/AuthCookie.pm
 %%SITE_PERL%%/Apache2/AuthCookie/Params.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache2/AuthCookie
-@dirrmtry %%SITE_PERL%%/Apache2
-@dirrmtry %%SITE_PERL%%/Apache/AuthCookie/Params
-@dirrmtry %%SITE_PERL%%/Apache/AuthCookie
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index dc1e9b89b43a..1db53be89648 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-AuthTicket
 PORTVERSION=	0.93
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-AuthTicket/pkg-plist b/www/p5-Apache-AuthTicket/pkg-plist
index 6d3c5eaa8c3a..aeb02f847d40 100644
--- a/www/p5-Apache-AuthTicket/pkg-plist
+++ b/www/p5-Apache-AuthTicket/pkg-plist
@@ -1,12 +1,6 @@
 %%SITE_PERL%%/Apache/AuthTicket.pm
 %%SITE_PERL%%/Apache/AuthTicket/Base.pm
 %%SITE_PERL%%/Apache2/AuthTicket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket/.packlist
 %%PERL5_MAN3%%/Apache::AuthTicket.3.gz
 %%PERL5_MAN3%%/Apache::AuthTicket::Base.3.gz
 %%PERL5_MAN3%%/Apache2::AuthTicket.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/AuthTicket
-@dirrmtry %%SITE_PERL%%/Apache2
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index efb4b624c037..157c19039d52 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-Clean
 PORTVERSION=	2.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Apache/GEOFF
diff --git a/www/p5-Apache-Clean2/pkg-plist b/www/p5-Apache-Clean2/pkg-plist
index 084ec8490e15..b3e68f90fb22 100644
--- a/www/p5-Apache-Clean2/pkg-plist
+++ b/www/p5-Apache-Clean2/pkg-plist
@@ -1,8 +1,4 @@
 %%PERL5_MAN3%%/Apache::Clean.3.gz
 %%SITE_PERL%%/Apache/Clean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-ConfigFile/Makefile b/www/p5-Apache-ConfigFile/Makefile
index 5448976ce089..03bdcd59dfc2 100644
--- a/www/p5-Apache-ConfigFile/Makefile
+++ b/www/p5-Apache-ConfigFile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-ConfigFile
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NWIGER
diff --git a/www/p5-Apache-ConfigFile/pkg-plist b/www/p5-Apache-ConfigFile/pkg-plist
index a8fa3089ceb8..ef48f2a37d40 100644
--- a/www/p5-Apache-ConfigFile/pkg-plist
+++ b/www/p5-Apache-ConfigFile/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Apache::ConfigFile.3.gz
 %%SITE_PERL%%/Apache/ConfigFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-ConfigParser/Makefile b/www/p5-Apache-ConfigParser/Makefile
index 473fb8e93b6c..6c927d95d5de 100644
--- a/www/p5-Apache-ConfigParser/Makefile
+++ b/www/p5-Apache-ConfigParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-ConfigParser
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-ConfigParser/pkg-plist b/www/p5-Apache-ConfigParser/pkg-plist
index 53aaf7bf9e40..96fc960ca945 100644
--- a/www/p5-Apache-ConfigParser/pkg-plist
+++ b/www/p5-Apache-ConfigParser/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Apache/ConfigParser.pod
 %%SITE_PERL%%/Apache/ConfigParser/Directive.pm
 %%SITE_PERL%%/Apache/ConfigParser/Directive.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigParser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/ConfigParser
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile
index 120bee771fac..58d071ebb246 100644
--- a/www/p5-Apache-DB/Makefile
+++ b/www/p5-Apache-DB/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-DB
 PORTVERSION=	0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-DB/pkg-plist b/www/p5-Apache-DB/pkg-plist
index 4c0c33a7802e..74ee87bd9128 100644
--- a/www/p5-Apache-DB/pkg-plist
+++ b/www/p5-Apache-DB/pkg-plist
@@ -2,12 +2,8 @@
 %%PERL5_MAN3%%/Apache::DProf.3.gz
 %%PERL5_MAN3%%/Apache::SmallProf.3.gz
 %%PERL5_MAN3%%/Apache::perl5db.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/DB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/DProf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SmallProf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/perl5db.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/DB.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+%%SITE_ARCH%%/Apache/DB.pm
+%%SITE_ARCH%%/Apache/DProf.pm
+%%SITE_ARCH%%/Apache/SmallProf.pm
+%%SITE_ARCH%%/Apache/perl5db.pl
+%%SITE_ARCH%%/auto/Apache/DB/DB.so
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 47bfddc0e782..340aee9a5e33 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-DBI
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	www databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-DBI/pkg-plist b/www/p5-Apache-DBI/pkg-plist
index 4948ac79f59a..f2845131fede 100644
--- a/www/p5-Apache-DBI/pkg-plist
+++ b/www/p5-Apache-DBI/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Apache::DBI.3.gz
 %%SITE_PERL%%/Apache/AuthDBI.pm
 %%SITE_PERL%%/Apache/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index ee6a478f8c95..19b5999f5c93 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-Gallery
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	http://apachegallery.dk/download/ \
diff --git a/www/p5-Apache-Gallery/pkg-plist b/www/p5-Apache-Gallery/pkg-plist
index 9aed0ee71328..fa79ed5ed155 100644
--- a/www/p5-Apache-Gallery/pkg-plist
+++ b/www/p5-Apache-Gallery/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Apache::Gallery.3.gz
 %%SITE_PERL%%/Apache/Gallery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery/.packlist
 %%DATADIR%%/templates/bright/README
 %%DATADIR%%/templates/bright/dircomment.tpl
 %%DATADIR%%/templates/bright/directory.tpl
@@ -104,6 +103,3 @@ www/icons/gallery/video-wmv.png
 @dirrm %%DATADIR%%/templates/bright
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Htgroup/Makefile b/www/p5-Apache-Htgroup/Makefile
index b11657095559..4919bbc065e0 100644
--- a/www/p5-Apache-Htgroup/Makefile
+++ b/www/p5-Apache-Htgroup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Htgroup
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Htgroup/pkg-plist b/www/p5-Apache-Htgroup/pkg-plist
index dee4f58b7920..5e956ea7d48a 100644
--- a/www/p5-Apache-Htgroup/pkg-plist
+++ b/www/p5-Apache-Htgroup/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/Apache/Htgroup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Htgroup/.packlist
 %%PERL5_MAN3%%/Apache::Htgroup.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Htgroup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-LogFormat-Compiler/Makefile b/www/p5-Apache-LogFormat-Compiler/Makefile
index 03a58a4bdd2f..c80c5c00c86e 100644
--- a/www/p5-Apache-LogFormat-Compiler/Makefile
+++ b/www/p5-Apache-LogFormat-Compiler/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Apache-LogFormat-Compiler
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 213d061e4faa..c1ceb20a2960 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-MP3
 PORTVERSION=	4.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-MP3/pkg-plist b/www/p5-Apache-MP3/pkg-plist
index 4d9502481341..3207ce32c1f1 100644
--- a/www/p5-Apache-MP3/pkg-plist
+++ b/www/p5-Apache-MP3/pkg-plist
@@ -47,7 +47,6 @@
 %%SITE_PERL%%/Apache/MP3/Playlist.pm
 %%SITE_PERL%%/Apache/MP3/Resample.pm
 %%SITE_PERL%%/Apache/MP3/Sorted.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3/.packlist
 %%DATADIR%%/apache_mp3.css
 %%DATADIR%%/apache_mp3_fig1.gif
 %%DATADIR%%/apache_mp3_help.gif
@@ -59,8 +58,3 @@
 %%DATADIR%%/right_arrow.gif
 %%DATADIR%%/sound.gif
 @dirrmtry %%DATADIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/MP3/L10N
-@dirrmtry %%SITE_PERL%%/Apache/MP3
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile
index ea4256baa3ee..1abf6aaa034f 100644
--- a/www/p5-Apache-ParseFormData/Makefile
+++ b/www/p5-Apache-ParseFormData/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-ParseFormData
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-ParseFormData/pkg-plist b/www/p5-Apache-ParseFormData/pkg-plist
index 8d05f5eda728..5f708828cbc9 100644
--- a/www/p5-Apache-ParseFormData/pkg-plist
+++ b/www/p5-Apache-ParseFormData/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Apache/ParseFormData.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData/.packlist
 %%PERL5_MAN3%%/Apache::ParseFormData.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Profiler/Makefile b/www/p5-Apache-Profiler/Makefile
index 7e55c9cf50d5..fb0854e23d63 100644
--- a/www/p5-Apache-Profiler/Makefile
+++ b/www/p5-Apache-Profiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Profiler
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Profiler/pkg-plist b/www/p5-Apache-Profiler/pkg-plist
index 5d1700c9adb0..21ff1a86e2c7 100644
--- a/www/p5-Apache-Profiler/pkg-plist
+++ b/www/p5-Apache-Profiler/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Apache::Profiler.3.gz
 %%SITE_PERL%%/Apache/Profiler.pm
 %%SITE_PERL%%/Apache2/Profiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache2
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-PHP/Makefile b/www/p5-Apache-Session-PHP/Makefile
index 24a1ed57e60c..18bc888d3283 100644
--- a/www/p5-Apache-Session-PHP/Makefile
+++ b/www/p5-Apache-Session-PHP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Session-PHP
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Session-PHP/pkg-plist b/www/p5-Apache-Session-PHP/pkg-plist
index 78af0f2e43c9..945900f4bdd1 100644
--- a/www/p5-Apache-Session-PHP/pkg-plist
+++ b/www/p5-Apache-Session-PHP/pkg-plist
@@ -4,11 +4,3 @@
 %%SITE_PERL%%/Apache/Session/PHP.pm
 %%SITE_PERL%%/Apache/Session/Serialize/PHP.pm
 %%SITE_PERL%%/Apache/Session/Store/PHP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/Session/Store
-@dirrmtry %%SITE_PERL%%/Apache/Session/Serialize
-@dirrmtry %%SITE_PERL%%/Apache/Session
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-SQLite3/Makefile b/www/p5-Apache-Session-SQLite3/Makefile
index 52d4aa271277..527074c727dc 100644
--- a/www/p5-Apache-Session-SQLite3/Makefile
+++ b/www/p5-Apache-Session-SQLite3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Session-SQLite3
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Session-SQLite3/pkg-plist b/www/p5-Apache-Session-SQLite3/pkg-plist
index e42e9798ecf1..7296246cd3fb 100644
--- a/www/p5-Apache-Session-SQLite3/pkg-plist
+++ b/www/p5-Apache-Session-SQLite3/pkg-plist
@@ -1,10 +1,3 @@
 %%PERL5_MAN3%%/Apache::Session::SQLite3.3.gz
 %%SITE_PERL%%/Apache/Session/SQLite3.pm
 %%SITE_PERL%%/Apache/Session/Store/SQLite3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/Session/Store
-@dirrmtry %%SITE_PERL%%/Apache/Session
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-SharedMem/Makefile b/www/p5-Apache-Session-SharedMem/Makefile
index b18deb3db841..afa722415ad0 100644
--- a/www/p5-Apache-Session-SharedMem/Makefile
+++ b/www/p5-Apache-Session-SharedMem/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Session-SharedMem
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Session-SharedMem/pkg-plist b/www/p5-Apache-Session-SharedMem/pkg-plist
index a786372af040..d53b1fe13eb2 100644
--- a/www/p5-Apache-Session-SharedMem/pkg-plist
+++ b/www/p5-Apache-Session-SharedMem/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Apache::Session::Store::SharedMem.3.gz
 %%SITE_PERL%%/Apache/Session/SharedMem.pm
 %%SITE_PERL%%/Apache/Session/Store/SharedMem.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SharedMem/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SharedMem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/Session/Store
-@dirrmtry %%SITE_PERL%%/Apache/Session
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index 65e51d760b2b..3f6faa3f3364 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Session-Wrapper
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Session-Wrapper/pkg-plist b/www/p5-Apache-Session-Wrapper/pkg-plist
index 9ec08bacb8da..d48dc60a8c58 100644
--- a/www/p5-Apache-Session-Wrapper/pkg-plist
+++ b/www/p5-Apache-Session-Wrapper/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Apache::Session::Wrapper.3.gz
 %%SITE_PERL%%/Apache/Session/Wrapper.pm
-@dirrmtry %%SITE_PERL%%/Apache/Session
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index 6af9c9881528..d8c5607efec9 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Session
 PORTVERSION=	1.93
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Session/pkg-plist b/www/p5-Apache-Session/pkg-plist
index a697f8684240..ccf437d67cfd 100644
--- a/www/p5-Apache-Session/pkg-plist
+++ b/www/p5-Apache-Session/pkg-plist
@@ -57,10 +57,3 @@
 %%SITE_PERL%%/Apache/Session/Store/Postgres.pm
 %%SITE_PERL%%/Apache/Session/Store/Sybase.pm
 %%SITE_PERL%%/Apache/Session/Sybase.pm
-@dirrmtry %%SITE_PERL%%/Apache/Session/Store
-@dirrmtry %%SITE_PERL%%/Apache/Session/Serialize
-@dirrmtry %%SITE_PERL%%/Apache/Session/MySQL
-@dirrmtry %%SITE_PERL%%/Apache/Session/Lock
-@dirrmtry %%SITE_PERL%%/Apache/Session/Generate
-@dirrmtry %%SITE_PERL%%/Apache/Session
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-SessionX/Makefile b/www/p5-Apache-SessionX/Makefile
index fb7509531d6d..8ba696390782 100644
--- a/www/p5-Apache-SessionX/Makefile
+++ b/www/p5-Apache-SessionX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-SessionX
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-SessionX/pkg-plist b/www/p5-Apache-SessionX/pkg-plist
index d70026fca781..fd69f58c2b81 100644
--- a/www/p5-Apache-SessionX/pkg-plist
+++ b/www/p5-Apache-SessionX/pkg-plist
@@ -6,10 +6,3 @@
 %%SITE_PERL%%/Apache/SessionX/Manager.pm
 %%SITE_PERL%%/Apache/SessionX/Store/File.pm
 %%SITE_PERL%%/Apache/testcount.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SessionX/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SessionX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrmtry %%SITE_PERL%%/Apache/SessionX/Store
-@dirrmtry %%SITE_PERL%%/Apache/SessionX/Generate
-@dirrmtry %%SITE_PERL%%/Apache/SessionX
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Singleton/Makefile b/www/p5-Apache-Singleton/Makefile
index 59d5bad2084c..573d8f75ac29 100644
--- a/www/p5-Apache-Singleton/Makefile
+++ b/www/p5-Apache-Singleton/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Apache-Singleton
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Singleton/pkg-plist b/www/p5-Apache-Singleton/pkg-plist
index 679e18bfa93e..f382053aefd2 100644
--- a/www/p5-Apache-Singleton/pkg-plist
+++ b/www/p5-Apache-Singleton/pkg-plist
@@ -1,11 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton/.packlist
 %%PERL5_MAN3%%/Apache::Singleton.3.gz
 %%PERL5_MAN3%%/Apache::Singleton::Process.3.gz
 %%PERL5_MAN3%%/Apache::Singleton::Request.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 %%SITE_PERL%%/Apache/Singleton.pm
 %%SITE_PERL%%/Apache/Singleton/Process.pm
 %%SITE_PERL%%/Apache/Singleton/Request.pm
-@dirrm %%SITE_PERL%%/Apache/Singleton
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache2-SiteControl/Makefile b/www/p5-Apache2-SiteControl/Makefile
index be4c9d565709..05c2f546fad0 100644
--- a/www/p5-Apache2-SiteControl/Makefile
+++ b/www/p5-Apache2-SiteControl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache2-SiteControl
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache2-SiteControl/pkg-plist b/www/p5-Apache2-SiteControl/pkg-plist
index a10f0d09ff9b..2d77ea5c114e 100644
--- a/www/p5-Apache2-SiteControl/pkg-plist
+++ b/www/p5-Apache2-SiteControl/pkg-plist
@@ -14,8 +14,3 @@
 %%SITE_PERL%%/Apache2/SiteControl/Rule.pm
 %%SITE_PERL%%/Apache2/SiteControl/User.pm
 %%SITE_PERL%%/Apache2/SiteControl/UserFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SiteControl/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SiteControl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2
-@dirrm %%SITE_PERL%%/Apache2/SiteControl
-@dirrmtry %%SITE_PERL%%/Apache2
diff --git a/www/p5-ApacheBench/Makefile b/www/p5-ApacheBench/Makefile
index 6458fdf36b74..0b78edef72cc 100644
--- a/www/p5-ApacheBench/Makefile
+++ b/www/p5-ApacheBench/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ApacheBench
 PORTVERSION=	0.73
+PORTREVISION=	1
 CATEGORIES=	www benchmarks perl5
 MASTER_SITES=	CPAN/HTTPD
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-ApacheBench/pkg-plist b/www/p5-ApacheBench/pkg-plist
index 29f1be728a6a..0aa37779ce55 100644
--- a/www/p5-ApacheBench/pkg-plist
+++ b/www/p5-ApacheBench/pkg-plist
@@ -1,12 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Regression.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Run.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so
+%%SITE_ARCH%%/HTTPD/Bench/ApacheBench.pm
+%%SITE_ARCH%%/HTTPD/Bench/ApacheBench/Regression.pm
+%%SITE_ARCH%%/HTTPD/Bench/ApacheBench/Run.pm
+%%SITE_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so
 %%PERL5_MAN3%%/HTTPD::Bench::ApacheBench.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD
diff --git a/www/p5-App-Nopaste/Makefile b/www/p5-App-Nopaste/Makefile
index cfa99c7fedce..d54cea01007e 100644
--- a/www/p5-App-Nopaste/Makefile
+++ b/www/p5-App-Nopaste/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	App-Nopaste
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
diff --git a/www/p5-App-Nopaste/pkg-plist b/www/p5-App-Nopaste/pkg-plist
index 6349200d869d..05326280fd8d 100644
--- a/www/p5-App-Nopaste/pkg-plist
+++ b/www/p5-App-Nopaste/pkg-plist
@@ -23,10 +23,4 @@ bin/nopaste
 %%SITE_PERL%%/App/Nopaste/Service/Snitch.pm
 %%SITE_PERL%%/App/Nopaste/Service/Ubuntu.pm
 %%SITE_PERL%%/App/Nopaste/Service/ssh.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Nopaste/.packlist
 man/man1/nopaste.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Nopaste
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
-@dirrmtry %%SITE_PERL%%/App/Nopaste/Service
-@dirrmtry %%SITE_PERL%%/App/Nopaste
-@dirrmtry %%SITE_PERL%%/App
diff --git a/www/p5-App-gist/Makefile b/www/p5-App-gist/Makefile
index 43bf8dc80f15..c8f91c51855d 100644
--- a/www/p5-App-gist/Makefile
+++ b/www/p5-App-gist/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	App-gist
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ALEXBIO
diff --git a/www/p5-App-gist/pkg-plist b/www/p5-App-gist/pkg-plist
index 681a16c64bdb..9541c470857d 100644
--- a/www/p5-App-gist/pkg-plist
+++ b/www/p5-App-gist/pkg-plist
@@ -1,8 +1,4 @@
 bin/gist
 %%PERL5_MAN3%%/App::gist.3.gz
 %%SITE_PERL%%/App/gist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/gist/.packlist
 man/man1/gist.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/gist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
-@dirrmtry %%SITE_PERL%%/App
diff --git a/www/p5-Ark/Makefile b/www/p5-Ark/Makefile
index f1e0db276b57..9941ccaedd95 100644
--- a/www/p5-Ark/Makefile
+++ b/www/p5-Ark/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Ark
 PORTVERSION=	0.1.r1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	http://cloud.github.com/downloads/typester/ark-perl/ \
 		${MASTER_SITE_LOCAL}
diff --git a/www/p5-Ark/pkg-plist b/www/p5-Ark/pkg-plist
index a00e5b2bc1ca..35f2da98376d 100644
--- a/www/p5-Ark/pkg-plist
+++ b/www/p5-Ark/pkg-plist
@@ -1,5 +1,4 @@
 bin/ark.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ark/.packlist
 %%SITE_PERL%%/Ark.pm
 %%SITE_PERL%%/Ark/Action.pm
 %%SITE_PERL%%/Ark/ActionChain.pm
@@ -55,21 +54,3 @@ bin/ark.pl
 %%PERL5_MAN3%%/Ark::Command::Newapp.3.gz
 %%PERL5_MAN3%%/Ark::Command::Server.3.gz
 %%PERL5_MAN3%%/Ark::Command::View.3.gz
-@dirrm %%SITE_PERL%%/Ark/View
-@dirrm %%SITE_PERL%%/Ark/Plugin/Session/Store
-@dirrm %%SITE_PERL%%/Ark/Plugin/Session/State
-@dirrm %%SITE_PERL%%/Ark/Plugin/Session
-@dirrm %%SITE_PERL%%/Ark/Plugin/Encoding
-@dirrm %%SITE_PERL%%/Ark/Plugin/Authentication/Store/DBIx
-@dirrm %%SITE_PERL%%/Ark/Plugin/Authentication/Store
-@dirrm %%SITE_PERL%%/Ark/Plugin/Authentication/Credential
-@dirrm %%SITE_PERL%%/Ark/Plugin/Authentication
-@dirrm %%SITE_PERL%%/Ark/Plugin
-@dirrm %%SITE_PERL%%/Ark/Model
-@dirrm %%SITE_PERL%%/Ark/DispatchType
-@dirrm %%SITE_PERL%%/Ark/Context
-@dirrm %%SITE_PERL%%/Ark/Command/Interface
-@dirrm %%SITE_PERL%%/Ark/Command/Flavor
-@dirrm %%SITE_PERL%%/Ark/Command
-@dirrm %%SITE_PERL%%/Ark
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ark
diff --git a/www/p5-Bigtop/Makefile b/www/p5-Bigtop/Makefile
index 53a977addf1b..bd37c544447f 100644
--- a/www/p5-Bigtop/Makefile
+++ b/www/p5-Bigtop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Bigtop
 PORTVERSION=	0.38
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Bigtop/pkg-plist b/www/p5-Bigtop/pkg-plist
index 59fbc0dd73dd..58d3df1e3c75 100644
--- a/www/p5-Bigtop/pkg-plist
+++ b/www/p5-Bigtop/pkg-plist
@@ -116,17 +116,3 @@ share/TentMaker/tenttemplates/quick_edit.ttc
 share/TentMaker/tenttemplates/show_or_hide.ttc
 share/TentMaker/tenttemplates/tenter.js
 share/TentMaker/tenttemplates/tenter.tt
-@dirrmtry %%SITE_PERL%%/Bigtop/ScriptHelp/Style
-@dirrmtry %%SITE_PERL%%/Bigtop/ScriptHelp
-@dirrmtry %%SITE_PERL%%/Bigtop/Docs
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/SiteLook
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/SQL
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/Model
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/Init
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/HttpdConf
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/Diagram
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/Control
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/Conf
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend/CGI
-@dirrmtry %%SITE_PERL%%/Bigtop/Backend
-@dirrmtry %%SITE_PERL%%/Bigtop
diff --git a/www/p5-Blog-Spam/Makefile b/www/p5-Blog-Spam/Makefile
index 75382a96013b..f1c2ef31af13 100644
--- a/www/p5-Blog-Spam/Makefile
+++ b/www/p5-Blog-Spam/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Blog-Spam
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SKX
diff --git a/www/p5-Blog-Spam/pkg-plist b/www/p5-Blog-Spam/pkg-plist
index 8923b036034c..073a1ded2ae4 100644
--- a/www/p5-Blog-Spam/pkg-plist
+++ b/www/p5-Blog-Spam/pkg-plist
@@ -23,7 +23,6 @@ bin/blogspam
 %%SITE_PERL%%/Blog/Spam/Plugin/surbl.pm
 %%SITE_PERL%%/Blog/Spam/Plugin/wordcount.pm
 %%SITE_PERL%%/Blog/Spam/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Blog/Spam/.packlist
 %%PERL5_MAN3%%/Blog::Spam::API.3.gz
 %%PERL5_MAN3%%/Blog::Spam::Plugin::00blacklist.3.gz
 %%PERL5_MAN3%%/Blog::Spam::Plugin::00whitelist.3.gz
@@ -49,8 +48,3 @@ bin/blogspam
 %%PERL5_MAN3%%/Blog::Spam::Plugin::wordcount.3.gz
 %%PERL5_MAN3%%/Blog::Spam::Server.3.gz
 man/man1/blogspam.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Blog/Spam
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Blog
-@dirrm %%SITE_PERL%%/Blog/Spam/Plugin
-@dirrm %%SITE_PERL%%/Blog/Spam
-@dirrmtry %%SITE_PERL%%/Blog
diff --git a/www/p5-Browser-Open/Makefile b/www/p5-Browser-Open/Makefile
index 7d193f881ea8..2d9971a025cf 100644
--- a/www/p5-Browser-Open/Makefile
+++ b/www/p5-Browser-Open/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Browser-Open
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CFRANKS
diff --git a/www/p5-Browser-Open/pkg-plist b/www/p5-Browser-Open/pkg-plist
index 80db02f28c70..d54d19c71806 100644
--- a/www/p5-Browser-Open/pkg-plist
+++ b/www/p5-Browser-Open/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Browser/Open.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Browser/Open/.packlist
 %%PERL5_MAN3%%/Browser::Open.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Browser/Open
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Browser
-@dirrmtry %%SITE_PERL%%/Browser
diff --git a/www/p5-Business-PayPal/Makefile b/www/p5-Business-PayPal/Makefile
index 07434a403e61..2e0504a7970b 100644
--- a/www/p5-Business-PayPal/Makefile
+++ b/www/p5-Business-PayPal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Business-PayPal
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Business-PayPal/pkg-plist b/www/p5-Business-PayPal/pkg-plist
index 2055a97eb7ff..a9736291438b 100644
--- a/www/p5-Business-PayPal/pkg-plist
+++ b/www/p5-Business-PayPal/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Business/PayPal.pm
 %%SITE_PERL%%/Business/getppcert.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal/.packlist
 %%PERL5_MAN3%%/Business::PayPal.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@dirrm %%SITE_PERL%%/Business
diff --git a/www/p5-CGI-Ajax/Makefile b/www/p5-CGI-Ajax/Makefile
index 8cce2c2f5c63..db7959af786f 100644
--- a/www/p5-CGI-Ajax/Makefile
+++ b/www/p5-CGI-Ajax/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Ajax
 PORTVERSION=	0.707
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Ajax/pkg-plist b/www/p5-CGI-Ajax/pkg-plist
index 999a9270c45e..6fe4366de98c 100644
--- a/www/p5-CGI-Ajax/pkg-plist
+++ b/www/p5-CGI-Ajax/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CGI/Ajax.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax/.packlist
 %%PERL5_MAN3%%/CGI::Ajax.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Dispatch-Server/Makefile b/www/p5-CGI-Application-Dispatch-Server/Makefile
index 5a3180e39f4f..c56eaae34e9b 100644
--- a/www/p5-CGI-Application-Dispatch-Server/Makefile
+++ b/www/p5-CGI-Application-Dispatch-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Dispatch-Server
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Dispatch-Server/pkg-plist b/www/p5-CGI-Application-Dispatch-Server/pkg-plist
index 34360030ae62..a1e0e6d9cc87 100644
--- a/www/p5-CGI-Application-Dispatch-Server/pkg-plist
+++ b/www/p5-CGI-Application-Dispatch-Server/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/CGI/Application/Dispatch/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Dispatch/Server/.packlist
 %%PERL5_MAN3%%/CGI::Application::Dispatch::Server.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Dispatch/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Dispatch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Application/Dispatch
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Dispatch/Makefile b/www/p5-CGI-Application-Dispatch/Makefile
index 262f4add82b3..643c8da15b88 100644
--- a/www/p5-CGI-Application-Dispatch/Makefile
+++ b/www/p5-CGI-Application-Dispatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Dispatch
 PORTVERSION=	3.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN/CGI
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Dispatch/pkg-plist b/www/p5-CGI-Application-Dispatch/pkg-plist
index 45536b850134..b99b5f268d93 100644
--- a/www/p5-CGI-Application-Dispatch/pkg-plist
+++ b/www/p5-CGI-Application-Dispatch/pkg-plist
@@ -4,6 +4,3 @@
 %%PERL5_MAN3%%/CGI::Application::Dispatch.3.gz
 %%PERL5_MAN3%%/CGI::Application::Dispatch::PSGI.3.gz
 %%PERL5_MAN3%%/CGI::Application::Dispatch::Regexp.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application/Dispatch
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-PSGI/Makefile b/www/p5-CGI-Application-PSGI/Makefile
index dc80f9ad720c..3e9b487d041f 100644
--- a/www/p5-CGI-Application-PSGI/Makefile
+++ b/www/p5-CGI-Application-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-Application-PSGI
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-PSGI/pkg-plist b/www/p5-CGI-Application-PSGI/pkg-plist
index d9110bbfaff6..5425af851723 100644
--- a/www/p5-CGI-Application-PSGI/pkg-plist
+++ b/www/p5-CGI-Application-PSGI/pkg-plist
@@ -1,4 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/PSGI/.packlist
 %%SITE_PERL%%/CGI/Application/PSGI.pm
 %%PERL5_MAN3%%/CGI::Application::PSGI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/PSGI
diff --git a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
index 9b2338a8ccb0..db032ef8505b 100644
--- a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
+++ b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-AnyTemplate
 PORTVERSION=	0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist b/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist
index a23ca3e1e14a..68a15709eb9f 100644
--- a/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist
@@ -14,8 +14,3 @@
 %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/HTMLTemplatePluggable.pm
 %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/Petal.pm
 %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/TemplateToolkit.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Apache/Makefile b/www/p5-CGI-Application-Plugin-Apache/Makefile
index 2816c34c65ee..d72d006d7abd 100644
--- a/www/p5-CGI-Application-Plugin-Apache/Makefile
+++ b/www/p5-CGI-Application-Plugin-Apache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Apache
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Apache/pkg-plist b/www/p5-CGI-Application-Plugin-Apache/pkg-plist
index c43d47c708fe..20813d7be780 100644
--- a/www/p5-CGI-Application-Plugin-Apache/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Apache/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/CGI/Application/Plugin/Apache.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Apache/Request.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Apache2/Request.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Apache2
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Apache
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Authentication/Makefile b/www/p5-CGI-Application-Plugin-Authentication/Makefile
index 56d085c2c0d4..50a85cd8e64f 100644
--- a/www/p5-CGI-Application-Plugin-Authentication/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authentication/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Authentication
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Authentication/pkg-plist b/www/p5-CGI-Application-Plugin-Authentication/pkg-plist
index 8d3bcab73e97..7d5686eaced1 100644
--- a/www/p5-CGI-Application-Plugin-Authentication/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Authentication/pkg-plist
@@ -36,12 +36,3 @@
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Store.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Store/Cookie.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Store/Session.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Store
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Driver/Filter
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Driver/Authen
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Driver
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Display
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Authorization/Makefile b/www/p5-CGI-Application-Plugin-Authorization/Makefile
index fb39a062b249..b570a83e285e 100644
--- a/www/p5-CGI-Application-Plugin-Authorization/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authorization/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Authorization
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Authorization/pkg-plist b/www/p5-CGI-Application-Plugin-Authorization/pkg-plist
index ac464ded4dc3..81da643a2b3c 100644
--- a/www/p5-CGI-Application-Plugin-Authorization/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Authorization/pkg-plist
@@ -12,8 +12,3 @@
 %%SITE_PERL%%/CGI/Application/Plugin/Authorization/Driver/Generic.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authorization/Driver/HTGroup.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authorization/Driver/SimpleGroup.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authorization/Driver
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authorization
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
index 486ce82563d8..da18db2dd9b3 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-AutoRunmode
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist b/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist
index 45b662567b87..e62d3fe1ad15 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist
@@ -2,12 +2,3 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::AutoRunmode::FileDelegate.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/AutoRunmode.pm
 %%SITE_PERL%%/CGI/Application/Plugin/AutoRunmode/FileDelegate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/AutoRunmode/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/AutoRunmode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/AutoRunmode
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
index b78a23d26733..012d693f27c0 100644
--- a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
+++ b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Config-YAML
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist b/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist
index 1b9a8500a350..1bed5d369edd 100644
--- a/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Config/YAML/.packlist
 %%SITE_PERL%%/CGI/Application/Plugin/Config/YAML.pm
 %%PERL5_MAN3%%/CGI::Application::Plugin::Config::YAML.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Config
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Config/YAML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Config
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
diff --git a/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile b/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile
index 4dd249062bae..8fda8d646045 100644
--- a/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile
+++ b/www/p5-CGI-Application-Plugin-ConfigAuto/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-ConfigAuto
 PORTVERSION=	1.33
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-ConfigAuto/pkg-plist b/www/p5-CGI-Application-Plugin-ConfigAuto/pkg-plist
index ed4372f76dde..8e4f147c578f 100644
--- a/www/p5-CGI-Application-Plugin-ConfigAuto/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-ConfigAuto/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/CGI/Application/Plugin/ConfigAuto.pm
 %%PERL5_MAN3%%/CGI::Application::Plugin::ConfigAuto.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index c05de8e950c3..882c8323744e 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-DBH
 PORTVERSION=	4.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-DBH/pkg-plist b/www/p5-CGI-Application-Plugin-DBH/pkg-plist
index 807d172135ca..a227f55bcbec 100644
--- a/www/p5-CGI-Application-Plugin-DBH/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-DBH/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CGI/Application/Plugin/DBH.pm
 %%PERL5_MAN3%%/CGI::Application::Plugin::DBH.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
index 3174a127dd07..a84af75bbd97 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-DebugScreen
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist b/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist
index 0263c15a8b3b..c5ac8829528c 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::DebugScreen.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/DebugScreen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/DebugScreen/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/DebugScreen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-DevPopup/Makefile b/www/p5-CGI-Application-Plugin-DevPopup/Makefile
index 54b1ba977e7c..656aaf7f4273 100644
--- a/www/p5-CGI-Application-Plugin-DevPopup/Makefile
+++ b/www/p5-CGI-Application-Plugin-DevPopup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-DevPopup
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-DevPopup/pkg-plist b/www/p5-CGI-Application-Plugin-DevPopup/pkg-plist
index 05e9cbd98b4a..89992e372a3d 100644
--- a/www/p5-CGI-Application-Plugin-DevPopup/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-DevPopup/pkg-plist
@@ -2,14 +2,7 @@
 %%SITE_PERL%%/CGI/Application/Plugin/DevPopup/HTTPHeaders.pm
 %%SITE_PERL%%/CGI/Application/Plugin/DevPopup/Timing.pm
 %%SITE_PERL%%/CGI/Application/Plugin/DevPopup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/DevPopup/.packlist
 %%PERL5_MAN3%%/CGI::Application::Plugin::DevPopup.3.gz
 %%PERL5_MAN3%%/CGI::Application::Plugin::DevPopup::HTTPHeaders.3.gz
 %%PERL5_MAN3%%/CGI::Application::Plugin::DevPopup::Timing.3.gz
 %%PERL5_MAN3%%/CGI::Application::Plugin::DevPopup::Log.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/DevPopup
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/DevPopup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-Forward/Makefile b/www/p5-CGI-Application-Plugin-Forward/Makefile
index 24697686ed43..e69593fa1642 100644
--- a/www/p5-CGI-Application-Plugin-Forward/Makefile
+++ b/www/p5-CGI-Application-Plugin-Forward/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Forward
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Forward/pkg-plist b/www/p5-CGI-Application-Plugin-Forward/pkg-plist
index fe49254cdc58..1d9a02c5989c 100644
--- a/www/p5-CGI-Application-Plugin-Forward/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Forward/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::Forward.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Forward.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-HTDot/Makefile b/www/p5-CGI-Application-Plugin-HTDot/Makefile
index 202e16149e26..87f8a35c80e6 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTDot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-HTDot
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-HTDot/pkg-plist b/www/p5-CGI-Application-Plugin-HTDot/pkg-plist
index 1d077b467250..bd9297de080a 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-HTDot/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/CGI/Application/Plugin/HTDot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HTDot/.packlist
 %%PERL5_MAN3%%/CGI::Application::Plugin::HTDot.3.gz
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HTDot
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
index 5967b57ad763..58596b2dd827 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-HTMLPrototype
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist b/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist
index 1af48fcdd3e5..0d8e11e2da4a 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::HTMLPrototype.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/HTMLPrototype.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
index 4ef58bfad014..b5a7f4cbc5ab 100644
--- a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
+++ b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-HtmlTidy
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist b/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist
index 17f994fa8d21..1cc8136cf4c4 100644
--- a/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist
@@ -2,12 +2,3 @@
 %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy.pm
 %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy/tidy.conf
 %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy/validate.tmpl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HtmlTidy/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HtmlTidy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-JSON/Makefile b/www/p5-CGI-Application-Plugin-JSON/Makefile
index 2a2970fa0ae9..a490010a76e1 100644
--- a/www/p5-CGI-Application-Plugin-JSON/Makefile
+++ b/www/p5-CGI-Application-Plugin-JSON/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-JSON
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-JSON/pkg-plist b/www/p5-CGI-Application-Plugin-JSON/pkg-plist
index 9a68bbacddfe..61975b34a519 100644
--- a/www/p5-CGI-Application-Plugin-JSON/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-JSON/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/CGI/Application/Plugin/JSON.pm
 %%PERL5_MAN3%%/CGI::Application::Plugin::JSON.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
index 499dc6307081..aa2f16ee8e1c 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-LinkIntegrity
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist b/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist
index 45a3d8c2b7e1..5ffeeee8e0af 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::LinkIntegrity.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/LinkIntegrity.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
index 15c7a89f0e4b..e8c382a587b6 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-LogDispatch
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist b/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist
index ec9fed85e039..6a7966b0aeec 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::LogDispatch.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/LogDispatch.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/Makefile b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
index 704290b164ba..043b31ac9eab 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/Makefile
+++ b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-MessageStack
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist b/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist
index bb47352050df..8734c1ab73c3 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::MessageStack.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/MessageStack.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Redirect/Makefile b/www/p5-CGI-Application-Plugin-Redirect/Makefile
index a2e2f409ac91..b338605f8611 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/Makefile
+++ b/www/p5-CGI-Application-Plugin-Redirect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Redirect
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Redirect/pkg-plist b/www/p5-CGI-Application-Plugin-Redirect/pkg-plist
index 0ca50e57fdc9..39184eb4b861 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Redirect/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::Redirect.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Redirect.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Session/Makefile b/www/p5-CGI-Application-Plugin-Session/Makefile
index 15e62c603c15..818fb5f68f4b 100644
--- a/www/p5-CGI-Application-Plugin-Session/Makefile
+++ b/www/p5-CGI-Application-Plugin-Session/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Session
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Session/pkg-plist b/www/p5-CGI-Application-Plugin-Session/pkg-plist
index c5d96fc3c7c8..9feaad85a87f 100644
--- a/www/p5-CGI-Application-Plugin-Session/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Session/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::Session.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Session.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Session/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Stream/Makefile b/www/p5-CGI-Application-Plugin-Stream/Makefile
index 983aa64c4ee5..3788ec1b5f21 100644
--- a/www/p5-CGI-Application-Plugin-Stream/Makefile
+++ b/www/p5-CGI-Application-Plugin-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-Stream
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-Stream/pkg-plist b/www/p5-CGI-Application-Plugin-Stream/pkg-plist
index 1420969c1fed..6cff0832f29f 100644
--- a/www/p5-CGI-Application-Plugin-Stream/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Stream/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::Stream.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Stream.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-TT/Makefile b/www/p5-CGI-Application-Plugin-TT/Makefile
index cf9afa3365fc..d89541aee15d 100644
--- a/www/p5-CGI-Application-Plugin-TT/Makefile
+++ b/www/p5-CGI-Application-Plugin-TT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-TT
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-TT/pkg-plist b/www/p5-CGI-Application-Plugin-TT/pkg-plist
index f0ba3340efb3..8ec8f0f97873 100644
--- a/www/p5-CGI-Application-Plugin-TT/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-TT/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::TT.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/TT.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
index 524e1d1db290..02bb1a141017 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-ValidateRM
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist b/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist
index 493b1b5fe215..99a4a022584a 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/CGI/Application/Plugin/ValidateRM.pm
 %%PERL5_MAN3%%/CGI::Application::Plugin::ValidateRM.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/Makefile b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
index 3b1e8ef8e70f..e74a9473b786 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/Makefile
+++ b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Plugin-ViewCode
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist b/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist
index 1ec4f065d163..d0d79a27f8e2 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/CGI::Application::Plugin::ViewCode.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/ViewCode.pm
-@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Server/Makefile b/www/p5-CGI-Application-Server/Makefile
index 54c3c90ede4f..de8f7858dfc5 100644
--- a/www/p5-CGI-Application-Server/Makefile
+++ b/www/p5-CGI-Application-Server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Application-Server
 PORTVERSION=	0.063
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application-Server/pkg-plist b/www/p5-CGI-Application-Server/pkg-plist
index 23bdb2bc0163..192d194b1ba5 100644
--- a/www/p5-CGI-Application-Server/pkg-plist
+++ b/www/p5-CGI-Application-Server/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/CGI/Application/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Server/.packlist
 %%PERL5_MAN3%%/CGI::Application::Server.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 2450fb0d2ba1..485aa538834d 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Application
 PORTVERSION=	4.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Application/pkg-plist b/www/p5-CGI-Application/pkg-plist
index 543fbd027b33..862d766bfb90 100644
--- a/www/p5-CGI-Application/pkg-plist
+++ b/www/p5-CGI-Application/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/CGI::Application::Mailform.3.gz
 %%SITE_PERL%%/CGI/Application.pm
 %%SITE_PERL%%/CGI/Application/Mailform.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Application
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index 87e81b5e64df..a9f47d533128 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-ArgChecker
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-ArgChecker/pkg-plist b/www/p5-CGI-ArgChecker/pkg-plist
index 0742c66b5950..54874edb0304 100644
--- a/www/p5-CGI-ArgChecker/pkg-plist
+++ b/www/p5-CGI-ArgChecker/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CGI::ArgChecker.3.gz
 %%SITE_PERL%%/CGI/ArgChecker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Builder-TT2/Makefile b/www/p5-CGI-Builder-TT2/Makefile
index c9ac13f170ef..1822b60be21a 100644
--- a/www/p5-CGI-Builder-TT2/Makefile
+++ b/www/p5-CGI-Builder-TT2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Builder-TT2
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LARSEN
diff --git a/www/p5-CGI-Builder-TT2/pkg-plist b/www/p5-CGI-Builder-TT2/pkg-plist
index d7cadd1d1210..c3636d68689a 100644
--- a/www/p5-CGI-Builder-TT2/pkg-plist
+++ b/www/p5-CGI-Builder-TT2/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/CGI::Builder::TT2.3.gz
 %%SITE_PERL%%/CGI/Builder/TT2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/TT2/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/TT2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Builder
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Builder/Makefile b/www/p5-CGI-Builder/Makefile
index 86f26ddd23c1..bc2119b08737 100644
--- a/www/p5-CGI-Builder/Makefile
+++ b/www/p5-CGI-Builder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Builder
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Builder/pkg-plist b/www/p5-CGI-Builder/pkg-plist
index 2680144c9974..09684d2b6017 100644
--- a/www/p5-CGI-Builder/pkg-plist
+++ b/www/p5-CGI-Builder/pkg-plist
@@ -8,11 +8,3 @@
 %%SITE_PERL%%/CGI/Builder/Conf.pm
 %%SITE_PERL%%/CGI/Builder/Const.pm
 %%SITE_PERL%%/CGI/Builder/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Builder
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/Bundle/CGI/Builder
-@dirrmtry %%SITE_PERL%%/Bundle/CGI
-@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile
index 7c1e651e6a6f..f32aeb876a07 100644
--- a/www/p5-CGI-Cache/Makefile
+++ b/www/p5-CGI-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Cache
 PORTVERSION=	1.42.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Cache/pkg-plist b/www/p5-CGI-Cache/pkg-plist
index 7957905b7101..3b8515577d89 100644
--- a/www/p5-CGI-Cache/pkg-plist
+++ b/www/p5-CGI-Cache/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CGI/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist
 %%PERL5_MAN3%%/CGI::Cache.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Compile/Makefile b/www/p5-CGI-Compile/Makefile
index 1ebb065fb9f2..fa402f29d0b9 100644
--- a/www/p5-CGI-Compile/Makefile
+++ b/www/p5-CGI-Compile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-Compile
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-CGI-Compile/pkg-plist b/www/p5-CGI-Compile/pkg-plist
index b7af48d448b4..5aafc0a8b519 100644
--- a/www/p5-CGI-Compile/pkg-plist
+++ b/www/p5-CGI-Compile/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_ARCH%%/auto/CGI/Compile/.packlist
 %%SITE_PERL%%/CGI/Compile.pm
 %%PERL5_MAN3%%/CGI::Compile.3.gz
diff --git a/www/p5-CGI-Compress-Gzip/Makefile b/www/p5-CGI-Compress-Gzip/Makefile
index dfac142ceba6..e6f62db653b2 100644
--- a/www/p5-CGI-Compress-Gzip/Makefile
+++ b/www/p5-CGI-Compress-Gzip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Compress-Gzip
 PORTVERSION=	1.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CGI
diff --git a/www/p5-CGI-Compress-Gzip/pkg-plist b/www/p5-CGI-Compress-Gzip/pkg-plist
index 1a9513ae76d7..24f8cac4730c 100644
--- a/www/p5-CGI-Compress-Gzip/pkg-plist
+++ b/www/p5-CGI-Compress-Gzip/pkg-plist
@@ -2,6 +2,3 @@
 %%PERL5_MAN3%%/CGI::Compress::Gzip::FileHandle.3.gz
 %%SITE_PERL%%/CGI/Compress/Gzip.pm
 %%SITE_PERL%%/CGI/Compress/Gzip/FileHandle.pm
-@dirrmtry %%SITE_PERL%%/CGI/Compress/Gzip
-@dirrmtry %%SITE_PERL%%/CGI/Compress
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Cookie-Splitter/Makefile b/www/p5-CGI-Cookie-Splitter/Makefile
index 271d61e2ac00..73221ce2b3d4 100644
--- a/www/p5-CGI-Cookie-Splitter/Makefile
+++ b/www/p5-CGI-Cookie-Splitter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Cookie-Splitter
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Cookie-Splitter/pkg-plist b/www/p5-CGI-Cookie-Splitter/pkg-plist
index 489271fd4fdc..cfbe38a9aa06 100644
--- a/www/p5-CGI-Cookie-Splitter/pkg-plist
+++ b/www/p5-CGI-Cookie-Splitter/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/CGI/Cookie/Splitter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cookie/Splitter/.packlist
 %%PERL5_MAN3%%/CGI::Cookie::Splitter.3.gz
-@dirrmtry %%SITE_PERL%%/CGI/Cookie
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cookie/Splitter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Cookie-XS/Makefile b/www/p5-CGI-Cookie-XS/Makefile
index e43e9e9b8d38..8505aa787138 100644
--- a/www/p5-CGI-Cookie-XS/Makefile
+++ b/www/p5-CGI-Cookie-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Cookie-XS
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AGENT
diff --git a/www/p5-CGI-Cookie-XS/pkg-plist b/www/p5-CGI-Cookie-XS/pkg-plist
index 9ad5cb92da79..2f2624e54455 100644
--- a/www/p5-CGI-Cookie-XS/pkg-plist
+++ b/www/p5-CGI-Cookie-XS/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cookie/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cookie/XS/XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/CGI/Cookie/XS.pm
+%%SITE_ARCH%%/auto/CGI/Cookie/XS/XS.so
+%%SITE_ARCH%%/CGI/Cookie/XS.pm
 %%PERL5_MAN3%%/CGI::Cookie::XS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cookie/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CGI/Cookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CGI
diff --git a/www/p5-CGI-Deurl-XS/Makefile b/www/p5-CGI-Deurl-XS/Makefile
index 9da379844f9a..ddac11128968 100644
--- a/www/p5-CGI-Deurl-XS/Makefile
+++ b/www/p5-CGI-Deurl-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Deurl-XS
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Deurl-XS/pkg-plist b/www/p5-CGI-Deurl-XS/pkg-plist
index 214046ad9956..f87f7c5c142f 100644
--- a/www/p5-CGI-Deurl-XS/pkg-plist
+++ b/www/p5-CGI-Deurl-XS/pkg-plist
@@ -1,10 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Deurl/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Deurl/XS/XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Deurl/XS/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/CGI/Deurl/XS.pm
+%%SITE_ARCH%%/auto/CGI/Deurl/XS/XS.so
+%%SITE_ARCH%%/auto/CGI/Deurl/XS/autosplit.ix
+%%SITE_ARCH%%/CGI/Deurl/XS.pm
 %%PERL5_MAN3%%/CGI::Deurl::XS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CGI/Deurl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CGI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Deurl/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Deurl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Emulate-PSGI/Makefile b/www/p5-CGI-Emulate-PSGI/Makefile
index c78c54e6be61..3ffbc2c47472 100644
--- a/www/p5-CGI-Emulate-PSGI/Makefile
+++ b/www/p5-CGI-Emulate-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-Emulate-PSGI
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-CGI-Emulate-PSGI/pkg-plist b/www/p5-CGI-Emulate-PSGI/pkg-plist
index 2eecaa6f11c9..b56e8d7dc368 100644
--- a/www/p5-CGI-Emulate-PSGI/pkg-plist
+++ b/www/p5-CGI-Emulate-PSGI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Emulate/PSGI/.packlist
 %%SITE_PERL%%/CGI/Emulate/PSGI.pm
 %%SITE_PERL%%/CGI/Parse/PSGI.pm
 %%PERL5_MAN3%%/CGI::Emulate::PSGI.3.gz
diff --git a/www/p5-CGI-EncryptForm/Makefile b/www/p5-CGI-EncryptForm/Makefile
index 3436a9ee2ba0..e9493c473b23 100644
--- a/www/p5-CGI-EncryptForm/Makefile
+++ b/www/p5-CGI-EncryptForm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-EncryptForm
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARAL
diff --git a/www/p5-CGI-EncryptForm/pkg-plist b/www/p5-CGI-EncryptForm/pkg-plist
index 03d91d2082e8..08819b2402df 100644
--- a/www/p5-CGI-EncryptForm/pkg-plist
+++ b/www/p5-CGI-EncryptForm/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CGI/EncryptForm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/EncryptForm/.packlist
 %%PERL5_MAN3%%/CGI::EncryptForm.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/EncryptForm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Enurl/Makefile b/www/p5-CGI-Enurl/Makefile
index 6c8fff06e82a..8faa4ae9ced1 100644
--- a/www/p5-CGI-Enurl/Makefile
+++ b/www/p5-CGI-Enurl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-Enurl
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Enurl/pkg-plist b/www/p5-CGI-Enurl/pkg-plist
index 6a6653e691b4..8da1fb1bc5c2 100644
--- a/www/p5-CGI-Enurl/pkg-plist
+++ b/www/p5-CGI-Enurl/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/CGI/Enurl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Enurl/.packlist
 %%PERL5_MAN3%%/CGI::Enurl.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Enurl
diff --git a/www/p5-CGI-Ex/Makefile b/www/p5-CGI-Ex/Makefile
index 712399ad474d..3bab7d4ec31d 100644
--- a/www/p5-CGI-Ex/Makefile
+++ b/www/p5-CGI-Ex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Ex
 PORTVERSION=	2.41
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Ex/pkg-plist b/www/p5-CGI-Ex/pkg-plist
index b6bba1c9625e..d4c4e4559488 100644
--- a/www/p5-CGI-Ex/pkg-plist
+++ b/www/p5-CGI-Ex/pkg-plist
@@ -26,9 +26,3 @@
 %%SITE_PERL%%/CGI/Ex/sha1.js
 %%SITE_PERL%%/CGI/Ex/validate.js
 %%SITE_PERL%%/CGI/Ex/yaml_load.js
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ex/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Ex/App
-@dirrmtry %%SITE_PERL%%/CGI/Ex
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Expand/Makefile b/www/p5-CGI-Expand/Makefile
index 1130eeeb3b1f..365279dfa0a3 100644
--- a/www/p5-CGI-Expand/Makefile
+++ b/www/p5-CGI-Expand/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Expand
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Expand/pkg-plist b/www/p5-CGI-Expand/pkg-plist
index ae8c019fe0d3..9ec132a2fa0e 100644
--- a/www/p5-CGI-Expand/pkg-plist
+++ b/www/p5-CGI-Expand/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CGI/Expand.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Expand/.packlist
 %%PERL5_MAN3%%/CGI::Expand.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Expand
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-ExtDirect/Makefile b/www/p5-CGI-ExtDirect/Makefile
index 36c7fb0e26b9..60f92ca233ff 100644
--- a/www/p5-CGI-ExtDirect/Makefile
+++ b/www/p5-CGI-ExtDirect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-ExtDirect
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-ExtDirect/pkg-plist b/www/p5-CGI-ExtDirect/pkg-plist
index 1dad09422988..6f08eced94b7 100644
--- a/www/p5-CGI-ExtDirect/pkg-plist
+++ b/www/p5-CGI-ExtDirect/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CGI/ExtDirect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ExtDirect/.packlist
 %%PERL5_MAN3%%/CGI::ExtDirect.3.gz
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ExtDirect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-FCKeditor/Makefile b/www/p5-CGI-FCKeditor/Makefile
index ac6b0bc30086..15c357de164b 100644
--- a/www/p5-CGI-FCKeditor/Makefile
+++ b/www/p5-CGI-FCKeditor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-FCKeditor
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-FCKeditor/pkg-plist b/www/p5-CGI-FCKeditor/pkg-plist
index 8259098c0c9d..80aeff54a24f 100644
--- a/www/p5-CGI-FCKeditor/pkg-plist
+++ b/www/p5-CGI-FCKeditor/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CGI/FCKeditor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FCKeditor/.packlist
 %%PERL5_MAN3%%/CGI::FCKeditor.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FCKeditor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index e253f2f1bfc8..4a62d480a654 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-FastTemplate
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-FastTemplate/pkg-plist b/www/p5-CGI-FastTemplate/pkg-plist
index 4ea554210c4a..a88f4ed1fbd0 100644
--- a/www/p5-CGI-FastTemplate/pkg-plist
+++ b/www/p5-CGI-FastTemplate/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CGI::FastTemplate.3.gz
 %%SITE_PERL%%/CGI/FastTemplate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index e1b3a0daaf63..feb4f5c66704 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-FormBuilder
 PORTVERSION=	3.0800
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-FormBuilder/pkg-plist b/www/p5-CGI-FormBuilder/pkg-plist
index 1a3ca5411892..ee66117d30dd 100644
--- a/www/p5-CGI-FormBuilder/pkg-plist
+++ b/www/p5-CGI-FormBuilder/pkg-plist
@@ -58,7 +58,6 @@
 %%SITE_PERL%%/CGI/FormBuilder/Template/Text.pm
 %%SITE_PERL%%/CGI/FormBuilder/Test.pm
 %%SITE_PERL%%/CGI/FormBuilder/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FormBuilder/.packlist
 %%PERL5_MAN3%%/CGI::FormBuilder.3.gz
 %%PERL5_MAN3%%/CGI::FormBuilder::Field.3.gz
 %%PERL5_MAN3%%/CGI::FormBuilder::Messages.3.gz
@@ -75,11 +74,3 @@
 %%PERL5_MAN3%%/CGI::FormBuilder::Template::Text.3.gz
 %%PERL5_MAN3%%/CGI::FormBuilder::Test.3.gz
 %%PERL5_MAN3%%/CGI::FormBuilder::Util.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FormBuilder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI/FormBuilder/Field
-@dirrm %%SITE_PERL%%/CGI/FormBuilder/Messages
-@dirrm %%SITE_PERL%%/CGI/FormBuilder/Source
-@dirrm %%SITE_PERL%%/CGI/FormBuilder/Template
-@dirrm %%SITE_PERL%%/CGI/FormBuilder
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Framework/Makefile b/www/p5-CGI-Framework/Makefile
index 07a8fc57260e..973dcfded9f5 100644
--- a/www/p5-CGI-Framework/Makefile
+++ b/www/p5-CGI-Framework/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Framework
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Framework/pkg-plist b/www/p5-CGI-Framework/pkg-plist
index 29dcbcc5b239..063faf8ede2f 100644
--- a/www/p5-CGI-Framework/pkg-plist
+++ b/www/p5-CGI-Framework/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CGI::Framework.3.gz
 %%SITE_PERL%%/CGI/Framework.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index 17e99feba885..8f79e1e52f78 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Kwiki
 PORTVERSION=	0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Kwiki/pkg-plist b/www/p5-CGI-Kwiki/pkg-plist
index 10363fc32299..a70ce3bf935c 100644
--- a/www/p5-CGI-Kwiki/pkg-plist
+++ b/www/p5-CGI-Kwiki/pkg-plist
@@ -64,12 +64,4 @@ bin/kwiki-install
 %%SITE_PERL%%/CGI/Kwiki/Slides.pm
 %%SITE_PERL%%/CGI/Kwiki/Style.pm
 %%SITE_PERL%%/CGI/Kwiki/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI-Kwiki/.packlist
 man/man1/kwiki-install.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI-Kwiki
-@dirrmtry %%SITE_PERL%%/CGI/Kwiki/Plugin
-@dirrmtry %%SITE_PERL%%/CGI/Kwiki/Pages
-@dirrmtry %%SITE_PERL%%/CGI/Kwiki/I18N
-@dirrmtry %%SITE_PERL%%/CGI/Kwiki/Backup
-@dirrmtry %%SITE_PERL%%/CGI/Kwiki
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index 3a72dac623be..60f38d8b852e 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Minimal
 PORTVERSION=	1.29
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Minimal/pkg-plist b/www/p5-CGI-Minimal/pkg-plist
index f4b0ec89c3aa..16f890743a83 100644
--- a/www/p5-CGI-Minimal/pkg-plist
+++ b/www/p5-CGI-Minimal/pkg-plist
@@ -3,8 +3,3 @@
 %%SITE_PERL%%/CGI/Minimal.pod
 %%SITE_PERL%%/CGI/Minimal/Misc.pm
 %%SITE_PERL%%/CGI/Minimal/Multipart.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Minimal
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-PSGI/Makefile b/www/p5-CGI-PSGI/Makefile
index 1e58810d3a61..aa2c861d1233 100644
--- a/www/p5-CGI-PSGI/Makefile
+++ b/www/p5-CGI-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-PSGI
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-CGI-PSGI/pkg-plist b/www/p5-CGI-PSGI/pkg-plist
index 97fa716a58ce..73a4ed9959db 100644
--- a/www/p5-CGI-PSGI/pkg-plist
+++ b/www/p5-CGI-PSGI/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/PSGI/.packlist
 %%SITE_PERL%%/CGI/PSGI.pm
 %%PERL5_MAN3%%/CGI::PSGI.3.gz
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/PSGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Pager/Makefile b/www/p5-CGI-Pager/Makefile
index 8e65073f8809..57d15efcc6c8 100644
--- a/www/p5-CGI-Pager/Makefile
+++ b/www/p5-CGI-Pager/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-Pager
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Pager/pkg-plist b/www/p5-CGI-Pager/pkg-plist
index 8258a0b99f5f..8d1ae546cff3 100644
--- a/www/p5-CGI-Pager/pkg-plist
+++ b/www/p5-CGI-Pager/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Pager/.packlist
 %%SITE_PERL%%/CGI/Pager.pm
 %%PERL5_MAN3%%/CGI::Pager.3.gz
diff --git a/www/p5-CGI-Prototype/Makefile b/www/p5-CGI-Prototype/Makefile
index 38a340d60735..54da6279f833 100644
--- a/www/p5-CGI-Prototype/Makefile
+++ b/www/p5-CGI-Prototype/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Prototype
 PORTVERSION=	0.9054
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Prototype/pkg-plist b/www/p5-CGI-Prototype/pkg-plist
index 7d2202996af7..312573259666 100644
--- a/www/p5-CGI-Prototype/pkg-plist
+++ b/www/p5-CGI-Prototype/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/CGI/Prototype.pm
 %%SITE_PERL%%/CGI/Prototype/Hidden.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Prototype/.packlist
 %%PERL5_MAN3%%/CGI::Prototype.3.gz
 %%PERL5_MAN3%%/CGI::Prototype::Hidden.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Prototype
-@dirrmtry %%SITE_PERL%%/CGI/Prototype
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Response/Makefile b/www/p5-CGI-Response/Makefile
index f42d4955d69c..d972caa3dc0e 100644
--- a/www/p5-CGI-Response/Makefile
+++ b/www/p5-CGI-Response/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Response
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Response/pkg-plist b/www/p5-CGI-Response/pkg-plist
index e13547086808..a36537c010b8 100644
--- a/www/p5-CGI-Response/pkg-plist
+++ b/www/p5-CGI-Response/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CGI::Response.3.gz
 %%SITE_PERL%%/CGI/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-SSI/Makefile b/www/p5-CGI-SSI/Makefile
index 0f9b171ad9bc..9636dd847c07 100644
--- a/www/p5-CGI-SSI/Makefile
+++ b/www/p5-CGI-SSI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-SSI
 PORTVERSION=	0.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-SSI/pkg-plist b/www/p5-CGI-SSI/pkg-plist
index 22b3eea4c794..50183d99725c 100644
--- a/www/p5-CGI-SSI/pkg-plist
+++ b/www/p5-CGI-SSI/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CGI/SSI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI/.packlist
 %%PERL5_MAN3%%/CGI::SSI.3.gz
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Session-ExpireSessions/Makefile b/www/p5-CGI-Session-ExpireSessions/Makefile
index 149730094b5c..002320fcfe1a 100644
--- a/www/p5-CGI-Session-ExpireSessions/Makefile
+++ b/www/p5-CGI-Session-ExpireSessions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Session-ExpireSessions
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CGI
diff --git a/www/p5-CGI-Session-ExpireSessions/pkg-plist b/www/p5-CGI-Session-ExpireSessions/pkg-plist
index 083e7fe2dda8..5113749ecf36 100644
--- a/www/p5-CGI-Session-ExpireSessions/pkg-plist
+++ b/www/p5-CGI-Session-ExpireSessions/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/ExpireSessions/.packlist
 %%SITE_PERL%%/CGI/Session/ExpireSessions.pm
 %%PERL5_MAN3%%/CGI::Session::ExpireSessions.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/ExpireSessions
diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index 3a1d8e7ecad1..cc98f70725a3 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Session
 PORTVERSION=	4.48
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARKSTOS
diff --git a/www/p5-CGI-Session/pkg-plist b/www/p5-CGI-Session/pkg-plist
index ca2f03e05ebb..7010217be8ee 100644
--- a/www/p5-CGI-Session/pkg-plist
+++ b/www/p5-CGI-Session/pkg-plist
@@ -15,7 +15,6 @@
 %%SITE_PERL%%/CGI/Session/Serialize/storable.pm
 %%SITE_PERL%%/CGI/Session/Test/Default.pm
 %%SITE_PERL%%/CGI/Session/Tutorial.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist
 %%PERL5_MAN3%%/CGI::Session.3.gz
 %%PERL5_MAN3%%/CGI::Session::Driver.3.gz
 %%PERL5_MAN3%%/CGI::Session::Driver::DBI.3.gz
@@ -33,11 +32,3 @@
 %%PERL5_MAN3%%/CGI::Session::Serialize::storable.3.gz
 %%PERL5_MAN3%%/CGI::Session::Test::Default.3.gz
 %%PERL5_MAN3%%/CGI::Session::Tutorial.3.gz
-@dirrm %%SITE_PERL%%/CGI/Session/Driver
-@dirrm %%SITE_PERL%%/CGI/Session/ID
-@dirrm %%SITE_PERL%%/CGI/Session/Serialize
-@dirrm %%SITE_PERL%%/CGI/Session/Test
-@dirrm %%SITE_PERL%%/CGI/Session
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index 9b7f1ddc3f95..d465d39f9cbf 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Simple
 PORTVERSION=	1.113
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ANDYA
diff --git a/www/p5-CGI-Simple/pkg-plist b/www/p5-CGI-Simple/pkg-plist
index c32f975b0abe..1e68cddc4490 100644
--- a/www/p5-CGI-Simple/pkg-plist
+++ b/www/p5-CGI-Simple/pkg-plist
@@ -2,12 +2,7 @@
 %%SITE_PERL%%/CGI/Simple/Cookie.pm
 %%SITE_PERL%%/CGI/Simple/Standard.pm
 %%SITE_PERL%%/CGI/Simple/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Simple/.packlist
 %%PERL5_MAN3%%/CGI::Simple.3.gz
 %%PERL5_MAN3%%/CGI::Simple::Cookie.3.gz
 %%PERL5_MAN3%%/CGI::Simple::Standard.3.gz
 %%PERL5_MAN3%%/CGI::Simple::Util.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI/Simple
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index af8e8b174dab..9ef1588eac2d 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-SpeedyCGI
 PORTVERSION=	2.22
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-SpeedyCGI/pkg-plist b/www/p5-CGI-SpeedyCGI/pkg-plist
index 4b1fee9a0074..78972b3fea5b 100644
--- a/www/p5-CGI-SpeedyCGI/pkg-plist
+++ b/www/p5-CGI-SpeedyCGI/pkg-plist
@@ -3,10 +3,6 @@ bin/speedy_backend
 bin/speedy_dump
 bin/speedy_suidperl
 %%SITE_PERL%%/CGI/SpeedyCGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
 %%APACHE%%%%APACHEMODDIR%%/mod_speedycgi.so
 %%APACHE%%@exec %D/sbin/apxs -e -a -n speedycgi %D/%F
 %%APACHE%%@unexec %D/sbin/apxs -e -A -n speedycgi %D/%F
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Struct/Makefile b/www/p5-CGI-Struct/Makefile
index a51afd89438f..2e044d134db1 100644
--- a/www/p5-CGI-Struct/Makefile
+++ b/www/p5-CGI-Struct/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI-Struct
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Struct/pkg-plist b/www/p5-CGI-Struct/pkg-plist
index 01cf0be8abb1..a348a48ebb00 100644
--- a/www/p5-CGI-Struct/pkg-plist
+++ b/www/p5-CGI-Struct/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Struct/.packlist
 %%SITE_PERL%%/CGI/Struct.pm
 %%PERL5_MAN3%%/CGI::Struct.3.gz
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Struct
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Thin/Makefile b/www/p5-CGI-Thin/Makefile
index f45c14178733..d5f947f5af77 100644
--- a/www/p5-CGI-Thin/Makefile
+++ b/www/p5-CGI-Thin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Thin
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Thin/pkg-plist b/www/p5-CGI-Thin/pkg-plist
index 24283d5e9cd7..5feab9eb9f40 100644
--- a/www/p5-CGI-Thin/pkg-plist
+++ b/www/p5-CGI-Thin/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/CGI/Thin.pm
 %%SITE_PERL%%/CGI/Thin/Cookies.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Thin/.packlist
 %%PERL5_MAN3%%/CGI::Thin.3.gz
 %%PERL5_MAN3%%/CGI::Thin::Cookies.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Thin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI/Thin
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Untaint-date/Makefile b/www/p5-CGI-Untaint-date/Makefile
index b21db4ad7df7..9062a9bfacf7 100644
--- a/www/p5-CGI-Untaint-date/Makefile
+++ b/www/p5-CGI-Untaint-date/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Untaint-date
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Untaint-date/pkg-plist b/www/p5-CGI-Untaint-date/pkg-plist
index 6c0553bfb258..0afc35e5a96f 100644
--- a/www/p5-CGI-Untaint-date/pkg-plist
+++ b/www/p5-CGI-Untaint-date/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/CGI::Untaint::date.3.gz
 %%SITE_PERL%%/CGI/Untaint/date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/date/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/date
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Untaint
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Untaint-email/Makefile b/www/p5-CGI-Untaint-email/Makefile
index fc51255824a9..46d475f02021 100644
--- a/www/p5-CGI-Untaint-email/Makefile
+++ b/www/p5-CGI-Untaint-email/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Untaint-email
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Untaint-email/pkg-plist b/www/p5-CGI-Untaint-email/pkg-plist
index b72798f97038..3ef6f5e528e0 100644
--- a/www/p5-CGI-Untaint-email/pkg-plist
+++ b/www/p5-CGI-Untaint-email/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/CGI/Untaint/email.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/email/.packlist
 %%PERL5_MAN3%%/CGI::Untaint::email.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/email
diff --git a/www/p5-CGI-Untaint/Makefile b/www/p5-CGI-Untaint/Makefile
index 8d86bcda96c5..43067f0e1ba8 100644
--- a/www/p5-CGI-Untaint/Makefile
+++ b/www/p5-CGI-Untaint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Untaint
 PORTVERSION=	1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Untaint/pkg-plist b/www/p5-CGI-Untaint/pkg-plist
index 1320b3a234af..6ecf3e961bd8 100644
--- a/www/p5-CGI-Untaint/pkg-plist
+++ b/www/p5-CGI-Untaint/pkg-plist
@@ -8,8 +8,3 @@
 %%SITE_PERL%%/CGI/Untaint/integer.pm
 %%SITE_PERL%%/CGI/Untaint/object.pm
 %%SITE_PERL%%/CGI/Untaint/printable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI/Untaint
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Upload/Makefile b/www/p5-CGI-Upload/Makefile
index 24ac65aa2200..42275cbb97cf 100644
--- a/www/p5-CGI-Upload/Makefile
+++ b/www/p5-CGI-Upload/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Upload
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Upload/pkg-plist b/www/p5-CGI-Upload/pkg-plist
index a9ad58856397..fae841e17f8f 100644
--- a/www/p5-CGI-Upload/pkg-plist
+++ b/www/p5-CGI-Upload/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CGI::Upload.3.gz
 %%SITE_PERL%%/CGI/Upload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Utils/Makefile b/www/p5-CGI-Utils/Makefile
index c6cf233f83db..100793cc4cd2 100644
--- a/www/p5-CGI-Utils/Makefile
+++ b/www/p5-CGI-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Utils
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-Utils/pkg-plist b/www/p5-CGI-Utils/pkg-plist
index 9f77fd95a67e..f83dab278abb 100644
--- a/www/p5-CGI-Utils/pkg-plist
+++ b/www/p5-CGI-Utils/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Utils/.packlist
 %%SITE_PERL%%/CGI/Utils.pm
 %%SITE_PERL%%/CGI/Utils/UploadFile.pm
 %%PERL5_MAN3%%/CGI::Utils.3.gz
 %%PERL5_MAN3%%/CGI::Utils::UploadFile.3.gz
-@dirrm    %%SITE_PERL%%/CGI/Utils
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Utils
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile
index dafbcfc04382..b23c2b675ff9 100644
--- a/www/p5-CGI-XMLApplication/Makefile
+++ b/www/p5-CGI-XMLApplication/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-XMLApplication
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-XMLApplication/pkg-plist b/www/p5-CGI-XMLApplication/pkg-plist
index 5d68df5aaa8e..816fdd87ade5 100644
--- a/www/p5-CGI-XMLApplication/pkg-plist
+++ b/www/p5-CGI-XMLApplication/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/CGI::XMLApplication.3.gz
 %%SITE_PERL%%/CGI/XMLApplication.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex2_finish.xsl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex2_form.xsl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.pl
@@ -15,6 +14,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/minimal.xsl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/minimalapp.pm
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index bb844677f725..e8f6677f4685 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CGI.pm
 PORTVERSION=	3.63
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-CGI.pm/pkg-plist b/www/p5-CGI.pm/pkg-plist
index d355b5289c1b..1b22a9fc7e6c 100644
--- a/www/p5-CGI.pm/pkg-plist
+++ b/www/p5-CGI.pm/pkg-plist
@@ -7,7 +7,6 @@
 %%SITE_PERL%%/CGI/Push.pm
 %%SITE_PERL%%/CGI/Switch.pm
 %%SITE_PERL%%/CGI/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caution.xbm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clickable_image.cgi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie.cgi
@@ -39,5 +38,3 @@
 %%PERL5_MAN3%%/CGI::Push.3.gz
 %%PERL5_MAN3%%/CGI::Switch.3.gz
 %%PERL5_MAN3%%/CGI::Util.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index e1a436d43442..7151a0643e20 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CGI-Lite
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI_Lite/pkg-plist b/www/p5-CGI_Lite/pkg-plist
index 174ffb2206da..44566f5b0485 100644
--- a/www/p5-CGI_Lite/pkg-plist
+++ b/www/p5-CGI_Lite/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/CGI/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Lite/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -13,6 +12,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PERL5_MAN3%%/CGI::Lite.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CIF-Client/Makefile b/www/p5-CIF-Client/Makefile
index 0806863fd6e7..ae5cf895e0ab 100644
--- a/www/p5-CIF-Client/Makefile
+++ b/www/p5-CIF-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CIF-Client
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAXJAZMAN/cif
diff --git a/www/p5-CIF-Client/pkg-plist b/www/p5-CIF-Client/pkg-plist
index cc737b52b5cf..359c5153467e 100644
--- a/www/p5-CIF-Client/pkg-plist
+++ b/www/p5-CIF-Client/pkg-plist
@@ -22,11 +22,4 @@ bin/cif
 %%SITE_PERL%%/CIF/Client/Plugin/Snort.pm
 %%SITE_PERL%%/CIF/Client/Plugin/Table.pm
 %%SITE_PERL%%/CIF/Client/Support.pm
-%%SITE_PERL%%/mach/auto/CIF/Client/.packlist
 %%PERL5_MAN3%%/CIF::Client.3.gz
-@dirrm %%SITE_PERL%%/mach/auto/CIF/Client
-@dirrm %%SITE_PERL%%/mach/auto/CIF
-@dirrm %%SITE_PERL%%/CIF/Client/Plugin/Iodef
-@dirrm %%SITE_PERL%%/CIF/Client/Plugin
-@dirrm %%SITE_PERL%%/CIF/Client
-@dirrm %%SITE_PERL%%/CIF
diff --git a/www/p5-CSS-DOM/Makefile b/www/p5-CSS-DOM/Makefile
index 6829324d33d9..5283c8f737bb 100644
--- a/www/p5-CSS-DOM/Makefile
+++ b/www/p5-CSS-DOM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-DOM
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CSS
diff --git a/www/p5-CSS-DOM/pkg-plist b/www/p5-CSS-DOM/pkg-plist
index 4e03dd61bbcb..47dd9cec433f 100644
--- a/www/p5-CSS-DOM/pkg-plist
+++ b/www/p5-CSS-DOM/pkg-plist
@@ -43,11 +43,3 @@
 %%SITE_PERL%%/CSS/DOM/Value/List.pm
 %%SITE_PERL%%/CSS/DOM/Value/Primitive.pm
 %%SITE_PERL%%/CSS/DOM/Value/Primitive/colours.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/DOM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/DOM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/CSS/DOM/Value/Primitive
-@dirrmtry %%SITE_PERL%%/CSS/DOM/Value
-@dirrmtry %%SITE_PERL%%/CSS/DOM/Rule
-@dirrmtry %%SITE_PERL%%/CSS/DOM
-@dirrmtry %%SITE_PERL%%/CSS
diff --git a/www/p5-CSS-Inliner/Makefile b/www/p5-CSS-Inliner/Makefile
index 941abb2f051c..bc42996db2f7 100644
--- a/www/p5-CSS-Inliner/Makefile
+++ b/www/p5-CSS-Inliner/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CSS-Inliner
 PORTVERSION=	3948
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CSS-Inliner/pkg-plist b/www/p5-CSS-Inliner/pkg-plist
index 531c1a9b0612..5017a6306703 100644
--- a/www/p5-CSS-Inliner/pkg-plist
+++ b/www/p5-CSS-Inliner/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/CSS/Inliner.pm
 %%SITE_PERL%%/CSS/Inliner/Parser.pm
 %%SITE_PERL%%/CSS/Inliner/TreeBuilder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Inliner/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Inliner
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
-@dirrmtry %%SITE_PERL%%/CSS/Inliner
-@dirrmtry %%SITE_PERL%%/CSS
diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index d32f03872df9..48b2e5413571 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Action-REST
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Action-REST/pkg-plist b/www/p5-Catalyst-Action-REST/pkg-plist
index 24240e9c4369..acfc91d2a93d 100644
--- a/www/p5-Catalyst-Action-REST/pkg-plist
+++ b/www/p5-Catalyst-Action-REST/pkg-plist
@@ -34,23 +34,3 @@
 %%SITE_PERL%%/Catalyst/Request/REST/ForBrowsers.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Request/REST.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Request/REST/ForBrowsers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/REST/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/REST
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Request/REST
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Request
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor
-@dirrmtry %%SITE_PERL%%/Catalyst/Request/REST
-@dirrmtry %%SITE_PERL%%/Catalyst/Request
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/YAML
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/XML
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/JSON
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/REST
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize/XML
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize/JSON
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize
-@dirrmtry %%SITE_PERL%%/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Action-RenderView/Makefile b/www/p5-Catalyst-Action-RenderView/Makefile
index 643b3bf70e69..a78b8d54ccd9 100644
--- a/www/p5-Catalyst-Action-RenderView/Makefile
+++ b/www/p5-Catalyst-Action-RenderView/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Action-RenderView
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Action-RenderView/pkg-plist b/www/p5-Catalyst-Action-RenderView/pkg-plist
index c3f19832ba04..1de9d96ed3d0 100644
--- a/www/p5-Catalyst-Action-RenderView/pkg-plist
+++ b/www/p5-Catalyst-Action-RenderView/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Action::RenderView.3.gz
 %%SITE_PERL%%/Catalyst/Action/RenderView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/RenderView/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/RenderView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
index 86b630f4be66..6cad25aeda12 100644
--- a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
+++ b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Action-Serialize-XML-Hash-LX
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/pkg-plist b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/pkg-plist
index 08bbe4a89a94..1a912238000e 100644
--- a/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/pkg-plist
+++ b/www/p5-Catalyst-Action-Serialize-XML-Hash-LX/pkg-plist
@@ -1,19 +1,4 @@
 %%SITE_PERL%%/Catalyst/Action/Deserialize/XML/Hash/LX.pm
 %%SITE_PERL%%/Catalyst/Action/Serialize/XML/Hash/LX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/Serialize/XML/Hash/LX/.packlist
 %%PERL5_MAN3%%/Catalyst::Action::Deserialize::XML::Hash::LX.3.gz
 %%PERL5_MAN3%%/Catalyst::Action::Serialize::XML::Hash::LX.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/Serialize/XML/Hash/LX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/Serialize/XML/Hash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/Serialize/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/Serialize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/XML/Hash
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/XML
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize/XML/Hash
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize/XML
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize
-@dirrmtry %%SITE_PERL%%/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-ActionRole-ACL/Makefile b/www/p5-Catalyst-ActionRole-ACL/Makefile
index 07cffcce591a..7b33a9240da1 100644
--- a/www/p5-Catalyst-ActionRole-ACL/Makefile
+++ b/www/p5-Catalyst-ActionRole-ACL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-ActionRole-ACL
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/www/p5-Catalyst-ActionRole-ACL/pkg-plist b/www/p5-Catalyst-ActionRole-ACL/pkg-plist
index 77efc41296af..0b5b2f617f5e 100644
--- a/www/p5-Catalyst-ActionRole-ACL/pkg-plist
+++ b/www/p5-Catalyst-ActionRole-ACL/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Catalyst/Action/Role/ACL.pm
 %%SITE_PERL%%/Catalyst/ActionRole/ACL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/ActionRole/ACL/.packlist
 %%PERL5_MAN3%%/Catalyst::Action::Role::ACL.3.gz
 %%PERL5_MAN3%%/Catalyst::ActionRole::ACL.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/ActionRole/ACL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/ActionRole
-@dirrmtry %%SITE_PERL%%/Catalyst/ActionRole
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Role
-@dirrmtry %%SITE_PERL%%/Catalyst/Action
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
index 547d0be1d177..c17eb13aaabf 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Authentication-Credential-HTTP
 PORTVERSION=	1.016
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/pkg-plist b/www/p5-Catalyst-Authentication-Credential-HTTP/pkg-plist
index 22f4c278e142..878adf0e5e3f 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/pkg-plist
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/pkg-plist
@@ -1,10 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Credential/HTTP/.packlist
 %%SITE_PERL%%/Catalyst/Authentication/Credential/HTTP.pm
 %%PERL5_MAN3%%/Catalyst::Authentication::Credential::HTTP.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Credential
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Credential/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Credential
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile b/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
index 3df28de2f9b6..ac609bf848cd 100644
--- a/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-OpenID/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Authentication-Credential-OpenID
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Authentication-Credential-OpenID/pkg-plist b/www/p5-Catalyst-Authentication-Credential-OpenID/pkg-plist
index fd590fe0c189..65d7008dda9d 100644
--- a/www/p5-Catalyst-Authentication-Credential-OpenID/pkg-plist
+++ b/www/p5-Catalyst-Authentication-Credential-OpenID/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Authentication/Credential/OpenID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Credential/OpenID/.packlist
 %%PERL5_MAN3%%/Catalyst::Authentication::Credential::OpenID.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Credential
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Credential/OpenID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Credential
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
index c456a2d4bb2e..c3244152eb46 100644
--- a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Authentication-Store-DBIx-Class
 PORTVERSION=	0.1506
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Authentication-Store-DBIx-Class/pkg-plist b/www/p5-Catalyst-Authentication-Store-DBIx-Class/pkg-plist
index 6db462362f1c..41d63e8df9bf 100644
--- a/www/p5-Catalyst-Authentication-Store-DBIx-Class/pkg-plist
+++ b/www/p5-Catalyst-Authentication-Store-DBIx-Class/pkg-plist
@@ -1,18 +1,6 @@
 %%SITE_PERL%%/Catalyst/Authentication/Realm/SimpleDB.pm
 %%SITE_PERL%%/Catalyst/Authentication/Store/DBIx/Class.pm
 %%SITE_PERL%%/Catalyst/Authentication/Store/DBIx/Class/User.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Store/DBIx/Class/.packlist
 %%PERL5_MAN3%%/Catalyst::Authentication::Realm::SimpleDB.3.gz
 %%PERL5_MAN3%%/Catalyst::Authentication::Store::DBIx::Class.3.gz
 %%PERL5_MAN3%%/Catalyst::Authentication::Store::DBIx::Class::User.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Store/DBIx/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Store/DBIx
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Store/DBIx/Class
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Store/DBIx
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Realm
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
index 8ad24e7bb6bd..19426cb83063 100644
--- a/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-LDAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Authentication-Store-LDAP
 PORTVERSION=	1.014
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Authentication-Store-LDAP/pkg-plist b/www/p5-Catalyst-Authentication-Store-LDAP/pkg-plist
index d93a05bec9ac..34140bd7d2ad 100644
--- a/www/p5-Catalyst-Authentication-Store-LDAP/pkg-plist
+++ b/www/p5-Catalyst-Authentication-Store-LDAP/pkg-plist
@@ -1,15 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Store/LDAP/.packlist
 %%SITE_PERL%%/Catalyst/Authentication/Store/LDAP.pm
 %%SITE_PERL%%/Catalyst/Authentication/Store/LDAP/Backend.pm
 %%SITE_PERL%%/Catalyst/Authentication/Store/LDAP/User.pm
 %%PERL5_MAN3%%/Catalyst::Authentication::Store::LDAP.3.gz
 %%PERL5_MAN3%%/Catalyst::Authentication::Store::LDAP::Backend.3.gz
 %%PERL5_MAN3%%/Catalyst::Authentication::Store::LDAP::User.3.gz
-@dirrm %%SITE_PERL%%/Catalyst/Authentication/Store/LDAP
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Store/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
index 1e76a8035771..d19f469d3a46 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Component-ACCEPT_CONTEXT
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/pkg-plist b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/pkg-plist
index 937f21c46abb..c796335f3cfd 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/pkg-plist
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Component/ACCEPT_CONTEXT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Component/ACCEPT_CONTEXT/.packlist
 %%PERL5_MAN3%%/Catalyst::Component::ACCEPT_CONTEXT.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Component/ACCEPT_CONTEXT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Component
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Component-InstancePerContext/Makefile b/www/p5-Catalyst-Component-InstancePerContext/Makefile
index b0fb8b7a2e86..32526b7a30de 100644
--- a/www/p5-Catalyst-Component-InstancePerContext/Makefile
+++ b/www/p5-Catalyst-Component-InstancePerContext/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Component-InstancePerContext
 PORTVERSION=	0.001001
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Component-InstancePerContext/pkg-plist b/www/p5-Catalyst-Component-InstancePerContext/pkg-plist
index f88ab123854a..83ed6de9982c 100644
--- a/www/p5-Catalyst-Component-InstancePerContext/pkg-plist
+++ b/www/p5-Catalyst-Component-InstancePerContext/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Component/InstancePerContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Component/InstancePerContext/.packlist
 %%PERL5_MAN3%%/Catalyst::Component::InstancePerContext.3.gz
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Component/InstancePerContext
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Component
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Controller-ActionRole/Makefile b/www/p5-Catalyst-Controller-ActionRole/Makefile
index f13f6777de54..06f85ac1c105 100644
--- a/www/p5-Catalyst-Controller-ActionRole/Makefile
+++ b/www/p5-Catalyst-Controller-ActionRole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Controller-ActionRole
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Controller-ActionRole/pkg-plist b/www/p5-Catalyst-Controller-ActionRole/pkg-plist
index 3fe1b2f6bedc..dd2d31d3978b 100644
--- a/www/p5-Catalyst-Controller-ActionRole/pkg-plist
+++ b/www/p5-Catalyst-Controller-ActionRole/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Controller/ActionRole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/ActionRole/.packlist
 %%PERL5_MAN3%%/Catalyst::Controller::ActionRole.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/ActionRole
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index bf78b37bc094..8b10563d4732 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Controller-BindLex
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NUFFIN
diff --git a/www/p5-Catalyst-Controller-BindLex/pkg-plist b/www/p5-Catalyst-Controller-BindLex/pkg-plist
index 1d3197385fc9..f72bf65d68fb 100644
--- a/www/p5-Catalyst-Controller-BindLex/pkg-plist
+++ b/www/p5-Catalyst-Controller-BindLex/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Controller::BindLex.3.gz
 %%SITE_PERL%%/Catalyst/Controller/BindLex.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Controller-FormBuilder/Makefile b/www/p5-Catalyst-Controller-FormBuilder/Makefile
index e5345edf718a..5664fa6df87c 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Controller-FormBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Controller-FormBuilder
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSTROUT
diff --git a/www/p5-Catalyst-Controller-FormBuilder/pkg-plist b/www/p5-Catalyst-Controller-FormBuilder/pkg-plist
index be3f2c9a26f0..537b981d2dcb 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/pkg-plist
+++ b/www/p5-Catalyst-Controller-FormBuilder/pkg-plist
@@ -3,13 +3,4 @@
 %%SITE_PERL%%/Catalyst/Controller/FormBuilder/Action/HTML/Template.pm
 %%SITE_PERL%%/Catalyst/Controller/FormBuilder/Action/Mason.pm
 %%SITE_PERL%%/Catalyst/Controller/FormBuilder/Action/TT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/FormBuilder/.packlist
 %%PERL5_MAN3%%/Catalyst::Controller::FormBuilder.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/FormBuilder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/FormBuilder/Action/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/FormBuilder/Action
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/FormBuilder
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
index 0bcce8d67ad7..2bf36ff00720 100644
--- a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
+++ b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Controller-HTML-FormFu
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/pkg-plist b/www/p5-Catalyst-Controller-HTML-FormFu/pkg-plist
index 4ceb374f6e72..aa5df7f94349 100644
--- a/www/p5-Catalyst-Controller-HTML-FormFu/pkg-plist
+++ b/www/p5-Catalyst-Controller-HTML-FormFu/pkg-plist
@@ -10,24 +10,6 @@
 %%SITE_PERL%%/HTML/FormFu/Constraint/RequestToken.pm
 %%SITE_PERL%%/HTML/FormFu/Element/RequestToken.pm
 %%SITE_PERL%%/HTML/FormFu/Plugin/RequestToken.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/HTML/FormFu/.packlist
 %%PERL5_MAN3%%/Catalyst::Controller::HTML::FormFu.3.gz
 %%PERL5_MAN3%%/Catalyst::Helper::HTML::FormFu.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Element::RequestToken.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/HTML/FormFu
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Plugin
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Element
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Constraint
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/
-@dirrmtry %%SITE_PERL%%/HTML/
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/HTML/FormFu/ActionBase
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/HTML/FormFu/Action
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/HTML/FormFu
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Controller-RateLimit/Makefile b/www/p5-Catalyst-Controller-RateLimit/Makefile
index d19636920d76..a02009b4aa43 100644
--- a/www/p5-Catalyst-Controller-RateLimit/Makefile
+++ b/www/p5-Catalyst-Controller-RateLimit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Controller-RateLimit
 PORTVERSION=	0.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Controller-RateLimit/pkg-plist b/www/p5-Catalyst-Controller-RateLimit/pkg-plist
index c9af5d38f804..afcb63b56799 100644
--- a/www/p5-Catalyst-Controller-RateLimit/pkg-plist
+++ b/www/p5-Catalyst-Controller-RateLimit/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Controller::RateLimit.3.gz
 %%SITE_PERL%%/Catalyst/Controller/RateLimit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RateLimit/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RateLimit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Controller-RequestToken/Makefile b/www/p5-Catalyst-Controller-RequestToken/Makefile
index c761c787cfcb..5e88230b7701 100644
--- a/www/p5-Catalyst-Controller-RequestToken/Makefile
+++ b/www/p5-Catalyst-Controller-RequestToken/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Controller-RequestToken
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Controller-RequestToken/pkg-plist b/www/p5-Catalyst-Controller-RequestToken/pkg-plist
index 2a442b6be8e1..ef8872d8193e 100644
--- a/www/p5-Catalyst-Controller-RequestToken/pkg-plist
+++ b/www/p5-Catalyst-Controller-RequestToken/pkg-plist
@@ -2,16 +2,7 @@
 %%SITE_PERL%%/Catalyst/Controller/RequestToken/Action/CreateToken.pm
 %%SITE_PERL%%/Catalyst/Controller/RequestToken/Action/RemoveToken.pm
 %%SITE_PERL%%/Catalyst/Controller/RequestToken/Action/ValidateToken.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RequestToken/.packlist
 %%PERL5_MAN3%%/Catalyst::Controller::RequestToken.3.gz
 %%PERL5_MAN3%%/Catalyst::Controller::RequestToken::Action::CreateToken.3.gz
 %%PERL5_MAN3%%/Catalyst::Controller::RequestToken::Action::RemoveToken.3.gz
 %%PERL5_MAN3%%/Catalyst::Controller::RequestToken::Action::ValidateToken.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RequestToken
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/mach
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/RequestToken/Action
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller/RequestToken
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Devel/Makefile b/www/p5-Catalyst-Devel/Makefile
index b271c7ea4741..8062572cf90a 100644
--- a/www/p5-Catalyst-Devel/Makefile
+++ b/www/p5-Catalyst-Devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Devel
 PORTVERSION=	1.38
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/www/p5-Catalyst-Devel/pkg-plist b/www/p5-Catalyst-Devel/pkg-plist
index 3e4e383bfc70..ef1194854992 100644
--- a/www/p5-Catalyst-Devel/pkg-plist
+++ b/www/p5-Catalyst-Devel/pkg-plist
@@ -37,22 +37,3 @@
 %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/t/02pod.t.tt
 %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/t/03podcoverage.t.tt
 %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/t/comptest.tt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Devel/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Devel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/t
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/script
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/root/static/images
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/root/static
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/root
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/lib/MyApp/Controller
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/lib/MyApp
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/lib/Helper
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/lib
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel
-@dirrmtry %%SITE_PERL%%/auto/share/dist
-@dirrmtry %%SITE_PERL%%/auto/share
-@dirrmtry %%SITE_PERL%%/Module/Install
-@dirrmtry %%SITE_PERL%%/Module
-@dirrmtry %%SITE_PERL%%/Catalyst/Restarter
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-DispatchType-Regex/Makefile b/www/p5-Catalyst-DispatchType-Regex/Makefile
index a02785306769..fc1d1c9735bb 100644
--- a/www/p5-Catalyst-DispatchType-Regex/Makefile
+++ b/www/p5-Catalyst-DispatchType-Regex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-DispatchType-Regex
 PORTVERSION=	5.90.033
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-DispatchType-Regex/pkg-plist b/www/p5-Catalyst-DispatchType-Regex/pkg-plist
index 1250bc483234..2ea522d23f7a 100644
--- a/www/p5-Catalyst-DispatchType-Regex/pkg-plist
+++ b/www/p5-Catalyst-DispatchType-Regex/pkg-plist
@@ -6,5 +6,3 @@
 %%PERL5_MAN3%%/Catalyst::DispatchType::LocalRegexp.3.gz
 %%PERL5_MAN3%%/Catalyst::DispatchType::Regex.3.gz
 %%PERL5_MAN3%%/Catalyst::DispatchType::Regexp.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/DispatchType
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Engine-Apache/Makefile b/www/p5-Catalyst-Engine-Apache/Makefile
index d9c6decb81b4..810f98a8c9d7 100644
--- a/www/p5-Catalyst-Engine-Apache/Makefile
+++ b/www/p5-Catalyst-Engine-Apache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Engine-Apache
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Engine-Apache/pkg-plist b/www/p5-Catalyst-Engine-Apache/pkg-plist
index 0365095eff58..54f3de09aeea 100644
--- a/www/p5-Catalyst-Engine-Apache/pkg-plist
+++ b/www/p5-Catalyst-Engine-Apache/pkg-plist
@@ -3,16 +3,8 @@
 %%SITE_PERL%%/Catalyst/Engine/Apache/MP13.pm
 %%SITE_PERL%%/Catalyst/Engine/Apache2/MP19.pm
 %%SITE_PERL%%/Catalyst/Engine/Apache2/MP20.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/Apache/.packlist
 %%PERL5_MAN3%%/Catalyst::Engine::Apache.3.gz
 %%PERL5_MAN3%%/Catalyst::Engine::Apache2.3.gz
 %%PERL5_MAN3%%/Catalyst::Engine::Apache2::MP19.3.gz
 %%PERL5_MAN3%%/Catalyst::Engine::Apache2::MP20.3.gz
 %%PERL5_MAN3%%/Catalyst::Engine::Apache::MP13.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/Apache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Engine/Apache2
-@dirrmtry %%SITE_PERL%%/Catalyst/Engine/Apache
-@dirrmtry %%SITE_PERL%%/Catalyst/Engine
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
index 1037a134fa9e..6d2ced14c837 100644
--- a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
+++ b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Engine-HTTP-Prefork
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist b/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist
index c173fa8ce777..2a221640a09e 100644
--- a/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist
+++ b/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist
@@ -2,12 +2,3 @@
 %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork.pm
 %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork/Handler.pm
 %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork/Restarter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP/Prefork/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP/Prefork
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork
-@dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP
-@dirrmtry %%SITE_PERL%%/Catalyst/Engine
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Engine-PSGI/Makefile b/www/p5-Catalyst-Engine-PSGI/Makefile
index b39111bdfbab..4f3ab009e138 100644
--- a/www/p5-Catalyst-Engine-PSGI/Makefile
+++ b/www/p5-Catalyst-Engine-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-Engine-PSGI
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Catalyst-Engine-PSGI/pkg-plist b/www/p5-Catalyst-Engine-PSGI/pkg-plist
index 5d3d085a6f36..3ddaf5d7810d 100644
--- a/www/p5-Catalyst-Engine-PSGI/pkg-plist
+++ b/www/p5-Catalyst-Engine-PSGI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/PSGI/.packlist
 %%SITE_PERL%%/Catalyst/Controller/Metal.pm
 %%SITE_PERL%%/Catalyst/Engine/PSGI.pm
 %%SITE_PERL%%/Catalyst/Helper/PSGI.pm
@@ -7,12 +6,3 @@
 %%PERL5_MAN3%%/Catalyst::Engine::PSGI.3.gz
 %%PERL5_MAN3%%/Catalyst::Helper::PSGI.3.gz
 %%PERL5_MAN3%%/Plack::Test::Adopt::Catalyst.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Test/Adopt
-@dirrmtry %%SITE_PERL%%/Plack/Test
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/PSGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine
-@dirrm %%SITE_PERL%%/Catalyst/Engine
diff --git a/www/p5-Catalyst-Enzyme/Makefile b/www/p5-Catalyst-Enzyme/Makefile
index 221c39b3f5f6..0ed663d3cc25 100644
--- a/www/p5-Catalyst-Enzyme/Makefile
+++ b/www/p5-Catalyst-Enzyme/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Enzyme
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Enzyme/pkg-plist b/www/p5-Catalyst-Enzyme/pkg-plist
index c0335f0e54f4..6d1b1de5d4a5 100644
--- a/www/p5-Catalyst-Enzyme/pkg-plist
+++ b/www/p5-Catalyst-Enzyme/pkg-plist
@@ -27,21 +27,3 @@
 %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT/root/base/view.tt
 %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT/root/base/view_macros.tt
 %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT/root/static/css/enzyme.css
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Enzyme/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Enzyme
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT/root/static/css
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT/root/static
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT/root/base
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT/root
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Enzyme/TT
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Enzyme
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/Enzyme
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Controller/Enzyme
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/Enzyme/CRUD
-@dirrmtry %%SITE_PERL%%/Catalyst/Enzyme
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
index 86bc3fb03ea1..97944d09048e 100644
--- a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
+++ b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Helper-Controller-Scaffold
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist b/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist
index b841a32683b1..f9b9e150e2da 100644
--- a/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist
+++ b/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Helper/Controller/Scaffold.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold/.packlist
 %%PERL5_MAN3%%/Catalyst::Helper::Controller::Scaffold.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Manual/Makefile b/www/p5-Catalyst-Manual/Makefile
index 5299e5872570..e98399e3ecfa 100644
--- a/www/p5-Catalyst-Manual/Makefile
+++ b/www/p5-Catalyst-Manual/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Manual
 PORTVERSION=	5.9008
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-Catalyst-Manual/pkg-plist b/www/p5-Catalyst-Manual/pkg-plist
index 8c8caa8be0c0..6cf093b53b39 100644
--- a/www/p5-Catalyst-Manual/pkg-plist
+++ b/www/p5-Catalyst-Manual/pkg-plist
@@ -66,15 +66,3 @@
 %%SITE_PERL%%/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormHandler.pod
 %%SITE_PERL%%/Catalyst/Manual/Tutorial/10_Appendices.pod
 %%SITE_PERL%%/Catalyst/Manual/WritingPlugins.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Manual/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Manual
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Tutorial/09_AdvancedCRUD
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Tutorial
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/nginx
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/lighttpd
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/IIS
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/Apache
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment
-@dirrmtry %%SITE_PERL%%/Catalyst/Manual
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-Adaptor/Makefile b/www/p5-Catalyst-Model-Adaptor/Makefile
index 900fb5220302..2b7e0fde2be5 100644
--- a/www/p5-Catalyst-Model-Adaptor/Makefile
+++ b/www/p5-Catalyst-Model-Adaptor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-Adaptor
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-Adaptor/pkg-plist b/www/p5-Catalyst-Model-Adaptor/pkg-plist
index 8aa6cf1bbb4d..c62da2a7377b 100644
--- a/www/p5-Catalyst-Model-Adaptor/pkg-plist
+++ b/www/p5-Catalyst-Model-Adaptor/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Adaptor/.packlist
 %%SITE_PERL%%/Catalyst/Helper/Model/Adaptor.pm
 %%SITE_PERL%%/Catalyst/Helper/Model/Factory.pm
 %%SITE_PERL%%/Catalyst/Helper/Model/Factory/PerRequest.pm
@@ -13,13 +12,3 @@
 %%PERL5_MAN3%%/Catalyst::Model::Adaptor::Base.3.gz
 %%PERL5_MAN3%%/Catalyst::Model::Factory.3.gz
 %%PERL5_MAN3%%/Catalyst::Model::Factory::PerRequest.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Adaptor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/Factory
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/Factory
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/Adaptor
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-CDBI-Plain/Makefile b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
index d4fe9d180f9e..295201e5ecb6 100644
--- a/www/p5-Catalyst-Model-CDBI-Plain/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-Model-CDBI-Plain
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-CDBI-Plain/pkg-plist b/www/p5-Catalyst-Model-CDBI-Plain/pkg-plist
index eaa5590dab4a..abe313f8f63d 100644
--- a/www/p5-Catalyst-Model-CDBI-Plain/pkg-plist
+++ b/www/p5-Catalyst-Model-CDBI-Plain/pkg-plist
@@ -1,13 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI/Plain/.packlist
 %%SITE_PERL%%/Catalyst/Model/CDBI/Plain.pm
 %%SITE_PERL%%/Catalyst/Helper/Model/CDBI/Plain.pm
 %%PERL5_MAN3%%/Catalyst::Model::CDBI::Plain.3.gz
 %%PERL5_MAN3%%/Catalyst::Helper::Model::CDBI::Plain.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI/Plain
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/CDBI
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/CDBI
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
index 3d8c9b16acf7..ad8dff3c5d6b 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-CDBI-Sweet
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
index 76475cd9ec59..3f27b3aaa86c 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Model::CDBI::Sweet.3.gz
 %%SITE_PERL%%/Catalyst/Model/CDBI/Sweet.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/CDBI
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-CDBI/Makefile b/www/p5-Catalyst-Model-CDBI/Makefile
index f935fc3da8ce..25ce672069ef 100644
--- a/www/p5-Catalyst-Model-CDBI/Makefile
+++ b/www/p5-Catalyst-Model-CDBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-CDBI
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-CDBI/pkg-plist b/www/p5-Catalyst-Model-CDBI/pkg-plist
index 6cf7e435af2e..7a3551d16aa4 100644
--- a/www/p5-Catalyst-Model-CDBI/pkg-plist
+++ b/www/p5-Catalyst-Model-CDBI/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Model::CDBI.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/CDBI.pm
 %%SITE_PERL%%/Catalyst/Model/CDBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/Makefile b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
index 2fadbbf876c3..dd23f579d7fe 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-DBIC-Plain
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRI
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
index 9cf4bd314627..ec7072012a18 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
+++ b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
@@ -2,14 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Model::DBIC::Plain.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/DBIC/Plain.pm
 %%SITE_PERL%%/Catalyst/Model/DBIC/Plain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/Makefile b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
index 7b27bd8fc4fe..59faf1db0d71 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-DBIC-Schema
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist b/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist
index 9db858ccc4bd..c4acc6e75391 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist
+++ b/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist
@@ -11,19 +11,3 @@
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/PerRequestSchema.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/SchemaProxy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Schema/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Schema
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/DBIC/Schema
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
index 599bf6a65b80..034251029732 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Model-DynamicAdaptor
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOMYHERO
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist b/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
index 2c641128f637..b169647226b8 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Model::DynamicAdaptor.3.gz
 %%SITE_PERL%%/Catalyst/Model/DynamicAdaptor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DynamicAdaptor/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DynamicAdaptor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-LDAP/Makefile b/www/p5-Catalyst-Model-LDAP/Makefile
index 1f9e629bbeaf..93560069eac3 100644
--- a/www/p5-Catalyst-Model-LDAP/Makefile
+++ b/www/p5-Catalyst-Model-LDAP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-Model-LDAP
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-LDAP/pkg-plist b/www/p5-Catalyst-Model-LDAP/pkg-plist
index 40579c05d628..6182f3a5434a 100644
--- a/www/p5-Catalyst-Model-LDAP/pkg-plist
+++ b/www/p5-Catalyst-Model-LDAP/pkg-plist
@@ -8,12 +8,3 @@
 %%SITE_PERL%%/Catalyst/Model/LDAP/Connection.pm
 %%SITE_PERL%%/Catalyst/Model/LDAP/Entry.pm
 %%SITE_PERL%%/Catalyst/Model/LDAP/Search.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/LDAP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/LDAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/LDAP
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-Memcached/Makefile b/www/p5-Catalyst-Model-Memcached/Makefile
index 07067f5234a3..f0715e7d942c 100644
--- a/www/p5-Catalyst-Model-Memcached/Makefile
+++ b/www/p5-Catalyst-Model-Memcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-Memcached
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-Memcached/pkg-plist b/www/p5-Catalyst-Model-Memcached/pkg-plist
index db5f1aef79a9..95f334f6d37f 100644
--- a/www/p5-Catalyst-Model-Memcached/pkg-plist
+++ b/www/p5-Catalyst-Model-Memcached/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Memcached/.packlist
 %%PERL5_MAN3%%/Catalyst::Model::Memcached.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Memcached
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 %%SITE_PERL%%/Catalyst/Model/Memcached.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-Oryx/Makefile b/www/p5-Catalyst-Model-Oryx/Makefile
index 99e38c20dc13..6c932ccca2cc 100644
--- a/www/p5-Catalyst-Model-Oryx/Makefile
+++ b/www/p5-Catalyst-Model-Oryx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-Oryx
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-Oryx/pkg-plist b/www/p5-Catalyst-Model-Oryx/pkg-plist
index c71b884cca93..8552f2b8849d 100644
--- a/www/p5-Catalyst-Model-Oryx/pkg-plist
+++ b/www/p5-Catalyst-Model-Oryx/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Model::Oryx.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/Oryx.pm
 %%SITE_PERL%%/Catalyst/Model/Oryx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Oryx/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Oryx
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-Tarantool/Makefile b/www/p5-Catalyst-Model-Tarantool/Makefile
index b2c1ddd50be1..cd724d9fe636 100644
--- a/www/p5-Catalyst-Model-Tarantool/Makefile
+++ b/www/p5-Catalyst-Model-Tarantool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-Tarantool
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-Tarantool/pkg-plist b/www/p5-Catalyst-Model-Tarantool/pkg-plist
index d54866bf34ee..4c1aec5419dd 100644
--- a/www/p5-Catalyst-Model-Tarantool/pkg-plist
+++ b/www/p5-Catalyst-Model-Tarantool/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/Catalyst/Model/pod2htmd.tmp
 %%SITE_PERL%%/Catalyst/Model/pod2htmi.tmp
 %%SITE_PERL%%/Catalyst/Model/Tarantool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Tarantool/.packlist
 %%PERL5_MAN3%%/Catalyst::Model::Tarantool.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Tarantool
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrm %%SITE_PERL%%/Catalyst/Model
diff --git a/www/p5-Catalyst-Model-XML-Feed/Makefile b/www/p5-Catalyst-Model-XML-Feed/Makefile
index 2b4c743b597e..edc2baa79232 100644
--- a/www/p5-Catalyst-Model-XML-Feed/Makefile
+++ b/www/p5-Catalyst-Model-XML-Feed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Model-XML-Feed
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Model-XML-Feed/pkg-plist b/www/p5-Catalyst-Model-XML-Feed/pkg-plist
index b3606539f988..4666097e736f 100644
--- a/www/p5-Catalyst-Model-XML-Feed/pkg-plist
+++ b/www/p5-Catalyst-Model-XML-Feed/pkg-plist
@@ -2,12 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Model::XML::Feed::Item.3.gz
 %%SITE_PERL%%/Catalyst/Model/XML/Feed.pm
 %%SITE_PERL%%/Catalyst/Model/XML/Feed/Item.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/XML/Feed/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/XML/Feed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/XML/Feed
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/XML
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-Xapian/Makefile b/www/p5-Catalyst-Model-Xapian/Makefile
index 2f8bf8509d3d..05c2462d6854 100644
--- a/www/p5-Catalyst-Model-Xapian/Makefile
+++ b/www/p5-Catalyst-Model-Xapian/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Model-Xapian
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/www/p5-Catalyst-Model-Xapian/pkg-plist b/www/p5-Catalyst-Model-Xapian/pkg-plist
index f4aa440ba6a2..352396b980ca 100644
--- a/www/p5-Catalyst-Model-Xapian/pkg-plist
+++ b/www/p5-Catalyst-Model-Xapian/pkg-plist
@@ -4,12 +4,3 @@
 %%SITE_PERL%%/Catalyst/Model/Xapian.pm
 %%SITE_PERL%%/Catalyst/Model/Xapian/Result.pm
 %%SITE_PERL%%/Catalyst/Model/sample-indexer.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/Xapian
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-Xapian10/Makefile b/www/p5-Catalyst-Model-Xapian10/Makefile
index 8642a9a31a05..7715fe057cd2 100644
--- a/www/p5-Catalyst-Model-Xapian10/Makefile
+++ b/www/p5-Catalyst-Model-Xapian10/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Model-Xapian10
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/www/p5-Catalyst-Model-Xapian10/pkg-plist b/www/p5-Catalyst-Model-Xapian10/pkg-plist
index f4aa440ba6a2..352396b980ca 100644
--- a/www/p5-Catalyst-Model-Xapian10/pkg-plist
+++ b/www/p5-Catalyst-Model-Xapian10/pkg-plist
@@ -4,12 +4,3 @@
 %%SITE_PERL%%/Catalyst/Model/Xapian.pm
 %%SITE_PERL%%/Catalyst/Model/Xapian/Result.pm
 %%SITE_PERL%%/Catalyst/Model/sample-indexer.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/Xapian
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-AtomServer/Makefile b/www/p5-Catalyst-Plugin-AtomServer/Makefile
index 8b03c6759cde..e80539f7c2e4 100644
--- a/www/p5-Catalyst-Plugin-AtomServer/Makefile
+++ b/www/p5-Catalyst-Plugin-AtomServer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-AtomServer
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-AtomServer/pkg-plist b/www/p5-Catalyst-Plugin-AtomServer/pkg-plist
index be1bd287dffa..03f8e771d771 100644
--- a/www/p5-Catalyst-Plugin-AtomServer/pkg-plist
+++ b/www/p5-Catalyst-Plugin-AtomServer/pkg-plist
@@ -1,16 +1,6 @@
 %%SITE_PERL%%/Catalyst/Plugin/AtomServer.pm
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/Credential/Atom.pm
 %%SITE_PERL%%/Catalyst/View/Atom/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/AtomServer/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::AtomServer.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Authentication::Credential::Atom.3.gz
 %%PERL5_MAN3%%/Catalyst::View::Atom::XML.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/AtomServer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/View/Atom
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Credential
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
index 9d5f272606f2..9d9b1154f17f 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Authentication-CDBI
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
index b64679510105..adf70930a68a 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Authentication::CDBI.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/CDBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
index 82093b60d64d..fbdf59272c96 100644
--- a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Authentication-OpenID
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Authentication-OpenID/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-OpenID/pkg-plist
index ecfeaf448ecb..e770e2a65952 100644
--- a/www/p5-Catalyst-Plugin-Authentication-OpenID/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-OpenID/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/OpenID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/OpenID/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Authentication::OpenID.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/OpenID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
index 172f10831f36..d3e33a1c99e5 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Authentication-Store-Htpasswd
 PORTVERSION=	0.020
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
index 7a3440de3ca8..00f2fed5ab5a 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd.pm
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/Backend.pm
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index 39461d344406..f6a6e938ac5c 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Authentication
 PORTVERSION=	0.10023
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-Catalyst-Plugin-Authentication/pkg-plist b/www/p5-Catalyst-Plugin-Authentication/pkg-plist
index 7e6145620a09..649481972f90 100644
--- a/www/p5-Catalyst-Plugin-Authentication/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication/pkg-plist
@@ -32,18 +32,3 @@
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Minimal.pm
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/User.pm
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/User/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/User
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Credential
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/User
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Realm
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication/Credential
-@dirrmtry %%SITE_PERL%%/Catalyst/Authentication
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
index dea9a149e283..fded430e7f88 100644
--- a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Authorization-ACL
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist b/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist
index 214dff311346..61ae439bed8c 100644
--- a/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist
@@ -1,13 +1,4 @@
 %%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL/Engine.pm
 %%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization/ACL/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Authorization::ACL::Engine.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Authorization::ACL.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization/ACL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
index 7775630c03e2..1a8bd2a8e4a4 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Authorization-Roles
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
index 8ffd983dde92..6c90c701f167 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Authorization::Roles.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Authorization/Roles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization/Roles/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization/Roles
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
index 86a741ddba47..e95c335f395f 100644
--- a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
+++ b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-AutoCRUD
 PORTVERSION=	2.131.210
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist b/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist
index a741ed54d4b7..d97709a31fd0 100644
--- a/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist
+++ b/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist
@@ -75,33 +75,3 @@
 %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC/ProxyColumns.pm
 %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC/Relationships.pm
 %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC/ViewsAsTables.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/AutoCRUD/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/AutoCRUD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC
-@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine
-@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD
-@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter
-@dirrmtry %%SITE_PERL%%/SQL/Translator/AutoCRUD
-@dirrmtry %%SITE_PERL%%/SQL/Translator
-@dirrmtry %%SITE_PERL%%/SQL
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/skinny/wrapper
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/skinny
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/wrapper
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript/update
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript/grid
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/static
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model/StorageEngine/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model/StorageEngine
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Manual
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller/DisplayEngine
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Browser/Makefile b/www/p5-Catalyst-Plugin-Browser/Makefile
index f49369a4e0f3..9d719257c056 100644
--- a/www/p5-Catalyst-Plugin-Browser/Makefile
+++ b/www/p5-Catalyst-Plugin-Browser/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-Plugin-Browser
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Browser/pkg-plist b/www/p5-Catalyst-Plugin-Browser/pkg-plist
index 9a4a6b7a6339..f79397ee590d 100644
--- a/www/p5-Catalyst-Plugin-Browser/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Browser/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Browser.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Browser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Browser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Browser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-C3/Makefile b/www/p5-Catalyst-Plugin-C3/Makefile
index e3970837bc50..b0e3804e81ac 100644
--- a/www/p5-Catalyst-Plugin-C3/Makefile
+++ b/www/p5-Catalyst-Plugin-C3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-C3
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-C3/pkg-plist b/www/p5-Catalyst-Plugin-C3/pkg-plist
index 5f1abd4d1496..a28f9c486cbe 100644
--- a/www/p5-Catalyst-Plugin-C3/pkg-plist
+++ b/www/p5-Catalyst-Plugin-C3/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::C3.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/C3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/C3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/C3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
index ec2deb96f752..d0d56841b4aa 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Cache-FastMmap
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
index 901f36fe3bc7..f63b5d3ef598 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Cache::FastMmap.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Cache/FastMmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/FastMmap/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/FastMmap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
index 47d00f284e56..d8d03b2b9e69 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Cache-Memcached-Fast
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/pkg-plist b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/pkg-plist
index 50dcc33379ba..03981ceb6af9 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/pkg-plist
@@ -1,12 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached/Fast/.packlist
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Memcached/Fast.pm
 %%PERL5_MAN3%%/Catalyst::Plugin::Cache::Memcached::Fast.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache/Memcached
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
index f5fe23700e33..3b5420522cd1 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Cache-Memcached
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
index 7b06aad7645a..cf1d0c075ac1 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Cache::Memcached.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Memcached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Cache/Makefile b/www/p5-Catalyst-Plugin-Cache/Makefile
index 4fe48f78f0a2..cab5b50cd48f 100644
--- a/www/p5-Catalyst-Plugin-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Cache
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Cache/pkg-plist b/www/p5-Catalyst-Plugin-Cache/pkg-plist
index 0e49aa49815b..f1fb781c1bc5 100644
--- a/www/p5-Catalyst-Plugin-Cache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache/pkg-plist
@@ -12,13 +12,3 @@
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Curried.pm
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Store.pod
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Store/Memory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache/Choose
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache/Backend
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Captcha/Makefile b/www/p5-Catalyst-Plugin-Captcha/Makefile
index c7651059b1ab..576d0069888e 100644
--- a/www/p5-Catalyst-Plugin-Captcha/Makefile
+++ b/www/p5-Catalyst-Plugin-Captcha/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Captcha
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Captcha/pkg-plist b/www/p5-Catalyst-Plugin-Captcha/pkg-plist
index c88a66f02fa2..ad445106812a 100644
--- a/www/p5-Catalyst-Plugin-Captcha/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Captcha/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Captcha.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Captcha.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Captcha/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Captcha
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile b/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile
index d038d109725b..7f3d470b299e 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile
+++ b/www/p5-Catalyst-Plugin-ConfigLoader-Environment/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-ConfigLoader-Environment
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader-Environment/pkg-plist b/www/p5-Catalyst-Plugin-ConfigLoader-Environment/pkg-plist
index 5f1c62f246be..4be6e6eef1e8 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader-Environment/pkg-plist
+++ b/www/p5-Catalyst-Plugin-ConfigLoader-Environment/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/ConfigLoader/Environment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ConfigLoader/Environment/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::ConfigLoader::Environment.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ConfigLoader/Environment
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ConfigLoader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/ConfigLoader
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
index 76dd75732d6b..ab274a5cc1f2 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
+++ b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-Plugin-ConfigLoader
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist b/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist
index 2b04bc702a5f..407b85ea1157 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist
+++ b/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::ConfigLoader::Manual.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/ConfigLoader.pm
 %%SITE_PERL%%/Catalyst/Plugin/ConfigLoader/Manual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ConfigLoader/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ConfigLoader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/ConfigLoader
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-CookiedSession/Makefile b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
index 024c2afca142..5050155f99b4 100644
--- a/www/p5-Catalyst-Plugin-CookiedSession/Makefile
+++ b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-CookiedSession
 PORTVERSION=	0.35
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-CookiedSession/pkg-plist b/www/p5-Catalyst-Plugin-CookiedSession/pkg-plist
index 875f0032a6be..78d67a327da0 100644
--- a/www/p5-Catalyst-Plugin-CookiedSession/pkg-plist
+++ b/www/p5-Catalyst-Plugin-CookiedSession/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/CookiedSession/.packlist
 %%SITE_PERL%%/Catalyst/Plugin/CookiedSession.pm
 %%PERL5_MAN3%%/Catalyst::Plugin::CookiedSession.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/CookiedSession/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/
-@dirrmtry %%SITE_PERL%%/Catalyst/
diff --git a/www/p5-Catalyst-Plugin-DateTime/Makefile b/www/p5-Catalyst-Plugin-DateTime/Makefile
index 100a7e8be181..9fccb4f75a79 100644
--- a/www/p5-Catalyst-Plugin-DateTime/Makefile
+++ b/www/p5-Catalyst-Plugin-DateTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-DateTime
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-DateTime/pkg-plist b/www/p5-Catalyst-Plugin-DateTime/pkg-plist
index aa199a0cd605..98e668d8ae1c 100644
--- a/www/p5-Catalyst-Plugin-DateTime/pkg-plist
+++ b/www/p5-Catalyst-Plugin-DateTime/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/DateTime/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::DateTime.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/DateTime
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 %%SITE_PERL%%/Catalyst/Plugin/DateTime.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
index 7eb65840923e..255626066556 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-DefaultEnd
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
index 1ae3bdfafa00..e5588999113d 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::DefaultEnd.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/DefaultEnd.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Email/Makefile b/www/p5-Catalyst-Plugin-Email/Makefile
index d165f7d9f73a..8bd22cb242f9 100644
--- a/www/p5-Catalyst-Plugin-Email/Makefile
+++ b/www/p5-Catalyst-Plugin-Email/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Email
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Email/pkg-plist b/www/p5-Catalyst-Plugin-Email/pkg-plist
index 7461a11a1cb5..b0261326bf6e 100644
--- a/www/p5-Catalyst-Plugin-Email/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Email/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Email.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Email.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Email/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
index 279a57ed8fc7..31be981fd0fa 100644
--- a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
+++ b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-ErrorCatcher
 PORTVERSION=	0.0.8.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHISEL
diff --git a/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist b/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist
index a3961b23bf1c..2197d73ccbec 100644
--- a/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist
+++ b/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist
@@ -16,13 +16,3 @@
 %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/Plugin/CleanUp/Pg/TransactionAborted.pm
 %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/Plugin/CleanUp/Pg/UniqueConstraintViolation.pm
 %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/Plugin/CleanUp/TxnDo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ErrorCatcher/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ErrorCatcher
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/Plugin/CleanUp/Pg
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/Plugin/CleanUp
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-FillInForm/Makefile b/www/p5-Catalyst-Plugin-FillInForm/Makefile
index 5bd65f681c5f..1e85c18574d3 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/Makefile
+++ b/www/p5-Catalyst-Plugin-FillInForm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-FillInForm
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
index d2ce1e5d5e39..c13df7b8b252 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::FillInForm.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/FillInForm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-FormBuilder/Makefile b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
index 46e06216b97e..edc2438c713c 100644
--- a/www/p5-Catalyst-Plugin-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-FormBuilder
 PORTVERSION=	1.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist b/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist
index de9a35baf4e6..c075aaffb24c 100644
--- a/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::FormBuilder.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/FormBuilder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormBuilder/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormBuilder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-FormValidator/Makefile b/www/p5-Catalyst-Plugin-FormValidator/Makefile
index 942fc37b31ec..befa00fb6d67 100644
--- a/www/p5-Catalyst-Plugin-FormValidator/Makefile
+++ b/www/p5-Catalyst-Plugin-FormValidator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-FormValidator
 PORTVERSION=	0.094
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-FormValidator/pkg-plist b/www/p5-Catalyst-Plugin-FormValidator/pkg-plist
index ccaf4d8868d1..29376d042cc0 100644
--- a/www/p5-Catalyst-Plugin-FormValidator/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FormValidator/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/FormValidator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::FormValidator.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-I18N/Makefile b/www/p5-Catalyst-Plugin-I18N/Makefile
index 53534a935e0e..d962b4d019d7 100644
--- a/www/p5-Catalyst-Plugin-I18N/Makefile
+++ b/www/p5-Catalyst-Plugin-I18N/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-I18N
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-I18N/pkg-plist b/www/p5-Catalyst-Plugin-I18N/pkg-plist
index fa07da8ef99a..8a407dc1dfa9 100644
--- a/www/p5-Catalyst-Plugin-I18N/pkg-plist
+++ b/www/p5-Catalyst-Plugin-I18N/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::I18N::Manual.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/I18N.pm
 %%SITE_PERL%%/Catalyst/Plugin/I18N/Manual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/I18N
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile b/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
index 5e0c00437695..aebfb2cf4c8d 100644
--- a/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
+++ b/www/p5-Catalyst-Plugin-Log-Dispatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Log-Dispatch
 PORTVERSION=	0.121
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Log-Dispatch/pkg-plist b/www/p5-Catalyst-Plugin-Log-Dispatch/pkg-plist
index 1596627def9e..ab69207c30f0 100644
--- a/www/p5-Catalyst-Plugin-Log-Dispatch/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Log-Dispatch/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Log/Dispatch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Log/Dispatch/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Log::Dispatch.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Log/Dispatch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Log
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Log
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Log-Handler/Makefile b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
index cc90064cf2f4..2735ed612073 100644
--- a/www/p5-Catalyst-Plugin-Log-Handler/Makefile
+++ b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-Plugin-Log-Handler
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Log-Handler/pkg-plist b/www/p5-Catalyst-Plugin-Log-Handler/pkg-plist
index b2bca68340c2..1f689bfad146 100644
--- a/www/p5-Catalyst-Plugin-Log-Handler/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Log-Handler/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Log::Handler.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Log/Handler.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Log
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-LogWarnings/Makefile b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
index 742c40cbb117..bc2b00efe997 100644
--- a/www/p5-Catalyst-Plugin-LogWarnings/Makefile
+++ b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-LogWarnings
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist b/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist
index 8f809ec802f9..722935749494 100644
--- a/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist
+++ b/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::LogWarnings.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/LogWarnings.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/LogWarnings/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/LogWarnings
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-PageCache/Makefile b/www/p5-Catalyst-Plugin-PageCache/Makefile
index 83f8caa995cd..c6916d590a44 100644
--- a/www/p5-Catalyst-Plugin-PageCache/Makefile
+++ b/www/p5-Catalyst-Plugin-PageCache/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-PageCache
 PORTVERSION=	0.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-PageCache/pkg-plist b/www/p5-Catalyst-Plugin-PageCache/pkg-plist
index 20262f59214d..6f367d93b9a8 100644
--- a/www/p5-Catalyst-Plugin-PageCache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-PageCache/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::PageCache.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/PageCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/PageCache/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/PageCache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Params-Nested/Makefile b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
index d8da83076419..420e38bd7e68 100644
--- a/www/p5-Catalyst-Plugin-Params-Nested/Makefile
+++ b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Params-Nested
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist b/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist
index 4db373bf119b..d9dc96cae99c 100644
--- a/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist
@@ -2,12 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Params::Nested::Expander.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Params/Nested.pm
 %%SITE_PERL%%/Catalyst/Plugin/Params/Nested/Expander.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Params/Nested/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Params/Nested
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Params
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Params/Nested
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Params
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Pluggable/Makefile b/www/p5-Catalyst-Plugin-Pluggable/Makefile
index 11ee6d8ab5dd..71d67c8e2cc7 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/Makefile
+++ b/www/p5-Catalyst-Plugin-Pluggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Pluggable
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRI
diff --git a/www/p5-Catalyst-Plugin-Pluggable/pkg-plist b/www/p5-Catalyst-Plugin-Pluggable/pkg-plist
index ab5b02b12685..f6f65a32c41c 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Pluggable/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Pluggable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Pluggable.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Prototype/Makefile b/www/p5-Catalyst-Plugin-Prototype/Makefile
index dd4db767b6e2..0b435eda1bc9 100644
--- a/www/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/www/p5-Catalyst-Plugin-Prototype/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Prototype
 PORTVERSION=	1.33
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/www/p5-Catalyst-Plugin-Prototype/pkg-plist b/www/p5-Catalyst-Plugin-Prototype/pkg-plist
index 6e656122d1ef..a2d8a17e154f 100644
--- a/www/p5-Catalyst-Plugin-Prototype/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Prototype/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Prototype.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Prototype.pm
 %%SITE_PERL%%/Catalyst/Plugin/Prototype.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile b/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
index 2754c4530d05..7571449ed30e 100644
--- a/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-RunAfterRequest
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist b/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist
index 2c26f8dd886c..b9fa21d6c313 100644
--- a/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist
+++ b/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::RunAfterRequest.3.gz
 %%SITE_PERL%%/Catalyst/Model/Role/RunAfterRequest.pm
 %%SITE_PERL%%/Catalyst/Plugin/RunAfterRequest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/RunAfterRequest/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/RunAfterRequest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/Role
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Scheduler/Makefile b/www/p5-Catalyst-Plugin-Scheduler/Makefile
index 89ccc62033a9..48f53688fb8e 100644
--- a/www/p5-Catalyst-Plugin-Scheduler/Makefile
+++ b/www/p5-Catalyst-Plugin-Scheduler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Scheduler
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Scheduler/pkg-plist b/www/p5-Catalyst-Plugin-Scheduler/pkg-plist
index 707ae5964815..0f56315a9062 100644
--- a/www/p5-Catalyst-Plugin-Scheduler/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Scheduler/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Scheduler.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Scheduler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Scheduler/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Scheduler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Server/Makefile b/www/p5-Catalyst-Plugin-Server/Makefile
index ea7c9f748e0c..4ea8ad4d8471 100644
--- a/www/p5-Catalyst-Plugin-Server/Makefile
+++ b/www/p5-Catalyst-Plugin-Server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Server
 PORTVERSION=	0.28
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Server/pkg-plist b/www/p5-Catalyst-Plugin-Server/pkg-plist
index 74178e6ec0a7..683e406f0fae 100644
--- a/www/p5-Catalyst-Plugin-Server/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Server/pkg-plist
@@ -1,5 +1,4 @@
 bin/rpc_client
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Server/.packlist
 %%SITE_PERL%%/Catalyst/Plugin/Server.pm
 %%SITE_PERL%%/Catalyst/Plugin/Server/XMLRPC.pm
 %%SITE_PERL%%/Catalyst/Plugin/Server/XMLRPC/DispatchType/XMLRPCPath.pm
@@ -10,11 +9,3 @@ bin/rpc_client
 %%PERL5_MAN3%%/Catalyst::Plugin::Server::XMLRPC::DispatchType::XMLRPCPath.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Server::XMLRPC::DispatchType::XMLRPCRegex.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Server::XMLRPC::Tutorial.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/Server/XMLRPC/DispatchType
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/Server/XMLRPC
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/Server
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
index 6e46ca97dcf2..c1e1b7385ece 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-FastMmap
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist
index 758c4c4a6a8a..d4827cad491c 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/FastMmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/FastMmap/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::FastMmap.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/FastMmap
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-PerUser/Makefile b/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
index 8aebdab8c889..4c7f2867000f 100644
--- a/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-PerUser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-PerUser
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-PerUser/pkg-plist b/www/p5-Catalyst-Plugin-Session-PerUser/pkg-plist
index ae4da75a6c66..90c9e1cdaea4 100644
--- a/www/p5-Catalyst-Plugin-Session-PerUser/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-PerUser/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/PerUser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/PerUser/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::PerUser.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/PerUser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
index df44728bca06..11603990bc17 100644
--- a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-State-Cookie
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist b/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist
index 7772fff1ae95..cb2cb3f214ee 100644
--- a/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist
@@ -1,12 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/State/Cookie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State/Cookie/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::State::Cookie.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State/Cookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
index dcc9b1808bca..a5f82658629c 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-State-URI
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
index 45a31baf732d..030b01a8215f 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
@@ -1,12 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::State::URI.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/State/URI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State/URI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State/URI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
index 60262bf817b1..45a3b7536cf2 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-Cache
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist
index c15dc0bc119a..dd166b487e72 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist
@@ -1,12 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::Cache.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Cache/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
index f1e9db9cc8f4..d03b4a1882cc 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-DBI
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
index 2462880727dc..f75f02784d9b 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
@@ -1,12 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::DBI.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/DBI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/DBI/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/DBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
index 882aecee7722..2ab49cc468ea 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBIC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-DBIC
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBIC/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-DBIC/pkg-plist
index 743221a5fcdc..ca32f88b78e0 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBIC/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBIC/pkg-plist
@@ -1,15 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/DBIC/.packlist
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/DBIC.pm
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/DBIC/Delegate.pm
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::DBIC.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::DBIC::Delegate.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index a2761d290094..abb9f11c808c 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-Delegate
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist
index 46c531d553e9..c2b60aa25469 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist
@@ -1,12 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::Delegate.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Delegate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Delegate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Delegate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
index 0224eff807e0..1d18a688446a 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-FastMmap
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist
index 6e98a8a246eb..a39cb8bb832f 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist
@@ -1,12 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/FastMmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/FastMmap/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::FastMmap.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/FastMmap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
index 14cd0f4a76f3..93c6870f651a 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-File
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist
index 7ae01149bec9..91151ebb92d9 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist
@@ -1,12 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/File/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::File.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
index 2a9ac17957ab..eb01d6d6f75c 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-Memcached-Fast
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/pkg-plist
index 9ba3aaa2ae3d..66d47bc47f97 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached-Fast/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Memcached/Fast.pm
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::Memcached::Fast.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Memcached
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
index ed09751ccfda..bff9948b467b 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session-Store-Memcached
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist
index 649f2ae94082..87066c5f5f2f 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist
@@ -1,12 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Memcached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Memcached/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::Memcached.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Memcached
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session/Makefile b/www/p5-Catalyst-Plugin-Session/Makefile
index 99bdcf1ce606..c1133a0687dc 100644
--- a/www/p5-Catalyst-Plugin-Session/Makefile
+++ b/www/p5-Catalyst-Plugin-Session/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Session
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Session/pkg-plist b/www/p5-Catalyst-Plugin-Session/pkg-plist
index 48e773af8bd8..df78e656a35c 100644
--- a/www/p5-Catalyst-Plugin-Session/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session/pkg-plist
@@ -4,18 +4,9 @@
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Dummy.pm
 %%SITE_PERL%%/Catalyst/Plugin/Session/Test/Store.pm
 %%SITE_PERL%%/Catalyst/Plugin/Session/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Session.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::State.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::Dummy.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Test::Store.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::Session::Tutorial.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Test
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Setenv/Makefile b/www/p5-Catalyst-Plugin-Setenv/Makefile
index 0a46af7d9aba..3fc30e975137 100644
--- a/www/p5-Catalyst-Plugin-Setenv/Makefile
+++ b/www/p5-Catalyst-Plugin-Setenv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Setenv
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Setenv/pkg-plist b/www/p5-Catalyst-Plugin-Setenv/pkg-plist
index 695b161861f9..693918535a67 100644
--- a/www/p5-Catalyst-Plugin-Setenv/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Setenv/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Setenv.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Setenv.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile
index fcc4dd99c2a1..0c58a9df6bfe 100644
--- a/www/p5-Catalyst-Plugin-Singleton/Makefile
+++ b/www/p5-Catalyst-Plugin-Singleton/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Singleton
 PORTVERSION=	0.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-Catalyst-Plugin-Singleton/pkg-plist b/www/p5-Catalyst-Plugin-Singleton/pkg-plist
index 3631c127f077..119a32dbf0b6 100644
--- a/www/p5-Catalyst-Plugin-Singleton/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Singleton/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Singleton.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Singleton.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-SmartURI/Makefile b/www/p5-Catalyst-Plugin-SmartURI/Makefile
index 24ce9cae77a4..e99774effaaa 100644
--- a/www/p5-Catalyst-Plugin-SmartURI/Makefile
+++ b/www/p5-Catalyst-Plugin-SmartURI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-SmartURI
 PORTVERSION=	0.039
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-SmartURI/pkg-plist b/www/p5-Catalyst-Plugin-SmartURI/pkg-plist
index deaf3e7e99ec..5b07a7c767fd 100644
--- a/www/p5-Catalyst-Plugin-SmartURI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-SmartURI/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/SmartURI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SmartURI/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::SmartURI.3.gz
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SmartURI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-StackTrace/Makefile b/www/p5-Catalyst-Plugin-StackTrace/Makefile
index 985eefdf60a7..8b72ca442a5e 100644
--- a/www/p5-Catalyst-Plugin-StackTrace/Makefile
+++ b/www/p5-Catalyst-Plugin-StackTrace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-StackTrace
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-StackTrace/pkg-plist b/www/p5-Catalyst-Plugin-StackTrace/pkg-plist
index 144e377a940c..184371487fcf 100644
--- a/www/p5-Catalyst-Plugin-StackTrace/pkg-plist
+++ b/www/p5-Catalyst-Plugin-StackTrace/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/StackTrace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/StackTrace/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::StackTrace.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/StackTrace
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Static-Simple/Makefile b/www/p5-Catalyst-Plugin-Static-Simple/Makefile
index a13f3b5bd15a..0f66c5bef324 100644
--- a/www/p5-Catalyst-Plugin-Static-Simple/Makefile
+++ b/www/p5-Catalyst-Plugin-Static-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Static-Simple
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Static-Simple/pkg-plist b/www/p5-Catalyst-Plugin-Static-Simple/pkg-plist
index 3738cc323e37..acbc2f066431 100644
--- a/www/p5-Catalyst-Plugin-Static-Simple/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Static-Simple/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Static/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static/Simple/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Static::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Static
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Static/Makefile b/www/p5-Catalyst-Plugin-Static/Makefile
index 154cc5d0ab2e..86f8914ae8d3 100644
--- a/www/p5-Catalyst-Plugin-Static/Makefile
+++ b/www/p5-Catalyst-Plugin-Static/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Static
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/www/p5-Catalyst-Plugin-Static/pkg-plist b/www/p5-Catalyst-Plugin-Static/pkg-plist
index 43bbf3e805bd..16fb35623e44 100644
--- a/www/p5-Catalyst-Plugin-Static/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Static/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/Static.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::Static.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-StatusMessage/Makefile b/www/p5-Catalyst-Plugin-StatusMessage/Makefile
index 62e121c56329..95c002bfe660 100644
--- a/www/p5-Catalyst-Plugin-StatusMessage/Makefile
+++ b/www/p5-Catalyst-Plugin-StatusMessage/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-Plugin-StatusMessage
 PORTVERSION=	1.002000
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-StatusMessage/pkg-plist b/www/p5-Catalyst-Plugin-StatusMessage/pkg-plist
index fe080fe71318..b78fc1ab8e8c 100644
--- a/www/p5-Catalyst-Plugin-StatusMessage/pkg-plist
+++ b/www/p5-Catalyst-Plugin-StatusMessage/pkg-plist
@@ -1,9 +1,2 @@
 %%SITE_PERL%%/Catalyst/Plugin/StatusMessage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/StatusMessage/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::StatusMessage.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/StatusMessage
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-SubRequest/Makefile b/www/p5-Catalyst-Plugin-SubRequest/Makefile
index 864b3344d4cd..7d8a941bf5f8 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-SubRequest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-SubRequest
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
index e8d37ac8c119..66a9a2061559 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
+++ b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::SubRequest.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/SubRequest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Textile/Makefile b/www/p5-Catalyst-Plugin-Textile/Makefile
index 9b366245509a..bc8b45227608 100644
--- a/www/p5-Catalyst-Plugin-Textile/Makefile
+++ b/www/p5-Catalyst-Plugin-Textile/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Textile
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRI
diff --git a/www/p5-Catalyst-Plugin-Textile/pkg-plist b/www/p5-Catalyst-Plugin-Textile/pkg-plist
index 9d696104027a..642a9ae9d81a 100644
--- a/www/p5-Catalyst-Plugin-Textile/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Textile/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Textile.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Textile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Unicode/Makefile b/www/p5-Catalyst-Plugin-Unicode/Makefile
index 228a825a0769..64fc5033f01e 100644
--- a/www/p5-Catalyst-Plugin-Unicode/Makefile
+++ b/www/p5-Catalyst-Plugin-Unicode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Unicode
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-Unicode/pkg-plist b/www/p5-Catalyst-Plugin-Unicode/pkg-plist
index 34deea460806..9db863fb4298 100644
--- a/www/p5-Catalyst-Plugin-Unicode/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Unicode/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::Plugin::Unicode.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Unicode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Unicode/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-XMLRPC/Makefile b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
index 3d09e25c333b..37c9da56080c 100644
--- a/www/p5-Catalyst-Plugin-XMLRPC/Makefile
+++ b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-XMLRPC
 PORTVERSION=	2.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist b/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist
index 2a893c8391c3..1b2b3b759e55 100644
--- a/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist
+++ b/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist
@@ -1,15 +1,6 @@
 %%SITE_PERL%%/Catalyst/Action/XMLRPC.pm
 %%SITE_PERL%%/Catalyst/Plugin/XMLRPC.pm
 %%SITE_PERL%%/Catalyst/Plugin/XMLRPC/DispatchType/XMLRPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC/.packlist
 %%PERL5_MAN3%%/Catalyst::Plugin::XMLRPC.3.gz
 %%PERL5_MAN3%%/Catalyst::Plugin::XMLRPC::DispatchType::XMLRPC.3.gz
 %%PERL5_MAN3%%/Catalyst::Action::XMLRPC.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/XMLRPC/DispatchType
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/XMLRPC
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index ce1461140112..788408c377ef 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-Runtime
 PORTVERSION=	5.90070
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JJNAPIORK
diff --git a/www/p5-Catalyst-Runtime/pkg-plist b/www/p5-Catalyst-Runtime/pkg-plist
index 3e929da41529..e426731977f8 100644
--- a/www/p5-Catalyst-Runtime/pkg-plist
+++ b/www/p5-Catalyst-Runtime/pkg-plist
@@ -47,7 +47,6 @@ bin/catalyst.pl
 %%SITE_PERL%%/Catalyst/Upgrading.pod
 %%SITE_PERL%%/Catalyst/Utils.pm
 %%SITE_PERL%%/Catalyst/View.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Runtime/.packlist
 %%PERL5_MAN3%%/Catalyst.3.gz
 %%PERL5_MAN3%%/Catalyst::Action.3.gz
 %%PERL5_MAN3%%/Catalyst::ActionChain.3.gz
@@ -97,16 +96,3 @@ bin/catalyst.pl
 %%PERL5_MAN3%%/Catalyst::Utils.3.gz
 %%PERL5_MAN3%%/Catalyst::View.3.gz
 man/man1/catalyst.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Runtime
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Script
-@dirrmtry %%SITE_PERL%%/Catalyst/Request
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Unicode
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst/Middleware
-@dirrmtry %%SITE_PERL%%/Catalyst/Exception
-@dirrmtry %%SITE_PERL%%/Catalyst/Engine
-@dirrmtry %%SITE_PERL%%/Catalyst/DispatchType
-@dirrmtry %%SITE_PERL%%/Catalyst/Component
-@dirrmtry %%SITE_PERL%%/Catalyst/ActionRole
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
index a10a4cd3cb19..233947d528ff 100644
--- a/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
+++ b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-TraitFor-Controller-DBIC-DoesPaging
 PORTVERSION=	1.001000
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/pkg-plist b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/pkg-plist
index 74cf0a653b95..8b20188e2983 100644
--- a/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/pkg-plist
+++ b/www/p5-Catalyst-TraitFor-Controller-DBIC-DoesPaging/pkg-plist
@@ -1,12 +1,2 @@
 %%SITE_PERL%%/Catalyst/TraitFor/Controller/DBIC/DoesPaging.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Controller/DBIC/DoesPaging/.packlist
 %%PERL5_MAN3%%/Catalyst::TraitFor::Controller::DBIC::DoesPaging.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Controller/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Controller/DBIC/DoesPaging
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Controller/DBIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Controller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
index 9a4d318c7734..574446540c13 100644
--- a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
+++ b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-TraitFor-Request-BrowserDetect
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist
index 56a000bc03b8..69e9f3efbde9 100644
--- a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist
+++ b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::TraitFor::Request::BrowserDetect.3.gz
 %%SITE_PERL%%/Catalyst/TraitFor/Request/BrowserDetect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Request/BrowserDetect/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Request/BrowserDetect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Request
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Request
-@dirrmtry %%SITE_PERL%%/Catalyst/TraitFor
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-ClearSilver/Makefile b/www/p5-Catalyst-View-ClearSilver/Makefile
index 7c47421588a0..752e9564dbc0 100644
--- a/www/p5-Catalyst-View-ClearSilver/Makefile
+++ b/www/p5-Catalyst-View-ClearSilver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-ClearSilver
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
diff --git a/www/p5-Catalyst-View-ClearSilver/pkg-plist b/www/p5-Catalyst-View-ClearSilver/pkg-plist
index 674f244f712f..224b4b37c6e0 100644
--- a/www/p5-Catalyst-View-ClearSilver/pkg-plist
+++ b/www/p5-Catalyst-View-ClearSilver/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Catalyst/View/ClearSilver.pm
 %%SITE_PERL%%/Catalyst/Helper/View/ClearSilver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/ClearSilver/.packlist
 %%PERL5_MAN3%%/Catalyst::Helper::View::ClearSilver.3.gz
 %%PERL5_MAN3%%/Catalyst::View::ClearSilver.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/ClearSilver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
diff --git a/www/p5-Catalyst-View-Email/Makefile b/www/p5-Catalyst-View-Email/Makefile
index 107d6d080e48..340ab01c599a 100644
--- a/www/p5-Catalyst-View-Email/Makefile
+++ b/www/p5-Catalyst-View-Email/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-Email
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-Email/pkg-plist b/www/p5-Catalyst-View-Email/pkg-plist
index 035f533e1a6e..45307c64d36b 100644
--- a/www/p5-Catalyst-View-Email/pkg-plist
+++ b/www/p5-Catalyst-View-Email/pkg-plist
@@ -6,13 +6,3 @@
 %%SITE_PERL%%/Catalyst/Helper/View/Email/Template.pm
 %%SITE_PERL%%/Catalyst/View/Email.pm
 %%SITE_PERL%%/Catalyst/View/Email/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Email/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/View/Email
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Email
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-GraphViz/Makefile b/www/p5-Catalyst-View-GraphViz/Makefile
index 51fa261f945b..81e8370d31fc 100644
--- a/www/p5-Catalyst-View-GraphViz/Makefile
+++ b/www/p5-Catalyst-View-GraphViz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-View-GraphViz
 PORTVERSION=	0.05
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-GraphViz/pkg-plist b/www/p5-Catalyst-View-GraphViz/pkg-plist
index 7883dfba9c57..7d7dab3b1101 100644
--- a/www/p5-Catalyst-View-GraphViz/pkg-plist
+++ b/www/p5-Catalyst-View-GraphViz/pkg-plist
@@ -4,11 +4,3 @@
 %%SITE_PERL%%/Catalyst/Helper/View/GraphView.pm
 %%SITE_PERL%%/Catalyst/Helper/View/GraphViz.pm
 %%SITE_PERL%%/Catalyst/View/GraphViz.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/GraphViz/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/GraphViz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
index a9e4966d0efb..65bfd7fb7362 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-HTML-Template-Compiled
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist b/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist
index 9546ea0f3cd0..dd9d122a9fb2 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::View::HTML::Template::Compiled.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/HTML/Template/Compiled.pm
 %%SITE_PERL%%/Catalyst/View/HTML/Template/Compiled.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML/Template
-@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/HTML/Template
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-HTML-Template/Makefile b/www/p5-Catalyst-View-HTML-Template/Makefile
index 08d3abfde69b..bb8da201d890 100644
--- a/www/p5-Catalyst-View-HTML-Template/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-HTML-Template
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-HTML-Template/pkg-plist b/www/p5-Catalyst-View-HTML-Template/pkg-plist
index 1b151cea07f0..fc3d5f515d69 100644
--- a/www/p5-Catalyst-View-HTML-Template/pkg-plist
+++ b/www/p5-Catalyst-View-HTML-Template/pkg-plist
@@ -2,9 +2,3 @@
 %%SITE_PERL%%/Catalyst/View/HTML/Template.pm
 %%PERL5_MAN3%%/Catalyst::Helper::View::HTML::Template.3.gz
 %%PERL5_MAN3%%/Catalyst::View::HTML::Template.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-JSON/Makefile b/www/p5-Catalyst-View-JSON/Makefile
index 5c4919daebb6..293c969974a8 100644
--- a/www/p5-Catalyst-View-JSON/Makefile
+++ b/www/p5-Catalyst-View-JSON/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-View-JSON
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Catalyst-View-JSON/pkg-plist b/www/p5-Catalyst-View-JSON/pkg-plist
index ff5112ef2f56..95b0637d5a9a 100644
--- a/www/p5-Catalyst-View-JSON/pkg-plist
+++ b/www/p5-Catalyst-View-JSON/pkg-plist
@@ -1,10 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/JSON/.packlist
 %%SITE_PERL%%/Catalyst/View/JSON.pm
 %%SITE_PERL%%/Catalyst/Helper/View/JSON.pm
 %%PERL5_MAN3%%/Catalyst::Helper::View::JSON.3.gz
 %%PERL5_MAN3%%/Catalyst::View::JSON.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
diff --git a/www/p5-Catalyst-View-Jemplate/Makefile b/www/p5-Catalyst-View-Jemplate/Makefile
index d0160c4a9c7c..081dbdc2b7ae 100644
--- a/www/p5-Catalyst-View-Jemplate/Makefile
+++ b/www/p5-Catalyst-View-Jemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-Jemplate
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Catalyst
diff --git a/www/p5-Catalyst-View-Jemplate/pkg-plist b/www/p5-Catalyst-View-Jemplate/pkg-plist
index d4bac9cc9f75..93a180bab5cd 100644
--- a/www/p5-Catalyst-View-Jemplate/pkg-plist
+++ b/www/p5-Catalyst-View-Jemplate/pkg-plist
@@ -1,12 +1,4 @@
 %%SITE_PERL%%/Catalyst/Helper/View/Jemplate.pm
 %%SITE_PERL%%/Catalyst/View/Jemplate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Jemplate/.packlist
 %%PERL5_MAN3%%/Catalyst::Helper::View::Jemplate.3.gz
 %%PERL5_MAN3%%/Catalyst::View::Jemplate.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Jemplate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-Mason/Makefile b/www/p5-Catalyst-View-Mason/Makefile
index 07600c08efb3..223c79cf8a17 100644
--- a/www/p5-Catalyst-View-Mason/Makefile
+++ b/www/p5-Catalyst-View-Mason/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-View-Mason
 PORTVERSION=	0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-Mason/pkg-plist b/www/p5-Catalyst-View-Mason/pkg-plist
index 3f530f4b4191..dab1b8f7000a 100644
--- a/www/p5-Catalyst-View-Mason/pkg-plist
+++ b/www/p5-Catalyst-View-Mason/pkg-plist
@@ -1,12 +1,4 @@
 %%SITE_PERL%%/Catalyst/Helper/View/Mason.pm
 %%SITE_PERL%%/Catalyst/View/Mason.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Mason/.packlist
 %%PERL5_MAN3%%/Catalyst::Helper::View::Mason.3.gz
 %%PERL5_MAN3%%/Catalyst::View::Mason.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Mason
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-REST-XML/Makefile b/www/p5-Catalyst-View-REST-XML/Makefile
index bfa9e942f2ab..42a41d34d0b8 100644
--- a/www/p5-Catalyst-View-REST-XML/Makefile
+++ b/www/p5-Catalyst-View-REST-XML/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-View-REST-XML
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-REST-XML/pkg-plist b/www/p5-Catalyst-View-REST-XML/pkg-plist
index b80812077d9e..2c678a1e0a50 100644
--- a/www/p5-Catalyst-View-REST-XML/pkg-plist
+++ b/www/p5-Catalyst-View-REST-XML/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/REST/XML/.packlist
 %%SITE_PERL%%/Catalyst/View/REST/XML.pm
 %%PERL5_MAN3%%/Catalyst::View::REST::XML.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/View/REST
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/REST/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/REST
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
diff --git a/www/p5-Catalyst-View-RRDGraph/Makefile b/www/p5-Catalyst-View-RRDGraph/Makefile
index bbe05d6e8431..f8bd3beae899 100644
--- a/www/p5-Catalyst-View-RRDGraph/Makefile
+++ b/www/p5-Catalyst-View-RRDGraph/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Catalyst-View-RRDGraph
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-RRDGraph/pkg-plist b/www/p5-Catalyst-View-RRDGraph/pkg-plist
index 6ec8005d769c..ed818d7d489a 100644
--- a/www/p5-Catalyst-View-RRDGraph/pkg-plist
+++ b/www/p5-Catalyst-View-RRDGraph/pkg-plist
@@ -2,11 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::View::RRDGraph.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/RRDGraph.pm
 %%SITE_PERL%%/Catalyst/View/RRDGraph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/RRDGraph/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/RRDGraph
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
index bcca40c270cb..57b75f5f51a4 100644
--- a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
+++ b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-View-TT-ControllerLocal
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-TT-ControllerLocal/pkg-plist b/www/p5-Catalyst-View-TT-ControllerLocal/pkg-plist
index d841ab25d5d8..05e9911badce 100644
--- a/www/p5-Catalyst-View-TT-ControllerLocal/pkg-plist
+++ b/www/p5-Catalyst-View-TT-ControllerLocal/pkg-plist
@@ -1,14 +1,4 @@
 %%SITE_PERL%%/Catalyst/View/TT/ControllerLocal.pm
 %%SITE_PERL%%/Catalyst/Helper/View/TTControllerLocal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT/ControllerLocal/.packlist
 %%PERL5_MAN3%%/Catalyst::Helper::View::TTControllerLocal.3.gz
 %%PERL5_MAN3%%/Catalyst::View::TT::ControllerLocal.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT/ControllerLocal
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View/TT
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-TT/Makefile b/www/p5-Catalyst-View-TT/Makefile
index ee8d4826069d..fc5a167fc942 100644
--- a/www/p5-Catalyst-View-TT/Makefile
+++ b/www/p5-Catalyst-View-TT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-TT
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-TT/pkg-plist b/www/p5-Catalyst-View-TT/pkg-plist
index 8372f8e76a28..315abb53c202 100644
--- a/www/p5-Catalyst-View-TT/pkg-plist
+++ b/www/p5-Catalyst-View-TT/pkg-plist
@@ -4,11 +4,3 @@
 %%SITE_PERL%%/Catalyst/Helper/View/TT.pm
 %%SITE_PERL%%/Catalyst/Helper/View/TTSite.pm
 %%SITE_PERL%%/Catalyst/View/TT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-Template-Declare/Makefile b/www/p5-Catalyst-View-Template-Declare/Makefile
index 0b3c2f03af7c..5da780385095 100644
--- a/www/p5-Catalyst-View-Template-Declare/Makefile
+++ b/www/p5-Catalyst-View-Template-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-Template-Declare
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-Template-Declare/pkg-plist b/www/p5-Catalyst-View-Template-Declare/pkg-plist
index a7393c479b35..1d7f2e0292ee 100644
--- a/www/p5-Catalyst-View-Template-Declare/pkg-plist
+++ b/www/p5-Catalyst-View-Template-Declare/pkg-plist
@@ -2,14 +2,3 @@
 %%PERL5_MAN3%%/Catalyst::View::Template::Declare.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/Template/Declare.pm
 %%SITE_PERL%%/Catalyst/View/Template/Declare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template/Declare/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template/Declare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/View/Template
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Template
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-Templated/Makefile b/www/p5-Catalyst-View-Templated/Makefile
index 89c5f76b33a3..038dcbb6c923 100644
--- a/www/p5-Catalyst-View-Templated/Makefile
+++ b/www/p5-Catalyst-View-Templated/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-Templated
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JROCKWAY
diff --git a/www/p5-Catalyst-View-Templated/pkg-plist b/www/p5-Catalyst-View-Templated/pkg-plist
index bf22b66b0ba4..f4a131463849 100644
--- a/www/p5-Catalyst-View-Templated/pkg-plist
+++ b/www/p5-Catalyst-View-Templated/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Catalyst::View::Templated.3.gz
 %%SITE_PERL%%/Catalyst/View/Templated.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Templated/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Templated
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-XML-Feed/Makefile b/www/p5-Catalyst-View-XML-Feed/Makefile
index 23c93476dc63..ed65fa1b3bd6 100644
--- a/www/p5-Catalyst-View-XML-Feed/Makefile
+++ b/www/p5-Catalyst-View-XML-Feed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-XML-Feed
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Catalyst-View-XML-Feed/pkg-plist b/www/p5-Catalyst-View-XML-Feed/pkg-plist
index 656a8f14d735..6728bbe35dd5 100644
--- a/www/p5-Catalyst-View-XML-Feed/pkg-plist
+++ b/www/p5-Catalyst-View-XML-Feed/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/XML/Feed/.packlist
 %%SITE_PERL%%/Catalyst/View/XML/Feed.pm
 %%PERL5_MAN3%%/Catalyst::View::XML::Feed.3.gz
diff --git a/www/p5-Catalyst-View-XML-Simple/Makefile b/www/p5-Catalyst-View-XML-Simple/Makefile
index cd2a2780ddaa..61a2156034d6 100644
--- a/www/p5-Catalyst-View-XML-Simple/Makefile
+++ b/www/p5-Catalyst-View-XML-Simple/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Catalyst-View-XML-Simple
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
diff --git a/www/p5-Catalyst-View-XML-Simple/pkg-plist b/www/p5-Catalyst-View-XML-Simple/pkg-plist
index a3e621bc3cf8..7ad53a3cafbc 100644
--- a/www/p5-Catalyst-View-XML-Simple/pkg-plist
+++ b/www/p5-Catalyst-View-XML-Simple/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/XML/Simple/.packlist
 %%SITE_PERL%%/Catalyst/View/XML/Simple.pm
 %%PERL5_MAN3%%/Catalyst::View::XML::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/View/XML
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/XML/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
diff --git a/www/p5-Catalyst-View-XSLT/Makefile b/www/p5-Catalyst-View-XSLT/Makefile
index 1c54b92a2d4a..cbae5ea94839 100644
--- a/www/p5-Catalyst-View-XSLT/Makefile
+++ b/www/p5-Catalyst-View-XSLT/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Catalyst-View-XSLT
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JANUS
diff --git a/www/p5-Catalyst-View-XSLT/pkg-plist b/www/p5-Catalyst-View-XSLT/pkg-plist
index 18f4621c60b5..257426a6b7a3 100644
--- a/www/p5-Catalyst-View-XSLT/pkg-plist
+++ b/www/p5-Catalyst-View-XSLT/pkg-plist
@@ -4,9 +4,3 @@
 %%SITE_PERL%%/Catalyst/Helper/View/XSLT.pm
 %%SITE_PERL%%/Catalyst/View/XSLT.pm
 %%SITE_PERL%%/Catalyst/View/XSLT/XML/LibXSLT.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/View/XSLT/XML
-@dirrmtry %%SITE_PERL%%/Catalyst/View/XSLT
-@dirrmtry %%SITE_PERL%%/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-CatalystX-Component-Traits/Makefile b/www/p5-CatalystX-Component-Traits/Makefile
index 3946b2c42881..18738b4743af 100644
--- a/www/p5-CatalystX-Component-Traits/Makefile
+++ b/www/p5-CatalystX-Component-Traits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CatalystX-Component-Traits
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CatalystX-Component-Traits/pkg-plist b/www/p5-CatalystX-Component-Traits/pkg-plist
index 832fada10206..625b0edea30a 100644
--- a/www/p5-CatalystX-Component-Traits/pkg-plist
+++ b/www/p5-CatalystX-Component-Traits/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/CatalystX/Component/Traits.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Component/Traits/.packlist
 %%PERL5_MAN3%%/CatalystX::Component::Traits.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Component/Traits
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX
-@dirrmtry %%SITE_PERL%%/CatalystX/Component
-@dirrmtry %%SITE_PERL%%/CatalystX
diff --git a/www/p5-CatalystX-InjectComponent/Makefile b/www/p5-CatalystX-InjectComponent/Makefile
index 6babb72258d0..b8ca8535e92b 100644
--- a/www/p5-CatalystX-InjectComponent/Makefile
+++ b/www/p5-CatalystX-InjectComponent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CatalystX-InjectComponent
 PORTVERSION=	0.025
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CatalystX-InjectComponent/pkg-plist b/www/p5-CatalystX-InjectComponent/pkg-plist
index 66fa51d78c6b..2909900e4aa4 100644
--- a/www/p5-CatalystX-InjectComponent/pkg-plist
+++ b/www/p5-CatalystX-InjectComponent/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/CatalystX/InjectComponent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/InjectComponent/.packlist
 %%PERL5_MAN3%%/CatalystX::InjectComponent.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/InjectComponent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX
-@dirrmtry %%SITE_PERL%%/CatalystX
diff --git a/www/p5-CatalystX-LeakChecker/Makefile b/www/p5-CatalystX-LeakChecker/Makefile
index 54c75b59a5bf..0b97eceda980 100644
--- a/www/p5-CatalystX-LeakChecker/Makefile
+++ b/www/p5-CatalystX-LeakChecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CatalystX-LeakChecker
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/www/p5-CatalystX-LeakChecker/pkg-plist b/www/p5-CatalystX-LeakChecker/pkg-plist
index 9ead30ff0d56..585453e0ff27 100644
--- a/www/p5-CatalystX-LeakChecker/pkg-plist
+++ b/www/p5-CatalystX-LeakChecker/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CatalystX::LeakChecker.3.gz
 %%SITE_PERL%%/CatalystX/LeakChecker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/LeakChecker/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/LeakChecker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX
-@dirrmtry %%SITE_PERL%%/CatalystX
diff --git a/www/p5-CatalystX-Profile/Makefile b/www/p5-CatalystX-Profile/Makefile
index c098fcbb8532..c92e5e25304f 100644
--- a/www/p5-CatalystX-Profile/Makefile
+++ b/www/p5-CatalystX-Profile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CatalystX-Profile
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CYCLES
diff --git a/www/p5-CatalystX-Profile/pkg-plist b/www/p5-CatalystX-Profile/pkg-plist
index f5ed4010da1d..3d14db948756 100644
--- a/www/p5-CatalystX-Profile/pkg-plist
+++ b/www/p5-CatalystX-Profile/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/CatalystX/Profile/Controller/ControlProfiling.pm
 %%SITE_PERL%%/CatalystX/Profile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Profile/.packlist
 %%PERL5_MAN3%%/CatalystX::Profile.3.gz
 %%PERL5_MAN3%%/CatalystX::Profile::Controller::ControlProfiling.3.gz
-@dirrmtry %%SITE_PERL%%/CatalystX/Profile/Controller
-@dirrmtry %%SITE_PERL%%/CatalystX/Profile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Profile
diff --git a/www/p5-CatalystX-REPL/Makefile b/www/p5-CatalystX-REPL/Makefile
index dd5c053b2c55..7e9a54dd98b9 100644
--- a/www/p5-CatalystX-REPL/Makefile
+++ b/www/p5-CatalystX-REPL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CatalystX-REPL
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/www/p5-CatalystX-REPL/pkg-plist b/www/p5-CatalystX-REPL/pkg-plist
index 7454735ddd21..c5670b4a0be6 100644
--- a/www/p5-CatalystX-REPL/pkg-plist
+++ b/www/p5-CatalystX-REPL/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/REPL/.packlist
 %%SITE_PERL%%/CatalystX/REPL.pm
 %%PERL5_MAN3%%/CatalystX::REPL.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/REPL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX
-@dirrmtry %%SITE_PERL%%/CatalystX
diff --git a/www/p5-CatalystX-RoleApplicator/Makefile b/www/p5-CatalystX-RoleApplicator/Makefile
index ad80924e9677..59672c710877 100644
--- a/www/p5-CatalystX-RoleApplicator/Makefile
+++ b/www/p5-CatalystX-RoleApplicator/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	CatalystX-RoleApplicator
 PORTVERSION=	0.005
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CatalystX-RoleApplicator/pkg-plist b/www/p5-CatalystX-RoleApplicator/pkg-plist
index 1a264cc52f9e..c502fa6bb1bf 100644
--- a/www/p5-CatalystX-RoleApplicator/pkg-plist
+++ b/www/p5-CatalystX-RoleApplicator/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/CatalystX::RoleApplicator.3.gz
 %%SITE_PERL%%/CatalystX/RoleApplicator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/RoleApplicator/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/RoleApplicator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX
-@dirrmtry %%SITE_PERL%%/CatalystX
diff --git a/www/p5-CatalystX-SimpleLogin/Makefile b/www/p5-CatalystX-SimpleLogin/Makefile
index 15cdedae7c27..2facba1de7a6 100644
--- a/www/p5-CatalystX-SimpleLogin/Makefile
+++ b/www/p5-CatalystX-SimpleLogin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	CatalystX-SimpleLogin
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
diff --git a/www/p5-CatalystX-SimpleLogin/pkg-plist b/www/p5-CatalystX-SimpleLogin/pkg-plist
index f47b36af05b3..fb601fffdb69 100644
--- a/www/p5-CatalystX-SimpleLogin/pkg-plist
+++ b/www/p5-CatalystX-SimpleLogin/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/CatalystX/SimpleLogin/TraitFor/Controller/Login/WithRedirect.pm
 %%SITE_PERL%%/CatalystX/SimpleLogin/Manual.pod
 %%SITE_PERL%%/CatalystX/SimpleLogin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/SimpleLogin/.packlist
 %%PERL5_MAN3%%/Catalyst::ActionRole::NeedsLogin.3.gz
 %%PERL5_MAN3%%/CatalystX::SimpleLogin.3.gz
 %%PERL5_MAN3%%/CatalystX::SimpleLogin::Controller::Login.3.gz
@@ -19,14 +18,3 @@
 %%PERL5_MAN3%%/CatalystX::SimpleLogin::TraitFor::Controller::Login::OpenID.3.gz
 %%PERL5_MAN3%%/CatalystX::SimpleLogin::TraitFor::Controller::Login::RenderAsTTTemplate.3.gz
 %%PERL5_MAN3%%/CatalystX::SimpleLogin::TraitFor::Controller::Login::WithRedirect.3.gz
-@dirrmtry %%SITE_PERL%%/Catalyst/ActionRole
-@dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/SimpleLogin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX
-@dirrmtry %%SITE_PERL%%/CatalystX/SimpleLogin/Controller
-@dirrmtry %%SITE_PERL%%/CatalystX/SimpleLogin/Form
-@dirrmtry %%SITE_PERL%%/CatalystX/SimpleLogin/TraitFor/Controller/Login
-@dirrmtry %%SITE_PERL%%/CatalystX/SimpleLogin/TraitFor/Controller
-@dirrmtry %%SITE_PERL%%/CatalystX/SimpleLogin/TraitFor
-@dirrmtry %%SITE_PERL%%/CatalystX/SimpleLogin
-@dirrmtry %%SITE_PERL%%/CatalystX
diff --git a/www/p5-Class-DBI-FromForm/Makefile b/www/p5-Class-DBI-FromForm/Makefile
index 86bb1d592562..341dadccab7e 100644
--- a/www/p5-Class-DBI-FromForm/Makefile
+++ b/www/p5-Class-DBI-FromForm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Class-DBI-FromForm
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/www/p5-Class-DBI-FromForm/pkg-plist b/www/p5-Class-DBI-FromForm/pkg-plist
index 94e0f5d95938..194ac447f2e0 100644
--- a/www/p5-Class-DBI-FromForm/pkg-plist
+++ b/www/p5-Class-DBI-FromForm/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Class/DBI/FromForm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm/.packlist
 %%PERL5_MAN3%%/Class::DBI::FromForm.3.gz
-@dirrmtry %%SITE_PERL%%/Class/DBI
-@dirrmtry %%SITE_PERL%%/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/www/p5-ClearSilver/Makefile b/www/p5-ClearSilver/Makefile
index 0ecca91f0c79..57a46529dfe6 100644
--- a/www/p5-ClearSilver/Makefile
+++ b/www/p5-ClearSilver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ClearSilver
 PORTVERSION=	0.10.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.clearsilver.net/downloads/
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-ClearSilver/pkg-plist b/www/p5-ClearSilver/pkg-plist
index 40a20f0877f7..c17eac093d88 100644
--- a/www/p5-ClearSilver/pkg-plist
+++ b/www/p5-ClearSilver/pkg-plist
@@ -1,5 +1,3 @@
 %%PERL5_MAN3%%/ClearSilver.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/ClearSilver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ClearSilver/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ClearSilver/ClearSilver.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ClearSilver
+%%SITE_ARCH%%/ClearSilver.pm
+%%SITE_ARCH%%/auto/ClearSilver/ClearSilver.so
diff --git a/www/p5-Compress-LeadingBlankSpaces/Makefile b/www/p5-Compress-LeadingBlankSpaces/Makefile
index e36cfb0c8cc0..e9d045edfa47 100644
--- a/www/p5-Compress-LeadingBlankSpaces/Makefile
+++ b/www/p5-Compress-LeadingBlankSpaces/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Compress-LeadingBlankSpaces
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Compress-LeadingBlankSpaces/pkg-plist b/www/p5-Compress-LeadingBlankSpaces/pkg-plist
index 9b0c1af892bd..aff11a9d0313 100644
--- a/www/p5-Compress-LeadingBlankSpaces/pkg-plist
+++ b/www/p5-Compress-LeadingBlankSpaces/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Compress::LeadingBlankSpaces.3.gz
 %%SITE_PERL%%/Compress/LeadingBlankSpaces.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress
-@dirrmtry %%SITE_PERL%%/Compress
diff --git a/www/p5-Continuity/Makefile b/www/p5-Continuity/Makefile
index 47fe557c9779..1e1b09d6105b 100644
--- a/www/p5-Continuity/Makefile
+++ b/www/p5-Continuity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Continuity
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=CPAN:AWWAIID
diff --git a/www/p5-Continuity/pkg-plist b/www/p5-Continuity/pkg-plist
index 198020e237a4..f2f06b393058 100644
--- a/www/p5-Continuity/pkg-plist
+++ b/www/p5-Continuity/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Continuity/.packlist
 %%SITE_PERL%%/Continuity.pm
 %%SITE_PERL%%/Continuity/Adapt/FCGI.pm
 %%SITE_PERL%%/Continuity/Adapt/HttpDaemon.pm
@@ -16,6 +15,3 @@
 %%PERL5_MAN3%%/Continuity::Mapper.3.gz
 %%PERL5_MAN3%%/Continuity::Request.3.gz
 %%PERL5_MAN3%%/Continuity::RequestCallbacks.3.gz
-@dirrmtry %%SITE_PERL%%/Continuity/Adapt
-@dirrmtry %%SITE_PERL%%/Continuity
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Continuity
diff --git a/www/p5-Cookie-Baker/Makefile b/www/p5-Cookie-Baker/Makefile
index f49f113729c8..0e8261680920 100644
--- a/www/p5-Cookie-Baker/Makefile
+++ b/www/p5-Cookie-Baker/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Cookie-Baker
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Corona/Makefile b/www/p5-Corona/Makefile
index 95f7309c8144..5457043e5069 100644
--- a/www/p5-Corona/Makefile
+++ b/www/p5-Corona/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Corona
 PORTVERSION=	0.1004
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Corona/pkg-plist b/www/p5-Corona/pkg-plist
index f9d5946e0202..55b1210e61c6 100644
--- a/www/p5-Corona/pkg-plist
+++ b/www/p5-Corona/pkg-plist
@@ -2,11 +2,7 @@ bin/corona
 man/man1/corona.1.gz
 %%PERL5_MAN3%%/Corona.3.gz
 %%PERL5_MAN3%%/Plack::Handler::Corona.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Corona/.packlist
 %%SITE_PERL%%/Corona.pm
 %%SITE_PERL%%/Corona/Server.pm
 %%SITE_PERL%%/Plack/Handler/Corona.pm
 %%SITE_PERL%%/Plack/Server/Coro.pm
-@dirrm %%SITE_PERL%%/Corona
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Corona
-@dirrmtry %%SITE_PERL%%/Plack/Server
diff --git a/www/p5-Dancer-Logger-Log4perl/Makefile b/www/p5-Dancer-Logger-Log4perl/Makefile
index ad5883c1202c..9386dbb827bd 100644
--- a/www/p5-Dancer-Logger-Log4perl/Makefile
+++ b/www/p5-Dancer-Logger-Log4perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Logger-Log4perl
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Dancer-Logger-Log4perl/pkg-plist b/www/p5-Dancer-Logger-Log4perl/pkg-plist
index 59afd1067c9f..7bca29c1ac93 100644
--- a/www/p5-Dancer-Logger-Log4perl/pkg-plist
+++ b/www/p5-Dancer-Logger-Log4perl/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Dancer/Logger/Log4perl.pm
-%%SITE_PERL%%/mach/auto/Dancer/Logger/Log4perl/.packlist
 %%PERL5_MAN3%%/Dancer::Logger::Log4perl.3.gz
-@dirrm %%SITE_PERL%%/mach/auto/Dancer/Logger/Log4perl
-@dirrmtry %%SITE_PERL%%/mach/auto/Dancer/Logger
-@dirrmtry %%SITE_PERL%%/mach/auto/Dancer
-@dirrmtry %%SITE_PERL%%/Dancer/Logger
-@dirrmtry %%SITE_PERL%%/Dancer
diff --git a/www/p5-Dancer-Plugin-ExtDirect/Makefile b/www/p5-Dancer-Plugin-ExtDirect/Makefile
index 9fb7e8f52def..81ee3c9f0141 100644
--- a/www/p5-Dancer-Plugin-ExtDirect/Makefile
+++ b/www/p5-Dancer-Plugin-ExtDirect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-ExtDirect
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Dancer-Plugin-ExtDirect/pkg-plist b/www/p5-Dancer-Plugin-ExtDirect/pkg-plist
index fa4c127b747e..1a3e9b90c02c 100644
--- a/www/p5-Dancer-Plugin-ExtDirect/pkg-plist
+++ b/www/p5-Dancer-Plugin-ExtDirect/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/ExtDirect/.packlist
 %%SITE_PERL%%/Dancer/Plugin/ExtDirect.pm
 %%PERL5_MAN3%%/Dancer::Plugin::ExtDirect.3.gz
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/Dancer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/ExtDirect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
diff --git a/www/p5-Dancer-Plugin-Feed/Makefile b/www/p5-Dancer-Plugin-Feed/Makefile
index d6a2dd1f2bd0..f815f12dbd22 100644
--- a/www/p5-Dancer-Plugin-Feed/Makefile
+++ b/www/p5-Dancer-Plugin-Feed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Feed
 PORTVERSION=	1.131470
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Dancer-Plugin-Feed/pkg-plist b/www/p5-Dancer-Plugin-Feed/pkg-plist
index 1010d4bcd61f..3d1b282d0de0 100644
--- a/www/p5-Dancer-Plugin-Feed/pkg-plist
+++ b/www/p5-Dancer-Plugin-Feed/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Feed/.packlist
 %%SITE_PERL%%/Dancer/Plugin/Feed.pm
 %%PERL5_MAN3%%/Dancer::Plugin::Feed.3.gz
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/Dancer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Feed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
diff --git a/www/p5-Dancer-Plugin-Lexicon/Makefile b/www/p5-Dancer-Plugin-Lexicon/Makefile
index 1a58086652d0..bb5f6c517eaa 100644
--- a/www/p5-Dancer-Plugin-Lexicon/Makefile
+++ b/www/p5-Dancer-Plugin-Lexicon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Lexicon
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DRTECH
diff --git a/www/p5-Dancer-Plugin-Lexicon/pkg-plist b/www/p5-Dancer-Plugin-Lexicon/pkg-plist
index 425e4e97b395..f920102d9b52 100644
--- a/www/p5-Dancer-Plugin-Lexicon/pkg-plist
+++ b/www/p5-Dancer-Plugin-Lexicon/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Dancer::Plugin::Lexicon.3.gz
 %%SITE_PERL%%/Dancer/Plugin/Lexicon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Lexicon/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Lexicon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
diff --git a/www/p5-Dancer-Plugin-Memcached/Makefile b/www/p5-Dancer-Plugin-Memcached/Makefile
index e52448d871c7..dbc857c5468e 100644
--- a/www/p5-Dancer-Plugin-Memcached/Makefile
+++ b/www/p5-Dancer-Plugin-Memcached/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-Memcached
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SQUEEK
diff --git a/www/p5-Dancer-Plugin-Memcached/pkg-plist b/www/p5-Dancer-Plugin-Memcached/pkg-plist
index 6538642b9347..721fb9f73c10 100644
--- a/www/p5-Dancer-Plugin-Memcached/pkg-plist
+++ b/www/p5-Dancer-Plugin-Memcached/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Dancer::Plugin::Memcached.3.gz
 %%SITE_PERL%%/Dancer/Plugin/Memcached.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Memcached/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Memcached
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
diff --git a/www/p5-Dancer-Plugin-REST/Makefile b/www/p5-Dancer-Plugin-REST/Makefile
index 1e165aa39b11..b43e0d07c6f8 100644
--- a/www/p5-Dancer-Plugin-REST/Makefile
+++ b/www/p5-Dancer-Plugin-REST/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-REST
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:YANICK
diff --git a/www/p5-Dancer-Plugin-SiteMap/Makefile b/www/p5-Dancer-Plugin-SiteMap/Makefile
index b362bd73ee5b..59ae7343a5c9 100644
--- a/www/p5-Dancer-Plugin-SiteMap/Makefile
+++ b/www/p5-Dancer-Plugin-SiteMap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer-Plugin-SiteMap
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JAMESR
diff --git a/www/p5-Dancer-Plugin-SiteMap/pkg-plist b/www/p5-Dancer-Plugin-SiteMap/pkg-plist
index 613cfbe44096..d8b4057b7326 100644
--- a/www/p5-Dancer-Plugin-SiteMap/pkg-plist
+++ b/www/p5-Dancer-Plugin-SiteMap/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Dancer/Plugin/SiteMap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/SiteMap/.packlist
 %%PERL5_MAN3%%/Dancer::Plugin::SiteMap.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/SiteMap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/Dancer
diff --git a/www/p5-Dancer-Plugin-ValidationClass/Makefile b/www/p5-Dancer-Plugin-ValidationClass/Makefile
index 8a3b8ee38a36..a93b08e291e5 100644
--- a/www/p5-Dancer-Plugin-ValidationClass/Makefile
+++ b/www/p5-Dancer-Plugin-ValidationClass/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Dancer-Plugin-ValidationClass
 PORTVERSION=	0.120490
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AWNCORP
diff --git a/www/p5-Dancer-Plugin-ValidationClass/pkg-plist b/www/p5-Dancer-Plugin-ValidationClass/pkg-plist
index 7a24d95ad2c0..2b64756c1041 100644
--- a/www/p5-Dancer-Plugin-ValidationClass/pkg-plist
+++ b/www/p5-Dancer-Plugin-ValidationClass/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/ValidationClass/.packlist
 %%SITE_PERL%%/Dancer/Plugin/ValidationClass.pm
 %%PERL5_MAN3%%/Dancer::Plugin::ValidationClass.3.gz
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrm %%SITE_PERL%%/Dancer/Plugin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/ValidationClass
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
diff --git a/www/p5-Dancer-Session-Cookie/Makefile b/www/p5-Dancer-Session-Cookie/Makefile
index 5d821e113e69..497b92f625fc 100644
--- a/www/p5-Dancer-Session-Cookie/Makefile
+++ b/www/p5-Dancer-Session-Cookie/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Dancer-Session-Cookie
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Dancer-Template-Xslate/Makefile b/www/p5-Dancer-Template-Xslate/Makefile
index f41d908d5d7f..d6b6f7e0abcb 100644
--- a/www/p5-Dancer-Template-Xslate/Makefile
+++ b/www/p5-Dancer-Template-Xslate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Dancer-Template-Xslate
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSIMOES
diff --git a/www/p5-Dancer-Template-Xslate/pkg-plist b/www/p5-Dancer-Template-Xslate/pkg-plist
index 80a96e38f216..80030b5fa6db 100644
--- a/www/p5-Dancer-Template-Xslate/pkg-plist
+++ b/www/p5-Dancer-Template-Xslate/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Dancer/Template/Xslate.pm
 %%PERL5_MAN3%%/Dancer::Template::Xslate.3.gz
-@dirrmtry %%SITE_PERL%%/Dancer/Template
-@dirrmtry %%SITE_PERL%%/Dancer
diff --git a/www/p5-Dancer/Makefile b/www/p5-Dancer/Makefile
index 14667428c614..c3762153cc28 100644
--- a/www/p5-Dancer/Makefile
+++ b/www/p5-Dancer/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Dancer
 PORTVERSION=	1.3132
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:YANICK
diff --git a/www/p5-Dancer/pkg-plist b/www/p5-Dancer/pkg-plist
index 51ea8d279dd4..96e87113db6f 100644
--- a/www/p5-Dancer/pkg-plist
+++ b/www/p5-Dancer/pkg-plist
@@ -78,7 +78,6 @@ man/man1/dancer.1.gz
 %%PERL5_MAN3%%/Dancer::Timer.3.gz
 %%PERL5_MAN3%%/Dancer::Tutorial.3.gz
 bin/dancer
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/.packlist
 %%SITE_PERL%%/Dancer.pm
 %%SITE_PERL%%/Dancer/App.pm
 %%SITE_PERL%%/Dancer/Config.pm
diff --git a/www/p5-Dancer2/Makefile b/www/p5-Dancer2/Makefile
index 7da2ee19c5e4..68b2780add8a 100644
--- a/www/p5-Dancer2/Makefile
+++ b/www/p5-Dancer2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Dancer2
 PORTVERSION=	0.153002
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Dancer2/pkg-plist b/www/p5-Dancer2/pkg-plist
index bb3213c3a18e..7a30fc89c9b1 100644
--- a/www/p5-Dancer2/pkg-plist
+++ b/www/p5-Dancer2/pkg-plist
@@ -1,5 +1,4 @@
 bin/dancer2
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer2/.packlist
 %%SITE_PERL%%/auto/share/dist/Dancer2/skel/MANIFEST.SKIP
 %%SITE_PERL%%/auto/share/dist/Dancer2/skel/Makefile.PL
 %%SITE_PERL%%/auto/share/dist/Dancer2/skel/config.yml
diff --git a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
index beabc18767a9..01dd91c9697c 100644
--- a/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
+++ b/www/p5-Data-TreeDumper-Renderer-DHTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-TreeDumper-Renderer-DHTML
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist b/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist
index adee98c2f228..7d8ea1cb7a78 100644
--- a/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist
+++ b/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist
@@ -1,16 +1,4 @@
 %%SITE_PERL%%/Data/TreeDumper/Renderer/DHTML.pm
 %%SITE_PERL%%/Data/TreeDumper/Renderer/dhtml_test.pl
 %%SITE_PERL%%/auto/Data/TreeDumper/Renderer/DHTML/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer/DHTML/.packlist
 %%PERL5_MAN3%%/Data::TreeDumper::Renderer::DHTML.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer/DHTML
-@dirrm %%SITE_PERL%%/auto/Data/TreeDumper/Renderer/DHTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrmtry %%SITE_PERL%%/auto/Data/TreeDumper/Renderer
-@dirrmtry %%SITE_PERL%%/auto/Data/TreeDumper
-@dirrmtry %%SITE_PERL%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data/TreeDumper/Renderer
-@dirrmtry %%SITE_PERL%%/Data/TreeDumper
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/www/p5-Data-Validate-URI/Makefile b/www/p5-Data-Validate-URI/Makefile
index 3c24b50a614f..7ed44a39974e 100644
--- a/www/p5-Data-Validate-URI/Makefile
+++ b/www/p5-Data-Validate-URI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Data-Validate-URI
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Data
diff --git a/www/p5-Data-Validate-URI/pkg-plist b/www/p5-Data-Validate-URI/pkg-plist
index 51802d8b9ddd..400efde69186 100644
--- a/www/p5-Data-Validate-URI/pkg-plist
+++ b/www/p5-Data-Validate-URI/pkg-plist
@@ -7,12 +7,4 @@
 %%SITE_PERL%%/auto/Data/Validate/URI/is_tel_uri.al
 %%SITE_PERL%%/auto/Data/Validate/URI/_split_uri.al
 %%SITE_PERL%%/auto/Data/Validate/URI/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/URI/.packlist
 %%PERL5_MAN3%%/Data::Validate::URI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/URI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrmtry %%SITE_PERL%%/auto/Data/Validate/URI
-@dirrmtry %%SITE_PERL%%/auto/Data/Validate
-@dirrmtry %%SITE_PERL%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/www/p5-Emplacken/Makefile b/www/p5-Emplacken/Makefile
index 2683f9ea68b5..ac1bd5bd61b2 100644
--- a/www/p5-Emplacken/Makefile
+++ b/www/p5-Emplacken/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Emplacken
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DROLSKY
diff --git a/www/p5-Emplacken/pkg-plist b/www/p5-Emplacken/pkg-plist
index fb45146697e0..c17e1c19756d 100644
--- a/www/p5-Emplacken/pkg-plist
+++ b/www/p5-Emplacken/pkg-plist
@@ -11,12 +11,5 @@ bin/emplacken
 %%SITE_PERL%%/Emplacken/Stderr.pm
 %%SITE_PERL%%/Emplacken/Types.pm
 %%SITE_PERL%%/Emplacken/Types/Internal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Emplacken/.packlist
 %%PERL5_MAN3%%/Emplacken.3.gz
 %%PERL5_MAN3%%/Emplacken::Types.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Emplacken
-@dirrm %%SITE_PERL%%/Emplacken/Types
-@dirrm %%SITE_PERL%%/Emplacken/Role
-@dirrm %%SITE_PERL%%/Emplacken/CodeBuilder
-@dirrm %%SITE_PERL%%/Emplacken/App
-@dirrm %%SITE_PERL%%/Emplacken
diff --git a/www/p5-FAQ-OMatic/Makefile b/www/p5-FAQ-OMatic/Makefile
index 8ded46b3289e..27951e1eb399 100644
--- a/www/p5-FAQ-OMatic/Makefile
+++ b/www/p5-FAQ-OMatic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FAQ-OMatic
 PORTVERSION=	2.719
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-FAQ-OMatic/pkg-plist b/www/p5-FAQ-OMatic/pkg-plist
index 4aabed86c011..2316b4010004 100644
--- a/www/p5-FAQ-OMatic/pkg-plist
+++ b/www/p5-FAQ-OMatic/pkg-plist
@@ -63,8 +63,3 @@
 %%SITE_PERL%%/FAQ/OMatic/submitMove.pm
 %%SITE_PERL%%/FAQ/OMatic/submitPart.pm
 %%SITE_PERL%%/FAQ/OMatic/submitPass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ
-@dirrmtry %%SITE_PERL%%/FAQ/OMatic
-@dirrmtry %%SITE_PERL%%/FAQ
diff --git a/www/p5-FCGI-Async/Makefile b/www/p5-FCGI-Async/Makefile
index 1389568cdb7a..761e686cf508 100644
--- a/www/p5-FCGI-Async/Makefile
+++ b/www/p5-FCGI-Async/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	FCGI-Async
 PORTVERSION=	0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-FCGI-Async/pkg-plist b/www/p5-FCGI-Async/pkg-plist
index 16bdbf4a7202..ba982df84e9a 100644
--- a/www/p5-FCGI-Async/pkg-plist
+++ b/www/p5-FCGI-Async/pkg-plist
@@ -1,14 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Async/.packlist
 %%SITE_PERL%%/FCGI/Async.pm
 %%SITE_PERL%%/FCGI/Async/PSGI.pm
 %%SITE_PERL%%/Plack/Handler/FCGI/Async.pm
 %%PERL5_MAN3%%/Plack::Handler::FCGI::Async.3.gz
 %%PERL5_MAN3%%/FCGI::Async::PSGI.3.gz
 %%PERL5_MAN3%%/FCGI::Async.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Async
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
-@dirrmtry %%SITE_PERL%%/FCGI/Async
-@dirrmtry %%SITE_PERL%%/FCGI
-@dirrmtry %%SITE_PERL%%/Plack/Handler/FCGI
-@dirrmtry %%SITE_PERL%%/Plack/Handler
-@dirrmtry %%SITE_PERL%%/Plack
diff --git a/www/p5-FCGI-Client/Makefile b/www/p5-FCGI-Client/Makefile
index 816bbabfd214..f75b73c04d9d 100644
--- a/www/p5-FCGI-Client/Makefile
+++ b/www/p5-FCGI-Client/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	FCGI-Client
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/www/p5-FCGI-Client/pkg-plist b/www/p5-FCGI-Client/pkg-plist
index 1c7cca23134f..abb4c273c127 100644
--- a/www/p5-FCGI-Client/pkg-plist
+++ b/www/p5-FCGI-Client/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Client/.packlist
 %%SITE_PERL%%/FCGI/Client.pm
 %%SITE_PERL%%/FCGI/Client/Connection.pm
 %%SITE_PERL%%/FCGI/Client/Constant.pm
@@ -11,7 +10,3 @@
 %%PERL5_MAN3%%/FCGI::Client::Record.3.gz
 %%PERL5_MAN3%%/FCGI::Client::RecordFactory.3.gz
 %%PERL5_MAN3%%/FCGI::Client::RecordHeader.3.gz
-@dirrmtry %%SITE_PERL%%/FCGI/Client
-@dirrmtry %%SITE_PERL%%/FCGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
diff --git a/www/p5-FCGI-Engine/Makefile b/www/p5-FCGI-Engine/Makefile
index 3d54154ad518..721c470e5c0e 100644
--- a/www/p5-FCGI-Engine/Makefile
+++ b/www/p5-FCGI-Engine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FCGI-Engine
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-FCGI-Engine/pkg-plist b/www/p5-FCGI-Engine/pkg-plist
index 38780e50a34a..5280c44bcf66 100644
--- a/www/p5-FCGI-Engine/pkg-plist
+++ b/www/p5-FCGI-Engine/pkg-plist
@@ -12,7 +12,6 @@
 %%SITE_PERL%%/Plack/Handler/FCGI/Engine/ProcManager.pm
 %%SITE_PERL%%/Plack/Server/FCGI/Engine.pm
 %%SITE_PERL%%/Plack/Server/FCGI/Engine/ProcManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Engine/.packlist
 %%PERL5_MAN3%%/FCGI::Engine.3.gz
 %%PERL5_MAN3%%/FCGI::Engine::Core.3.gz
 %%PERL5_MAN3%%/FCGI::Engine::Manager.3.gz
@@ -27,17 +26,3 @@
 %%PERL5_MAN3%%/Plack::Handler::FCGI::Engine::ProcManager.3.gz
 %%PERL5_MAN3%%/Plack::Server::FCGI::Engine.3.gz
 %%PERL5_MAN3%%/Plack::Server::FCGI::Engine::ProcManager.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Engine
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
-@dirrmtry %%SITE_PERL%%/Plack/Server/FCGI/Engine
-@dirrmtry %%SITE_PERL%%/Plack/Server/FCGI
-@dirrmtry %%SITE_PERL%%/Plack/Server
-@dirrmtry %%SITE_PERL%%/Plack/Handler/FCGI/Engine
-@dirrmtry %%SITE_PERL%%/Plack/Handler/FCGI
-@dirrmtry %%SITE_PERL%%/Plack/Handler
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrmtry %%SITE_PERL%%/FCGI/Engine/ProcManager
-@dirrmtry %%SITE_PERL%%/FCGI/Engine/Manager/Server
-@dirrmtry %%SITE_PERL%%/FCGI/Engine/Manager
-@dirrmtry %%SITE_PERL%%/FCGI/Engine
-@dirrmtry %%SITE_PERL%%/FCGI
diff --git a/www/p5-FCGI-ProcManager/Makefile b/www/p5-FCGI-ProcManager/Makefile
index 811abfd44919..995f28b7e495 100644
--- a/www/p5-FCGI-ProcManager/Makefile
+++ b/www/p5-FCGI-ProcManager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FCGI-ProcManager
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-FCGI-ProcManager/pkg-plist b/www/p5-FCGI-ProcManager/pkg-plist
index 6617b4022323..da743a2bda35 100644
--- a/www/p5-FCGI-ProcManager/pkg-plist
+++ b/www/p5-FCGI-ProcManager/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/FCGI/ProcManager.pm
 %%SITE_PERL%%/FCGI/ProcManager/Constrained.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/ProcManager/.packlist
 %%PERL5_MAN3%%/FCGI::ProcManager.3.gz
 %%PERL5_MAN3%%/FCGI::ProcManager::Constrained.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/ProcManager
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
-@dirrm %%SITE_PERL%%/FCGI/ProcManager
-@dirrmtry %%SITE_PERL%%/FCGI
diff --git a/www/p5-FCGI-Spawn/Makefile b/www/p5-FCGI-Spawn/Makefile
index ed2edde4ae7a..534125d9fef9 100644
--- a/www/p5-FCGI-Spawn/Makefile
+++ b/www/p5-FCGI-Spawn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FCGI-Spawn
 PORTVERSION=	0.16.7
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-FCGI-Spawn/pkg-plist b/www/p5-FCGI-Spawn/pkg-plist
index 62024f606662..73a86d72dcc5 100644
--- a/www/p5-FCGI-Spawn/pkg-plist
+++ b/www/p5-FCGI-Spawn/pkg-plist
@@ -1,15 +1,10 @@
 %%SITE_PERL%%/FCGI/Spawn.pm
 %%SITE_PERL%%/FCGI/Spawn/BinUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Spawn/.packlist
 %%PERL5_MAN3%%/FCGI::Spawn.3.gz
 %%PERL5_MAN3%%/FCGI::Spawn::BinUtils.3.gz
 man/man1/fcgi_spawn.1.gz
 bin/fcgi_spawn
 etc/fcgi_spawn/fcgi_spawn.conf.sample
 share/doc/p5-FCGI-Spawn/README
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Spawn
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
-@dirrmtry %%SITE_PERL%%/FCGI/Spawn
-@dirrmtry %%SITE_PERL%%/FCGI
 @dirrmtry share/doc/p5-FCGI-Spawn
 @dirrmtry etc/fcgi_spawn
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index 33cd42dbab19..9d6c73dd2948 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FCGI
 PORTVERSION=	0.74
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/www/p5-FCGI/pkg-plist b/www/p5-FCGI/pkg-plist
index 04822cb4c4be..d19b5ac567c3 100644
--- a/www/p5-FCGI/pkg-plist
+++ b/www/p5-FCGI/pkg-plist
@@ -1,5 +1,3 @@
 %%PERL5_MAN3%%/FCGI.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/FCGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/.packlist
-%%PURE_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/FCGI.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
+%%SITE_ARCH%%/FCGI.pm
+%%PURE_PERL%%%%SITE_ARCH%%/auto/FCGI/FCGI.so
diff --git a/www/p5-FEAR-API/Makefile b/www/p5-FEAR-API/Makefile
index 74e3b16aa69f..4744ab4a0b32 100644
--- a/www/p5-FEAR-API/Makefile
+++ b/www/p5-FEAR-API/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	FEAR-API
 PORTVERSION=	0.489
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:XERN
diff --git a/www/p5-FEAR-API/pkg-plist b/www/p5-FEAR-API/pkg-plist
index c570adc8ba55..a57382537512 100644
--- a/www/p5-FEAR-API/pkg-plist
+++ b/www/p5-FEAR-API/pkg-plist
@@ -28,13 +28,4 @@ bin/fearperl
 %%SITE_PERL%%/FEAR/API/SourceFilter.pm
 %%SITE_PERL%%/FEAR/API/Translate.pm
 %%SITE_PERL%%/FEAR/API/Translate/Backend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FEAR/API/.packlist
 man/man1/fear.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FEAR/API
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FEAR
-@dirrmtry %%SITE_PERL%%/FEAR/API/Translate
-@dirrmtry %%SITE_PERL%%/FEAR/API/Recorder
-@dirrmtry %%SITE_PERL%%/FEAR/API/Prefetching
-@dirrmtry %%SITE_PERL%%/FEAR/API/Extract
-@dirrmtry %%SITE_PERL%%/FEAR/API
-@dirrmtry %%SITE_PERL%%/FEAR
diff --git a/www/p5-Facebook-Graph/Makefile b/www/p5-Facebook-Graph/Makefile
index 3609bb030d8d..eb819ed3c6e7 100644
--- a/www/p5-Facebook-Graph/Makefile
+++ b/www/p5-Facebook-Graph/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Facebook-Graph
 PORTVERSION=	1.0801
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RIZEN
diff --git a/www/p5-Facebook-Graph/pkg-plist b/www/p5-Facebook-Graph/pkg-plist
index 4614dbd65995..c65fb96e007a 100644
--- a/www/p5-Facebook-Graph/pkg-plist
+++ b/www/p5-Facebook-Graph/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Facebook/Graph/.packlist
 %%SITE_PERL%%/Facebook/Graph.pm
 %%SITE_PERL%%/Facebook/Graph/AccessToken.pm
 %%SITE_PERL%%/Facebook/Graph/AccessToken/Response.pm
diff --git a/www/p5-Feed-Find/Makefile b/www/p5-Feed-Find/Makefile
index 7fe54dd71c4a..82f6e53934dd 100644
--- a/www/p5-Feed-Find/Makefile
+++ b/www/p5-Feed-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Feed-Find
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BTROTT
diff --git a/www/p5-Feed-Find/pkg-plist b/www/p5-Feed-Find/pkg-plist
index 11a7c4c8cf91..33e0149a38a6 100644
--- a/www/p5-Feed-Find/pkg-plist
+++ b/www/p5-Feed-Find/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Feed/Find.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Feed/Find/.packlist
 %%PERL5_MAN3%%/Feed::Find.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Feed/Find
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Feed
-@dirrmtry %%SITE_PERL%%/Feed
diff --git a/www/p5-Feersum/Makefile b/www/p5-Feersum/Makefile
index 0c923ea4691f..4358210fea27 100644
--- a/www/p5-Feersum/Makefile
+++ b/www/p5-Feersum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Feersum
 PORTVERSION=	1.400
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STASH
diff --git a/www/p5-Feersum/pkg-plist b/www/p5-Feersum/pkg-plist
index 4e7927f8f5a8..10a197cdb51d 100644
--- a/www/p5-Feersum/pkg-plist
+++ b/www/p5-Feersum/pkg-plist
@@ -1,19 +1,13 @@
 bin/feersum
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Feersum/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Feersum/Feersum.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Plack/Handler/Feersum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Feersum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Feersum/Runner.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Feersum/Connection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Feersum/Connection/Handle.pm
+%%SITE_ARCH%%/auto/Feersum/Feersum.so
+%%SITE_ARCH%%/Plack/Handler/Feersum.pm
+%%SITE_ARCH%%/Feersum.pm
+%%SITE_ARCH%%/Feersum/Runner.pm
+%%SITE_ARCH%%/Feersum/Connection.pm
+%%SITE_ARCH%%/Feersum/Connection/Handle.pm
 man/man1/feersum.1.gz
 %%PERL5_MAN3%%/Feersum.3.gz
 %%PERL5_MAN3%%/Feersum::Connection.3.gz
 %%PERL5_MAN3%%/Feersum::Connection::Handle.3.gz
 %%PERL5_MAN3%%/Feersum::Runner.3.gz
 %%PERL5_MAN3%%/Plack::Handler::Feersum.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Feersum
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Plack/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Plack
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Feersum/Connection
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Feersum
diff --git a/www/p5-File-Mork/Makefile b/www/p5-File-Mork/Makefile
index d03327f2df30..a2115796c6a1 100644
--- a/www/p5-File-Mork/Makefile
+++ b/www/p5-File-Mork/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Mork
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SIMONW
diff --git a/www/p5-File-Mork/pkg-plist b/www/p5-File-Mork/pkg-plist
index 34b21148a444..bd56e9281957 100644
--- a/www/p5-File-Mork/pkg-plist
+++ b/www/p5-File-Mork/pkg-plist
@@ -1,8 +1,4 @@
 bin/mork
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Mork/.packlist
 %%SITE_PERL%%/File/Mork.pm
 %%PERL5_MAN3%%/File::Mork.3.gz
 man/man1/mork.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Mork
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/www/p5-Flea/Makefile b/www/p5-Flea/Makefile
index a6baea3fc393..0bbe12d008a8 100644
--- a/www/p5-Flea/Makefile
+++ b/www/p5-Flea/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Flea
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FRODWITH
diff --git a/www/p5-Flea/pkg-plist b/www/p5-Flea/pkg-plist
index bf6620d4d8d5..e640f0f83756 100644
--- a/www/p5-Flea/pkg-plist
+++ b/www/p5-Flea/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flea/.packlist
 %%SITE_PERL%%/Flea.pm
 %%SITE_PERL%%/Flea/Parser/Method.pm
 %%SITE_PERL%%/Flea/Parser/Route.pm
 %%PERL5_MAN3%%/Flea.3.gz
-@dirrm %%SITE_PERL%%/Flea/Parser
-@dirrm %%SITE_PERL%%/Flea
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flea
diff --git a/www/p5-Flickr-API/Makefile b/www/p5-Flickr-API/Makefile
index 504c209df8a0..4c660fc20b79 100644
--- a/www/p5-Flickr-API/Makefile
+++ b/www/p5-Flickr-API/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Flickr-API
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Flickr-API/pkg-plist b/www/p5-Flickr-API/pkg-plist
index db66c794a41e..a85116ad6763 100644
--- a/www/p5-Flickr-API/pkg-plist
+++ b/www/p5-Flickr-API/pkg-plist
@@ -4,8 +4,3 @@
 %%PERL5_MAN3%%/Flickr::API.3.gz
 %%PERL5_MAN3%%/Flickr::API::Request.3.gz
 %%PERL5_MAN3%%/Flickr::API::Response.3.gz
-@dirrm %%SITE_PERL%%/Flickr/API
-@dirrmtry %%SITE_PERL%%/Flickr
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/API/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/API
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr
diff --git a/www/p5-Flickr-Upload/Makefile b/www/p5-Flickr-Upload/Makefile
index 01459ad01786..9ef1cbea3df4 100644
--- a/www/p5-Flickr-Upload/Makefile
+++ b/www/p5-Flickr-Upload/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Flickr-Upload
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Flickr-Upload/pkg-plist b/www/p5-Flickr-Upload/pkg-plist
index 03900f548fd6..f285d8068d5a 100644
--- a/www/p5-Flickr-Upload/pkg-plist
+++ b/www/p5-Flickr-Upload/pkg-plist
@@ -1,8 +1,4 @@
 bin/flickr_upload
 %%PERL5_MAN3%%/Flickr::Upload.3.gz
 %%SITE_PERL%%/Flickr/Upload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/Upload/.packlist
 man/man1/flickr_upload.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/Upload
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr
-@dirrmtry %%SITE_PERL%%/Flickr
diff --git a/www/p5-Fliggy/Makefile b/www/p5-Fliggy/Makefile
index 8d0c4f219b14..f564569eea40 100644
--- a/www/p5-Fliggy/Makefile
+++ b/www/p5-Fliggy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Fliggy
 PORTVERSION=	0.009003
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VTI
diff --git a/www/p5-Fliggy/pkg-plist b/www/p5-Fliggy/pkg-plist
index 0e37e391af61..d2ec8681089c 100644
--- a/www/p5-Fliggy/pkg-plist
+++ b/www/p5-Fliggy/pkg-plist
@@ -1,10 +1,7 @@
 bin/fliggy
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fliggy/.packlist
 %%SITE_PERL%%/Fliggy.pm
 %%SITE_PERL%%/Fliggy/Server.pm
 %%SITE_PERL%%/Plack/Handler/Fliggy.pm
 %%PERL5_MAN3%%/Fliggy.3.gz
 %%PERL5_MAN3%%/Fliggy::Server.3.gz
 %%PERL5_MAN3%%/Plack::Handler::Fliggy.3.gz
-@dirrm %%SITE_PERL%%/Fliggy
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fliggy
diff --git a/www/p5-Furl/Makefile b/www/p5-Furl/Makefile
index 484617367472..51cd6868569d 100644
--- a/www/p5-Furl/Makefile
+++ b/www/p5-Furl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Furl
 PORTVERSION=	3.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/www/p5-FurlX-Coro/Makefile b/www/p5-FurlX-Coro/Makefile
index a06e9bc21c42..99e01c87d5ea 100644
--- a/www/p5-FurlX-Coro/Makefile
+++ b/www/p5-FurlX-Coro/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	FurlX-Coro
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
diff --git a/www/p5-FurlX-Coro/pkg-plist b/www/p5-FurlX-Coro/pkg-plist
index 4363403b858a..f3170984f745 100644
--- a/www/p5-FurlX-Coro/pkg-plist
+++ b/www/p5-FurlX-Coro/pkg-plist
@@ -2,5 +2,3 @@
 %%PERL5_MAN3%%/FurlX::Coro::HTTP.3.gz
 %%SITE_PERL%%/FurlX/Coro.pm
 %%SITE_PERL%%/FurlX/Coro/HTTP.pm
-@dirrm %%SITE_PERL%%/FurlX/Coro
-@dirrmtry %%SITE_PERL%%/FurlX
diff --git a/www/p5-Gantry/Makefile b/www/p5-Gantry/Makefile
index 2bf231327d26..98667443faad 100644
--- a/www/p5-Gantry/Makefile
+++ b/www/p5-Gantry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gantry
 PORTVERSION=	3.64
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Gantry/pkg-plist b/www/p5-Gantry/pkg-plist
index 1da5a8c8f3ad..d3b88b049c3f 100644
--- a/www/p5-Gantry/pkg-plist
+++ b/www/p5-Gantry/pkg-plist
@@ -297,31 +297,3 @@
 @dirrmtry %%WWWDIR%%/images
 @dirrmtry %%WWWDIR%%/css
 @dirrmtry %%WWWDIR%%
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
-@dirrmtry %%SITE_PERL%%/Gantry/Utils/Model
-@dirrmtry %%SITE_PERL%%/Gantry/Utils/DBConnHelper
-@dirrmtry %%SITE_PERL%%/Gantry/Utils
-@dirrmtry %%SITE_PERL%%/Gantry/Template
-@dirrmtry %%SITE_PERL%%/Gantry/State
-@dirrmtry %%SITE_PERL%%/Gantry/Stash/View
-@dirrmtry %%SITE_PERL%%/Gantry/Stash
-@dirrmtry %%SITE_PERL%%/Gantry/Plugins/SOAP
-@dirrmtry %%SITE_PERL%%/Gantry/Plugins/Cache
-@dirrmtry %%SITE_PERL%%/Gantry/Plugins/AutoCRUDHelper
-@dirrmtry %%SITE_PERL%%/Gantry/Plugins
-@dirrmtry %%SITE_PERL%%/Gantry/Engine
-@dirrmtry %%SITE_PERL%%/Gantry/Docs
-@dirrmtry %%SITE_PERL%%/Gantry/Control/Model/GEN
-@dirrmtry %%SITE_PERL%%/Gantry/Control/Model
-@dirrmtry %%SITE_PERL%%/Gantry/Control/C/Authz
-@dirrmtry %%SITE_PERL%%/Gantry/Control/C
-@dirrmtry %%SITE_PERL%%/Gantry/Control
-@dirrmtry %%SITE_PERL%%/Gantry/Conf/Provider/SQL
-@dirrmtry %%SITE_PERL%%/Gantry/Conf/Provider/HTTP/Config
-@dirrmtry %%SITE_PERL%%/Gantry/Conf/Provider/HTTP
-@dirrmtry %%SITE_PERL%%/Gantry/Conf/Provider/FlatFile/Config
-@dirrmtry %%SITE_PERL%%/Gantry/Conf/Provider/FlatFile
-@dirrmtry %%SITE_PERL%%/Gantry/Conf/Provider
-@dirrmtry %%SITE_PERL%%/Gantry/Conf
-@dirrmtry %%SITE_PERL%%/Gantry
diff --git a/www/p5-Geo-Caching/Makefile b/www/p5-Geo-Caching/Makefile
index 54f0374ca8cb..10009d35f8f8 100644
--- a/www/p5-Geo-Caching/Makefile
+++ b/www/p5-Geo-Caching/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Geo-Caching
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5 geography
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Geo-Caching/pkg-plist b/www/p5-Geo-Caching/pkg-plist
index 3701875b4f8c..39f63246177b 100644
--- a/www/p5-Geo-Caching/pkg-plist
+++ b/www/p5-Geo-Caching/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Geo::Caching.3.gz
 %%SITE_PERL%%/Geo/Caching.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Caching/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Caching
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/www/p5-Google-Code-Upload/Makefile b/www/p5-Google-Code-Upload/Makefile
index 077d153b854c..c291017ce777 100644
--- a/www/p5-Google-Code-Upload/Makefile
+++ b/www/p5-Google-Code-Upload/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Google-Code-Upload
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Google-Code-Upload/pkg-plist b/www/p5-Google-Code-Upload/pkg-plist
index 00ae589e8c3b..93564ed04d46 100644
--- a/www/p5-Google-Code-Upload/pkg-plist
+++ b/www/p5-Google-Code-Upload/pkg-plist
@@ -1,10 +1,4 @@
 bin/googlecode_upload.pl
 %%SITE_PERL%%/Google/Code/Upload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Code/Upload/.packlist
 %%PERL5_MAN3%%/Google::Code::Upload.3.gz
 man/man1/googlecode_upload.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Code/Upload
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Code
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google
-@dirrmtry %%SITE_PERL%%/Google/Code
-@dirrmtry %%SITE_PERL%%/Google
diff --git a/www/p5-Google-Search/Makefile b/www/p5-Google-Search/Makefile
index 53d2eaded3df..a535f88b8d2a 100644
--- a/www/p5-Google-Search/Makefile
+++ b/www/p5-Google-Search/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Google-Search
 PORTVERSION=	0.028
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Google-Search/pkg-plist b/www/p5-Google-Search/pkg-plist
index 08489c2d3d4c..8f4b07e0cc6e 100644
--- a/www/p5-Google-Search/pkg-plist
+++ b/www/p5-Google-Search/pkg-plist
@@ -4,6 +4,5 @@
 %%SITE_PERL%%/Google/Search/Page.pm
 %%SITE_PERL%%/Google/Search/Response.pm
 %%SITE_PERL%%/Google/Search/Result.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Search/.packlist
 %%PERL5_MAN3%%/Google::Search.3.gz
 %%PERL5_MAN3%%/Google::Search::Result.3.gz
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index 034092783b5a..c8e1cd19deba 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-WebKit
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/www/p5-Gtk2-WebKit/pkg-plist b/www/p5-Gtk2-WebKit/pkg-plist
index e1046d2d3034..c2d1a890bf09 100644
--- a/www/p5-Gtk2-WebKit/pkg-plist
+++ b/www/p5-Gtk2-WebKit/pkg-plist
@@ -1,24 +1,27 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebBackForwardList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebView.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebFrame.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebHistoryItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/NetworkRequest.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebSettings.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/Download.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebDatabase.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/SecurityOrigin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/NetworkResponse.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/GeolocationPolicyDecision.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebResource.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/WebDataSource.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/Install/webkit.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/Install/webkit-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/WebKit/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/WebKit/WebKit.so
+%%SITE_ARCH%%/Gtk2/WebKit.pm
+%%SITE_ARCH%%/Gtk2/WebKit.pod
+%%SITE_ARCH%%/Gtk2/WebKit/Download.pod
+%%SITE_ARCH%%/Gtk2/WebKit/GeolocationPolicyDecision.pod
+%%SITE_ARCH%%/Gtk2/WebKit/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/WebKit/Install/webkit-autogen.h
+%%SITE_ARCH%%/Gtk2/WebKit/Install/webkit.typemap
+%%SITE_ARCH%%/Gtk2/WebKit/NetworkRequest.pod
+%%SITE_ARCH%%/Gtk2/WebKit/NetworkResponse.pod
+%%SITE_ARCH%%/Gtk2/WebKit/SecurityOrigin.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebBackForwardList.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebDataSource.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebDatabase.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebFrame.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebHistoryItem.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebInspector.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebNavigationAction.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebPolicyDecision.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebResource.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebSettings.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebView.pod
+%%SITE_ARCH%%/Gtk2/WebKit/WebWindowFeatures.pod
+%%SITE_ARCH%%/Gtk2/WebKit/index.pod
+%%SITE_ARCH%%/auto/Gtk2/WebKit/WebKit.so
 %%PERL5_MAN3%%/Gtk2::WebKit.3.gz
 %%PERL5_MAN3%%/Gtk2::WebKit::Download.3.gz
 %%PERL5_MAN3%%/Gtk2::WebKit::GeolocationPolicyDecision.3.gz
@@ -38,9 +41,3 @@
 %%PERL5_MAN3%%/Gtk2::WebKit::WebView.3.gz
 %%PERL5_MAN3%%/Gtk2::WebKit::WebWindowFeatures.3.gz
 %%PERL5_MAN3%%/Gtk2::WebKit::index.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WebKit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/WebKit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
diff --git a/www/p5-Gungho/Makefile b/www/p5-Gungho/Makefile
index 56c8e07a6fdd..8c454b71ebeb 100644
--- a/www/p5-Gungho/Makefile
+++ b/www/p5-Gungho/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gungho
 PORTVERSION=	0.09.008
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/www/p5-Gungho/pkg-plist b/www/p5-Gungho/pkg-plist
index 97cecb4c5968..b8d16f3b52da 100644
--- a/www/p5-Gungho/pkg-plist
+++ b/www/p5-Gungho/pkg-plist
@@ -105,27 +105,4 @@ bin/gungho
 %%SITE_PERL%%/Gungho/Request/http.pm
 %%SITE_PERL%%/Gungho/Response.pm
 %%SITE_PERL%%/Gungho/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gungho/.packlist
 man/man1/gungho.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gungho
-@dirrmtry %%SITE_PERL%%/Gungho/Request
-@dirrmtry %%SITE_PERL%%/Gungho/Provider/File
-@dirrmtry %%SITE_PERL%%/Gungho/Provider
-@dirrmtry %%SITE_PERL%%/Gungho/Plugin/Statistics/Storage
-@dirrmtry %%SITE_PERL%%/Gungho/Plugin/Statistics/Format
-@dirrmtry %%SITE_PERL%%/Gungho/Plugin/Statistics
-@dirrmtry %%SITE_PERL%%/Gungho/Plugin
-@dirrmtry %%SITE_PERL%%/Gungho/Manual
-@dirrmtry %%SITE_PERL%%/Gungho/Log
-@dirrmtry %%SITE_PERL%%/Gungho/Handler/FileWriter
-@dirrmtry %%SITE_PERL%%/Gungho/Handler
-@dirrmtry %%SITE_PERL%%/Gungho/Engine/IO
-@dirrmtry %%SITE_PERL%%/Gungho/Engine/Danga
-@dirrmtry %%SITE_PERL%%/Gungho/Engine
-@dirrmtry %%SITE_PERL%%/Gungho/Component/Throttle
-@dirrmtry %%SITE_PERL%%/Gungho/Component/RobotRules/Storage
-@dirrmtry %%SITE_PERL%%/Gungho/Component/RobotRules
-@dirrmtry %%SITE_PERL%%/Gungho/Component/Authentication
-@dirrmtry %%SITE_PERL%%/Gungho/Component
-@dirrmtry %%SITE_PERL%%/Gungho/Base
-@dirrmtry %%SITE_PERL%%/Gungho
diff --git a/www/p5-GunghoX-FollowLinks/Makefile b/www/p5-GunghoX-FollowLinks/Makefile
index 1c37312149b2..94c0429fcf25 100644
--- a/www/p5-GunghoX-FollowLinks/Makefile
+++ b/www/p5-GunghoX-FollowLinks/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	GunghoX-FollowLinks
 PORTVERSION=	0.00006
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/www/p5-GunghoX-FollowLinks/pkg-plist b/www/p5-GunghoX-FollowLinks/pkg-plist
index 7c41da3ed125..f9b13a0fd085 100644
--- a/www/p5-GunghoX-FollowLinks/pkg-plist
+++ b/www/p5-GunghoX-FollowLinks/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GunghoX/FollowLinks/.packlist
 %%SITE_PERL%%/GunghoX/FollowLinks.pm
 %%SITE_PERL%%/GunghoX/FollowLinks/Filter.pm
 %%SITE_PERL%%/GunghoX/FollowLinks/Filter/Strip.pm
@@ -28,12 +27,3 @@
 %%PERL5_MAN3%%/GunghoX::FollowLinks::Rule::HTML::SelectedTags.3.gz
 %%PERL5_MAN3%%/GunghoX::FollowLinks::Rule::MIME.3.gz
 %%PERL5_MAN3%%/GunghoX::FollowLinks::Rule::URI.3.gz
-@dirrm %%SITE_PERL%%/GunghoX/FollowLinks/Rule/HTML
-@dirrm %%SITE_PERL%%/GunghoX/FollowLinks/Rule/Fresh
-@dirrm %%SITE_PERL%%/GunghoX/FollowLinks/Rule
-@dirrm %%SITE_PERL%%/GunghoX/FollowLinks/Parser
-@dirrm %%SITE_PERL%%/GunghoX/FollowLinks/Filter
-@dirrm %%SITE_PERL%%/GunghoX/FollowLinks
-@dirrmtry %%SITE_PERL%%/GunghoX
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GunghoX/FollowLinks
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GunghoX
diff --git a/www/p5-HTML-Adsense/Makefile b/www/p5-HTML-Adsense/Makefile
index 860fcd7b1ef7..c9e2ce00bd71 100644
--- a/www/p5-HTML-Adsense/Makefile
+++ b/www/p5-HTML-Adsense/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Adsense
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Adsense/pkg-plist b/www/p5-HTML-Adsense/pkg-plist
index 7d7e2b7fe3e7..439f3a178277 100644
--- a/www/p5-HTML-Adsense/pkg-plist
+++ b/www/p5-HTML-Adsense/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/Adsense.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Adsense/.packlist
 %%PERL5_MAN3%%/HTML::Adsense.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Adsense
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Breadcrumbs/Makefile b/www/p5-HTML-Breadcrumbs/Makefile
index a8bd8da43c36..273789160927 100644
--- a/www/p5-HTML-Breadcrumbs/Makefile
+++ b/www/p5-HTML-Breadcrumbs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Breadcrumbs
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Breadcrumbs/pkg-plist b/www/p5-HTML-Breadcrumbs/pkg-plist
index a36409c2f6d0..a339f16c2163 100644
--- a/www/p5-HTML-Breadcrumbs/pkg-plist
+++ b/www/p5-HTML-Breadcrumbs/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Breadcrumbs.3.gz
 %%SITE_PERL%%/HTML/Breadcrumbs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Breadcrumbs/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Breadcrumbs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-CalendarMonthSimple/Makefile b/www/p5-HTML-CalendarMonthSimple/Makefile
index 324ca0f35c08..d23b02b7b79c 100644
--- a/www/p5-HTML-CalendarMonthSimple/Makefile
+++ b/www/p5-HTML-CalendarMonthSimple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-CalendarMonthSimple
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-CalendarMonthSimple/pkg-plist b/www/p5-HTML-CalendarMonthSimple/pkg-plist
index 678a81b81a04..a1137d9fdcc7 100644
--- a/www/p5-HTML-CalendarMonthSimple/pkg-plist
+++ b/www/p5-HTML-CalendarMonthSimple/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::CalendarMonthSimple.3.gz
 %%SITE_PERL%%/HTML/CalendarMonthSimple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Chunks/Makefile b/www/p5-HTML-Chunks/Makefile
index 7e7bdf587acb..7a5f24216830 100644
--- a/www/p5-HTML-Chunks/Makefile
+++ b/www/p5-HTML-Chunks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Chunks
 PORTVERSION=	1.55.1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Chunks/pkg-plist b/www/p5-HTML-Chunks/pkg-plist
index 274ae363b8d0..18b4ed053ef1 100644
--- a/www/p5-HTML-Chunks/pkg-plist
+++ b/www/p5-HTML-Chunks/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/HTML/Chunks.pm
 %%SITE_PERL%%/HTML/Chunks/Super.pm
 %%SITE_PERL%%/HTML/Chunks/Local.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Chunks/.packlist
 %%PERL5_MAN3%%/HTML::Chunks.3.gz
 %%PERL5_MAN3%%/HTML::Chunks::Local.3.gz
 %%PERL5_MAN3%%/HTML::Chunks::Super.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Chunks
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrm %%SITE_PERL%%/HTML/Chunks
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index f999764f705e..de2450651da5 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Clean
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Clean/pkg-plist b/www/p5-HTML-Clean/pkg-plist
index 4e3280d57ff7..d4243c842253 100644
--- a/www/p5-HTML-Clean/pkg-plist
+++ b/www/p5-HTML-Clean/pkg-plist
@@ -2,10 +2,4 @@ bin/htmlclean
 %%PERL5_MAN3%%/HTML::Clean.3.gz
 %%SITE_PERL%%/HTML/Clean.pm
 %%SITE_PERL%%/auto/HTML/Clean/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
 man/man1/htmlclean.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/auto/HTML/Clean
-@dirrmtry %%SITE_PERL%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-ContentExtractor/Makefile b/www/p5-HTML-ContentExtractor/Makefile
index 83fe2a6d75b3..75180a8c892a 100644
--- a/www/p5-HTML-ContentExtractor/Makefile
+++ b/www/p5-HTML-ContentExtractor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-ContentExtractor
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-ContentExtractor/pkg-plist b/www/p5-HTML-ContentExtractor/pkg-plist
index ab87fd1742bf..a40567b941db 100644
--- a/www/p5-HTML-ContentExtractor/pkg-plist
+++ b/www/p5-HTML-ContentExtractor/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/ContentExtractor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ContentExtractor/.packlist
 %%PERL5_MAN3%%/HTML::ContentExtractor.3.gz
-@dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ContentExtractor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-DOM/Makefile b/www/p5-HTML-DOM/Makefile
index afb0d5561bb9..4f0b8ba6277a 100644
--- a/www/p5-HTML-DOM/Makefile
+++ b/www/p5-HTML-DOM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-DOM
 PORTVERSION=	0.054
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-DOM/pkg-plist b/www/p5-HTML-DOM/pkg-plist
index d5a66ec648ac..1554569390c7 100644
--- a/www/p5-HTML-DOM/pkg-plist
+++ b/www/p5-HTML-DOM/pkg-plist
@@ -72,7 +72,6 @@
 %%PERL5_MAN3%%/HTML::DOM::NodeList::Radio.3.gz
 %%PERL5_MAN3%%/HTML::DOM::Text.3.gz
 %%PERL5_MAN3%%/HTML::DOM::View.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/DOM/.packlist
 %%SITE_PERL%%/HTML/DOM.pm
 %%SITE_PERL%%/HTML/DOM/Attr.pm
 %%SITE_PERL%%/HTML/DOM/CharacterData.pm
diff --git a/www/p5-HTML-Declare/Makefile b/www/p5-HTML-Declare/Makefile
index bfd33e7552ba..466f98587caf 100644
--- a/www/p5-HTML-Declare/Makefile
+++ b/www/p5-HTML-Declare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Declare
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Declare/pkg-plist b/www/p5-HTML-Declare/pkg-plist
index c6a927c4f142..7912e56e48ac 100644
--- a/www/p5-HTML-Declare/pkg-plist
+++ b/www/p5-HTML-Declare/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/HTML/Declare.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Declare/.packlist
 %%PERL5_MAN3%%/HTML::Declare.3.gz
diff --git a/www/p5-HTML-Defaultify/Makefile b/www/p5-HTML-Defaultify/Makefile
index d662ac6c7fa5..1fe5ebe6f708 100644
--- a/www/p5-HTML-Defaultify/Makefile
+++ b/www/p5-HTML-Defaultify/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Defaultify
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.jmarshall.com/tools/defaultify/releases/ \
 		CPAN
diff --git a/www/p5-HTML-Defaultify/pkg-plist b/www/p5-HTML-Defaultify/pkg-plist
index d42cb276b94a..9c84a9dec0e0 100644
--- a/www/p5-HTML-Defaultify/pkg-plist
+++ b/www/p5-HTML-Defaultify/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/HTML/Defaultify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Defaultify/.packlist
 %%PERL5_MAN3%%/HTML::Defaultify.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Defaultify
diff --git a/www/p5-HTML-Diff/Makefile b/www/p5-HTML-Diff/Makefile
index 4cf366209fdf..b504cd28ec95 100644
--- a/www/p5-HTML-Diff/Makefile
+++ b/www/p5-HTML-Diff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Diff
 PORTVERSION=	0.561
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Diff/pkg-plist b/www/p5-HTML-Diff/pkg-plist
index 3198a0b02ffb..5bd732b13685 100644
--- a/www/p5-HTML-Diff/pkg-plist
+++ b/www/p5-HTML-Diff/pkg-plist
@@ -1,7 +1,3 @@
 bin/htmldiff
 %%SITE_PERL%%/HTML/Diff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Diff/.packlist
 %%PERL5_MAN3%%/HTML::Diff.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Diff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Display/Makefile b/www/p5-HTML-Display/Makefile
index 70a62e84f20a..8f3821cda50c 100644
--- a/www/p5-HTML-Display/Makefile
+++ b/www/p5-HTML-Display/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Display
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Display/pkg-plist b/www/p5-HTML-Display/pkg-plist
index fddfe30f9f00..f9ccec0bf9e4 100644
--- a/www/p5-HTML-Display/pkg-plist
+++ b/www/p5-HTML-Display/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Display/.packlist
 %%SITE_PERL%%/HTML/Display.pm
 %%SITE_PERL%%/HTML/Display/Common.pm
 %%SITE_PERL%%/HTML/Display/Debian.pm
@@ -25,8 +24,3 @@
 %%PERL5_MAN3%%/HTML::Display::Win32.3.gz
 %%PERL5_MAN3%%/HTML::Display::Win32::IE.3.gz
 %%PERL5_MAN3%%/HTML::Display::Win32::OLE.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Display
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Display/Win32
-@dirrmtry %%SITE_PERL%%/HTML/Display
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Element-Extended/Makefile b/www/p5-HTML-Element-Extended/Makefile
index 77941ba56ca5..21d83d5b80b0 100644
--- a/www/p5-HTML-Element-Extended/Makefile
+++ b/www/p5-HTML-Element-Extended/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Element-Extended
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Element-Extended/pkg-plist b/www/p5-HTML-Element-Extended/pkg-plist
index 85f4a252da0a..501162f1cafd 100644
--- a/www/p5-HTML-Element-Extended/pkg-plist
+++ b/www/p5-HTML-Element-Extended/pkg-plist
@@ -6,6 +6,3 @@
 %%SITE_PERL%%/HTML/ElementRaw.pm
 %%SITE_PERL%%/HTML/ElementSuper.pm
 %%SITE_PERL%%/HTML/ElementTable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Element-Library/Makefile b/www/p5-HTML-Element-Library/Makefile
index 9e08799573b4..b677576cda9a 100644
--- a/www/p5-HTML-Element-Library/Makefile
+++ b/www/p5-HTML-Element-Library/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Element-Library
 PORTVERSION=	5.112.170
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Element-Library/pkg-plist b/www/p5-HTML-Element-Library/pkg-plist
index 1fef3bac4564..ed2af6d8cb6f 100644
--- a/www/p5-HTML-Element-Library/pkg-plist
+++ b/www/p5-HTML-Element-Library/pkg-plist
@@ -3,10 +3,3 @@
 %%SITE_PERL%%/HTML/Element/Library.pm
 %%SITE_PERL%%/HTML/Element/Library.pod
 %%SITE_PERL%%/HTML/Element/Library/Changes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Element/Library/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Element/Library
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Element
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Element/Library
-@dirrmtry %%SITE_PERL%%/HTML/Element
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Element-Replacer/Makefile b/www/p5-HTML-Element-Replacer/Makefile
index b4db19dc859f..3a628cbb0d28 100644
--- a/www/p5-HTML-Element-Replacer/Makefile
+++ b/www/p5-HTML-Element-Replacer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Element-Replacer
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Element-Replacer/pkg-plist b/www/p5-HTML-Element-Replacer/pkg-plist
index 965fb3e36cf2..f94ffb7a7dc7 100644
--- a/www/p5-HTML-Element-Replacer/pkg-plist
+++ b/www/p5-HTML-Element-Replacer/pkg-plist
@@ -1,9 +1,3 @@
 %%PERL5_MAN3%%/HTML::Element::Replacer.3.gz
 %%SITE_PERL%%/HTML/Element/Replacer.pm
 %%SITE_PERL%%/HTML/Element/Replacer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Element/Replacer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Element/Replacer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Element
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Element
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Encoding/Makefile b/www/p5-HTML-Encoding/Makefile
index 4d9b5aaa051a..024da1480e81 100644
--- a/www/p5-HTML-Encoding/Makefile
+++ b/www/p5-HTML-Encoding/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Encoding
 PORTVERSION=	0.61
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Encoding/pkg-plist b/www/p5-HTML-Encoding/pkg-plist
index efea3e9ad047..8f4b1f5875d5 100644
--- a/www/p5-HTML-Encoding/pkg-plist
+++ b/www/p5-HTML-Encoding/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Encoding.3.gz
 %%SITE_PERL%%/HTML/Encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Encoding/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Encoding
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-ExtractContent/Makefile b/www/p5-HTML-ExtractContent/Makefile
index 0ffbe55351c1..c72cb93d95a1 100644
--- a/www/p5-HTML-ExtractContent/Makefile
+++ b/www/p5-HTML-ExtractContent/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-ExtractContent
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-ExtractContent/pkg-plist b/www/p5-HTML-ExtractContent/pkg-plist
index b45d28ddc9d7..6b9830eb86f0 100644
--- a/www/p5-HTML-ExtractContent/pkg-plist
+++ b/www/p5-HTML-ExtractContent/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ExtractContent/.packlist
 %%SITE_PERL%%/HTML/ExtractContent.pm
 %%SITE_PERL%%/HTML/ExtractContent/Util.pm
 %%PERL5_MAN3%%/HTML::ExtractContent.3.gz
-@dirrm %%SITE_PERL%%/HTML/ExtractContent
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ExtractContent
diff --git a/www/p5-HTML-ExtractMain/Makefile b/www/p5-HTML-ExtractMain/Makefile
index 8834c84e38b9..5b1f5b32fcf0 100644
--- a/www/p5-HTML-ExtractMain/Makefile
+++ b/www/p5-HTML-ExtractMain/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-ExtractMain
 PORTVERSION=	0.62
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-ExtractMain/pkg-plist b/www/p5-HTML-ExtractMain/pkg-plist
index df7a9db34139..3e3a278302c6 100644
--- a/www/p5-HTML-ExtractMain/pkg-plist
+++ b/www/p5-HTML-ExtractMain/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ExtractMain/.packlist
 %%SITE_PERL%%/HTML/ExtractMain.pm
 %%PERL5_MAN3%%/HTML::ExtractMain.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ExtractMain
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Field/Makefile b/www/p5-HTML-Field/Makefile
index eaae50ae8dfa..97cc077e744d 100644
--- a/www/p5-HTML-Field/Makefile
+++ b/www/p5-HTML-Field/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Field
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Field/pkg-plist b/www/p5-HTML-Field/pkg-plist
index 44044201feae..1edbc1a08c92 100644
--- a/www/p5-HTML-Field/pkg-plist
+++ b/www/p5-HTML-Field/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Field/.packlist
 %%SITE_PERL%%/HTML/Field.pm
 %%SITE_PERL%%/HTML/FieldForm.pm
 %%PERL5_MAN3%%/HTML::Field.3.gz
 %%PERL5_MAN3%%/HTML::FieldForm.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Field
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-FillInForm-ForceUTF8/Makefile b/www/p5-HTML-FillInForm-ForceUTF8/Makefile
index aad7bcfe7232..00a680eb80e9 100644
--- a/www/p5-HTML-FillInForm-ForceUTF8/Makefile
+++ b/www/p5-HTML-FillInForm-ForceUTF8/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FillInForm-ForceUTF8
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist b/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist
index e815497c1fbf..c50ebc0291f7 100644
--- a/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist
+++ b/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/HTML::FillInForm::ForceUTF8.3.gz
 %%SITE_PERL%%/HTML/FillInForm/ForceUTF8.pm
-@dirrmtry %%SITE_PERL%%/HTML/FillInForm
diff --git a/www/p5-HTML-FillInForm-Lite/Makefile b/www/p5-HTML-FillInForm-Lite/Makefile
index 32e27c2b2647..1ce96d3857d4 100644
--- a/www/p5-HTML-FillInForm-Lite/Makefile
+++ b/www/p5-HTML-FillInForm-Lite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-FillInForm-Lite
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-FillInForm-Lite/pkg-plist b/www/p5-HTML-FillInForm-Lite/pkg-plist
index b1bb4b4d3c49..fc76b715f948 100644
--- a/www/p5-HTML-FillInForm-Lite/pkg-plist
+++ b/www/p5-HTML-FillInForm-Lite/pkg-plist
@@ -4,6 +4,3 @@
 %%PERL5_MAN3%%/HTML::FillInForm::Lite.3.gz
 %%PERL5_MAN3%%/HTML::FillInForm::Lite::Compat.3.gz
 %%PERL5_MAN3%%/HTML::FillInForm::Lite::JA.3.gz
-@dirrm %%SITE_PERL%%/HTML/FillInForm/Lite
-@dirrmtry %%SITE_PERL%%/HTML/FillInForm
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index 4affc568796d..345cadd7fdd3 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FillInForm
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-FillInForm/pkg-plist b/www/p5-HTML-FillInForm/pkg-plist
index 90021ec00686..77aeae11676e 100644
--- a/www/p5-HTML-FillInForm/pkg-plist
+++ b/www/p5-HTML-FillInForm/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::FillInForm.3.gz
 %%SITE_PERL%%/HTML/FillInForm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Form/Makefile b/www/p5-HTML-Form/Makefile
index 7a795d3a4f46..3d25f27ee3d8 100644
--- a/www/p5-HTML-Form/Makefile
+++ b/www/p5-HTML-Form/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Form
 PORTVERSION=	6.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Form/pkg-plist b/www/p5-HTML-Form/pkg-plist
index 63f0e24dbafe..e5553ceab15f 100644
--- a/www/p5-HTML-Form/pkg-plist
+++ b/www/p5-HTML-Form/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Form.3.gz
 %%SITE_PERL%%/HTML/Form.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Form/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Form
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-FormFu-Imager/Makefile b/www/p5-HTML-FormFu-Imager/Makefile
index f1cc0b9ea1d5..51e582bfdac6 100644
--- a/www/p5-HTML-FormFu-Imager/Makefile
+++ b/www/p5-HTML-FormFu-Imager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FormFu-Imager
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-FormFu-Imager/pkg-plist b/www/p5-HTML-FormFu-Imager/pkg-plist
index 039d05b4ecae..daa42676d18e 100644
--- a/www/p5-HTML-FormFu-Imager/pkg-plist
+++ b/www/p5-HTML-FormFu-Imager/pkg-plist
@@ -2,17 +2,7 @@
 %%SITE_PERL%%/HTML/FormFu/Inflator/Imager.pm
 %%SITE_PERL%%/HTML/FormFu/Transformer/Imager.pm
 %%SITE_PERL%%/HTML/FormFu/Validator/Imager/Size.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu/Imager/.packlist
 %%PERL5_MAN3%%/HTML::FormFu::Imager.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Inflator::Imager.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Transformer::Imager.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Validator::Imager::Size.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu/Imager
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Validator/Imager
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Validator
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Transformer
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Inflator
-@dirrmtry %%SITE_PERL%%/HTML/FormFu
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-FormFu-Model-DBIC/Makefile b/www/p5-HTML-FormFu-Model-DBIC/Makefile
index 640a49327de0..cfc1e50115b9 100644
--- a/www/p5-HTML-FormFu-Model-DBIC/Makefile
+++ b/www/p5-HTML-FormFu-Model-DBIC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FormFu-Model-DBIC
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-FormFu-Model-DBIC/pkg-plist b/www/p5-HTML-FormFu-Model-DBIC/pkg-plist
index ee512e20da16..52cc8e8534d0 100644
--- a/www/p5-HTML-FormFu-Model-DBIC/pkg-plist
+++ b/www/p5-HTML-FormFu-Model-DBIC/pkg-plist
@@ -1,14 +1,4 @@
 %%SITE_PERL%%/HTML/FormFu/Constraint/DBIC/Unique.pm
 %%SITE_PERL%%/HTML/FormFu/Model/DBIC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu/Model/DBIC/.packlist
 %%PERL5_MAN3%%/HTML::FormFu::Constraint::DBIC::Unique.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Model::DBIC.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu/Model/DBIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Constraint/DBIC
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Constraint
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Model
-@dirrmtry %%SITE_PERL%%/HTML/FormFu
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-FormFu/Makefile b/www/p5-HTML-FormFu/Makefile
index bdf4ab231b1b..518e3670ed68 100644
--- a/www/p5-HTML-FormFu/Makefile
+++ b/www/p5-HTML-FormFu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FormFu
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-FormFu/pkg-plist b/www/p5-HTML-FormFu/pkg-plist
index aedcef61771c..c242c0c5e158 100644
--- a/www/p5-HTML-FormFu/pkg-plist
+++ b/www/p5-HTML-FormFu/pkg-plist
@@ -196,7 +196,6 @@ bin/html_formfu_dumpconf.pl
 %%SITE_PERL%%/auto/share/dist/HTML-FormFu/templates/tt/xhtml/repeatable
 %%SITE_PERL%%/auto/share/dist/HTML-FormFu/templates/tt/xhtml/start_block
 %%SITE_PERL%%/auto/share/dist/HTML-FormFu/templates/tt/xhtml/start_form
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu/.packlist
 %%PERL5_MAN3%%/HTML::FormFu.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Attribute.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Constraint.3.gz
@@ -318,33 +317,3 @@ bin/html_formfu_dumpconf.pl
 %%PERL5_MAN3%%/HTML::FormFu::Validator::Callback.3.gz
 man/man1/html_formfu_deploy.pl.1.gz
 man/man1/html_formfu_dumpconf.pl.1.gz
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Constraint/File
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Constraint/Repeatable
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Constraint
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Deflator
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Element
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Exception
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Filter
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/I18N
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Inflator
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Manual
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Model
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/OutputProcessor
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Plugin
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/QueryType/CGI
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/QueryType
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Role/Constraint
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Role/Element
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Role/Filter
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Role
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Transformer
-@dirrmtry %%SITE_PERL%%/HTML/FormFu/Validator
-@dirrmtry %%SITE_PERL%%/HTML/FormFu
-@dirrmtry %%SITE_PERL%%/MooseX/Attribute
-@dirrmtry %%SITE_PERL%%/MooseX/Traits/Attribute
-@dirrmtry %%SITE_PERL%%/MooseX/Traits
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormFu/templates/tt/xhtml
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormFu/templates/tt
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormFu/templates
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormFu
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormFu
diff --git a/www/p5-HTML-FormHandler/Makefile b/www/p5-HTML-FormHandler/Makefile
index 4d16d4e94cbc..1c54a9481e28 100644
--- a/www/p5-HTML-FormHandler/Makefile
+++ b/www/p5-HTML-FormHandler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FormHandler
 PORTVERSION=	0.40057
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-HTML-FormHandler/pkg-plist b/www/p5-HTML-FormHandler/pkg-plist
index b6e9299c6930..ba70c216a819 100644
--- a/www/p5-HTML-FormHandler/pkg-plist
+++ b/www/p5-HTML-FormHandler/pkg-plist
@@ -180,7 +180,6 @@
 %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates/wrapper/none.tt
 %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates/wrapper/simple.tt
 %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates/wrapper/wrap_label.tt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormHandler/.packlist
 %%PERL5_MAN3%%/HTML::FormHandler.3.gz
 %%PERL5_MAN3%%/HTML::FormHandler::Base.3.gz
 %%PERL5_MAN3%%/HTML::FormHandler::Blocks.3.gz
@@ -332,32 +331,3 @@
 %%PERL5_MAN3%%/HTML::FormHandler::Widget::Wrapper::Table.3.gz
 %%PERL5_MAN3%%/HTML::FormHandler::Widget::Wrapper::TableInline.3.gz
 %%PERL5_MAN3%%/HTML::FormHandler::Wizard.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormHandler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates/wrapper
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates/form
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates/foo
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates/field
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates
-@dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Wrapper
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Theme
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Form/Role
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Form
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Field/Role
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Field
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Block
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/TraitFor
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Result
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Render
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Page
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Moose
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Model
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Meta
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Manual
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/I18N
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Field/Repeatable
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Field
-@dirrmtry %%SITE_PERL%%/HTML/FormHandler
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-FromANSI/Makefile b/www/p5-HTML-FromANSI/Makefile
index a5c54a2ca70a..635dbbab2bda 100644
--- a/www/p5-HTML-FromANSI/Makefile
+++ b/www/p5-HTML-FromANSI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-FromANSI
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	HTML
diff --git a/www/p5-HTML-FromANSI/pkg-plist b/www/p5-HTML-FromANSI/pkg-plist
index 7f89b3f70a04..fa89ebbc5cd6 100644
--- a/www/p5-HTML-FromANSI/pkg-plist
+++ b/www/p5-HTML-FromANSI/pkg-plist
@@ -1,8 +1,4 @@
 bin/ansi2html
 %%PERL5_MAN3%%/HTML::FromANSI.3.gz
 %%SITE_PERL%%/HTML/FromANSI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromANSI/.packlist
 man/man1/ansi2html.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromANSI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile
index 0b513b6a2654..d969b69de588 100644
--- a/www/p5-HTML-FromText/Makefile
+++ b/www/p5-HTML-FromText/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		HTML-FromText
 PORTVERSION=		2.07
+PORTREVISION=	1
 CATEGORIES=		www perl5
 MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
diff --git a/www/p5-HTML-FromText/pkg-plist b/www/p5-HTML-FromText/pkg-plist
index 410a84c89f31..e976e1100ee5 100644
--- a/www/p5-HTML-FromText/pkg-plist
+++ b/www/p5-HTML-FromText/pkg-plist
@@ -1,8 +1,4 @@
 bin/text2html
 %%SITE_PERL%%/HTML/FromText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText/.packlist
 man/man1/text2html.1.gz
 %%PERL5_MAN3%%/HTML::FromText.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-GenToc/Makefile b/www/p5-HTML-GenToc/Makefile
index 0f9f0ff5e668..ac1cf22b1ee0 100644
--- a/www/p5-HTML-GenToc/Makefile
+++ b/www/p5-HTML-GenToc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-GenToc
 PORTVERSION=	3.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-GenToc/pkg-plist b/www/p5-HTML-GenToc/pkg-plist
index c3b41ac65481..316273e08c3d 100644
--- a/www/p5-HTML-GenToc/pkg-plist
+++ b/www/p5-HTML-GenToc/pkg-plist
@@ -2,4 +2,3 @@ bin/hypertoc
 %%PERL5_MAN3%%/HTML::GenToc.3.gz
 %%SITE_PERL%%/HTML/GenToc.pm
 man/man1/hypertoc.1.gz
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-GenerateUtil/Makefile b/www/p5-HTML-GenerateUtil/Makefile
index a15ab8961043..10042a32263a 100644
--- a/www/p5-HTML-GenerateUtil/Makefile
+++ b/www/p5-HTML-GenerateUtil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-GenerateUtil
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-GenerateUtil/pkg-plist b/www/p5-HTML-GenerateUtil/pkg-plist
index 1c4c712bcf8c..cfdc1f86a159 100644
--- a/www/p5-HTML-GenerateUtil/pkg-plist
+++ b/www/p5-HTML-GenerateUtil/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/HTML::GenerateUtil.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/GenerateUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/GenerateUtil/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/GenerateUtil/GenerateUtil.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/GenerateUtil
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
+%%SITE_ARCH%%/HTML/GenerateUtil.pm
+%%SITE_ARCH%%/auto/HTML/GenerateUtil/GenerateUtil.so
diff --git a/www/p5-HTML-GoogleMaps/Makefile b/www/p5-HTML-GoogleMaps/Makefile
index e4f9cec20262..214b2030cd72 100644
--- a/www/p5-HTML-GoogleMaps/Makefile
+++ b/www/p5-HTML-GoogleMaps/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-GoogleMaps
 PORTVERSION=	10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-GoogleMaps/pkg-plist b/www/p5-HTML-GoogleMaps/pkg-plist
index 46b3cf6dbf21..9812837363e2 100644
--- a/www/p5-HTML-GoogleMaps/pkg-plist
+++ b/www/p5-HTML-GoogleMaps/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/GoogleMaps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/GoogleMaps/.packlist
 %%PERL5_MAN3%%/HTML::GoogleMaps.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/GoogleMaps
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Highlight/Makefile b/www/p5-HTML-Highlight/Makefile
index 7fea9079b172..40feca19d4d0 100644
--- a/www/p5-HTML-Highlight/Makefile
+++ b/www/p5-HTML-Highlight/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Highlight
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Highlight/pkg-plist b/www/p5-HTML-Highlight/pkg-plist
index 53a50ec76061..136ee4fb85ef 100644
--- a/www/p5-HTML-Highlight/pkg-plist
+++ b/www/p5-HTML-Highlight/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Highlight.3.gz
 %%SITE_PERL%%/HTML/Highlight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Highlight/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Highlight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile
index 6c3dd27561c6..a09eb574aa60 100644
--- a/www/p5-HTML-LinkExtractor/Makefile
+++ b/www/p5-HTML-LinkExtractor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-LinkExtractor
 PORTVERSION=	0.130
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-LinkExtractor/pkg-plist b/www/p5-HTML-LinkExtractor/pkg-plist
index 248a63474c3f..1e5263aed5da 100644
--- a/www/p5-HTML-LinkExtractor/pkg-plist
+++ b/www/p5-HTML-LinkExtractor/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/LinkExtractor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/LinkExtractor/.packlist
 %%PERL5_MAN3%%/HTML::LinkExtractor.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/LinkExtractor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-LinkList/Makefile b/www/p5-HTML-LinkList/Makefile
index 1d5dae73f688..d7b3bcdcf5bd 100644
--- a/www/p5-HTML-LinkList/Makefile
+++ b/www/p5-HTML-LinkList/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-LinkList
 PORTVERSION=	0.1503
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-LinkList/pkg-plist b/www/p5-HTML-LinkList/pkg-plist
index ef44988ded73..bca0754f2939 100644
--- a/www/p5-HTML-LinkList/pkg-plist
+++ b/www/p5-HTML-LinkList/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/HTML::LinkList.3.gz
 %%SITE_PERL%%/HTML/LinkList.pm
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Lint/Makefile b/www/p5-HTML-Lint/Makefile
index 2ce210a02b98..6749232f7687 100644
--- a/www/p5-HTML-Lint/Makefile
+++ b/www/p5-HTML-Lint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Lint
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PETDANCE
diff --git a/www/p5-HTML-Lint/pkg-plist b/www/p5-HTML-Lint/pkg-plist
index ed8866c947d9..fa194dd6e60a 100644
--- a/www/p5-HTML-Lint/pkg-plist
+++ b/www/p5-HTML-Lint/pkg-plist
@@ -4,15 +4,8 @@ bin/weblint
 %%SITE_PERL%%/HTML/Lint/HTML4.pm
 %%SITE_PERL%%/HTML/Lint/Parser.pm
 %%SITE_PERL%%/Test/HTML/Lint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint/.packlist
 %%PERL5_MAN3%%/HTML::Lint.3.gz
 %%PERL5_MAN3%%/HTML::Lint::Error.3.gz
 %%PERL5_MAN3%%/HTML::Lint::HTML4.3.gz
 %%PERL5_MAN3%%/HTML::Lint::Parser.3.gz
 %%PERL5_MAN3%%/Test::HTML::Lint.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/Test/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Lint
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/www/p5-HTML-Location/Makefile b/www/p5-HTML-Location/Makefile
index 7cd9941fa841..52b2ddf05923 100644
--- a/www/p5-HTML-Location/Makefile
+++ b/www/p5-HTML-Location/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-Location
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Location/pkg-plist b/www/p5-HTML-Location/pkg-plist
index 911a1b50a905..ec9cbfd490ff 100644
--- a/www/p5-HTML-Location/pkg-plist
+++ b/www/p5-HTML-Location/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/Location.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Location/.packlist
 %%PERL5_MAN3%%/HTML::Location.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Location
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Macro/Makefile b/www/p5-HTML-Macro/Makefile
index bfc48e0f519a..4434553c121f 100644
--- a/www/p5-HTML-Macro/Makefile
+++ b/www/p5-HTML-Macro/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Macro
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Macro/pkg-plist b/www/p5-HTML-Macro/pkg-plist
index a658a16a6f99..0eba8de9346b 100644
--- a/www/p5-HTML-Macro/pkg-plist
+++ b/www/p5-HTML-Macro/pkg-plist
@@ -2,13 +2,5 @@
 %%SITE_PERL%%/HTML/Macro/Loop.pm
 %%SITE_PERL%%/auto/HTML/Macro/Loop/autosplit.ix
 %%SITE_PERL%%/auto/HTML/Macro/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Macro/.packlist
 %%PERL5_MAN3%%/HTML::Macro.3.gz
 %%PERL5_MAN3%%/HTML::Macro::Loop.3.gz
-@dirrmtry %%SITE_PERL%%/HTML/Macro
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrmtry %%SITE_PERL%%/auto/HTML/Macro/Loop
-@dirrmtry %%SITE_PERL%%/auto/HTML/Macro
-@dirrmtry %%SITE_PERL%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Macro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Mason-PSGIHandler/Makefile b/www/p5-HTML-Mason-PSGIHandler/Makefile
index d5fb6a0c7c58..c7e2d1804579 100644
--- a/www/p5-HTML-Mason-PSGIHandler/Makefile
+++ b/www/p5-HTML-Mason-PSGIHandler/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Mason-PSGIHandler
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Mason-PSGIHandler/pkg-plist b/www/p5-HTML-Mason-PSGIHandler/pkg-plist
index 801b22fac1d7..f0f79cdcf00d 100644
--- a/www/p5-HTML-Mason-PSGIHandler/pkg-plist
+++ b/www/p5-HTML-Mason-PSGIHandler/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/HTML/Mason/PSGIHandler/Streamy.pm
 %%SITE_PERL%%/HTML/Mason/PSGIHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason/PSGIHandler/.packlist
 %%PERL5_MAN3%%/HTML::Mason::PSGIHandler.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason/PSGIHandler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Mason/PSGIHandler
-@dirrmtry %%SITE_PERL%%/HTML/Mason
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index e5c6f3bc0876..4e1893614fb6 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Mason
 PORTVERSION=	1.54
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Mason/pkg-plist b/www/p5-HTML-Mason/pkg-plist
index b1ef516190e0..d70d9ff00426 100644
--- a/www/p5-HTML-Mason/pkg-plist
+++ b/www/p5-HTML-Mason/pkg-plist
@@ -32,7 +32,6 @@ bin/mason.pl
 %%SITE_PERL%%/HTML/Mason/Tests.pm
 %%SITE_PERL%%/HTML/Mason/Tools.pm
 %%SITE_PERL%%/HTML/Mason/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason/.packlist
 %%PERL5_MAN3%%/HTML::Mason.3.gz
 %%PERL5_MAN3%%/HTML::Mason::Admin.3.gz
 %%PERL5_MAN3%%/HTML::Mason::ApacheHandler.3.gz
@@ -64,13 +63,3 @@ bin/mason.pl
 %%PERL5_MAN3%%/HTML::Mason::Tests.3.gz
 %%PERL5_MAN3%%/HTML::Mason::Tools.3.gz
 %%PERL5_MAN3%%/HTML::Mason::Utils.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrm %%SITE_PERL%%/HTML/Mason/Resolver
-@dirrm %%SITE_PERL%%/HTML/Mason/Plugin
-@dirrm %%SITE_PERL%%/HTML/Mason/Component
-@dirrm %%SITE_PERL%%/HTML/Mason/Compiler
-@dirrm %%SITE_PERL%%/HTML/Mason/Cache
-@dirrm %%SITE_PERL%%/HTML/Mason/Apache
-@dirrm %%SITE_PERL%%/HTML/Mason
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-MobileConverter/Makefile b/www/p5-HTML-MobileConverter/Makefile
index 268f371a8e83..a2ebb934f3e4 100644
--- a/www/p5-HTML-MobileConverter/Makefile
+++ b/www/p5-HTML-MobileConverter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-MobileConverter
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-MobileConverter/pkg-plist b/www/p5-HTML-MobileConverter/pkg-plist
index efc135c0ee7d..cac6ab4a4b84 100644
--- a/www/p5-HTML-MobileConverter/pkg-plist
+++ b/www/p5-HTML-MobileConverter/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/MobileConverter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/MobileConverter/.packlist
 %%PERL5_MAN3%%/HTML::MobileConverter.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/MobileConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index 188f5b617f84..de749d8b4bef 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Pager
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Pager/pkg-plist b/www/p5-HTML-Pager/pkg-plist
index 87026fb36b13..e56a2c04d00b 100644
--- a/www/p5-HTML-Pager/pkg-plist
+++ b/www/p5-HTML-Pager/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Pager.3.gz
 %%SITE_PERL%%/HTML/Pager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Pager/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Pager
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Parser-Simple/Makefile b/www/p5-HTML-Parser-Simple/Makefile
index 613122aa0a81..ec088c0d687a 100644
--- a/www/p5-HTML-Parser-Simple/Makefile
+++ b/www/p5-HTML-Parser-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Parser-Simple
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Parser-Simple/pkg-plist b/www/p5-HTML-Parser-Simple/pkg-plist
index ce14bdc8fa56..a808c71e0447 100644
--- a/www/p5-HTML-Parser-Simple/pkg-plist
+++ b/www/p5-HTML-Parser-Simple/pkg-plist
@@ -1,13 +1,6 @@
 %%SITE_PERL%%/HTML/Parser/Simple.pm
 %%SITE_PERL%%/HTML/Parser/Simple/Attributes.pm
 %%SITE_PERL%%/HTML/Parser/Simple/Reporter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Simple/.packlist
 %%PERL5_MAN3%%/HTML::Parser::Simple.3.gz
 %%PERL5_MAN3%%/HTML::Parser::Simple::Attributes.3.gz
 %%PERL5_MAN3%%/HTML::Parser::Simple::Reporter.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrm %%SITE_PERL%%/HTML/Parser/Simple
-@dirrmtry %%SITE_PERL%%/HTML/Parser
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index b0f359003e3e..7fd3b9654d76 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Parser
 PORTVERSION=	3.71
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Parser/pkg-plist b/www/p5-HTML-Parser/pkg-plist
index 78badae881ce..b4b208502412 100644
--- a/www/p5-HTML-Parser/pkg-plist
+++ b/www/p5-HTML-Parser/pkg-plist
@@ -1,12 +1,11 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Entities.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/HeadParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/LinkExtor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/PullParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/TokeParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.so
+%%SITE_ARCH%%/HTML/Entities.pm
+%%SITE_ARCH%%/HTML/Filter.pm
+%%SITE_ARCH%%/HTML/HeadParser.pm
+%%SITE_ARCH%%/HTML/LinkExtor.pm
+%%SITE_ARCH%%/HTML/Parser.pm
+%%SITE_ARCH%%/HTML/PullParser.pm
+%%SITE_ARCH%%/HTML/TokeParser.pm
+%%SITE_ARCH%%/auto/HTML/Parser/Parser.so
 %%PERL5_MAN3%%/HTML::Entities.3.gz
 %%PERL5_MAN3%%/HTML::Filter.3.gz
 %%PERL5_MAN3%%/HTML::HeadParser.3.gz
@@ -14,6 +13,3 @@
 %%PERL5_MAN3%%/HTML::Parser.3.gz
 %%PERL5_MAN3%%/HTML::PullParser.3.gz
 %%PERL5_MAN3%%/HTML::TokeParser.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
diff --git a/www/p5-HTML-Perlinfo/Makefile b/www/p5-HTML-Perlinfo/Makefile
index db8abb661a4b..5d8e988d4907 100644
--- a/www/p5-HTML-Perlinfo/Makefile
+++ b/www/p5-HTML-Perlinfo/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Perlinfo
 PORTVERSION=	1.64
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Perlinfo/pkg-plist b/www/p5-HTML-Perlinfo/pkg-plist
index f141f7b8a333..772588a14360 100644
--- a/www/p5-HTML-Perlinfo/pkg-plist
+++ b/www/p5-HTML-Perlinfo/pkg-plist
@@ -12,8 +12,3 @@ man/man1/perlinfo.1.gz
 %%SITE_PERL%%/HTML/Perlinfo/HTML.pod
 %%SITE_PERL%%/HTML/Perlinfo/Loaded.pm
 %%SITE_PERL%%/HTML/Perlinfo/Modules.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Perlinfo/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Perlinfo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Perlinfo
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index 381ae13124c5..b7fe2aa716fd 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-PrettyPrinter
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-PrettyPrinter/pkg-plist b/www/p5-HTML-PrettyPrinter/pkg-plist
index 583b357a2824..282b964c178c 100644
--- a/www/p5-HTML-PrettyPrinter/pkg-plist
+++ b/www/p5-HTML-PrettyPrinter/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/HTML/PrettyPrinter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/PrettyPrinter/.packlist
 %%PERL5_MAN3%%/HTML::PrettyPrinter.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/PrettyPrinter
diff --git a/www/p5-HTML-Prototype/Makefile b/www/p5-HTML-Prototype/Makefile
index 5962ad757a71..428d8d6a99e4 100644
--- a/www/p5-HTML-Prototype/Makefile
+++ b/www/p5-HTML-Prototype/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Prototype
 PORTVERSION=	1.48
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Prototype/pkg-plist b/www/p5-HTML-Prototype/pkg-plist
index 1f2c5036a3c8..9655f1b6535c 100644
--- a/www/p5-HTML-Prototype/pkg-plist
+++ b/www/p5-HTML-Prototype/pkg-plist
@@ -12,6 +12,3 @@
 %%SITE_PERL%%/HTML/Prototype/Helper.pm
 %%SITE_PERL%%/HTML/Prototype/Helper/Tag.pm
 %%SITE_PERL%%/HTML/Prototype/Js.pm
-@dirrmtry %%SITE_PERL%%/HTML/Prototype/Helper
-@dirrmtry %%SITE_PERL%%/HTML/Prototype
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Query/Makefile b/www/p5-HTML-Query/Makefile
index 58616b905b64..47c33fc9555e 100644
--- a/www/p5-HTML-Query/Makefile
+++ b/www/p5-HTML-Query/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Query
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,9 +21,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 PLIST_FILES=	%%SITE_PERL%%/HTML/Query.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Query/.packlist \
 		%%PERL5_MAN3%%/HTML::Query.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Query \
-		%%SITE_PERL%%/HTML
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index f6af9f03ae56..83c10fb330dc 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-QuickCheck
 PORTVERSION=	1.0b1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-QuickCheck/pkg-plist b/www/p5-HTML-QuickCheck/pkg-plist
index 083ed111ebe9..f41bc6061928 100644
--- a/www/p5-HTML-QuickCheck/pkg-plist
+++ b/www/p5-HTML-QuickCheck/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::QuickCheck.3.gz
 %%SITE_PERL%%/HTML/QuickCheck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-RSSAutodiscovery/Makefile b/www/p5-HTML-RSSAutodiscovery/Makefile
index f8a87249f6b8..53457a87f2f3 100644
--- a/www/p5-HTML-RSSAutodiscovery/Makefile
+++ b/www/p5-HTML-RSSAutodiscovery/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-RSSAutodiscovery
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-RSSAutodiscovery/pkg-plist b/www/p5-HTML-RSSAutodiscovery/pkg-plist
index 66f3fc9547f5..c0fa3621eb9b 100644
--- a/www/p5-HTML-RSSAutodiscovery/pkg-plist
+++ b/www/p5-HTML-RSSAutodiscovery/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/RSSAutodiscovery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/RSSAutodiscovery/.packlist
 %%PERL5_MAN3%%/HTML::RSSAutodiscovery.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/RSSAutodiscovery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-ResolveLink/Makefile b/www/p5-HTML-ResolveLink/Makefile
index c88d48d542ed..4e5184ff6c82 100644
--- a/www/p5-HTML-ResolveLink/Makefile
+++ b/www/p5-HTML-ResolveLink/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-ResolveLink
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-ResolveLink/pkg-plist b/www/p5-HTML-ResolveLink/pkg-plist
index d9c6215230d1..d91080a7662d 100644
--- a/www/p5-HTML-ResolveLink/pkg-plist
+++ b/www/p5-HTML-ResolveLink/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ResolveLink/.packlist
 %%SITE_PERL%%/HTML/ResolveLink.pm
 %%PERL5_MAN3%%/HTML::ResolveLink.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/ResolveLink
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-RobotsMETA/Makefile b/www/p5-HTML-RobotsMETA/Makefile
index 1dada4586945..8fa3161197ae 100644
--- a/www/p5-HTML-RobotsMETA/Makefile
+++ b/www/p5-HTML-RobotsMETA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-RobotsMETA
 PORTVERSION=	0.00004
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/www/p5-HTML-RobotsMETA/pkg-plist b/www/p5-HTML-RobotsMETA/pkg-plist
index 3a72690a82bc..fde15b089905 100644
--- a/www/p5-HTML-RobotsMETA/pkg-plist
+++ b/www/p5-HTML-RobotsMETA/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/RobotsMETA/.packlist
 %%SITE_PERL%%/HTML/RobotsMETA.pm
 %%SITE_PERL%%/HTML/RobotsMETA/Rules.pm
 %%PERL5_MAN3%%/HTML::RobotsMETA.3.gz
 %%PERL5_MAN3%%/HTML::RobotsMETA::Rules.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/RobotsMETA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/RobotsMETA
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Scrubber/Makefile b/www/p5-HTML-Scrubber/Makefile
index 869bbc0daab4..bbe7eace9b5c 100644
--- a/www/p5-HTML-Scrubber/Makefile
+++ b/www/p5-HTML-Scrubber/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Scrubber
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Scrubber/pkg-plist b/www/p5-HTML-Scrubber/pkg-plist
index 26fad8a828ba..98effb9edb1a 100644
--- a/www/p5-HTML-Scrubber/pkg-plist
+++ b/www/p5-HTML-Scrubber/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/HTML::Scrubber.3.gz
 %%SITE_PERL%%/HTML/Scrubber.pm
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Seamstress/Makefile b/www/p5-HTML-Seamstress/Makefile
index 78052dd09a47..e7bc8be443c3 100644
--- a/www/p5-HTML-Seamstress/Makefile
+++ b/www/p5-HTML-Seamstress/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-Seamstress
 PORTVERSION=	5.0h
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Seamstress/pkg-plist b/www/p5-HTML-Seamstress/pkg-plist
index 7e2e3425b60a..6bd0f24b0a3a 100644
--- a/www/p5-HTML-Seamstress/pkg-plist
+++ b/www/p5-HTML-Seamstress/pkg-plist
@@ -41,17 +41,5 @@ bin/spkg.pl
 %%SITE_PERL%%/HTML/sbase.pl
 %%SITE_PERL%%/HTML/spkg.pl
 %%SITE_PERL%%/XML/Seamstress.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Seamstress/.packlist
 man/man1/sbase.pl.1.gz
 man/man1/spkg.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Seamstress
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/XML
-@dirrmtry %%SITE_PERL%%/HTML/Seamstress/Quickstart/lib/HTML/Seamstress
-@dirrmtry %%SITE_PERL%%/HTML/Seamstress/Quickstart/lib/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Seamstress/Quickstart/lib
-@dirrmtry %%SITE_PERL%%/HTML/Seamstress/Quickstart/html
-@dirrmtry %%SITE_PERL%%/HTML/Seamstress/Quickstart
-@dirrmtry %%SITE_PERL%%/HTML/Seamstress/Doc
-@dirrmtry %%SITE_PERL%%/HTML/Seamstress
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Selector-XPath/Makefile b/www/p5-HTML-Selector-XPath/Makefile
index 99beb0040647..7bcea8f4571f 100644
--- a/www/p5-HTML-Selector-XPath/Makefile
+++ b/www/p5-HTML-Selector-XPath/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Selector-XPath
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Selector-XPath/pkg-plist b/www/p5-HTML-Selector-XPath/pkg-plist
index c2613928420e..9112f8678964 100644
--- a/www/p5-HTML-Selector-XPath/pkg-plist
+++ b/www/p5-HTML-Selector-XPath/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/HTML/Selector/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Selector/XPath/.packlist
 %%PERL5_MAN3%%/HTML::Selector::XPath.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Selector/XPath
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Selector
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Selector
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Shakan/Makefile b/www/p5-HTML-Shakan/Makefile
index 90e4b84edc64..7e02daba2b8f 100644
--- a/www/p5-HTML-Shakan/Makefile
+++ b/www/p5-HTML-Shakan/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Shakan
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SONGMU
diff --git a/www/p5-HTML-Shakan/pkg-plist b/www/p5-HTML-Shakan/pkg-plist
index 8a663d2c8b5d..cf9720e8e074 100644
--- a/www/p5-HTML-Shakan/pkg-plist
+++ b/www/p5-HTML-Shakan/pkg-plist
@@ -41,12 +41,3 @@
 %%SITE_PERL%%/HTML/Shakan/Utils.pm
 %%SITE_PERL%%/HTML/Shakan/Widgets/Simple.pm
 %%SITE_PERL%%/HTML/Shakan/Widgets/jQueryUI.pm
-@dirrm %%SITE_PERL%%/HTML/Shakan/Widgets
-@dirrm %%SITE_PERL%%/HTML/Shakan/Role
-@dirrm %%SITE_PERL%%/HTML/Shakan/Renderer
-@dirrm %%SITE_PERL%%/HTML/Shakan/Model
-@dirrm %%SITE_PERL%%/HTML/Shakan/Inflator
-@dirrm %%SITE_PERL%%/HTML/Shakan/Filter
-@dirrm %%SITE_PERL%%/HTML/Shakan/Field
-@dirrm %%SITE_PERL%%/HTML/Shakan
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-SimpleLinkExtor/Makefile b/www/p5-HTML-SimpleLinkExtor/Makefile
index a07e086af073..7ecb530a909d 100644
--- a/www/p5-HTML-SimpleLinkExtor/Makefile
+++ b/www/p5-HTML-SimpleLinkExtor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-SimpleLinkExtor
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-SimpleLinkExtor/pkg-plist b/www/p5-HTML-SimpleLinkExtor/pkg-plist
index 4c77d9bf07a7..edd9c2fda66b 100644
--- a/www/p5-HTML-SimpleLinkExtor/pkg-plist
+++ b/www/p5-HTML-SimpleLinkExtor/pkg-plist
@@ -2,8 +2,4 @@ bin/linktractor
 %%PERL5_MAN3%%/HTML::SimpleLinkExtor.3.gz
 %%SITE_PERL%%/HTML/SimpleLinkExtor.pm
 %%SITE_PERL%%/auto/HTML/SimpleLinkExtor/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleLinkExtor/.packlist
 man/man1/linktractor.1.gz
-@dirrmtry %%SITE_PERL%%/auto/HTML/SimpleLinkExtor
-@dirrmtry %%SITE_PERL%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleLinkExtor
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index 310b12c21f9f..52a2aed53341 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-SimpleParse
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-SimpleParse/pkg-plist b/www/p5-HTML-SimpleParse/pkg-plist
index a7ef9e1644ac..68c547edc2ef 100644
--- a/www/p5-HTML-SimpleParse/pkg-plist
+++ b/www/p5-HTML-SimpleParse/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::SimpleParse.3.gz
 %%SITE_PERL%%/HTML/SimpleParse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleParse/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleParse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
index dee149903858..5cb07402058c 100644
--- a/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
+++ b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-StickyQuery-DoCoMoGUID
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:YAPPO
diff --git a/www/p5-HTML-StickyQuery-DoCoMoGUID/pkg-plist b/www/p5-HTML-StickyQuery-DoCoMoGUID/pkg-plist
index dfb06a131329..ac8e382e9382 100644
--- a/www/p5-HTML-StickyQuery-DoCoMoGUID/pkg-plist
+++ b/www/p5-HTML-StickyQuery-DoCoMoGUID/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery/DoCoMoGUID/.packlist
 %%SITE_PERL%%/HTML/StickyQuery/DoCoMoGUID.pm
 %%PERL5_MAN3%%/HTML::StickyQuery::DoCoMoGUID.3.gz
-@dirrmtry %%SITE_PERL%%/HTML/StickyQuery
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery/DoCoMoGUID
diff --git a/www/p5-HTML-StickyQuery/Makefile b/www/p5-HTML-StickyQuery/Makefile
index 0f256eec7e76..f338c2c58774 100644
--- a/www/p5-HTML-StickyQuery/Makefile
+++ b/www/p5-HTML-StickyQuery/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-StickyQuery
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-StickyQuery/pkg-plist b/www/p5-HTML-StickyQuery/pkg-plist
index 744fb71bf6f0..11e18912f56e 100644
--- a/www/p5-HTML-StickyQuery/pkg-plist
+++ b/www/p5-HTML-StickyQuery/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/StickyQuery.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery/.packlist
 %%PERL5_MAN3%%/HTML::StickyQuery.3.gz
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 933c6325b96d..3024a4ca7d00 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Stream
 PORTVERSION=	1.60
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Stream/pkg-plist b/www/p5-HTML-Stream/pkg-plist
index ea09cd745ad1..72f8929843db 100644
--- a/www/p5-HTML-Stream/pkg-plist
+++ b/www/p5-HTML-Stream/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Stream.3.gz
 %%SITE_PERL%%/HTML/Stream.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Strip/Makefile b/www/p5-HTML-Strip/Makefile
index 225baf7a51bb..6108cb9e8075 100644
--- a/www/p5-HTML-Strip/Makefile
+++ b/www/p5-HTML-Strip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Strip
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Strip/pkg-plist b/www/p5-HTML-Strip/pkg-plist
index e6274e4af9ec..a3a21b5d5893 100644
--- a/www/p5-HTML-Strip/pkg-plist
+++ b/www/p5-HTML-Strip/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/HTML::Strip.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Strip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip/Strip.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
+%%SITE_ARCH%%/HTML/Strip.pm
+%%SITE_ARCH%%/auto/HTML/Strip/Strip.so
diff --git a/www/p5-HTML-StripScripts-Parser/Makefile b/www/p5-HTML-StripScripts-Parser/Makefile
index d353c7d1a435..627d250c6e1d 100644
--- a/www/p5-HTML-StripScripts-Parser/Makefile
+++ b/www/p5-HTML-StripScripts-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-StripScripts-Parser
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-StripScripts-Parser/pkg-plist b/www/p5-HTML-StripScripts-Parser/pkg-plist
index ab36edb8198b..12ad24ee4253 100644
--- a/www/p5-HTML-StripScripts-Parser/pkg-plist
+++ b/www/p5-HTML-StripScripts-Parser/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::StripScripts::Parser.3.gz
 %%SITE_PERL%%/HTML/StripScripts/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StripScripts/Parser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StripScripts/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StripScripts
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/StripScripts
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-StripScripts/Makefile b/www/p5-HTML-StripScripts/Makefile
index 961de37d085f..2abfc9bedd2d 100644
--- a/www/p5-HTML-StripScripts/Makefile
+++ b/www/p5-HTML-StripScripts/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-StripScripts
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-StripScripts/pkg-plist b/www/p5-HTML-StripScripts/pkg-plist
index e1c773471018..0ac2c733b5cf 100644
--- a/www/p5-HTML-StripScripts/pkg-plist
+++ b/www/p5-HTML-StripScripts/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::StripScripts.3.gz
 %%SITE_PERL%%/HTML/StripScripts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StripScripts/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StripScripts
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index 7ee51c9adf33..d7f68b2fd771 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Summary
 PORTVERSION=	0.019
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Summary/pkg-plist b/www/p5-HTML-Summary/pkg-plist
index dec9fa5ee725..1adf8899e674 100644
--- a/www/p5-HTML-Summary/pkg-plist
+++ b/www/p5-HTML-Summary/pkg-plist
@@ -1,13 +1,6 @@
 %%SITE_PERL%%/HTML/Summary.pm
 %%SITE_PERL%%/Text/Sentence.pm
 %%SITE_PERL%%/Lingua/JA/Jtruncate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary/.packlist
 %%PERL5_MAN3%%/HTML::Summary.3.gz
 %%PERL5_MAN3%%/Text::Sentence.3.gz
 %%PERL5_MAN3%%/Lingua::JA::Jtruncate.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary
-@dirrm %%SITE_PERL%%/Lingua/JA
-@dirrm %%SITE_PERL%%/Lingua
-@dirrmtry %%SITE_PERL%%/Text
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Table/Makefile b/www/p5-HTML-Table/Makefile
index eb74338e7f14..44e842e56b60 100644
--- a/www/p5-HTML-Table/Makefile
+++ b/www/p5-HTML-Table/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-Table
 PORTVERSION=	2.08a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Table/pkg-plist b/www/p5-HTML-Table/pkg-plist
index 04555582ac24..ca09bd3073b3 100644
--- a/www/p5-HTML-Table/pkg-plist
+++ b/www/p5-HTML-Table/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table/.packlist
 %%PERL5_MAN3%%/HTML::Table.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TableContentParser/Makefile b/www/p5-HTML-TableContentParser/Makefile
index 2036f245da6d..a9b9c538b1bb 100644
--- a/www/p5-HTML-TableContentParser/Makefile
+++ b/www/p5-HTML-TableContentParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TableContentParser
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TableContentParser/pkg-plist b/www/p5-HTML-TableContentParser/pkg-plist
index 39e7ae06409f..064ca276a378 100644
--- a/www/p5-HTML-TableContentParser/pkg-plist
+++ b/www/p5-HTML-TableContentParser/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/TableContentParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableContentParser/.packlist
 %%PERL5_MAN3%%/HTML::TableContentParser.3.gz
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableContentParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index b56535d9be5d..3774d3f3046d 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TableExtract
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TableExtract/pkg-plist b/www/p5-HTML-TableExtract/pkg-plist
index f5af1b7c5097..468e7d90a57b 100644
--- a/www/p5-HTML-TableExtract/pkg-plist
+++ b/www/p5-HTML-TableExtract/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-TableExtract/.packlist
 %%SITE_PERL%%/HTML/TableExtract.pm
 %%PERL5_MAN3%%/HTML::TableExtract.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-TableExtract
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TableLayout/Makefile b/www/p5-HTML-TableLayout/Makefile
index 294534cdb08f..ae13b75dcc3a 100644
--- a/www/p5-HTML-TableLayout/Makefile
+++ b/www/p5-HTML-TableLayout/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TableLayout
 PORTVERSION=	1.001008
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TableLayout/pkg-plist b/www/p5-HTML-TableLayout/pkg-plist
index 839f99372892..75083998469c 100644
--- a/www/p5-HTML-TableLayout/pkg-plist
+++ b/www/p5-HTML-TableLayout/pkg-plist
@@ -3,9 +3,4 @@
 %%SITE_PERL%%/HTML/TableLayout/Component.pm
 %%SITE_PERL%%/HTML/TableLayout/Form.pm
 %%SITE_PERL%%/HTML/TableLayout.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout/.packlist
 %%PERL5_MAN3%%/HTML::TableLayout.3.gz
-@dirrm %%SITE_PERL%%/HTML/TableLayout
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TableParser/Makefile b/www/p5-HTML-TableParser/Makefile
index f2fd34778a6c..92f1d5c1626a 100644
--- a/www/p5-HTML-TableParser/Makefile
+++ b/www/p5-HTML-TableParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TableParser
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TableParser/pkg-plist b/www/p5-HTML-TableParser/pkg-plist
index 2f4de576b3ef..17d8d275fdc7 100644
--- a/www/p5-HTML-TableParser/pkg-plist
+++ b/www/p5-HTML-TableParser/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableParser/.packlist
 %%SITE_PERL%%/HTML/TableParser.pm
 %%SITE_PERL%%/HTML/TableParser/Table.pm
 %%PERL5_MAN3%%/HTML::TableParser.3.gz
 %%PERL5_MAN3%%/HTML::TableParser::Table.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/TableParser
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TableTiler/Makefile b/www/p5-HTML-TableTiler/Makefile
index 7e4341861cf1..6c84e47afa34 100644
--- a/www/p5-HTML-TableTiler/Makefile
+++ b/www/p5-HTML-TableTiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TableTiler
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TableTiler/pkg-plist b/www/p5-HTML-TableTiler/pkg-plist
index 3aa3a948e9af..67e3bbc2e1d7 100644
--- a/www/p5-HTML-TableTiler/pkg-plist
+++ b/www/p5-HTML-TableTiler/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::TableTiler.3.gz
 %%SITE_PERL%%/HTML/TableTiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableTiler/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableTiler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TagCloud-Extended/Makefile b/www/p5-HTML-TagCloud-Extended/Makefile
index cd01ea9eec47..43d3471a2e7e 100644
--- a/www/p5-HTML-TagCloud-Extended/Makefile
+++ b/www/p5-HTML-TagCloud-Extended/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TagCloud-Extended
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TagCloud-Extended/pkg-plist b/www/p5-HTML-TagCloud-Extended/pkg-plist
index 75cf85db0a1f..3c7a6a201a33 100644
--- a/www/p5-HTML-TagCloud-Extended/pkg-plist
+++ b/www/p5-HTML-TagCloud-Extended/pkg-plist
@@ -4,11 +4,4 @@
 %%SITE_PERL%%/HTML/TagCloud/Extended/Tag.pm
 %%SITE_PERL%%/HTML/TagCloud/Extended/TagColors.pm
 %%SITE_PERL%%/HTML/TagCloud/Extended/TagList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended/.packlist
 %%PERL5_MAN3%%/HTML::TagCloud::Extended.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud
-@dirrm %%SITE_PERL%%/HTML/TagCloud/Extended
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/TagCloud
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TagCloud/Makefile b/www/p5-HTML-TagCloud/Makefile
index 242769a2e7a7..01e83e491abe 100644
--- a/www/p5-HTML-TagCloud/Makefile
+++ b/www/p5-HTML-TagCloud/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TagCloud
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TagCloud/pkg-plist b/www/p5-HTML-TagCloud/pkg-plist
index aaa28e62bb96..8b6c90fb5081 100644
--- a/www/p5-HTML-TagCloud/pkg-plist
+++ b/www/p5-HTML-TagCloud/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/TagCloud.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/.packlist
 %%PERL5_MAN3%%/HTML::TagCloud.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TagParser/Makefile b/www/p5-HTML-TagParser/Makefile
index 69a6e742d62a..b6bf5616ccba 100644
--- a/www/p5-HTML-TagParser/Makefile
+++ b/www/p5-HTML-TagParser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TagParser
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TagParser/pkg-plist b/www/p5-HTML-TagParser/pkg-plist
index c18bab7a9eec..bb158293007e 100644
--- a/www/p5-HTML-TagParser/pkg-plist
+++ b/www/p5-HTML-TagParser/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::TagParser.3.gz
 %%SITE_PERL%%/HTML/TagParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagParser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index b03719763d03..8f7cbdc623d6 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Tagset
 PORTVERSION=	3.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Tagset/pkg-plist b/www/p5-HTML-Tagset/pkg-plist
index b785a90960e1..29e767a8913c 100644
--- a/www/p5-HTML-Tagset/pkg-plist
+++ b/www/p5-HTML-Tagset/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTML::Tagset.3.gz
 %%SITE_PERL%%/HTML/Tagset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-Associate/Makefile b/www/p5-HTML-Template-Associate/Makefile
index bd09d0458c4f..fcd1f7d8f70a 100644
--- a/www/p5-HTML-Template-Associate/Makefile
+++ b/www/p5-HTML-Template-Associate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Template-Associate
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ALEXP
diff --git a/www/p5-HTML-Template-Associate/pkg-plist b/www/p5-HTML-Template-Associate/pkg-plist
index 5ad91944854c..28478c45e823 100644
--- a/www/p5-HTML-Template-Associate/pkg-plist
+++ b/www/p5-HTML-Template-Associate/pkg-plist
@@ -4,8 +4,3 @@
 %%PERL5_MAN3%%/HTML::Template::Associate.3.gz
 %%PERL5_MAN3%%/HTML::Template::Associate::DBI.3.gz
 %%PERL5_MAN3%%/HTML::Template::Associate::FormValidator.3.gz
-@dirrm %%SITE_PERL%%/HTML/Template/Associate
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Associate/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Associate
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/HTML/Template
diff --git a/www/p5-HTML-Template-Compiled/Makefile b/www/p5-HTML-Template-Compiled/Makefile
index 72e039d4b9fb..a2630fa71949 100644
--- a/www/p5-HTML-Template-Compiled/Makefile
+++ b/www/p5-HTML-Template-Compiled/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Template-Compiled
 PORTVERSION=	1.001
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Template-Compiled/pkg-plist b/www/p5-HTML-Template-Compiled/pkg-plist
index c932162772c7..7d8ce24eb3d1 100644
--- a/www/p5-HTML-Template-Compiled/pkg-plist
+++ b/www/p5-HTML-Template-Compiled/pkg-plist
@@ -14,7 +14,6 @@
 %%SITE_PERL%%/HTML/Template/Compiled/Reference.pod
 %%SITE_PERL%%/HTML/Template/Compiled/Token.pm
 %%SITE_PERL%%/HTML/Template/Compiled/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Compiled/.packlist
 %%PERL5_MAN3%%/HTML::Template::Compiled.3.gz
 %%PERL5_MAN3%%/HTML::Template::Compiled::Classic.3.gz
 %%PERL5_MAN3%%/HTML::Template::Compiled::Compiler.3.gz
@@ -30,12 +29,3 @@
 %%PERL5_MAN3%%/HTML::Template::Compiled::Reference.3.gz
 %%PERL5_MAN3%%/HTML::Template::Compiled::Token.3.gz
 %%PERL5_MAN3%%/HTML::Template::Compiled::Utils.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Compiled
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Template/Compiled/Plugin
-@dirrmtry %%SITE_PERL%%/HTML/Template/Compiled/Expression
-@dirrmtry %%SITE_PERL%%/HTML/Template/Compiled/Compiler
-@dirrmtry %%SITE_PERL%%/HTML/Template/Compiled
-@dirrmtry %%SITE_PERL%%/HTML/Template
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-Expr/Makefile b/www/p5-HTML-Template-Expr/Makefile
index c031f71b561e..9a569e1277e1 100644
--- a/www/p5-HTML-Template-Expr/Makefile
+++ b/www/p5-HTML-Template-Expr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-Template-Expr
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Template-Expr/pkg-plist b/www/p5-HTML-Template-Expr/pkg-plist
index fddada00470d..805fd7b716cd 100644
--- a/www/p5-HTML-Template-Expr/pkg-plist
+++ b/www/p5-HTML-Template-Expr/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/HTML/Template/Expr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr/.packlist
 %%PERL5_MAN3%%/HTML::Template::Expr.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Template
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-HashWrapper/Makefile b/www/p5-HTML-Template-HashWrapper/Makefile
index f0df0874577d..c802db104643 100644
--- a/www/p5-HTML-Template-HashWrapper/Makefile
+++ b/www/p5-HTML-Template-HashWrapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Template-HashWrapper
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Template-HashWrapper/pkg-plist b/www/p5-HTML-Template-HashWrapper/pkg-plist
index 71ae935e4c09..9a6824a31598 100644
--- a/www/p5-HTML-Template-HashWrapper/pkg-plist
+++ b/www/p5-HTML-Template-HashWrapper/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::Template::HashWrapper.3.gz
 %%SITE_PERL%%/HTML/Template/HashWrapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/HashWrapper/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/HashWrapper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Template
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-JIT/Makefile b/www/p5-HTML-Template-JIT/Makefile
index ae413e0ca49b..8300f6038597 100644
--- a/www/p5-HTML-Template-JIT/Makefile
+++ b/www/p5-HTML-Template-JIT/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTML-Template-JIT
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Template-JIT/pkg-plist b/www/p5-HTML-Template-JIT/pkg-plist
index d5ab40c1ef5c..e1fd19064400 100644
--- a/www/p5-HTML-Template-JIT/pkg-plist
+++ b/www/p5-HTML-Template-JIT/pkg-plist
@@ -1,13 +1,6 @@
 %%SITE_PERL%%/HTML/Template/JIT.pm
 %%SITE_PERL%%/HTML/Template/JIT/Base.pm
 %%SITE_PERL%%/HTML/Template/JIT/Compiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT/.packlist
 %%PERL5_MAN3%%/HTML::Template::JIT.3.gz
 %%PERL5_MAN3%%/HTML::Template::JIT::Base.3.gz
 %%PERL5_MAN3%%/HTML::Template::JIT::Compiler.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrm %%SITE_PERL%%/HTML/Template/JIT
-@dirrmtry %%SITE_PERL%%/HTML/Template
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-Pluggable/Makefile b/www/p5-HTML-Template-Pluggable/Makefile
index e2b9e19bc739..caac2d91409e 100644
--- a/www/p5-HTML-Template-Pluggable/Makefile
+++ b/www/p5-HTML-Template-Pluggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Template-Pluggable
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Template-Pluggable/pkg-plist b/www/p5-HTML-Template-Pluggable/pkg-plist
index dc3e006eab1c..804e70e291e8 100644
--- a/www/p5-HTML-Template-Pluggable/pkg-plist
+++ b/www/p5-HTML-Template-Pluggable/pkg-plist
@@ -1,11 +1,4 @@
 %%SITE_PERL%%/HTML/Template/Pluggable.pm
 %%SITE_PERL%%/HTML/Template/Plugin/Dot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Pluggable/.packlist
 %%PERL5_MAN3%%/HTML::Template::Pluggable.3.gz
 %%PERL5_MAN3%%/HTML::Template::Plugin::Dot.3.gz
-@dirrmtry %%SITE_PERL%%/HTML/Template/Plugin
-@dirrmtry %%SITE_PERL%%/HTML/Template
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Pluggable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Template-Pro/Makefile b/www/p5-HTML-Template-Pro/Makefile
index 8b88b6a13c99..128abab8b5cf 100644
--- a/www/p5-HTML-Template-Pro/Makefile
+++ b/www/p5-HTML-Template-Pro/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Template-Pro
 PORTVERSION=	0.9510
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Template-Pro/pkg-plist b/www/p5-HTML-Template-Pro/pkg-plist
index 53b5912ff614..b33ef38dc081 100644
--- a/www/p5-HTML-Template-Pro/pkg-plist
+++ b/www/p5-HTML-Template-Pro/pkg-plist
@@ -1,15 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Pro/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Pro/Pro.so
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Template/PerlInterface.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Template/Pro.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Template/Pro/WrapAssociate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Template/SYNTAX.pod
+%%SITE_ARCH%%/auto/HTML/Template/Pro/Pro.so
+%%SITE_ARCH%%/HTML/Template/PerlInterface.pod
+%%SITE_ARCH%%/HTML/Template/Pro.pm
+%%SITE_ARCH%%/HTML/Template/Pro/WrapAssociate.pm
+%%SITE_ARCH%%/HTML/Template/SYNTAX.pod
 %%PERL5_MAN3%%/HTML::Template::PerlInterface.3.gz
 %%PERL5_MAN3%%/HTML::Template::Pro.3.gz
 %%PERL5_MAN3%%/HTML::Template::SYNTAX.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Template/Pro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Pro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile
index 48cfa9c5cc52..9e9486c856c6 100644
--- a/www/p5-HTML-Template/Makefile
+++ b/www/p5-HTML-Template/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTML-Template
 PORTVERSION=	2.95
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Template/pkg-plist b/www/p5-HTML-Template/pkg-plist
index 20412cb35f33..2106e5e1e578 100644
--- a/www/p5-HTML-Template/pkg-plist
+++ b/www/p5-HTML-Template/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/HTML::Template::FAQ.3.gz
 %%SITE_PERL%%/HTML/Template.pm
 %%SITE_PERL%%/HTML/Template/FAQ.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/.packlist
-@dirrm %%SITE_PERL%%/HTML/Template
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Toc/Makefile b/www/p5-HTML-Toc/Makefile
index 7765601a9b28..9ed50dae725b 100644
--- a/www/p5-HTML-Toc/Makefile
+++ b/www/p5-HTML-Toc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Toc
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Toc/pkg-plist b/www/p5-HTML-Toc/pkg-plist
index edd636e64c7c..a2d3d3ef7087 100644
--- a/www/p5-HTML-Toc/pkg-plist
+++ b/www/p5-HTML-Toc/pkg-plist
@@ -3,7 +3,3 @@
 %%SITE_PERL%%/HTML/TocGenerator.pm
 %%SITE_PERL%%/HTML/TocInsertor.pm
 %%SITE_PERL%%/HTML/TocUpdator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Toc/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Toc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TokeParser-Simple/Makefile b/www/p5-HTML-TokeParser-Simple/Makefile
index 9d7d96939e00..48c6da9e593e 100644
--- a/www/p5-HTML-TokeParser-Simple/Makefile
+++ b/www/p5-HTML-TokeParser-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TokeParser-Simple
 PORTVERSION=	3.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TokeParser-Simple/pkg-plist b/www/p5-HTML-TokeParser-Simple/pkg-plist
index 67a6a5be0227..65d3a047cca7 100644
--- a/www/p5-HTML-TokeParser-Simple/pkg-plist
+++ b/www/p5-HTML-TokeParser-Simple/pkg-plist
@@ -16,12 +16,3 @@
 %%SITE_PERL%%/HTML/TokeParser/Simple/Token/Tag/End.pm
 %%SITE_PERL%%/HTML/TokeParser/Simple/Token/Tag/Start.pm
 %%SITE_PERL%%/HTML/TokeParser/Simple/Token/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/TokeParser/Simple/Token/Tag
-@dirrmtry %%SITE_PERL%%/HTML/TokeParser/Simple/Token
-@dirrmtry %%SITE_PERL%%/HTML/TokeParser/Simple
-@dirrmtry %%SITE_PERL%%/HTML/TokeParser
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 468b5887048e..52239129bf75 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Tree
 PORTVERSION=	5.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Tree/pkg-plist b/www/p5-HTML-Tree/pkg-plist
index acf9d36bb09d..51be8efc1684 100644
--- a/www/p5-HTML-Tree/pkg-plist
+++ b/www/p5-HTML-Tree/pkg-plist
@@ -17,6 +17,3 @@ bin/htmltree
 %%SITE_PERL%%/HTML/Tree/AboutTrees.pod
 %%SITE_PERL%%/HTML/Tree/Scanning.pod
 %%SITE_PERL%%/HTML/TreeBuilder.pm
-@dirrmtry %%SITE_PERL%%/HTML/Tree
-@dirrmtry %%SITE_PERL%%/HTML/Element
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TreeBuilder-LibXML/Makefile b/www/p5-HTML-TreeBuilder-LibXML/Makefile
index f634c728c3a2..259884a7eb0b 100644
--- a/www/p5-HTML-TreeBuilder-LibXML/Makefile
+++ b/www/p5-HTML-TreeBuilder-LibXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TreeBuilder-LibXML
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TreeBuilder-LibXML/pkg-plist b/www/p5-HTML-TreeBuilder-LibXML/pkg-plist
index 5b52785060da..c9e7e3c71214 100644
--- a/www/p5-HTML-TreeBuilder-LibXML/pkg-plist
+++ b/www/p5-HTML-TreeBuilder-LibXML/pkg-plist
@@ -2,6 +2,3 @@
 %%PERL5_MAN3%%/HTML::TreeBuilder::LibXML::Node.3.gz
 %%SITE_PERL%%/HTML/TreeBuilder/LibXML.pm
 %%SITE_PERL%%/HTML/TreeBuilder/LibXML/Node.pm
-@dirrmtry %%SITE_PERL%%/HTML/TreeBuilder/LibXML
-@dirrmtry %%SITE_PERL%%/HTML/TreeBuilder
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TreeBuilder-XPath/Makefile b/www/p5-HTML-TreeBuilder-XPath/Makefile
index 66c182e1a144..17f5255484b6 100644
--- a/www/p5-HTML-TreeBuilder-XPath/Makefile
+++ b/www/p5-HTML-TreeBuilder-XPath/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-TreeBuilder-XPath
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-TreeBuilder-XPath/pkg-plist b/www/p5-HTML-TreeBuilder-XPath/pkg-plist
index 0431823ec249..7690b8fe302c 100644
--- a/www/p5-HTML-TreeBuilder-XPath/pkg-plist
+++ b/www/p5-HTML-TreeBuilder-XPath/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::TreeBuilder::XPath.3.gz
 %%SITE_PERL%%/HTML/TreeBuilder/XPath.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TreeBuilder/XPath/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TreeBuilder/XPath
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TreeBuilder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/TreeBuilder
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Widgets-SelectLayers/Makefile b/www/p5-HTML-Widgets-SelectLayers/Makefile
index df196354a29e..4855529aa855 100644
--- a/www/p5-HTML-Widgets-SelectLayers/Makefile
+++ b/www/p5-HTML-Widgets-SelectLayers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-Widgets-SelectLayers
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Widgets-SelectLayers/pkg-plist b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
index 8454bda93f54..e95955f46b97 100644
--- a/www/p5-HTML-Widgets-SelectLayers/pkg-plist
+++ b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/HTML/Widgets/SelectLayers.pm
 %%SITE_PERL%%/HTML/Widgets/homepage.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers/.packlist
 %%PERL5_MAN3%%/HTML::Widgets::SelectLayers.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/Widgets
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter-DokuWiki/Makefile b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
index 909e6b27b529..78270be5bf44 100644
--- a/www/p5-HTML-WikiConverter-DokuWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-DokuWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-DokuWiki
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-DokuWiki/pkg-plist b/www/p5-HTML-WikiConverter-DokuWiki/pkg-plist
index f87b92f8a30c..8059827b4fb2 100644
--- a/www/p5-HTML-WikiConverter-DokuWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-DokuWiki/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/DokuWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/DokuWiki/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::DokuWiki.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/DokuWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-GoogleCode/Makefile b/www/p5-HTML-WikiConverter-GoogleCode/Makefile
index 1e738feee256..d570e0e85329 100644
--- a/www/p5-HTML-WikiConverter-GoogleCode/Makefile
+++ b/www/p5-HTML-WikiConverter-GoogleCode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-GoogleCode
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-GoogleCode/pkg-plist b/www/p5-HTML-WikiConverter-GoogleCode/pkg-plist
index f2e586ed8db0..9ac176ed8554 100644
--- a/www/p5-HTML-WikiConverter-GoogleCode/pkg-plist
+++ b/www/p5-HTML-WikiConverter-GoogleCode/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/GoogleCode/.packlist
 %%SITE_PERL%%/HTML/WikiConverter/GoogleCode.pm
 %%PERL5_MAN3%%/HTML::WikiConverter::GoogleCode.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/GoogleCode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-Kwiki/Makefile b/www/p5-HTML-WikiConverter-Kwiki/Makefile
index 091b72f34e31..5cc84147cc9c 100644
--- a/www/p5-HTML-WikiConverter-Kwiki/Makefile
+++ b/www/p5-HTML-WikiConverter-Kwiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-Kwiki
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-Kwiki/pkg-plist b/www/p5-HTML-WikiConverter-Kwiki/pkg-plist
index c3380f2d9a43..c29df1f80be1 100644
--- a/www/p5-HTML-WikiConverter-Kwiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-Kwiki/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::WikiConverter::Kwiki.3.gz
 %%SITE_PERL%%/HTML/WikiConverter/Kwiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Kwiki/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Kwiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter-Markdown/Makefile b/www/p5-HTML-WikiConverter-Markdown/Makefile
index c86201ce205c..d46b10503baa 100644
--- a/www/p5-HTML-WikiConverter-Markdown/Makefile
+++ b/www/p5-HTML-WikiConverter-Markdown/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-Markdown
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-Markdown/pkg-plist b/www/p5-HTML-WikiConverter-Markdown/pkg-plist
index cbe141ad28e3..ad6e049ce0dc 100644
--- a/www/p5-HTML-WikiConverter-Markdown/pkg-plist
+++ b/www/p5-HTML-WikiConverter-Markdown/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/Markdown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Markdown/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::Markdown.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Markdown
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-MediaWiki/Makefile b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
index 26069cc51bcd..5936e8dbd42e 100644
--- a/www/p5-HTML-WikiConverter-MediaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-MediaWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-MediaWiki
 PORTVERSION=	0.59
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-MediaWiki/pkg-plist b/www/p5-HTML-WikiConverter-MediaWiki/pkg-plist
index 3020cea43e56..70684157887b 100644
--- a/www/p5-HTML-WikiConverter-MediaWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-MediaWiki/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::WikiConverter::MediaWiki.3.gz
 %%SITE_PERL%%/HTML/WikiConverter/MediaWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/MediaWiki/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/MediaWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter-MoinMoin/Makefile b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
index 856cf6450b23..02942df51ba0 100644
--- a/www/p5-HTML-WikiConverter-MoinMoin/Makefile
+++ b/www/p5-HTML-WikiConverter-MoinMoin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-MoinMoin
 PORTVERSION=	0.54
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-MoinMoin/pkg-plist b/www/p5-HTML-WikiConverter-MoinMoin/pkg-plist
index 88e1e13e1655..9ccf08ddebc8 100644
--- a/www/p5-HTML-WikiConverter-MoinMoin/pkg-plist
+++ b/www/p5-HTML-WikiConverter-MoinMoin/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/MoinMoin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/MoinMoin/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::MoinMoin.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/MoinMoin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-Oddmuse/Makefile b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
index dc0b3a0ea3a1..1a9553e3f2ce 100644
--- a/www/p5-HTML-WikiConverter-Oddmuse/Makefile
+++ b/www/p5-HTML-WikiConverter-Oddmuse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-Oddmuse
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-Oddmuse/pkg-plist b/www/p5-HTML-WikiConverter-Oddmuse/pkg-plist
index 4a4d0461b905..14797a3737d0 100644
--- a/www/p5-HTML-WikiConverter-Oddmuse/pkg-plist
+++ b/www/p5-HTML-WikiConverter-Oddmuse/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::WikiConverter::Oddmuse.3.gz
 %%SITE_PERL%%/HTML/WikiConverter/Oddmuse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Oddmuse/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Oddmuse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter-PbWiki/Makefile b/www/p5-HTML-WikiConverter-PbWiki/Makefile
index 5927370f04fc..9c8ba6c21cc9 100644
--- a/www/p5-HTML-WikiConverter-PbWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PbWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-PbWiki
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-PbWiki/pkg-plist b/www/p5-HTML-WikiConverter-PbWiki/pkg-plist
index 827d9b9da713..3232e028fdff 100644
--- a/www/p5-HTML-WikiConverter-PbWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-PbWiki/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/PbWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/PbWiki/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::PbWiki.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/PbWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-PhpWiki/Makefile b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
index 5f51e6122187..9e85cf7ed636 100644
--- a/www/p5-HTML-WikiConverter-PhpWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PhpWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-PhpWiki
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-PhpWiki/pkg-plist b/www/p5-HTML-WikiConverter-PhpWiki/pkg-plist
index 6f8706bfd446..51b4850a80e4 100644
--- a/www/p5-HTML-WikiConverter-PhpWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-PhpWiki/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::WikiConverter::PhpWiki.3.gz
 %%SITE_PERL%%/HTML/WikiConverter/PhpWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/PhpWiki/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/PhpWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter-PmWiki/Makefile b/www/p5-HTML-WikiConverter-PmWiki/Makefile
index 5b28644fc71e..d30bc9c95083 100644
--- a/www/p5-HTML-WikiConverter-PmWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-PmWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-PmWiki
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-PmWiki/pkg-plist b/www/p5-HTML-WikiConverter-PmWiki/pkg-plist
index 1073099b7fb6..419a09063cf7 100644
--- a/www/p5-HTML-WikiConverter-PmWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-PmWiki/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/PmWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/PmWiki/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::PmWiki.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/PmWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-SnipSnap/Makefile b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
index a8dadccdaaba..cf993e627d27 100644
--- a/www/p5-HTML-WikiConverter-SnipSnap/Makefile
+++ b/www/p5-HTML-WikiConverter-SnipSnap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-SnipSnap
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-SnipSnap/pkg-plist b/www/p5-HTML-WikiConverter-SnipSnap/pkg-plist
index fa2cfba0887a..48f20cedd1d9 100644
--- a/www/p5-HTML-WikiConverter-SnipSnap/pkg-plist
+++ b/www/p5-HTML-WikiConverter-SnipSnap/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/SnipSnap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/SnipSnap/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::SnipSnap.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/SnipSnap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-Socialtext/Makefile b/www/p5-HTML-WikiConverter-Socialtext/Makefile
index 283c496ca923..a0cd7b95c43b 100644
--- a/www/p5-HTML-WikiConverter-Socialtext/Makefile
+++ b/www/p5-HTML-WikiConverter-Socialtext/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-Socialtext
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-Socialtext/pkg-plist b/www/p5-HTML-WikiConverter-Socialtext/pkg-plist
index f55600f4b0ff..6f713706ccc5 100644
--- a/www/p5-HTML-WikiConverter-Socialtext/pkg-plist
+++ b/www/p5-HTML-WikiConverter-Socialtext/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::WikiConverter::Socialtext.3.gz
 %%SITE_PERL%%/HTML/WikiConverter/Socialtext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Socialtext/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Socialtext
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter-TikiWiki/Makefile b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
index 0333e88c37e0..a1011e291f5a 100644
--- a/www/p5-HTML-WikiConverter-TikiWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-TikiWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-TikiWiki
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-TikiWiki/pkg-plist b/www/p5-HTML-WikiConverter-TikiWiki/pkg-plist
index 64d2cf5d3d54..5898570f3cf3 100644
--- a/www/p5-HTML-WikiConverter-TikiWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-TikiWiki/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/TikiWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/TikiWiki/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::TikiWiki.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/TikiWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-UseMod/Makefile b/www/p5-HTML-WikiConverter-UseMod/Makefile
index 46f490e75368..b4eacd8dad6f 100644
--- a/www/p5-HTML-WikiConverter-UseMod/Makefile
+++ b/www/p5-HTML-WikiConverter-UseMod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-UseMod
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-UseMod/pkg-plist b/www/p5-HTML-WikiConverter-UseMod/pkg-plist
index a861018f6a80..9b198b1bd949 100644
--- a/www/p5-HTML-WikiConverter-UseMod/pkg-plist
+++ b/www/p5-HTML-WikiConverter-UseMod/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/UseMod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/UseMod/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::UseMod.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/UseMod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
index 51282a2bc2ae..8b336b772bb6 100644
--- a/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WakkaWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-WakkaWiki
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-WakkaWiki/pkg-plist b/www/p5-HTML-WikiConverter-WakkaWiki/pkg-plist
index d5a49a2228f4..89cfad6b1f93 100644
--- a/www/p5-HTML-WikiConverter-WakkaWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-WakkaWiki/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTML::WikiConverter::WakkaWiki.3.gz
 %%SITE_PERL%%/HTML/WikiConverter/WakkaWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/WakkaWiki/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/WakkaWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
index 2b065a858eea..530fd1eed61a 100644
--- a/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
+++ b/www/p5-HTML-WikiConverter-WikkaWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter-WikkaWiki
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter-WikkaWiki/pkg-plist b/www/p5-HTML-WikiConverter-WikkaWiki/pkg-plist
index f771fcc3cc86..bba60fccd7d2 100644
--- a/www/p5-HTML-WikiConverter-WikkaWiki/pkg-plist
+++ b/www/p5-HTML-WikiConverter-WikkaWiki/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTML/WikiConverter/WikkaWiki.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/WikkaWiki/.packlist
 %%PERL5_MAN3%%/HTML::WikiConverter::WikkaWiki.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/WikkaWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
diff --git a/www/p5-HTML-WikiConverter/Makefile b/www/p5-HTML-WikiConverter/Makefile
index 6bd68c827a70..f794a8acad2b 100644
--- a/www/p5-HTML-WikiConverter/Makefile
+++ b/www/p5-HTML-WikiConverter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-WikiConverter
 PORTVERSION=	0.68
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-WikiConverter/pkg-plist b/www/p5-HTML-WikiConverter/pkg-plist
index 7dcb87f4f2d8..8223cd0ffc6c 100644
--- a/www/p5-HTML-WikiConverter/pkg-plist
+++ b/www/p5-HTML-WikiConverter/pkg-plist
@@ -7,9 +7,4 @@ bin/html2wiki
 %%SITE_PERL%%/HTML/WikiConverter/Dialects.pod
 %%SITE_PERL%%/HTML/WikiConverter/Normalizer.pm
 %%SITE_PERL%%/HTML/WikiConverter/WebApp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/.packlist
 man/man1/html2wiki.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
-@dirrmtry %%SITE_PERL%%/HTML/WikiConverter
-@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTTP-Async/Makefile b/www/p5-HTTP-Async/Makefile
index 5c37a4e26ada..22c69efa3790 100644
--- a/www/p5-HTTP-Async/Makefile
+++ b/www/p5-HTTP-Async/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Async
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Async/pkg-plist b/www/p5-HTTP-Async/pkg-plist
index bf44f73f2d3a..d4092318a4d4 100644
--- a/www/p5-HTTP-Async/pkg-plist
+++ b/www/p5-HTTP-Async/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Async/.packlist
 %%SITE_PERL%%/HTTP/Async.pm
 %%SITE_PERL%%/HTTP/Async/Polite.pm
 %%PERL5_MAN3%%/HTTP::Async.3.gz
 %%PERL5_MAN3%%/HTTP::Async::Polite.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Async
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Async
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Body/Makefile b/www/p5-HTTP-Body/Makefile
index a47364ee8d65..2ca37cf4969c 100644
--- a/www/p5-HTTP-Body/Makefile
+++ b/www/p5-HTTP-Body/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Body
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GETTY
diff --git a/www/p5-HTTP-Body/pkg-plist b/www/p5-HTTP-Body/pkg-plist
index 29fd601b7935..b9e718933561 100644
--- a/www/p5-HTTP-Body/pkg-plist
+++ b/www/p5-HTTP-Body/pkg-plist
@@ -10,8 +10,3 @@
 %%SITE_PERL%%/HTTP/Body/UrlEncoded.pm
 %%SITE_PERL%%/HTTP/Body/XForms.pm
 %%SITE_PERL%%/HTTP/Body/XFormsMultipart.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Body
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-BrowserDetect/Makefile b/www/p5-HTTP-BrowserDetect/Makefile
index bf3b95c94ce7..3b54fd4456e0 100644
--- a/www/p5-HTTP-BrowserDetect/Makefile
+++ b/www/p5-HTTP-BrowserDetect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-BrowserDetect
 PORTVERSION=	1.75
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OALDERS
diff --git a/www/p5-HTTP-BrowserDetect/pkg-plist b/www/p5-HTTP-BrowserDetect/pkg-plist
index 24f53586fe86..5ab6d4fd5763 100644
--- a/www/p5-HTTP-BrowserDetect/pkg-plist
+++ b/www/p5-HTTP-BrowserDetect/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTTP/BrowserDetect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect/.packlist
 %%PERL5_MAN3%%/HTTP::BrowserDetect.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Cache-Transparent/Makefile b/www/p5-HTTP-Cache-Transparent/Makefile
index 01b038e98f5e..8c5da66d8dc1 100644
--- a/www/p5-HTTP-Cache-Transparent/Makefile
+++ b/www/p5-HTTP-Cache-Transparent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Cache-Transparent
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Cache-Transparent/pkg-plist b/www/p5-HTTP-Cache-Transparent/pkg-plist
index b4257e449d26..cfc28d662ebe 100644
--- a/www/p5-HTTP-Cache-Transparent/pkg-plist
+++ b/www/p5-HTTP-Cache-Transparent/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/HTTP/Cache/Transparent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache/Transparent/.packlist
 %%PERL5_MAN3%%/HTTP::Cache::Transparent.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache/Transparent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Cache
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-CookieJar/Makefile b/www/p5-HTTP-CookieJar/Makefile
index 477b246e628b..1c3d7e8d7666 100644
--- a/www/p5-HTTP-CookieJar/Makefile
+++ b/www/p5-HTTP-CookieJar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-CookieJar
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-CookieJar/pkg-plist b/www/p5-HTTP-CookieJar/pkg-plist
index 3e1e91c037a9..af4248a308f3 100644
--- a/www/p5-HTTP-CookieJar/pkg-plist
+++ b/www/p5-HTTP-CookieJar/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/HTTP/CookieJar.pm
 %%SITE_PERL%%/HTTP/CookieJar/LWP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/CookieJar/.packlist
 %%PERL5_MAN3%%/HTTP::CookieJar.3.gz
 %%PERL5_MAN3%%/HTTP::CookieJar::LWP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/CookieJar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrm %%SITE_PERL%%/HTTP/CookieJar
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Cookies-Mozilla/Makefile b/www/p5-HTTP-Cookies-Mozilla/Makefile
index a5eae8df90f2..817150c8c23b 100644
--- a/www/p5-HTTP-Cookies-Mozilla/Makefile
+++ b/www/p5-HTTP-Cookies-Mozilla/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTTP-Cookies-Mozilla
 PORTVERSION=	2.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Cookies-Mozilla/pkg-plist b/www/p5-HTTP-Cookies-Mozilla/pkg-plist
index 4fe639485276..2fb8fb1e544c 100644
--- a/www/p5-HTTP-Cookies-Mozilla/pkg-plist
+++ b/www/p5-HTTP-Cookies-Mozilla/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Cookies::Mozilla.3.gz
 %%SITE_PERL%%/HTTP/Cookies/Mozilla.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/Mozilla/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/Mozilla
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Cookies-iCab/Makefile b/www/p5-HTTP-Cookies-iCab/Makefile
index 9f1692f8552a..b482f22bff69 100644
--- a/www/p5-HTTP-Cookies-iCab/Makefile
+++ b/www/p5-HTTP-Cookies-iCab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTTP-Cookies-iCab
 PORTVERSION=	1.131
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Cookies-iCab/pkg-plist b/www/p5-HTTP-Cookies-iCab/pkg-plist
index 152c02e87cad..35461e4317a9 100644
--- a/www/p5-HTTP-Cookies-iCab/pkg-plist
+++ b/www/p5-HTTP-Cookies-iCab/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Cookies::iCab.3.gz
 %%SITE_PERL%%/HTTP/Cookies/iCab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/iCab/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/iCab
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Cookies-w3m/Makefile b/www/p5-HTTP-Cookies-w3m/Makefile
index 05f4d20f9919..9c1379e87e1a 100644
--- a/www/p5-HTTP-Cookies-w3m/Makefile
+++ b/www/p5-HTTP-Cookies-w3m/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTTP-Cookies-w3m
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Cookies-w3m/pkg-plist b/www/p5-HTTP-Cookies-w3m/pkg-plist
index 433d2171a344..62639c7f4666 100644
--- a/www/p5-HTTP-Cookies-w3m/pkg-plist
+++ b/www/p5-HTTP-Cookies-w3m/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/w3m/.packlist
 %%SITE_PERL%%/HTTP/Cookies/w3m.pm
 %%PERL5_MAN3%%/HTTP::Cookies::w3m.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/w3m
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Cookies/Makefile b/www/p5-HTTP-Cookies/Makefile
index f566650da615..0fb92f78a190 100644
--- a/www/p5-HTTP-Cookies/Makefile
+++ b/www/p5-HTTP-Cookies/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Cookies
 PORTVERSION=	6.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Cookies/pkg-plist b/www/p5-HTTP-Cookies/pkg-plist
index 89d966b1dbb0..2706207c6979 100644
--- a/www/p5-HTTP-Cookies/pkg-plist
+++ b/www/p5-HTTP-Cookies/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/HTTP/Cookies.pm
 %%SITE_PERL%%/HTTP/Cookies/Microsoft.pm
 %%SITE_PERL%%/HTTP/Cookies/Netscape.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index b034bb322722..e8b295dd534a 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-DAV
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-DAV/pkg-plist b/www/p5-HTTP-DAV/pkg-plist
index 1d728c2bf5c3..936eecadd47f 100644
--- a/www/p5-HTTP-DAV/pkg-plist
+++ b/www/p5-HTTP-DAV/pkg-plist
@@ -12,9 +12,4 @@ bin/dave
 %%SITE_PERL%%/HTTP/DAV/ResourceList.pm
 %%SITE_PERL%%/HTTP/DAV/Response.pm
 %%SITE_PERL%%/HTTP/DAV/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV/.packlist
 man/man1/dave.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/DAV
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Daemon-SSL/Makefile b/www/p5-HTTP-Daemon-SSL/Makefile
index a95ff881f75a..82adfa525171 100644
--- a/www/p5-HTTP-Daemon-SSL/Makefile
+++ b/www/p5-HTTP-Daemon-SSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Daemon-SSL
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Daemon-SSL/pkg-plist b/www/p5-HTTP-Daemon-SSL/pkg-plist
index 260ac3e18d63..0a87396f1a62 100644
--- a/www/p5-HTTP-Daemon-SSL/pkg-plist
+++ b/www/p5-HTTP-Daemon-SSL/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/HTTP/Daemon/SSL.pm
 %%PERL5_MAN3%%/HTTP::Daemon::SSL.3.gz
-@dirrmtry %%SITE_PERL%%/HTTP/Daemon
-@dirrmtry %%SITE_PERL%%/HTTP
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Daemon/SSL/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Daemon/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Daemon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Daemon/Makefile b/www/p5-HTTP-Daemon/Makefile
index c4a75cb739bb..194c28b7d318 100644
--- a/www/p5-HTTP-Daemon/Makefile
+++ b/www/p5-HTTP-Daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Daemon
 PORTVERSION=	6.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Daemon/pkg-plist b/www/p5-HTTP-Daemon/pkg-plist
index 770cfddc188b..03dd2a9bc66f 100644
--- a/www/p5-HTTP-Daemon/pkg-plist
+++ b/www/p5-HTTP-Daemon/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTTP/Daemon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Daemon/.packlist
 %%PERL5_MAN3%%/HTTP::Daemon.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Daemon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Date/Makefile b/www/p5-HTTP-Date/Makefile
index a19f8c614d82..619da054ab5c 100644
--- a/www/p5-HTTP-Date/Makefile
+++ b/www/p5-HTTP-Date/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Date
 PORTVERSION=	6.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Date/pkg-plist b/www/p5-HTTP-Date/pkg-plist
index f5f5566ba7c9..e419c3c08894 100644
--- a/www/p5-HTTP-Date/pkg-plist
+++ b/www/p5-HTTP-Date/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Date.3.gz
 %%SITE_PERL%%/HTTP/Date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Date/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Date
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Engine-Middleware/Makefile b/www/p5-HTTP-Engine-Middleware/Makefile
index 3f08005c4300..500e45abc596 100644
--- a/www/p5-HTTP-Engine-Middleware/Makefile
+++ b/www/p5-HTTP-Engine-Middleware/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	HTTP-Engine-Middleware
 PORTVERSION=	0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Engine-Middleware/pkg-plist b/www/p5-HTTP-Engine-Middleware/pkg-plist
index dd48d8d17c9b..1c239624252b 100644
--- a/www/p5-HTTP-Engine-Middleware/pkg-plist
+++ b/www/p5-HTTP-Engine-Middleware/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Engine/Middleware/.packlist
 %%SITE_PERL%%/HTTP/Engine/Middleware.pm
 %%SITE_PERL%%/HTTP/Engine/Middleware/AccessLog.pm
 %%SITE_PERL%%/HTTP/Engine/Middleware/DebugRequest.pm
@@ -38,9 +37,3 @@
 %%PERL5_MAN3%%/HTTP::Engine::Middleware::Status.3.gz
 %%PERL5_MAN3%%/HTTP::Engine::Middleware::Status::Memory.3.gz
 %%PERL5_MAN3%%/HTTP::Engine::Middleware::UploadTemp.3.gz
-@dirrm %%SITE_PERL%%/HTTP/Engine/Middleware/Status
-@dirrm %%SITE_PERL%%/HTTP/Engine/Middleware/Role
-@dirrm %%SITE_PERL%%/HTTP/Engine/Middleware/Profile
-@dirrm %%SITE_PERL%%/HTTP/Engine/Middleware
-@dirrmtry %%SITE_PERL%%/HTTP/Engine
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Engine/Middleware
diff --git a/www/p5-HTTP-Engine/Makefile b/www/p5-HTTP-Engine/Makefile
index 8998fd53a993..c991b851fd6e 100644
--- a/www/p5-HTTP-Engine/Makefile
+++ b/www/p5-HTTP-Engine/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	HTTP-Engine
 PORTVERSION=	0.03005
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Engine/pkg-plist b/www/p5-HTTP-Engine/pkg-plist
index bbb6b756bf8a..cc07c368594d 100644
--- a/www/p5-HTTP-Engine/pkg-plist
+++ b/www/p5-HTTP-Engine/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Engine/.packlist
 %%SITE_PERL%%/HTTP/Engine.pm
 %%SITE_PERL%%/HTTP/Engine/Cookbook.pod
 %%SITE_PERL%%/HTTP/Engine/Interface.pm
@@ -51,13 +50,3 @@
 %%PERL5_MAN3%%/HTTP::Engine::Role::Interface.3.gz
 %%PERL5_MAN3%%/HTTP::Engine::Test::Request.3.gz
 %%PERL5_MAN3%%/HTTP::Engine::Types::Core.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Engine
-@dirrm %%SITE_PERL%%/HTTP/Engine/Types
-@dirrm %%SITE_PERL%%/HTTP/Engine/Test
-@dirrm %%SITE_PERL%%/HTTP/Engine/Role/ResponseWriter
-@dirrm %%SITE_PERL%%/HTTP/Engine/Role/RequestBuilder
-@dirrm %%SITE_PERL%%/HTTP/Engine/Role
-@dirrm %%SITE_PERL%%/HTTP/Engine/RequestBuilder
-@dirrm %%SITE_PERL%%/HTTP/Engine/Request
-@dirrm %%SITE_PERL%%/HTTP/Engine/Interface
-@dirrm %%SITE_PERL%%/HTTP/Engine
diff --git a/www/p5-HTTP-Exception/Makefile b/www/p5-HTTP-Exception/Makefile
index 34a81eeb5dd0..7e89d02cc084 100644
--- a/www/p5-HTTP-Exception/Makefile
+++ b/www/p5-HTTP-Exception/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Exception
 PORTVERSION=	0.04006
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Exception/pkg-plist b/www/p5-HTTP-Exception/pkg-plist
index d11546a840ce..5aea12d4eb86 100644
--- a/www/p5-HTTP-Exception/pkg-plist
+++ b/www/p5-HTTP-Exception/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Exception/.packlist
 %%SITE_PERL%%/HTTP/Exception.pm
 %%SITE_PERL%%/HTTP/Exception/1XX.pm
 %%SITE_PERL%%/HTTP/Exception/2XX.pm
diff --git a/www/p5-HTTP-HeaderParser-XS/Makefile b/www/p5-HTTP-HeaderParser-XS/Makefile
index 5c4a6e0968a6..75b9d98c14f6 100644
--- a/www/p5-HTTP-HeaderParser-XS/Makefile
+++ b/www/p5-HTTP-HeaderParser-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-HeaderParser-XS
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-HeaderParser-XS/pkg-plist b/www/p5-HTTP-HeaderParser-XS/pkg-plist
index 77ae19ff7166..8a2a14c6170c 100644
--- a/www/p5-HTTP-HeaderParser-XS/pkg-plist
+++ b/www/p5-HTTP-HeaderParser-XS/pkg-plist
@@ -1,10 +1,4 @@
 %%PERL5_MAN3%%/HTTP::HeaderParser::XS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/HTTP/HeaderParser/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/HeaderParser/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/HeaderParser/XS/XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/HeaderParser/XS/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/HeaderParser/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/HeaderParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP/HeaderParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP
+%%SITE_ARCH%%/HTTP/HeaderParser/XS.pm
+%%SITE_ARCH%%/auto/HTTP/HeaderParser/XS/XS.so
+%%SITE_ARCH%%/auto/HTTP/HeaderParser/XS/autosplit.ix
diff --git a/www/p5-HTTP-Headers-Fast/Makefile b/www/p5-HTTP-Headers-Fast/Makefile
index 80dd80229cfd..a1498d4989b7 100644
--- a/www/p5-HTTP-Headers-Fast/Makefile
+++ b/www/p5-HTTP-Headers-Fast/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Headers-Fast
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Headers-Fast/pkg-plist b/www/p5-HTTP-Headers-Fast/pkg-plist
index ef30fed73d79..31b3dd3e6da4 100644
--- a/www/p5-HTTP-Headers-Fast/pkg-plist
+++ b/www/p5-HTTP-Headers-Fast/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/HTTP/Headers/Fast.pm
 %%PERL5_MAN3%%/HTTP::Headers::Fast.3.gz
-@dirrmtry %%SITE_PERL%%/HTTP/Headers
diff --git a/www/p5-HTTP-Link-Parser/Makefile b/www/p5-HTTP-Link-Parser/Makefile
index 4d1baebc86bc..3d40aa83bd60 100644
--- a/www/p5-HTTP-Link-Parser/Makefile
+++ b/www/p5-HTTP-Link-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Link-Parser
 PORTVERSION=	0.200
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Link-Parser/pkg-plist b/www/p5-HTTP-Link-Parser/pkg-plist
index e3500fb13424..3648daeeed5f 100644
--- a/www/p5-HTTP-Link-Parser/pkg-plist
+++ b/www/p5-HTTP-Link-Parser/pkg-plist
@@ -1,7 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Link::Parser.3.gz
 %%SITE_PERL%%/HTTP/Link/Parser.pm
-%%SITE_PERL%%/mach/auto/HTTP/Link/Parser/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/HTTP/Link/Parser
-@dirrmtry %%SITE_PERL%%/mach/auto/HTTP/Link
-@dirrm %%SITE_PERL%%/HTTP/Link
-@dirrmtry %%SITE_PERL%%/HTTP/
diff --git a/www/p5-HTTP-Lite/Makefile b/www/p5-HTTP-Lite/Makefile
index 8ca13156039e..8a2493080107 100644
--- a/www/p5-HTTP-Lite/Makefile
+++ b/www/p5-HTTP-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Lite
 PORTVERSION=	2.43
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Lite/pkg-plist b/www/p5-HTTP-Lite/pkg-plist
index 4003982fefaa..e0718f8cf2c6 100644
--- a/www/p5-HTTP-Lite/pkg-plist
+++ b/www/p5-HTTP-Lite/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTTP/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Lite/.packlist
 %%PERL5_MAN3%%/HTTP::Lite.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-MHTTP/Makefile b/www/p5-HTTP-MHTTP/Makefile
index e2126d4a7621..a95209b77c99 100644
--- a/www/p5-HTTP-MHTTP/Makefile
+++ b/www/p5-HTTP-MHTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-MHTTP
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-MHTTP/pkg-plist b/www/p5-HTTP-MHTTP/pkg-plist
index cd14e945babb..de5fb348f6e8 100644
--- a/www/p5-HTTP-MHTTP/pkg-plist
+++ b/www/p5-HTTP-MHTTP/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/HTTP::MHTTP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/HTTP/MHTTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MHTTP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MHTTP/MHTTP.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MHTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP
+%%SITE_ARCH%%/HTTP/MHTTP.pm
+%%SITE_ARCH%%/auto/HTTP/MHTTP/MHTTP.so
diff --git a/www/p5-HTTP-Message/Makefile b/www/p5-HTTP-Message/Makefile
index 780e7bd03f38..9c7f21f94f6b 100644
--- a/www/p5-HTTP-Message/Makefile
+++ b/www/p5-HTTP-Message/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTTP-Message
 PORTVERSION=	6.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Message/pkg-plist b/www/p5-HTTP-Message/pkg-plist
index ba06c2c957a4..f7c27ac55a2e 100644
--- a/www/p5-HTTP-Message/pkg-plist
+++ b/www/p5-HTTP-Message/pkg-plist
@@ -16,9 +16,3 @@
 %%SITE_PERL%%/HTTP/Request/Common.pm
 %%SITE_PERL%%/HTTP/Response.pm
 %%SITE_PERL%%/HTTP/Status.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Message/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Message
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Request
-@dirrmtry %%SITE_PERL%%/HTTP/Headers
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
index 98aab425feab..391801c99c6e 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-MobileAgent-Plugin-Charset
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Charset/pkg-plist b/www/p5-HTTP-MobileAgent-Plugin-Charset/pkg-plist
index 6c79a8ac1ec2..dd7f5b9cbaf7 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Charset/pkg-plist
+++ b/www/p5-HTTP-MobileAgent-Plugin-Charset/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Charset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/Plugin/Charset/.packlist
 %%PERL5_MAN3%%/HTTP::MobileAgent::Plugin::Charset.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/Plugin/Charset
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/Plugin
-@dirrmtry %%SITE_PERL%%/HTTP/MobileAgent/Plugin
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
index 1021db50b031..4b5eff795653 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-MobileAgent-Plugin-Locator
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Locator/pkg-plist b/www/p5-HTTP-MobileAgent-Plugin-Locator/pkg-plist
index 04e9fd223df5..eaced5eaae49 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Locator/pkg-plist
+++ b/www/p5-HTTP-MobileAgent-Plugin-Locator/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/Plugin/Locator/.packlist
 %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator.pm
 %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/Base.pm
 %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/DoCoMo/BasicLocation.pm
@@ -9,11 +8,3 @@
 %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/SoftBank/GPS.pm
 %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/Willcom/BasicLocation.pm
 %%PERL5_MAN3%%/HTTP::MobileAgent::Plugin::Locator.3.gz
-@dirrm %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/Willcom
-@dirrm %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/SoftBank
-@dirrm %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/EZweb
-@dirrm %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator/DoCoMo
-@dirrm %%SITE_PERL%%/HTTP/MobileAgent/Plugin/Locator
-@dirrmtry %%SITE_PERL%%/HTTP/MobileAgent/Plugin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/Plugin/Locator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/Plugin
diff --git a/www/p5-HTTP-MobileAgent/Makefile b/www/p5-HTTP-MobileAgent/Makefile
index 701b3fd018d4..a6db91f4dbeb 100644
--- a/www/p5-HTTP-MobileAgent/Makefile
+++ b/www/p5-HTTP-MobileAgent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-MobileAgent
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KURIHARA
diff --git a/www/p5-HTTP-MobileAgent/pkg-plist b/www/p5-HTTP-MobileAgent/pkg-plist
index b23ac1db3da5..e4a767ef6a22 100644
--- a/www/p5-HTTP-MobileAgent/pkg-plist
+++ b/www/p5-HTTP-MobileAgent/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/HTTP/MobileAgent/NonMobile.pm
 %%SITE_PERL%%/HTTP/MobileAgent/Request.pm
 %%SITE_PERL%%/HTTP/MobileAgent/Vodafone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/.packlist
 %%PERL5_MAN3%%/HTTP::MobileAgent.3.gz
 %%PERL5_MAN3%%/HTTP::MobileAgent::AirHPhone.3.gz
 %%PERL5_MAN3%%/HTTP::MobileAgent::Display.3.gz
@@ -17,6 +16,3 @@
 %%PERL5_MAN3%%/HTTP::MobileAgent::JPhone.3.gz
 %%PERL5_MAN3%%/HTTP::MobileAgent::NonMobile.3.gz
 %%PERL5_MAN3%%/HTTP::MobileAgent::Vodafone.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent
-@dirrm %%SITE_PERL%%/HTTP/MobileAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Negotiate/Makefile b/www/p5-HTTP-Negotiate/Makefile
index a7d1e3a3f344..c4567935fa1d 100644
--- a/www/p5-HTTP-Negotiate/Makefile
+++ b/www/p5-HTTP-Negotiate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Negotiate
 PORTVERSION=	6.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Negotiate/pkg-plist b/www/p5-HTTP-Negotiate/pkg-plist
index 5d4d1e7ebd8d..f3475ca6a276 100644
--- a/www/p5-HTTP-Negotiate/pkg-plist
+++ b/www/p5-HTTP-Negotiate/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Negotiate.3.gz
 %%SITE_PERL%%/HTTP/Negotiate.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Negotiate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Negotiate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Parser-XS/Makefile b/www/p5-HTTP-Parser-XS/Makefile
index e287baec58a0..f0cb0b89cb7c 100644
--- a/www/p5-HTTP-Parser-XS/Makefile
+++ b/www/p5-HTTP-Parser-XS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Parser-XS
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Parser-XS/pkg-plist b/www/p5-HTTP-Parser-XS/pkg-plist
index 6be8681c05c8..4a96f0cbc5fc 100644
--- a/www/p5-HTTP-Parser-XS/pkg-plist
+++ b/www/p5-HTTP-Parser-XS/pkg-plist
@@ -1,11 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/HTTP/Parser/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTTP/Parser/XS/PP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Parser/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Parser/XS/XS.so
+%%SITE_ARCH%%/HTTP/Parser/XS.pm
+%%SITE_ARCH%%/HTTP/Parser/XS/PP.pm
+%%SITE_ARCH%%/auto/HTTP/Parser/XS/XS.so
 %%PERL5_MAN3%%/HTTP::Parser::XS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTTP/Parser/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Parser/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Parser/Makefile b/www/p5-HTTP-Parser/Makefile
index 923fdfb94260..c39972b33b8f 100644
--- a/www/p5-HTTP-Parser/Makefile
+++ b/www/p5-HTTP-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Parser
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Parser/pkg-plist b/www/p5-HTTP-Parser/pkg-plist
index 2695522db881..4af98035f257 100644
--- a/www/p5-HTTP-Parser/pkg-plist
+++ b/www/p5-HTTP-Parser/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Parser/.packlist
 %%SITE_PERL%%/HTTP/Parser.pm
 %%PERL5_MAN3%%/HTTP::Parser.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Proxy/Makefile b/www/p5-HTTP-Proxy/Makefile
index 50772e0b8d56..49fac8dd5f7b 100644
--- a/www/p5-HTTP-Proxy/Makefile
+++ b/www/p5-HTTP-Proxy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Proxy
 PORTVERSION=	0.301
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Proxy/pkg-plist b/www/p5-HTTP-Proxy/pkg-plist
index bedbe329192b..3485d23be74e 100644
--- a/www/p5-HTTP-Proxy/pkg-plist
+++ b/www/p5-HTTP-Proxy/pkg-plist
@@ -34,8 +34,3 @@
 %%SITE_PERL%%/HTTP/Proxy/HeaderFilter.pm
 %%SITE_PERL%%/HTTP/Proxy/HeaderFilter/simple.pm
 %%SITE_PERL%%/HTTP/Proxy/HeaderFilter/standard.pm
-@dirrmtry %%SITE_PERL%%/HTTP/Proxy/HeaderFilter
-@dirrmtry %%SITE_PERL%%/HTTP/Proxy/Engine
-@dirrmtry %%SITE_PERL%%/HTTP/Proxy/BodyFilter
-@dirrmtry %%SITE_PERL%%/HTTP/Proxy
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Recorder/Makefile b/www/p5-HTTP-Recorder/Makefile
index 093302d34b58..1f8fc6f1b711 100644
--- a/www/p5-HTTP-Recorder/Makefile
+++ b/www/p5-HTTP-Recorder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Recorder
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Recorder/pkg-plist b/www/p5-HTTP-Recorder/pkg-plist
index 4f14e66f4491..210907319a3d 100644
--- a/www/p5-HTTP-Recorder/pkg-plist
+++ b/www/p5-HTTP-Recorder/pkg-plist
@@ -2,9 +2,4 @@ bin/httprecorder
 %%PERL5_MAN3%%/HTTP::Recorder.3.gz
 %%SITE_PERL%%/HTTP/Recorder.pm
 %%SITE_PERL%%/HTTP/Recorder/Logger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Recorder/.packlist
 man/man1/httprecorder.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Recorder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Recorder
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Request-AsCGI/Makefile b/www/p5-HTTP-Request-AsCGI/Makefile
index 60222de67bf7..6e3a17625034 100644
--- a/www/p5-HTTP-Request-AsCGI/Makefile
+++ b/www/p5-HTTP-Request-AsCGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Request-AsCGI
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Request-AsCGI/pkg-plist b/www/p5-HTTP-Request-AsCGI/pkg-plist
index 6f702567b4b4..cece657a5f4b 100644
--- a/www/p5-HTTP-Request-AsCGI/pkg-plist
+++ b/www/p5-HTTP-Request-AsCGI/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/HTTP/Request/AsCGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI/.packlist
 %%PERL5_MAN3%%/HTTP::Request::AsCGI.3.gz
-@dirrmtry %%SITE_PERL%%/HTTP/Request
-@dirrmtry %%SITE_PERL%%/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Request-Params/Makefile b/www/p5-HTTP-Request-Params/Makefile
index 0f066ccaa8dc..b2ee9ba3508b 100644
--- a/www/p5-HTTP-Request-Params/Makefile
+++ b/www/p5-HTTP-Request-Params/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTTP-Request-Params
 PORTVERSION=	1.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Request-Params/pkg-plist b/www/p5-HTTP-Request-Params/pkg-plist
index 3588ce68316d..3d185ca58f72 100644
--- a/www/p5-HTTP-Request-Params/pkg-plist
+++ b/www/p5-HTTP-Request-Params/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Request::Params.3.gz
 %%SITE_PERL%%/HTTP/Request/Params.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/Params/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/Params
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Request
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Response-Encoding/Makefile b/www/p5-HTTP-Response-Encoding/Makefile
index 8b3952cf3e1a..575ef9494e0f 100644
--- a/www/p5-HTTP-Response-Encoding/Makefile
+++ b/www/p5-HTTP-Response-Encoding/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTTP-Response-Encoding
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	HTTP
diff --git a/www/p5-HTTP-Response-Encoding/pkg-plist b/www/p5-HTTP-Response-Encoding/pkg-plist
index ba215fedbee6..81a8aa42ac58 100644
--- a/www/p5-HTTP-Response-Encoding/pkg-plist
+++ b/www/p5-HTTP-Response-Encoding/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Response::Encoding.3.gz
 %%SITE_PERL%%/HTTP/Response/Encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Response/Encoding/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Response/Encoding
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Response
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Response
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Router/Makefile b/www/p5-HTTP-Router/Makefile
index 6338f54b74fc..03e8209a9733 100644
--- a/www/p5-HTTP-Router/Makefile
+++ b/www/p5-HTTP-Router/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	HTTP-Router
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Router/pkg-plist b/www/p5-HTTP-Router/pkg-plist
index a0082d91fcf8..1d51e4c46f93 100644
--- a/www/p5-HTTP-Router/pkg-plist
+++ b/www/p5-HTTP-Router/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/HTTP/Router/Match.pm
 %%SITE_PERL%%/HTTP/Router.pm
 %%SITE_PERL%%/Test/HTTP/Router.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Router/.packlist
 %%PERL5_MAN3%%/HTTP::README.3.gz
 %%PERL5_MAN3%%/HTTP::Router.3.gz
 %%PERL5_MAN3%%/HTTP::Router::Debug.3.gz
@@ -13,9 +12,3 @@
 %%PERL5_MAN3%%/HTTP::Router::Match.3.gz
 %%PERL5_MAN3%%/HTTP::Router::Route.3.gz
 %%PERL5_MAN3%%/Test::HTTP::Router.3.gz
-@dirrm %%SITE_PERL%%/HTTP/Router
-@dirrmtry %%SITE_PERL%%/Test/HTTP
-@dirrmtry %%SITE_PERL%%/Test
-@dirrmtry %%SITE_PERL%%/HTTP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Router
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Server-Simple-Authen/Makefile b/www/p5-HTTP-Server-Simple-Authen/Makefile
index ad7284e73229..ef2c03a2b492 100644
--- a/www/p5-HTTP-Server-Simple-Authen/Makefile
+++ b/www/p5-HTTP-Server-Simple-Authen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Server-Simple-Authen
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Server-Simple-Authen/pkg-plist b/www/p5-HTTP-Server-Simple-Authen/pkg-plist
index 381965df82a5..b0c7323344d0 100644
--- a/www/p5-HTTP-Server-Simple-Authen/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Authen/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/HTTP/Server/Simple/Authen.pm
 %%SITE_PERL%%/HTTP/Server/Simple/server.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Authen/.packlist
 %%PERL5_MAN3%%/HTTP::Server::Simple::Authen.3.gz
diff --git a/www/p5-HTTP-Server-Simple-Mason/Makefile b/www/p5-HTTP-Server-Simple-Mason/Makefile
index fae0e1728157..967d0b4d5cd5 100644
--- a/www/p5-HTTP-Server-Simple-Mason/Makefile
+++ b/www/p5-HTTP-Server-Simple-Mason/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Server-Simple-Mason
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Server-Simple-Mason/pkg-plist b/www/p5-HTTP-Server-Simple-Mason/pkg-plist
index 2f81869b695b..3ea3515fcfc3 100644
--- a/www/p5-HTTP-Server-Simple-Mason/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Mason/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/HTTP/Server/Simple/Mason.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Mason/.packlist
 %%PERL5_MAN3%%/HTTP::Server::Simple::Mason.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Mason
-@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/HTTP/Server
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple-PSGI/Makefile b/www/p5-HTTP-Server-Simple-PSGI/Makefile
index 8e71ad37898a..a907a8ccf046 100644
--- a/www/p5-HTTP-Server-Simple-PSGI/Makefile
+++ b/www/p5-HTTP-Server-Simple-PSGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Server-Simple-PSGI
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Server-Simple-PSGI/pkg-plist b/www/p5-HTTP-Server-Simple-PSGI/pkg-plist
index 508e445df8d9..4c26e8120baa 100644
--- a/www/p5-HTTP-Server-Simple-PSGI/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-PSGI/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/HTTP/Server/Simple/PSGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/PSGI/.packlist
 %%PERL5_MAN3%%/HTTP::Server::Simple::PSGI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/PSGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/HTTP/Server
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple-Recorder/Makefile b/www/p5-HTTP-Server-Simple-Recorder/Makefile
index c33fdf095610..acb87622d84a 100644
--- a/www/p5-HTTP-Server-Simple-Recorder/Makefile
+++ b/www/p5-HTTP-Server-Simple-Recorder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Server-Simple-Recorder
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Server-Simple-Recorder/pkg-plist b/www/p5-HTTP-Server-Simple-Recorder/pkg-plist
index 0d60725a391d..1213e76136d5 100644
--- a/www/p5-HTTP-Server-Simple-Recorder/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Recorder/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/HTTP/Server/Simple/Recorder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder/.packlist
 %%PERL5_MAN3%%/HTTP::Server::Simple::Recorder.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server
-@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Server
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple-Static/Makefile b/www/p5-HTTP-Server-Simple-Static/Makefile
index 785d62d09f7b..3eaa13ed2a16 100644
--- a/www/p5-HTTP-Server-Simple-Static/Makefile
+++ b/www/p5-HTTP-Server-Simple-Static/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Server-Simple-Static
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	HTTP
diff --git a/www/p5-HTTP-Server-Simple-Static/pkg-plist b/www/p5-HTTP-Server-Simple-Static/pkg-plist
index 524842309bc2..9d6afd61fef5 100644
--- a/www/p5-HTTP-Server-Simple-Static/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Static/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/HTTP/Server/Simple/Static.pm
 %%PERL5_MAN3%%/HTTP::Server::Simple::Static.3.gz
-@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/HTTP/Server
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple/Makefile b/www/p5-HTTP-Server-Simple/Makefile
index 7927fef8eaae..2de80877cda0 100644
--- a/www/p5-HTTP-Server-Simple/Makefile
+++ b/www/p5-HTTP-Server-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Server-Simple
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Server-Simple/pkg-plist b/www/p5-HTTP-Server-Simple/pkg-plist
index e61bb6d867bc..32fa226e3717 100644
--- a/www/p5-HTTP-Server-Simple/pkg-plist
+++ b/www/p5-HTTP-Server-Simple/pkg-plist
@@ -1,14 +1,6 @@
 %%SITE_PERL%%/HTTP/Server/Simple.pm
 %%SITE_PERL%%/HTTP/Server/Simple/CGI.pm
 %%SITE_PERL%%/HTTP/Server/Simple/CGI/Environment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/.packlist
 %%PERL5_MAN3%%/HTTP::Server::Simple.3.gz
 %%PERL5_MAN3%%/HTTP::Server::Simple::CGI.3.gz
 %%PERL5_MAN3%%/HTTP::Server::Simple::CGI::Environment.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple/CGI
-@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/HTTP/Server
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Session-State-MobileAgentID/Makefile b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
index 98fe5ab59a0a..f3459107974c 100644
--- a/www/p5-HTTP-Session-State-MobileAgentID/Makefile
+++ b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Session-State-MobileAgentID
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/www/p5-HTTP-Session-State-MobileAgentID/pkg-plist b/www/p5-HTTP-Session-State-MobileAgentID/pkg-plist
index 8ac850f84379..9e939a6a1f52 100644
--- a/www/p5-HTTP-Session-State-MobileAgentID/pkg-plist
+++ b/www/p5-HTTP-Session-State-MobileAgentID/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Session/State/MobileAgentID/.packlist
 %%SITE_PERL%%/HTTP/Session/State/MobileAgentID.pm
 %%PERL5_MAN3%%/HTTP::Session::State::MobileAgentID.3.gz
-@dirrmtry %%SITE_PERL%%/HTTP/Session/State
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Session/State/MobileAgentID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Session/State
diff --git a/www/p5-HTTP-Session-Store-DBI/Makefile b/www/p5-HTTP-Session-Store-DBI/Makefile
index 4bd6eeb0b2c4..9a0c8eab48ae 100644
--- a/www/p5-HTTP-Session-Store-DBI/Makefile
+++ b/www/p5-HTTP-Session-Store-DBI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Session-Store-DBI
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Session-Store-DBI/pkg-plist b/www/p5-HTTP-Session-Store-DBI/pkg-plist
index 86a5d2d78d64..3df5115b9ff8 100644
--- a/www/p5-HTTP-Session-Store-DBI/pkg-plist
+++ b/www/p5-HTTP-Session-Store-DBI/pkg-plist
@@ -1,10 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Session/Store/DBI/.packlist
 %%SITE_PERL%%/HTTP/Session/Store/DBI.pm
 %%PERL5_MAN3%%/HTTP::Session::Store::DBI.3.gz
-@dirrmtry %%SITE_PERL%%/HTTP/Session/Store
-@dirrmtry %%SITE_PERL%%/HTTP/Session
-@dirrmtry %%SITE_PERL%%/HTTP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Session/Store/DBI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Session/Store
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Session/Makefile b/www/p5-HTTP-Session/Makefile
index a1c08a65e73e..2fe5d18b3380 100644
--- a/www/p5-HTTP-Session/Makefile
+++ b/www/p5-HTTP-Session/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Session
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/www/p5-HTTP-Session/pkg-plist b/www/p5-HTTP-Session/pkg-plist
index 076df81a3864..5c3458e90082 100644
--- a/www/p5-HTTP-Session/pkg-plist
+++ b/www/p5-HTTP-Session/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_ARCH%%/auto/HTTP/Session/.packlist
 %%SITE_PERL%%/HTTP/Session.pm
 %%SITE_PERL%%/HTTP/Session/ID/MD5.pm
 %%SITE_PERL%%/HTTP/Session/ID/SHA1.pm
diff --git a/www/p5-HTTP-Session2/Makefile b/www/p5-HTTP-Session2/Makefile
index e52290ae5845..25d0affc4d48 100644
--- a/www/p5-HTTP-Session2/Makefile
+++ b/www/p5-HTTP-Session2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTP-Session2
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-SimpleLinkChecker/Makefile b/www/p5-HTTP-SimpleLinkChecker/Makefile
index b09dde8cfa96..959df3b71121 100644
--- a/www/p5-HTTP-SimpleLinkChecker/Makefile
+++ b/www/p5-HTTP-SimpleLinkChecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-SimpleLinkChecker
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-SimpleLinkChecker/pkg-plist b/www/p5-HTTP-SimpleLinkChecker/pkg-plist
index 8b8e05778eb1..6b2218c5030a 100644
--- a/www/p5-HTTP-SimpleLinkChecker/pkg-plist
+++ b/www/p5-HTTP-SimpleLinkChecker/pkg-plist
@@ -1,8 +1,4 @@
 bin/http_status
 %%PERL5_MAN3%%/HTTP::SimpleLinkChecker.3.gz
 %%SITE_PERL%%/HTTP/SimpleLinkChecker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/SimpleLinkChecker/.packlist
 man/man1/http_status.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/SimpleLinkChecker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Size/Makefile b/www/p5-HTTP-Size/Makefile
index 723c50b259cb..039fa30a19f7 100644
--- a/www/p5-HTTP-Size/Makefile
+++ b/www/p5-HTTP-Size/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Size
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Size/pkg-plist b/www/p5-HTTP-Size/pkg-plist
index d4748a9436f6..56340f906990 100644
--- a/www/p5-HTTP-Size/pkg-plist
+++ b/www/p5-HTTP-Size/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/HTTP::Size.3.gz
 %%SITE_PERL%%/HTTP/Size.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Size/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Size
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Tiny-SPDY/Makefile b/www/p5-HTTP-Tiny-SPDY/Makefile
index e6052f280c91..e68a425412a4 100644
--- a/www/p5-HTTP-Tiny-SPDY/Makefile
+++ b/www/p5-HTTP-Tiny-SPDY/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Tiny-SPDY
 PORTVERSION=	0.020
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-Tiny-SPDY/pkg-plist b/www/p5-HTTP-Tiny-SPDY/pkg-plist
index 3ec191678e72..4e0ea1ccd124 100644
--- a/www/p5-HTTP-Tiny-SPDY/pkg-plist
+++ b/www/p5-HTTP-Tiny-SPDY/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/HTTP/Tiny/SPDY.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Tiny/SPDY/.packlist
 %%PERL5_MAN3%%/HTTP::Tiny::SPDY.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Tiny/SPDY
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Tiny
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
-@dirrmtry %%SITE_PERL%%/HTTP/Tiny
-@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Tiny/Makefile b/www/p5-HTTP-Tiny/Makefile
index 0f0349d18e82..3a0e6bc3d1ba 100644
--- a/www/p5-HTTP-Tiny/Makefile
+++ b/www/p5-HTTP-Tiny/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTP-Tiny
 PORTVERSION=	0.051
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/www/p5-HTTP-Tiny/pkg-plist b/www/p5-HTTP-Tiny/pkg-plist
index 1b6ec83ec02c..477019d15b37 100644
--- a/www/p5-HTTP-Tiny/pkg-plist
+++ b/www/p5-HTTP-Tiny/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/HTTP/Tiny.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Tiny/.packlist
 %%PERL5_MAN3%%/HTTP::Tiny.3.gz
diff --git a/www/p5-HTTP-WebTest/Makefile b/www/p5-HTTP-WebTest/Makefile
index 3e3e5aaa6e69..22516a55f2fc 100644
--- a/www/p5-HTTP-WebTest/Makefile
+++ b/www/p5-HTTP-WebTest/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	HTTP-WebTest
 PORTVERSION=	2.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTP-WebTest/pkg-plist b/www/p5-HTTP-WebTest/pkg-plist
index 3b2fe87db269..32cdcc615778 100644
--- a/www/p5-HTTP-WebTest/pkg-plist
+++ b/www/p5-HTTP-WebTest/pkg-plist
@@ -53,11 +53,3 @@ man/man1/wt.1.gz
 %%SITE_PERL%%/HTTP/WebTest/Test.pm
 %%SITE_PERL%%/HTTP/WebTest/TestResult.pm
 %%SITE_PERL%%/HTTP/WebTest/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/WebTest/.packlist
-@dirrmtry %%SITE_PERL%%/Bundle/HTTP
-@dirrmtry %%SITE_PERL%%/Bundle
-@dirrmtry %%SITE_PERL%%/HTTP/WebTest/Plugin
-@dirrmtry %%SITE_PERL%%/HTTP/WebTest
-@dirrmtry %%SITE_PERL%%/HTTP
-@dirrmtry %%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP/WebTest
-@dirrmtry %%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTPD-Log-Filter/Makefile b/www/p5-HTTPD-Log-Filter/Makefile
index 91361a06c701..d950c24b3198 100644
--- a/www/p5-HTTPD-Log-Filter/Makefile
+++ b/www/p5-HTTPD-Log-Filter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	HTTPD-Log-Filter
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AWRIGLEY
diff --git a/www/p5-HTTPD-Log-Filter/pkg-plist b/www/p5-HTTPD-Log-Filter/pkg-plist
index 0041c55f9fde..b8ae58ac8844 100644
--- a/www/p5-HTTPD-Log-Filter/pkg-plist
+++ b/www/p5-HTTPD-Log-Filter/pkg-plist
@@ -2,9 +2,3 @@ bin/exclude_robots
 %%PERL5_MAN3%%/HTTPD::Log::Filter.3.gz
 man/man1/exclude_robots.1.gz
 %%SITE_PERL%%/HTTPD/Log/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter
-@dirrmtry %%SITE_PERL%%/HTTPD/Log
-@dirrmtry %%SITE_PERL%%/HTTPD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 7f8ab66cd418..c218ff459a34 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTTPD-User-Manage
 PORTVERSION=	1.66
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTTPD-User-Manage/pkg-plist b/www/p5-HTTPD-User-Manage/pkg-plist
index 7c422734e2e0..dc1ac0f61eb9 100644
--- a/www/p5-HTTPD-User-Manage/pkg-plist
+++ b/www/p5-HTTPD-User-Manage/pkg-plist
@@ -14,17 +14,8 @@
 %%SITE_PERL%%/HTTPD/UserAdmin/SQL.pm
 %%SITE_PERL%%/HTTPD/UserAdmin/Text.pm
 %%SITE_PERL%%/HTTPD/UserAdmin/Text/cern.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-User-Manage/.packlist
 %%PERL5_MAN3%%/HTTPD::Authen.3.gz
 %%PERL5_MAN3%%/HTTPD::GroupAdmin.3.gz
 %%PERL5_MAN3%%/HTTPD::Realm.3.gz
 %%PERL5_MAN3%%/HTTPD::RealmManager.3.gz
 %%PERL5_MAN3%%/HTTPD::UserAdmin.3.gz
-@dirrm %%SITE_PERL%%/HTTPD/UserAdmin/DBM
-@dirrm %%SITE_PERL%%/HTTPD/UserAdmin/Text
-@dirrm %%SITE_PERL%%/HTTPD/UserAdmin
-@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/Text
-@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/DBM
-@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-User-Manage
-@dirrmtry %%SITE_PERL%%/HTTPD
diff --git a/www/p5-I18N-AcceptLanguage/Makefile b/www/p5-I18N-AcceptLanguage/Makefile
index 5c2874207701..d414c044a450 100644
--- a/www/p5-I18N-AcceptLanguage/Makefile
+++ b/www/p5-I18N-AcceptLanguage/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	I18N-AcceptLanguage
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-I18N-AcceptLanguage/pkg-plist b/www/p5-I18N-AcceptLanguage/pkg-plist
index 68947cbac1d0..c942d333c5bc 100644
--- a/www/p5-I18N-AcceptLanguage/pkg-plist
+++ b/www/p5-I18N-AcceptLanguage/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/AcceptLanguage/.packlist
 %%SITE_PERL%%/I18N/AcceptLanguage.pm
 %%PERL5_MAN3%%/I18N::AcceptLanguage.3.gz
-@dirrmtry %%SITE_PERL%%/I18N
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/AcceptLanguage
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N
diff --git a/www/p5-IMDB-Film/Makefile b/www/p5-IMDB-Film/Makefile
index 8596dac806fb..3d4d8e973b79 100644
--- a/www/p5-IMDB-Film/Makefile
+++ b/www/p5-IMDB-Film/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	IMDB-Film
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STEPANOV
diff --git a/www/p5-IMDB-Film/pkg-plist b/www/p5-IMDB-Film/pkg-plist
index d6b1493ab13e..bf1331bb7ecb 100644
--- a/www/p5-IMDB-Film/pkg-plist
+++ b/www/p5-IMDB-Film/pkg-plist
@@ -4,7 +4,3 @@
 %%SITE_PERL%%/IMDB/BaseClass.pm
 %%SITE_PERL%%/IMDB/Film.pm
 %%SITE_PERL%%/IMDB/Persons.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB/Film/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB/Film
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB
-@dirrmtry %%SITE_PERL%%/IMDB
diff --git a/www/p5-Image-Delivery/Makefile b/www/p5-Image-Delivery/Makefile
index 0d3f346f7100..deb8ecc98d06 100644
--- a/www/p5-Image-Delivery/Makefile
+++ b/www/p5-Image-Delivery/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Delivery
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Image-Delivery/pkg-plist b/www/p5-Image-Delivery/pkg-plist
index 2647dc229e49..95888a3b6e2b 100644
--- a/www/p5-Image-Delivery/pkg-plist
+++ b/www/p5-Image-Delivery/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Delivery/.packlist
 %%SITE_PERL%%/Image/Delivery.pm
 %%SITE_PERL%%/Image/Delivery/Provider.pm
 %%SITE_PERL%%/Image/Delivery/Provider/IOHandle.pm
@@ -6,8 +5,3 @@
 %%SITE_PERL%%/Image/Delivery/Provider/File.pm
 %%PERL5_MAN3%%/Image::Delivery.3.gz
 %%PERL5_MAN3%%/Image::Delivery::Provider.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Delivery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
-@dirrmtry %%SITE_PERL%%/Image/Delivery/Provider
-@dirrmtry %%SITE_PERL%%/Image/Delivery
-@dirrmtry %%SITE_PERL%%/Image
diff --git a/www/p5-JE/Makefile b/www/p5-JE/Makefile
index 8376104bf5fd..b8fef6693bb3 100644
--- a/www/p5-JE/Makefile
+++ b/www/p5-JE/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	JE
 PORTVERSION=	0.066
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SPROUT
diff --git a/www/p5-JE/pkg-plist b/www/p5-JE/pkg-plist
index 818c67cfbe80..9ccea259132a 100644
--- a/www/p5-JE/pkg-plist
+++ b/www/p5-JE/pkg-plist
@@ -31,7 +31,6 @@
 %%SITE_PERL%%/JE/escape.pl
 %%SITE_PERL%%/JE/toperl.pl
 %%SITE_PERL%%/JavaScript/Engine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JE/.packlist
 %%PERL5_MAN3%%/JE::Object.3.gz
 %%PERL5_MAN3%%/JE::_FieldHash.3.gz
 %%PERL5_MAN3%%/JE::String.3.gz
diff --git a/www/p5-Jemplate/Makefile b/www/p5-Jemplate/Makefile
index 254a5bf48a5f..5499a1490ae4 100644
--- a/www/p5-Jemplate/Makefile
+++ b/www/p5-Jemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jemplate
 PORTVERSION=	0.270
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/www/p5-Jemplate/pkg-plist b/www/p5-Jemplate/pkg-plist
index 8811a2491125..6cfda59561d1 100644
--- a/www/p5-Jemplate/pkg-plist
+++ b/www/p5-Jemplate/pkg-plist
@@ -12,7 +12,3 @@ man/man1/jemplate.1.gz
 %%SITE_PERL%%/Jemplate/Parser.pm
 %%SITE_PERL%%/Jemplate/Runtime.pm
 %%SITE_PERL%%/Jemplate/Runtime/Compact.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jemplate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jemplate
-@dirrmtry %%SITE_PERL%%/Jemplate/Runtime
-@dirrmtry %%SITE_PERL%%/Jemplate
diff --git a/www/p5-Jifty/Makefile b/www/p5-Jifty/Makefile
index 0b8882e628db..dc93fd5280b4 100644
--- a/www/p5-Jifty/Makefile
+++ b/www/p5-Jifty/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Jifty
 PORTVERSION=	1.10518
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARTAK
diff --git a/www/p5-Jifty/pkg-plist b/www/p5-Jifty/pkg-plist
index 3477aa996f30..01a80e4c6f1a 100644
--- a/www/p5-Jifty/pkg-plist
+++ b/www/p5-Jifty/pkg-plist
@@ -623,139 +623,3 @@ bin/jifty
 %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/helpers/calendar.html
 %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/index.html
 %%SITE_PERL%%/auto/share/dist/Jifty/web/transform_templates
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/helpers
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/_elements
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/__jifty/webservices
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/__jifty/error/_elements
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/__jifty/error
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/__jifty
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates/=
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/templates
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/js/yui
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/js
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui/us/tr
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui/us/my/bn
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui/us/my
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui/us
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui/tabview
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui/menu
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui/calendar
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/yui
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/silk
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/iepngfix
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/facebox
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images/css
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/images
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/css/yui/tabview
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/css/yui/menu
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/css/yui/calendar
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/css/yui
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static/css
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web/static
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/po
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/rsh
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/SinglePage/web/static/js
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/SinglePage/web/static
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/SinglePage/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/SinglePage
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/Prototypism/web/static/js/prototypism/scriptaculous
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/Prototypism/web/static/js/prototypism
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/Prototypism/web/static/js
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/Prototypism/web/static
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/Prototypism/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/Prototypism
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/OnlineDocs/web/templates
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/OnlineDocs/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/OnlineDocs
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/IEFixes/web/static/js/iefixes
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/IEFixes/web/static/js
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/IEFixes/web/static
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/IEFixes/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/IEFixes
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/I18N/web/static/js
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/I18N/web/static
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/I18N/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/I18N
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/CSSQuery/web/static/js/cssquery
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/CSSQuery/web/static/js
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/CSSQuery/web/static
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/CSSQuery/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/CSSQuery
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/action
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/_elements
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin/AdminUI
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty/Plugin
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins/Jifty
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/plugins
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty/dtd
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Jifty
-@dirrmtry %%SITE_PERL%%/auto/share/dist
-@dirrmtry %%SITE_PERL%%/auto/share
-@dirrmtry %%SITE_PERL%%/Jifty/Web/Session
-@dirrmtry %%SITE_PERL%%/Jifty/Web/Form/Field
-@dirrmtry %%SITE_PERL%%/Jifty/Web/Form
-@dirrmtry %%SITE_PERL%%/Jifty/Web
-@dirrmtry %%SITE_PERL%%/Jifty/View/Static
-@dirrmtry %%SITE_PERL%%/Jifty/View/Mason
-@dirrmtry %%SITE_PERL%%/Jifty/View/Declare
-@dirrmtry %%SITE_PERL%%/Jifty/View
-@dirrmtry %%SITE_PERL%%/Jifty/Upgrade
-@dirrmtry %%SITE_PERL%%/Jifty/TestServer
-@dirrmtry %%SITE_PERL%%/Jifty/Test/WWW
-@dirrmtry %%SITE_PERL%%/Jifty/Test
-@dirrmtry %%SITE_PERL%%/Jifty/Subs
-@dirrmtry %%SITE_PERL%%/Jifty/Script
-@dirrmtry %%SITE_PERL%%/Jifty/Request
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/ViewDeclarePage
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/User/Mixin/Model
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/User/Mixin
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/User
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/TestServerWarnings
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/SkeletonApp
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/SinglePage
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/SetupWizard/Action
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/SetupWizard
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/SQLQueries
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/RequestInspector/Model
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/RequestInspector
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/REST
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/OnlineDocs
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/LetMe
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/I18N/Action
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/I18N
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/ErrorTemplates
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Config/Action
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Config
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Authentication/Password/Notification
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Authentication/Password/Mixin/Model
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Authentication/Password/Mixin
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Authentication/Password/Action
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Authentication/Password
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/AdminUI
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/ActorMetadata/Mixin/Model
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/ActorMetadata/Mixin
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin/ActorMetadata
-@dirrmtry %%SITE_PERL%%/Jifty/Plugin
-@dirrmtry %%SITE_PERL%%/Jifty/Param
-@dirrmtry %%SITE_PERL%%/Jifty/Module
-@dirrmtry %%SITE_PERL%%/Jifty/Model
-@dirrmtry %%SITE_PERL%%/Jifty/Manual
-@dirrmtry %%SITE_PERL%%/Jifty/Logger
-@dirrmtry %%SITE_PERL%%/Jifty/Filter
-@dirrmtry %%SITE_PERL%%/Jifty/Event
-@dirrmtry %%SITE_PERL%%/Jifty/CAS/Store
-@dirrmtry %%SITE_PERL%%/Jifty/CAS
-@dirrmtry %%SITE_PERL%%/Jifty/Action/Record
-@dirrmtry %%SITE_PERL%%/Jifty/Action
-@dirrmtry %%SITE_PERL%%/Jifty
diff --git a/www/p5-LWP-Authen-Negotiate/Makefile b/www/p5-LWP-Authen-Negotiate/Makefile
index a6d006aae608..892dc9b0dd80 100644
--- a/www/p5-LWP-Authen-Negotiate/Makefile
+++ b/www/p5-LWP-Authen-Negotiate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-Authen-Negotiate
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-Authen-Negotiate/pkg-plist b/www/p5-LWP-Authen-Negotiate/pkg-plist
index e664697caea5..4ed97d1cb404 100644
--- a/www/p5-LWP-Authen-Negotiate/pkg-plist
+++ b/www/p5-LWP-Authen-Negotiate/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Negotiate/.packlist
 %%SITE_PERL%%/auto/LWP/Authen/Negotiate/autosplit.ix
 %%SITE_PERL%%/LWP/Authen/Negotiate.pm
 %%PERL5_MAN3%%/LWP::Authen::Negotiate.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Negotiate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen
-@dirrm %%SITE_PERL%%/auto/LWP/Authen/Negotiate
-@dirrmtry %%SITE_PERL%%/auto/LWP/Authen
-@dirrmtry %%SITE_PERL%%/auto/LWP
diff --git a/www/p5-LWP-Authen-OAuth/Makefile b/www/p5-LWP-Authen-OAuth/Makefile
index f2e09ea3ebc6..8897454715e1 100644
--- a/www/p5-LWP-Authen-OAuth/Makefile
+++ b/www/p5-LWP-Authen-OAuth/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	LWP-Authen-OAuth
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-Authen-OAuth/pkg-plist b/www/p5-LWP-Authen-OAuth/pkg-plist
index 1268905a9c54..099c3ed8a864 100644
--- a/www/p5-LWP-Authen-OAuth/pkg-plist
+++ b/www/p5-LWP-Authen-OAuth/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/OAuth/.packlist
 %%SITE_PERL%%/LWP/Authen/OAuth.pm
 %%PERL5_MAN3%%/LWP::Authen::OAuth.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/OAuth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen
diff --git a/www/p5-LWP-Authen-Wsse/Makefile b/www/p5-LWP-Authen-Wsse/Makefile
index 84fa4b17085f..de1ed7ba955d 100644
--- a/www/p5-LWP-Authen-Wsse/Makefile
+++ b/www/p5-LWP-Authen-Wsse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-Authen-Wsse
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-Authen-Wsse/pkg-plist b/www/p5-LWP-Authen-Wsse/pkg-plist
index 8e2d35555dc4..d40b090dbd67 100644
--- a/www/p5-LWP-Authen-Wsse/pkg-plist
+++ b/www/p5-LWP-Authen-Wsse/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/LWP::Authen::Wsse.3.gz
 %%SITE_PERL%%/LWP/Authen/Wsse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
-@dirrmtry %%SITE_PERL%%/LWP/Authen
-@dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile b/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile
index e804992e2e43..657c1a6430d3 100644
--- a/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile
+++ b/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-ConnCache-MaxKeepAliveRequests
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-ConnCache-MaxKeepAliveRequests/pkg-plist b/www/p5-LWP-ConnCache-MaxKeepAliveRequests/pkg-plist
index 1e851eea818a..8f0d995530f8 100644
--- a/www/p5-LWP-ConnCache-MaxKeepAliveRequests/pkg-plist
+++ b/www/p5-LWP-ConnCache-MaxKeepAliveRequests/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/LWP/ConnCache/MaxKeepAliveRequests.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/ConnCache/MaxKeepAliveRequests/.packlist
 %%PERL5_MAN3%%/LWP::ConnCache::MaxKeepAliveRequests.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/ConnCache/MaxKeepAliveRequests
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/ConnCache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
-@dirrm %%SITE_PERL%%/LWP/ConnCache
-@dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-LWP-MediaTypes/Makefile b/www/p5-LWP-MediaTypes/Makefile
index 7ea7296ab706..72e4f36714d8 100644
--- a/www/p5-LWP-MediaTypes/Makefile
+++ b/www/p5-LWP-MediaTypes/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-MediaTypes
 PORTVERSION=	6.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-MediaTypes/pkg-plist b/www/p5-LWP-MediaTypes/pkg-plist
index 555ef245c292..1e628521df76 100644
--- a/www/p5-LWP-MediaTypes/pkg-plist
+++ b/www/p5-LWP-MediaTypes/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/LWP::MediaTypes.3.gz
 %%SITE_PERL%%/LWP/MediaTypes.pm
 %%SITE_PERL%%/LWP/media.types
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/MediaTypes/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/MediaTypes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
-@dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-LWP-Online/Makefile b/www/p5-LWP-Online/Makefile
index 76ed4d32d822..0f7be33adefe 100644
--- a/www/p5-LWP-Online/Makefile
+++ b/www/p5-LWP-Online/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-Online
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
diff --git a/www/p5-LWP-Online/pkg-plist b/www/p5-LWP-Online/pkg-plist
index 49e99daf5322..e8f5552db444 100644
--- a/www/p5-LWP-Online/pkg-plist
+++ b/www/p5-LWP-Online/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/LWP/Online.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Online/.packlist
 %%PERL5_MAN3%%/LWP::Online.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Online
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
-@dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-LWP-Protocol-PSGI/Makefile b/www/p5-LWP-Protocol-PSGI/Makefile
index 855c73ef9c18..11a8ff6874af 100644
--- a/www/p5-LWP-Protocol-PSGI/Makefile
+++ b/www/p5-LWP-Protocol-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	LWP-Protocol-PSGI
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-Protocol-PSGI/pkg-plist b/www/p5-LWP-Protocol-PSGI/pkg-plist
index ae887c81cad6..375fcdd0a9ee 100644
--- a/www/p5-LWP-Protocol-PSGI/pkg-plist
+++ b/www/p5-LWP-Protocol-PSGI/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol/PSGI/.packlist
 %%SITE_PERL%%/LWP/Protocol/PSGI.pm
 %%PERL5_MAN3%%/LWP::Protocol::PSGI.3.gz
diff --git a/www/p5-LWP-Protocol-connect/Makefile b/www/p5-LWP-Protocol-connect/Makefile
index 9cec60a8a8e3..d6ee907b97b9 100644
--- a/www/p5-LWP-Protocol-connect/Makefile
+++ b/www/p5-LWP-Protocol-connect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-Protocol-connect
 PORTVERSION=	6.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-Protocol-connect/pkg-plist b/www/p5-LWP-Protocol-connect/pkg-plist
index 37ad103e274f..8836c89f03a2 100644
--- a/www/p5-LWP-Protocol-connect/pkg-plist
+++ b/www/p5-LWP-Protocol-connect/pkg-plist
@@ -6,11 +6,3 @@
 %%SITE_PERL%%/LWP/Protocol/https/connect.pm
 %%SITE_PERL%%/LWP/Protocol/https/connect/Socket.pm
 %%SITE_PERL%%/URI/connect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol/connect/.packlist
-@dirrmtry %%SITE_PERL%%/LWP/Protocol/connect/Socket
-@dirrmtry %%SITE_PERL%%/LWP/Protocol/connect
-@dirrmtry %%SITE_PERL%%/LWP/Protocol/http/connect
-@dirrmtry %%SITE_PERL%%/LWP/Protocol/http
-@dirrmtry %%SITE_PERL%%/LWP/Protocol/https/connect
-@dirrmtry %%SITE_PERL%%/LWP/Protocol/https
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol/connect
diff --git a/www/p5-LWP-Protocol-http10/Makefile b/www/p5-LWP-Protocol-http10/Makefile
index f79dcb3cb000..b5d35ddc9d30 100644
--- a/www/p5-LWP-Protocol-http10/Makefile
+++ b/www/p5-LWP-Protocol-http10/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-Protocol-http10
 PORTVERSION=	6.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-Protocol-http10/pkg-plist b/www/p5-LWP-Protocol-http10/pkg-plist
index 0fe26a2ed587..0807b57cf75e 100644
--- a/www/p5-LWP-Protocol-http10/pkg-plist
+++ b/www/p5-LWP-Protocol-http10/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/LWP/Protocol/http10.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol/http10/.packlist
 %%PERL5_MAN3%%/LWP::Protocol::http10.3.gz
diff --git a/www/p5-LWP-Protocol-https/Makefile b/www/p5-LWP-Protocol-https/Makefile
index 520f4f04eaec..0bd6d70d88e5 100644
--- a/www/p5-LWP-Protocol-https/Makefile
+++ b/www/p5-LWP-Protocol-https/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-Protocol-https
 PORTVERSION=	6.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-Protocol-https/pkg-plist b/www/p5-LWP-Protocol-https/pkg-plist
index 4d15010129ac..bf2413f48ddb 100644
--- a/www/p5-LWP-Protocol-https/pkg-plist
+++ b/www/p5-LWP-Protocol-https/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/LWP/Protocol/https.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol/https/.packlist
 %%PERL5_MAN3%%/LWP::Protocol::https.3.gz
diff --git a/www/p5-LWP-UserAgent-Determined/Makefile b/www/p5-LWP-UserAgent-Determined/Makefile
index f33a13d780f3..cbeb91c0afdc 100644
--- a/www/p5-LWP-UserAgent-Determined/Makefile
+++ b/www/p5-LWP-UserAgent-Determined/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-UserAgent-Determined
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ALEXMV
diff --git a/www/p5-LWP-UserAgent-Determined/pkg-plist b/www/p5-LWP-UserAgent-Determined/pkg-plist
index af4db310c380..4885e393c175 100644
--- a/www/p5-LWP-UserAgent-Determined/pkg-plist
+++ b/www/p5-LWP-UserAgent-Determined/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/LWP/UserAgent/Determined.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent/Determined/.packlist
 %%PERL5_MAN3%%/LWP::UserAgent::Determined.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent/Determined
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent
-@dirrmtry %%SITE_PERL%%/LWP/UserAgent
diff --git a/www/p5-LWP-UserAgent-POE/Makefile b/www/p5-LWP-UserAgent-POE/Makefile
index 25ff3daf8998..da9ee49a43b3 100644
--- a/www/p5-LWP-UserAgent-POE/Makefile
+++ b/www/p5-LWP-UserAgent-POE/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-UserAgent-POE
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	LWP
diff --git a/www/p5-LWP-UserAgent-POE/pkg-plist b/www/p5-LWP-UserAgent-POE/pkg-plist
index f2ce671c49f5..380720a0e03a 100644
--- a/www/p5-LWP-UserAgent-POE/pkg-plist
+++ b/www/p5-LWP-UserAgent-POE/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/LWP/UserAgent/POE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent/POE/.packlist
 %%PERL5_MAN3%%/LWP::UserAgent::POE.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
-@dirrmtry %%SITE_PERL%%/LWP/UserAgent
-@dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-LWP-UserAgent-WithCache/Makefile b/www/p5-LWP-UserAgent-WithCache/Makefile
index 7de89abcbc61..e773aa709000 100644
--- a/www/p5-LWP-UserAgent-WithCache/Makefile
+++ b/www/p5-LWP-UserAgent-WithCache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWP-UserAgent-WithCache
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWP-UserAgent-WithCache/pkg-plist b/www/p5-LWP-UserAgent-WithCache/pkg-plist
index 969e1d1febf9..31dbcdd4a178 100644
--- a/www/p5-LWP-UserAgent-WithCache/pkg-plist
+++ b/www/p5-LWP-UserAgent-WithCache/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/LWP/UserAgent/WithCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent/WithCache/.packlist
 %%PERL5_MAN3%%/LWP::UserAgent::WithCache.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent/WithCache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/UserAgent
-@dirrmtry %%SITE_PERL%%/LWP/UserAgent
diff --git a/www/p5-LWPx-ParanoidAgent/Makefile b/www/p5-LWPx-ParanoidAgent/Makefile
index 625553731c87..3be0af56c5e9 100644
--- a/www/p5-LWPx-ParanoidAgent/Makefile
+++ b/www/p5-LWPx-ParanoidAgent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWPx-ParanoidAgent
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	www security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWPx-ParanoidAgent/pkg-plist b/www/p5-LWPx-ParanoidAgent/pkg-plist
index 672bdc917d34..04d3bba2a3bb 100644
--- a/www/p5-LWPx-ParanoidAgent/pkg-plist
+++ b/www/p5-LWPx-ParanoidAgent/pkg-plist
@@ -2,8 +2,3 @@
 %%SITE_PERL%%/LWPx/ParanoidAgent.pm
 %%SITE_PERL%%/LWPx/Protocol/http_paranoid.pm
 %%SITE_PERL%%/LWPx/Protocol/https_paranoid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWPx/ParanoidAgent/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWPx/ParanoidAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWPx
-@dirrmtry %%SITE_PERL%%/LWPx/Protocol
-@dirrmtry %%SITE_PERL%%/LWPx
diff --git a/www/p5-LWPx-TimedHTTP/Makefile b/www/p5-LWPx-TimedHTTP/Makefile
index c9a853d705fc..bc6b202f940f 100644
--- a/www/p5-LWPx-TimedHTTP/Makefile
+++ b/www/p5-LWPx-TimedHTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	LWPx-TimedHTTP
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-LWPx-TimedHTTP/pkg-plist b/www/p5-LWPx-TimedHTTP/pkg-plist
index 8a24c6e93c6c..d20a93246f7e 100644
--- a/www/p5-LWPx-TimedHTTP/pkg-plist
+++ b/www/p5-LWPx-TimedHTTP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/LWPx/TimedHTTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWPx/TimedHTTP/.packlist
 %%PERL5_MAN3%%/LWPx::TimedHTTP.3.gz
diff --git a/www/p5-Markup-Perl/Makefile b/www/p5-Markup-Perl/Makefile
index 598d259fb629..ba71c253a2c3 100644
--- a/www/p5-Markup-Perl/Makefile
+++ b/www/p5-Markup-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Markup-Perl
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MMATHEWS
diff --git a/www/p5-Markup-Perl/pkg-plist b/www/p5-Markup-Perl/pkg-plist
index d7e5ae4a6b6e..d945eae83761 100644
--- a/www/p5-Markup-Perl/pkg-plist
+++ b/www/p5-Markup-Perl/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Markup::Perl.3.gz
 %%SITE_PERL%%/Markup/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Markup/Perl/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Markup/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Markup
-@dirrmtry %%SITE_PERL%%/Markup
diff --git a/www/p5-Mason/Makefile b/www/p5-Mason/Makefile
index 102a384c43db..3be4060797f6 100644
--- a/www/p5-Mason/Makefile
+++ b/www/p5-Mason/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mason
 PORTVERSION=	2.22
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JSWARTZ
diff --git a/www/p5-Mason/pkg-plist b/www/p5-Mason/pkg-plist
index ae1c7400c191..ea91e26a1416 100644
--- a/www/p5-Mason/pkg-plist
+++ b/www/p5-Mason/pkg-plist
@@ -115,23 +115,3 @@ man/man1/mason.pl.1.gz
 %%SITE_PERL%%/Mason/t/StaticSource.pm
 %%SITE_PERL%%/Mason/t/Syntax.pm
 %%SITE_PERL%%/Mason/t/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mason/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mason
-@dirrmtry %%SITE_PERL%%/Mason/t
-@dirrmtry %%SITE_PERL%%/Mason/Test/RootClass
-@dirrmtry %%SITE_PERL%%/Mason/Test/Plugins/Notify
-@dirrmtry %%SITE_PERL%%/Mason/Test/Plugins
-@dirrmtry %%SITE_PERL%%/Mason/Test/Overrides/Component
-@dirrmtry %%SITE_PERL%%/Mason/Test/Overrides
-@dirrmtry %%SITE_PERL%%/Mason/Test
-@dirrmtry %%SITE_PERL%%/Mason/PluginBundle
-@dirrmtry %%SITE_PERL%%/Mason/Plugin/TidyObjectFiles
-@dirrmtry %%SITE_PERL%%/Mason/Plugin/LvalueAttributes
-@dirrmtry %%SITE_PERL%%/Mason/Plugin/DollarDot
-@dirrmtry %%SITE_PERL%%/Mason/Plugin/Defer
-@dirrmtry %%SITE_PERL%%/Mason/Plugin
-@dirrmtry %%SITE_PERL%%/Mason/Moose
-@dirrmtry %%SITE_PERL%%/Mason/Manual
-@dirrmtry %%SITE_PERL%%/Mason/Filters
-@dirrmtry %%SITE_PERL%%/Mason/Component
-@dirrmtry %%SITE_PERL%%/Mason
diff --git a/www/p5-MasonX-Interp-WithCallbacks/Makefile b/www/p5-MasonX-Interp-WithCallbacks/Makefile
index f49ec2bafd86..93bc44071372 100644
--- a/www/p5-MasonX-Interp-WithCallbacks/Makefile
+++ b/www/p5-MasonX-Interp-WithCallbacks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MasonX-Interp-WithCallbacks
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-MasonX-Interp-WithCallbacks/pkg-plist b/www/p5-MasonX-Interp-WithCallbacks/pkg-plist
index 4db0f55e3117..929e0fb96f7b 100644
--- a/www/p5-MasonX-Interp-WithCallbacks/pkg-plist
+++ b/www/p5-MasonX-Interp-WithCallbacks/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/MasonX::Interp::WithCallbacks.3.gz
 %%SITE_PERL%%/MasonX/Interp/WithCallbacks.pm
-@dirrmtry %%SITE_PERL%%/MasonX/Interp
-@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-MasonX-Profiler/Makefile b/www/p5-MasonX-Profiler/Makefile
index 151d7e1d5498..32be7c730df8 100644
--- a/www/p5-MasonX-Profiler/Makefile
+++ b/www/p5-MasonX-Profiler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MasonX-Profiler
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-MasonX-Profiler/pkg-plist b/www/p5-MasonX-Profiler/pkg-plist
index 5d75bf1e48a2..019b52a966f4 100644
--- a/www/p5-MasonX-Profiler/pkg-plist
+++ b/www/p5-MasonX-Profiler/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/MasonX/Profiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Profiler/.packlist
 %%PERL5_MAN3%%/MasonX::Profiler.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Profiler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX
-@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-MasonX-Request-WithApacheSession/Makefile b/www/p5-MasonX-Request-WithApacheSession/Makefile
index 09e9d2405335..223a164b4d6f 100644
--- a/www/p5-MasonX-Request-WithApacheSession/Makefile
+++ b/www/p5-MasonX-Request-WithApacheSession/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MasonX-Request-WithApacheSession
 PORTVERSION=	0.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-MasonX-Request-WithApacheSession/pkg-plist b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
index b6fb059f3d41..cb5fe12c7e05 100644
--- a/www/p5-MasonX-Request-WithApacheSession/pkg-plist
+++ b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
@@ -2,5 +2,3 @@
 %%PERL5_MAN3%%/MasonX::Request::WithMultiSession.3.gz
 %%SITE_PERL%%/MasonX/Request/WithApacheSession.pm
 %%SITE_PERL%%/MasonX/Request/WithMultiSession.pm
-@dirrmtry %%SITE_PERL%%/MasonX/Request
-@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile
index 02fef4b598a6..0e4f43de1619 100644
--- a/www/p5-MasonX-WebApp/Makefile
+++ b/www/p5-MasonX-WebApp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MasonX-WebApp
 PORTVERSION=	0.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-MasonX-WebApp/pkg-plist b/www/p5-MasonX-WebApp/pkg-plist
index 8e70654c8f7b..69d6453c6730 100644
--- a/www/p5-MasonX-WebApp/pkg-plist
+++ b/www/p5-MasonX-WebApp/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/MasonX::WebApp.3.gz
 %%SITE_PERL%%/MasonX/WebApp.pm
-@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
index fb69ddf0df33..08e88d3ccefe 100644
--- a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
+++ b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Maypole-Authentication-UserSessionCookie
 PORTVERSION=	1.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SIMON
diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
index b5f375fc71a0..c2d5a904fceb 100644
--- a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
+++ b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Maypole/Authentication/UserSessionCookie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie/.packlist
 %%PERL5_MAN3%%/Maypole::Authentication::UserSessionCookie.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
-@dirrmtry %%SITE_PERL%%/Maypole/Authentication
-@dirrmtry %%SITE_PERL%%/Maypole
diff --git a/www/p5-Maypole-Component/Makefile b/www/p5-Maypole-Component/Makefile
index d53adfc16180..403f277a68b5 100644
--- a/www/p5-Maypole-Component/Makefile
+++ b/www/p5-Maypole-Component/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Maypole-Component
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SIMON
diff --git a/www/p5-Maypole-Component/pkg-plist b/www/p5-Maypole-Component/pkg-plist
index 5f47e42ac7cd..1780ef1f0f6a 100644
--- a/www/p5-Maypole-Component/pkg-plist
+++ b/www/p5-Maypole-Component/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Maypole::Component.3.gz
 %%SITE_PERL%%/Maypole/Component.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Component/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Component
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
-@dirrmtry %%SITE_PERL%%/Maypole
diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index 19b9f9885ab0..bedf13f76f30 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Maypole
 PORTVERSION=	2.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEEJAY
diff --git a/www/p5-Maypole/pkg-plist b/www/p5-Maypole/pkg-plist
index e738d92a0b83..6ad2ae69f3b8 100644
--- a/www/p5-Maypole/pkg-plist
+++ b/www/p5-Maypole/pkg-plist
@@ -48,7 +48,6 @@
 %%SITE_PERL%%/Maypole/templates/factory/search_form
 %%SITE_PERL%%/Maypole/templates/factory/title
 %%SITE_PERL%%/Maypole/templates/factory/view
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/.packlist
 %%PERL5_MAN3%%/Apache::MVC.3.gz
 %%PERL5_MAN3%%/CGI::%%AP_NAME%%.3.gz
 %%PERL5_MAN3%%/CGI::Untaint::%%AP_NAME%%.3.gz
@@ -117,15 +116,3 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/BeerDB
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
-@dirrmtry %%SITE_PERL%%/Maypole/templates/factory
-@dirrmtry %%SITE_PERL%%/Maypole/templates/beer
-@dirrmtry %%SITE_PERL%%/Maypole/templates
-@dirrmtry %%SITE_PERL%%/Maypole/View
-@dirrmtry %%SITE_PERL%%/Maypole/Model/CDBI
-@dirrmtry %%SITE_PERL%%/Maypole/Model
-@dirrmtry %%SITE_PERL%%/Maypole/Manual
-@dirrmtry %%SITE_PERL%%/Maypole/HTTPD
-@dirrmtry %%SITE_PERL%%/Maypole
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-MediaWiki-API/Makefile b/www/p5-MediaWiki-API/Makefile
index 088c3bd32f03..a2f4e943deff 100644
--- a/www/p5-MediaWiki-API/Makefile
+++ b/www/p5-MediaWiki-API/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MediaWiki-API
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-MediaWiki-API/pkg-plist b/www/p5-MediaWiki-API/pkg-plist
index 94c8d6744938..2362873d5f6c 100644
--- a/www/p5-MediaWiki-API/pkg-plist
+++ b/www/p5-MediaWiki-API/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/MediaWiki/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MediaWiki/API/.packlist
 %%PERL5_MAN3%%/MediaWiki::API.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MediaWiki/API
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MediaWiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/MediaWiki
diff --git a/www/p5-MediaWiki/Makefile b/www/p5-MediaWiki/Makefile
index b9b4396f5651..6bf236e5e4df 100644
--- a/www/p5-MediaWiki/Makefile
+++ b/www/p5-MediaWiki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MediaWiki
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SPECTRUM
diff --git a/www/p5-MediaWiki/pkg-plist b/www/p5-MediaWiki/pkg-plist
index fae5c58af37d..d677dff7b463 100644
--- a/www/p5-MediaWiki/pkg-plist
+++ b/www/p5-MediaWiki/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/MediaWiki.3.gz
 %%SITE_PERL%%/MediaWiki.pm
 %%SITE_PERL%%/MediaWiki/page.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MediaWiki/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MediaWiki
-@dirrmtry %%SITE_PERL%%/MediaWiki
diff --git a/www/p5-Mobile-UserAgent/Makefile b/www/p5-Mobile-UserAgent/Makefile
index e05aca2ed763..7e988f7d2b85 100644
--- a/www/p5-Mobile-UserAgent/Makefile
+++ b/www/p5-Mobile-UserAgent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mobile-UserAgent
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Mobile-UserAgent/pkg-plist b/www/p5-Mobile-UserAgent/pkg-plist
index 6d0679ae2b33..2bfa7c5fcf90 100644
--- a/www/p5-Mobile-UserAgent/pkg-plist
+++ b/www/p5-Mobile-UserAgent/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/Mobile/UserAgent.pm
 %%SITE_PERL%%/Mobile/UserAgentFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mobile/UserAgent/.packlist
 %%PERL5_MAN3%%/Mobile::UserAgent.3.gz
 %%PERL5_MAN3%%/Mobile::UserAgentFactory.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mobile/UserAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mobile
-@dirrmtry %%SITE_PERL%%/Mobile
diff --git a/www/p5-ModPerl-VersionUtil/Makefile b/www/p5-ModPerl-VersionUtil/Makefile
index 685617dd7f80..94d714b8428c 100644
--- a/www/p5-ModPerl-VersionUtil/Makefile
+++ b/www/p5-ModPerl-VersionUtil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ModPerl-VersionUtil
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-ModPerl-VersionUtil/pkg-plist b/www/p5-ModPerl-VersionUtil/pkg-plist
index 260bb4bbbf7b..50fe7d8247da 100644
--- a/www/p5-ModPerl-VersionUtil/pkg-plist
+++ b/www/p5-ModPerl-VersionUtil/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/ModPerl/VersionUtil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/VersionUtil/.packlist
 %%PERL5_MAN3%%/ModPerl::VersionUtil.3.gz
diff --git a/www/p5-Mojo-Server-FastCGI/Makefile b/www/p5-Mojo-Server-FastCGI/Makefile
index 949c11682aa8..d2e9ac84b69c 100644
--- a/www/p5-Mojo-Server-FastCGI/Makefile
+++ b/www/p5-Mojo-Server-FastCGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mojo-Server-FastCGI
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ARPI
diff --git a/www/p5-Mojo-Server-FastCGI/pkg-plist b/www/p5-Mojo-Server-FastCGI/pkg-plist
index e46ff3a6129e..4362f0e3541c 100644
--- a/www/p5-Mojo-Server-FastCGI/pkg-plist
+++ b/www/p5-Mojo-Server-FastCGI/pkg-plist
@@ -1,11 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojo/Server/FastCGI/.packlist
 %%SITE_PERL%%/Mojo/Server/FastCGI.pm
 %%SITE_PERL%%/Mojolicious/Command/fastcgi.pm
 %%PERL5_MAN3%%/Mojolicious::Command::fastcgi.3.gz
 %%PERL5_MAN3%%/Mojo::Server::FastCGI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojo/Server/FastCGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojo/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojo
-@dirrmtry %%SITE_PERL%%/Mojolicious/Command
-@dirrmtry %%SITE_PERL%%/Mojo/Server
-@dirrmtry %%SITE_PERL%%/Mojo
diff --git a/www/p5-MojoMojo/Makefile b/www/p5-MojoMojo/Makefile
index db4dd0ca8ba5..9f2ed8abca9f 100644
--- a/www/p5-MojoMojo/Makefile
+++ b/www/p5-MojoMojo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MojoMojo
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
diff --git a/www/p5-MojoMojo/pkg-plist b/www/p5-MojoMojo/pkg-plist
index 0ef90d56bb81..9bb99ef37eec 100644
--- a/www/p5-MojoMojo/pkg-plist
+++ b/www/p5-MojoMojo/pkg-plist
@@ -422,7 +422,6 @@ bin/mojomojo_update_db.pl
 %%SITE_PERL%%/MojoMojo/root/themes/purple-pleasure/page/wrapper.tt
 %%SITE_PERL%%/Text/SmartyPants.pm
 %%SITE_PERL%%/Text/Wikispaces2Markdown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MojoMojo/.packlist
 %%PERL5_MAN3%%/MojoMojo.3.gz
 %%PERL5_MAN3%%/MojoMojo::Controller::Admin.3.gz
 %%PERL5_MAN3%%/MojoMojo::Controller::Attachment.3.gz
@@ -519,79 +518,3 @@ man/man1/mojomojo_server.pl.1.gz
 man/man1/mojomojo_spawn_db.pl.1.gz
 man/man1/mojomojo_test.pl.1.gz
 man/man1/mojomojo_update_db.pl.1.gz
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/purple-pleasure/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst/images/global
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst/images/planet
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst/images/layout
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/purple-pleasure/js
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/grey-scale/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/pink-lady/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/nordaaker/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/madrid-pm/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/purple-pleasure
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/default/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/src
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/themes/purple-pleasure/page
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/epo/images
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/grey-scale
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/nordaaker
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/pink-lady
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/madrid-pm
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/themes/purple-pleasure
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/default
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/themes/pink-lady/page
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes/epo
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/themes/pink-lady
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/attachments
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/themes/madrid-pm
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/forms/pageadmin
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/themes/catalyst
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/mimetypes
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/rest/page
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/toolbar
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/themes
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/forms/comment
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/edithelp
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/comment
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/gallery
-@dirrmtry %%SITE_PERL%%/MojoMojo/Formatter/DocBook
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/emote
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/flash
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/json
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/forms/admin
-@dirrmtry %%SITE_PERL%%/MojoMojo/Schema/ResultSet
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/forms/user
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/admin
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/css
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/gfx
-@dirrmtry %%SITE_PERL%%/MojoMojo/resources/logo
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static/js
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/extensions
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/rest
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/user
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/page
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/mail
-@dirrmtry %%SITE_PERL%%/MojoMojo/Schema/Result
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/tag
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/themes
-@dirrmtry %%SITE_PERL%%/MojoMojo/Schema/Base
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/static
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/forms
-@dirrmtry %%SITE_PERL%%/MojoMojo/Controller
-@dirrmtry %%SITE_PERL%%/MojoMojo/resources
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MojoMojo
-@dirrmtry %%SITE_PERL%%/MojoMojo/root/base
-@dirrmtry %%SITE_PERL%%/MojoMojo/Extensions
-@dirrmtry %%SITE_PERL%%/MojoMojo/Formatter/File
-@dirrmtry %%SITE_PERL%%/MojoMojo/Formatter
-@dirrmtry %%SITE_PERL%%/MojoMojo/Schema
-@dirrmtry %%SITE_PERL%%/MojoMojo/Model
-@dirrmtry %%SITE_PERL%%/MojoMojo/View
-@dirrmtry %%SITE_PERL%%/MojoMojo/root
-@dirrmtry %%SITE_PERL%%/MojoMojo/I18N
-@dirrmtry %%SITE_PERL%%/MojoMojo
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/www/p5-Mojolicious-Plugin-Authentication/Makefile b/www/p5-Mojolicious-Plugin-Authentication/Makefile
index c03795a5e135..8581fe36c3df 100644
--- a/www/p5-Mojolicious-Plugin-Authentication/Makefile
+++ b/www/p5-Mojolicious-Plugin-Authentication/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mojolicious-Plugin-Authentication
 PORTVERSION=	1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Mojolicious-Plugin-Authentication/pkg-plist b/www/p5-Mojolicious-Plugin-Authentication/pkg-plist
index b67c5b665fea..caafed356393 100644
--- a/www/p5-Mojolicious-Plugin-Authentication/pkg-plist
+++ b/www/p5-Mojolicious-Plugin-Authentication/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Mojolicious::Plugin::Authentication.3.gz
 %%SITE_PERL%%/Mojolicious/Plugin/Authentication.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/Authentication/.packlist
diff --git a/www/p5-Mojolicious-Plugin-Database/Makefile b/www/p5-Mojolicious-Plugin-Database/Makefile
index 263c7638fb2d..e17479609797 100644
--- a/www/p5-Mojolicious-Plugin-Database/Makefile
+++ b/www/p5-Mojolicious-Plugin-Database/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mojolicious-Plugin-Database
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Mojolicious-Plugin-Database/pkg-plist b/www/p5-Mojolicious-Plugin-Database/pkg-plist
index 5f7a114f8439..deb37843ad73 100644
--- a/www/p5-Mojolicious-Plugin-Database/pkg-plist
+++ b/www/p5-Mojolicious-Plugin-Database/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Mojolicious/Plugin/Database.pm
 %%SITE_PERL%%/Mojolicious/Plugin/README.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/Database/.packlist
 %%PERL5_MAN3%%/Mojolicious::Plugin::Database.3.gz
 %%PERL5_MAN3%%/Mojolicious::Plugin::README.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/Database
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious
-@dirrmtry %%SITE_PERL%%/Mojolicious/Plugin
-@dirrmtry %%SITE_PERL%%/Mojolicious
diff --git a/www/p5-Mojolicious-Plugin-Mongodb/Makefile b/www/p5-Mojolicious-Plugin-Mongodb/Makefile
index 7896c56e21e0..87290d56c287 100644
--- a/www/p5-Mojolicious-Plugin-Mongodb/Makefile
+++ b/www/p5-Mojolicious-Plugin-Mongodb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mojolicious-Plugin-Mongodb
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Mojolicious-Plugin-Mongodb/pkg-plist b/www/p5-Mojolicious-Plugin-Mongodb/pkg-plist
index e8ae8d71d217..40f467003f73 100644
--- a/www/p5-Mojolicious-Plugin-Mongodb/pkg-plist
+++ b/www/p5-Mojolicious-Plugin-Mongodb/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Mojolicious::Plugin::Mongodb.3.gz
 %%SITE_PERL%%/Mojolicious/Plugin/Mongodb.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/Mongodb/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/Mongodb
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious
-@dirrmtry %%SITE_PERL%%/Mojolicious/Plugin
-@dirrmtry %%SITE_PERL%%/Mojolicious
diff --git a/www/p5-Mojolicious-Plugin-YamlConfig/Makefile b/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
index e3679f8a11fe..b63306815706 100644
--- a/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
+++ b/www/p5-Mojolicious-Plugin-YamlConfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mojolicious-Plugin-YamlConfig
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Mojolicious-Plugin-YamlConfig/pkg-plist b/www/p5-Mojolicious-Plugin-YamlConfig/pkg-plist
index 23e39423dc7b..121cb2c87263 100644
--- a/www/p5-Mojolicious-Plugin-YamlConfig/pkg-plist
+++ b/www/p5-Mojolicious-Plugin-YamlConfig/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Mojolicious/Plugin/YamlConfig.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/YamlConfig/.packlist
 %%PERL5_MAN3%%/Mojolicious::Plugin::YamlConfig.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/YamlConfig
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin
diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile
index 99b009635736..6bda38569a08 100644
--- a/www/p5-Mojolicious/Makefile
+++ b/www/p5-Mojolicious/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Mojolicious
 PORTVERSION=	5.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRI
diff --git a/www/p5-Mojolicious/pkg-plist b/www/p5-Mojolicious/pkg-plist
index 15aa6d001336..6934afd81285 100644
--- a/www/p5-Mojolicious/pkg-plist
+++ b/www/p5-Mojolicious/pkg-plist
@@ -162,7 +162,6 @@ bin/morbo
 %%SITE_PERL%%/Mojolicious/templates/not_found.html.ep
 %%SITE_PERL%%/Mojolicious/templates/perldoc.html.ep
 %%SITE_PERL%%/Test/Mojo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/.packlist
 %%SITE_PERL%%/ojo.pm
 %%PERL5_MAN3%%/Mojo.3.gz
 %%PERL5_MAN3%%/Mojo::Asset.3.gz
@@ -278,29 +277,3 @@ bin/morbo
 man/man1/hypnotoad.1.gz
 man/man1/mojo.1.gz
 man/man1/morbo.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious
-@dirrmtry %%SITE_PERL%%/Test
-@dirrm %%SITE_PERL%%/Mojolicious/templates
-@dirrm %%SITE_PERL%%/Mojolicious/public/mojo/prettify
-@dirrm %%SITE_PERL%%/Mojolicious/public/mojo/jquery
-@dirrm %%SITE_PERL%%/Mojolicious/public/mojo
-@dirrm %%SITE_PERL%%/Mojolicious/public
-@dirrm %%SITE_PERL%%/Mojolicious/Validator
-@dirrm %%SITE_PERL%%/Mojolicious/Routes
-@dirrmtry %%SITE_PERL%%/Mojolicious/Plugin
-@dirrm %%SITE_PERL%%/Mojolicious/Guides
-@dirrm %%SITE_PERL%%/Mojolicious/Command/generate
-@dirrm %%SITE_PERL%%/Mojolicious/Command
-@dirrmtry %%SITE_PERL%%/Mojolicious
-@dirrm %%SITE_PERL%%/Mojo/UserAgent
-@dirrm %%SITE_PERL%%/Mojo/Transaction
-@dirrm %%SITE_PERL%%/Mojo/Server
-@dirrm %%SITE_PERL%%/Mojo/Reactor
-@dirrm %%SITE_PERL%%/Mojo/Message
-@dirrm %%SITE_PERL%%/Mojo/JSON
-@dirrm %%SITE_PERL%%/Mojo/IOLoop
-@dirrm %%SITE_PERL%%/Mojo/DOM
-@dirrm %%SITE_PERL%%/Mojo/Cookie
-@dirrm %%SITE_PERL%%/Mojo/Content
-@dirrm %%SITE_PERL%%/Mojo/Asset
-@dirrm %%SITE_PERL%%/Mojo
diff --git a/www/p5-Monoceros/Makefile b/www/p5-Monoceros/Makefile
index 4c79f6d22c99..9170bb6e2c61 100644
--- a/www/p5-Monoceros/Makefile
+++ b/www/p5-Monoceros/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Monoceros
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZEBURO
diff --git a/www/p5-Mozilla-CA/Makefile b/www/p5-Mozilla-CA/Makefile
index d7b728de712b..d55cafef9eba 100644
--- a/www/p5-Mozilla-CA/Makefile
+++ b/www/p5-Mozilla-CA/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Mozilla-CA
 PORTVERSION=	20130114
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Mozilla-CA/pkg-plist b/www/p5-Mozilla-CA/pkg-plist
index d291f8cc77d8..147e9a36921e 100644
--- a/www/p5-Mozilla-CA/pkg-plist
+++ b/www/p5-Mozilla-CA/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/CA/.packlist
 %%SITE_PERL%%/Mozilla/CA.pm
 %%SITE_PERL%%/Mozilla/CA/cacert.pem
 %%SITE_PERL%%/Mozilla/mk-ca-bundle.pl
 %%PERL5_MAN3%%/Mozilla::CA.3.gz
-@dirrm %%SITE_PERL%%/Mozilla/CA
-@dirrmtry %%SITE_PERL%%/Mozilla
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/CA
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla
diff --git a/www/p5-Net-Akismet/Makefile b/www/p5-Net-Akismet/Makefile
index 27c0eb2368c5..87a9371b90e1 100644
--- a/www/p5-Net-Akismet/Makefile
+++ b/www/p5-Net-Akismet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Akismet
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-Akismet/pkg-plist b/www/p5-Net-Akismet/pkg-plist
index 4c0beaef7895..041eb217f6e0 100644
--- a/www/p5-Net-Akismet/pkg-plist
+++ b/www/p5-Net-Akismet/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Net::Akismet.3.gz
 %%SITE_PERL%%/Net/Akismet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Akismet/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Akismet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Net-Amazon-AWIS/Makefile b/www/p5-Net-Amazon-AWIS/Makefile
index dbafd680b5b7..5bec739dc798 100644
--- a/www/p5-Net-Amazon-AWIS/Makefile
+++ b/www/p5-Net-Amazon-AWIS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Amazon-AWIS
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-Amazon-AWIS/pkg-plist b/www/p5-Net-Amazon-AWIS/pkg-plist
index e4062098510f..c66bd2ac89a5 100644
--- a/www/p5-Net-Amazon-AWIS/pkg-plist
+++ b/www/p5-Net-Amazon-AWIS/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/Amazon/AWIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/AWIS/.packlist
 %%PERL5_MAN3%%/Net::Amazon::AWIS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/AWIS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Amazon
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Net-Async-FastCGI/Makefile b/www/p5-Net-Async-FastCGI/Makefile
index f8d690b020d4..e06053cbcfd4 100644
--- a/www/p5-Net-Async-FastCGI/Makefile
+++ b/www/p5-Net-Async-FastCGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Async-FastCGI
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-Async-FastCGI/pkg-plist b/www/p5-Net-Async-FastCGI/pkg-plist
index 79a43c5d5ee3..d5ac90a12139 100644
--- a/www/p5-Net-Async-FastCGI/pkg-plist
+++ b/www/p5-Net-Async-FastCGI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async/FastCGI/.packlist
 %%SITE_PERL%%/Net/Async/FastCGI.pm
 %%SITE_PERL%%/Net/Async/FastCGI/PSGI.pm
 %%SITE_PERL%%/Net/Async/FastCGI/Protocol.pm
@@ -9,13 +8,3 @@
 %%PERL5_MAN3%%/Net::Async::FastCGI::PSGI.3.gz
 %%PERL5_MAN3%%/Net::Async::FastCGI::Request.3.gz
 %%PERL5_MAN3%%/Plack::Handler::Net::Async::FastCGI.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Handler/Net/Async
-@dirrmtry %%SITE_PERL%%/Plack/Handler/Net
-@dirrmtry %%SITE_PERL%%/Plack/Handler
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrmtry %%SITE_PERL%%/Net/Async/FastCGI
-@dirrmtry %%SITE_PERL%%/Net/Async
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async/FastCGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/www/p5-Net-FastCGI/Makefile b/www/p5-Net-FastCGI/Makefile
index c93bc4453320..81845f4cde24 100644
--- a/www/p5-Net-FastCGI/Makefile
+++ b/www/p5-Net-FastCGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-FastCGI
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHANSEN
diff --git a/www/p5-Net-FastCGI/pkg-plist b/www/p5-Net-FastCGI/pkg-plist
index 209ade6a9090..733e8d52ae5b 100644
--- a/www/p5-Net-FastCGI/pkg-plist
+++ b/www/p5-Net-FastCGI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FastCGI/.packlist
 %%SITE_PERL%%/Net/FastCGI.pm
 %%SITE_PERL%%/Net/FastCGI.pod
 %%SITE_PERL%%/Net/FastCGI/Constant.pm
@@ -12,8 +11,3 @@
 %%PERL5_MAN3%%/Net::FastCGI::Constant.3.gz
 %%PERL5_MAN3%%/Net::FastCGI::IO.3.gz
 %%PERL5_MAN3%%/Net::FastCGI::Protocol.3.gz
-@dirrmtry %%SITE_PERL%%/Net/FastCGI/Protocol
-@dirrmtry %%SITE_PERL%%/Net/FastCGI
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FastCGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/www/p5-Net-FireEagle/Makefile b/www/p5-Net-FireEagle/Makefile
index 867a33b389c1..463cd1e836ff 100644
--- a/www/p5-Net-FireEagle/Makefile
+++ b/www/p5-Net-FireEagle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-FireEagle
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-FireEagle/pkg-plist b/www/p5-Net-FireEagle/pkg-plist
index 6967c22a3964..5cb6c0031abb 100644
--- a/www/p5-Net-FireEagle/pkg-plist
+++ b/www/p5-Net-FireEagle/pkg-plist
@@ -2,5 +2,3 @@ bin/fireeagle
 %%PERL5_MAN3%%/Net::FireEagle.3.gz
 man/man1/fireeagle.1.gz
 %%SITE_PERL%%/Net/FireEagle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FireEagle/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FireEagle
diff --git a/www/p5-Net-Flickr-API/Makefile b/www/p5-Net-Flickr-API/Makefile
index 2c81f3c2920f..7e115b17d006 100644
--- a/www/p5-Net-Flickr-API/Makefile
+++ b/www/p5-Net-Flickr-API/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-Flickr-API
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-Net-Flickr-API/pkg-plist b/www/p5-Net-Flickr-API/pkg-plist
index 15f223f328dc..92306f8333a9 100644
--- a/www/p5-Net-Flickr-API/pkg-plist
+++ b/www/p5-Net-Flickr-API/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Net::Flickr::API.3.gz
 %%SITE_PERL%%/Net/Flickr/API.pm
-@dirrmtry %%SITE_PERL%%/Net/Flickr
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Net-Flickr-Backup/Makefile b/www/p5-Net-Flickr-Backup/Makefile
index 0a7df39b6086..6ef9ab2368dc 100644
--- a/www/p5-Net-Flickr-Backup/Makefile
+++ b/www/p5-Net-Flickr-Backup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Flickr-Backup
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-Flickr-Backup/pkg-plist b/www/p5-Net-Flickr-Backup/pkg-plist
index bd7a63736f96..77a02d7f452b 100644
--- a/www/p5-Net-Flickr-Backup/pkg-plist
+++ b/www/p5-Net-Flickr-Backup/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/Flickr/Backup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flickr/Backup/.packlist
 %%PERL5_MAN3%%/Net::Flickr::Backup.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flickr/Backup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flickr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Flickr
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Net-Flickr-RDF/Makefile b/www/p5-Net-Flickr-RDF/Makefile
index 425212a7e14c..a4d6b4768399 100644
--- a/www/p5-Net-Flickr-RDF/Makefile
+++ b/www/p5-Net-Flickr-RDF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Flickr-RDF
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-Flickr-RDF/pkg-plist b/www/p5-Net-Flickr-RDF/pkg-plist
index 7be686872630..e8f6bc7491fe 100644
--- a/www/p5-Net-Flickr-RDF/pkg-plist
+++ b/www/p5-Net-Flickr-RDF/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Net/Flickr/RDF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flickr/RDF/.packlist
 %%PERL5_MAN3%%/Net::Flickr::RDF.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flickr/RDF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Flickr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Flickr
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Net-FreshBooks-API/Makefile b/www/p5-Net-FreshBooks-API/Makefile
index 1b8f04344506..c07017445e06 100644
--- a/www/p5-Net-FreshBooks-API/Makefile
+++ b/www/p5-Net-FreshBooks-API/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-FreshBooks-API
 PORTVERSION=	0.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-FreshBooks-API/pkg-plist b/www/p5-Net-FreshBooks-API/pkg-plist
index 3d3f86663578..59ba0fd7c283 100644
--- a/www/p5-Net-FreshBooks-API/pkg-plist
+++ b/www/p5-Net-FreshBooks-API/pkg-plist
@@ -42,11 +42,3 @@
 %%SITE_PERL%%/Net/FreshBooks/API/Role/Iterator.pm
 %%SITE_PERL%%/Net/FreshBooks/API/Role/LineItem.pm
 %%SITE_PERL%%/Net/FreshBooks/API/Role/SendBy.pm
-@dirrmtry %%SITE_PERL%%/Net/FreshBooks/API/Role
-@dirrmtry %%SITE_PERL%%/Net/FreshBooks/API/Recurring/AutoBill/Card
-@dirrmtry %%SITE_PERL%%/Net/FreshBooks/API/Recurring/AutoBill
-@dirrmtry %%SITE_PERL%%/Net/FreshBooks/API/Recurring
-@dirrmtry %%SITE_PERL%%/Net/FreshBooks/API/Client
-@dirrmtry %%SITE_PERL%%/Net/FreshBooks/API
-@dirrmtry %%SITE_PERL%%/Net/FreshBooks
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Net-GeoPlanet/Makefile b/www/p5-Net-GeoPlanet/Makefile
index 6dfed0db2594..06ecc199271e 100644
--- a/www/p5-Net-GeoPlanet/Makefile
+++ b/www/p5-Net-GeoPlanet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-GeoPlanet
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-GeoPlanet/pkg-plist b/www/p5-Net-GeoPlanet/pkg-plist
index 43966a3ffbe7..64d28f93dc0e 100644
--- a/www/p5-Net-GeoPlanet/pkg-plist
+++ b/www/p5-Net-GeoPlanet/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Net/GeoPlanet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/GeoPlanet/.packlist
 %%PERL5_MAN3%%/Net::GeoPlanet.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/GeoPlanet
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/www/p5-Net-Plurk/Makefile b/www/p5-Net-Plurk/Makefile
index 4c058af9c1ec..277a538fda58 100644
--- a/www/p5-Net-Plurk/Makefile
+++ b/www/p5-Net-Plurk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Plurk
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLSUNG
diff --git a/www/p5-Net-Plurk/pkg-plist b/www/p5-Net-Plurk/pkg-plist
index 752e3bf06aa4..cfc69a92f3fd 100644
--- a/www/p5-Net-Plurk/pkg-plist
+++ b/www/p5-Net-Plurk/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/Net/Plurk/Plurk.pm
 %%SITE_PERL%%/Net/Plurk/User.pm
 %%SITE_PERL%%/Net/Plurk/UserProfile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Plurk/.packlist
 %%PERL5_MAN3%%/Net::Plurk.3.gz
 %%PERL5_MAN3%%/Net::Plurk::OAuth.3.gz
 %%PERL5_MAN3%%/Net::Plurk::Plurk.3.gz
diff --git a/www/p5-Net-STF-Client/Makefile b/www/p5-Net-STF-Client/Makefile
index 412b62541dc9..157607430835 100644
--- a/www/p5-Net-STF-Client/Makefile
+++ b/www/p5-Net-STF-Client/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-STF-Client
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-STF-Client/pkg-plist b/www/p5-Net-STF-Client/pkg-plist
index 5090adbc5371..c1e531e471a2 100644
--- a/www/p5-Net-STF-Client/pkg-plist
+++ b/www/p5-Net-STF-Client/pkg-plist
@@ -1,10 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/STF/Client/.packlist
 %%SITE_PERL%%/Net/STF/Bucket.pm
 %%SITE_PERL%%/Net/STF/Client.pm
 %%SITE_PERL%%/Net/STF/Object.pm
 %%PERL5_MAN3%%/Net::STF::Bucket.3.gz
 %%PERL5_MAN3%%/Net::STF::Client.3.gz
 %%PERL5_MAN3%%/Net::STF::Object.3.gz
-@dirrmtry %%SITE_PERL%%/Net/STF
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/STF/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/STF
diff --git a/www/p5-Net-Trac/Makefile b/www/p5-Net-Trac/Makefile
index a12e43e31762..fd9d55c0677f 100644
--- a/www/p5-Net-Trac/Makefile
+++ b/www/p5-Net-Trac/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Trac
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/www/p5-Net-Trac/pkg-plist b/www/p5-Net-Trac/pkg-plist
index a914c1bf4c35..f843af5c78bb 100644
--- a/www/p5-Net-Trac/pkg-plist
+++ b/www/p5-Net-Trac/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Trac/.packlist
 %%SITE_PERL%%/Net/Trac.pm
 %%SITE_PERL%%/Net/Trac/Connection.pm
 %%SITE_PERL%%/Net/Trac/Mechanize.pm
@@ -17,7 +16,3 @@
 %%PERL5_MAN3%%/Net::Trac::TicketHistoryEntry.3.gz
 %%PERL5_MAN3%%/Net::Trac::TicketPropChange.3.gz
 %%PERL5_MAN3%%/Net::Trac::TicketSearch.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Trac
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Trac
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Net-YAP/Makefile b/www/p5-Net-YAP/Makefile
index ba9323b5c0f6..37414f25a3ec 100644
--- a/www/p5-Net-YAP/Makefile
+++ b/www/p5-Net-YAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-YAP
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-YAP/pkg-plist b/www/p5-Net-YAP/pkg-plist
index b1e71dd3eab0..403315e96c75 100644
--- a/www/p5-Net-YAP/pkg-plist
+++ b/www/p5-Net-YAP/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Net/YAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/YAP/.packlist
 %%PERL5_MAN3%%/Net::YAP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/YAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/www/p5-Net-eBay/Makefile b/www/p5-Net-eBay/Makefile
index 7db18508e5ec..a9a990cecee5 100644
--- a/www/p5-Net-eBay/Makefile
+++ b/www/p5-Net-eBay/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-eBay
 PORTVERSION=	0.61
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Net-eBay/pkg-plist b/www/p5-Net-eBay/pkg-plist
index 84434a3cde54..ae0e677744a9 100644
--- a/www/p5-Net-eBay/pkg-plist
+++ b/www/p5-Net-eBay/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/eBay.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/eBay/.packlist
 %%PERL5_MAN3%%/Net::eBay.3.gz
diff --git a/www/p5-Newsletter/Makefile b/www/p5-Newsletter/Makefile
index 8f3e616462ed..df13f3cbaa82 100644
--- a/www/p5-Newsletter/Makefile
+++ b/www/p5-Newsletter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Newsletter
 PORTVERSION=	0.03.3
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KALELE
diff --git a/www/p5-Newsletter/pkg-plist b/www/p5-Newsletter/pkg-plist
index e3f94722cee0..a13ff01fa1bd 100644
--- a/www/p5-Newsletter/pkg-plist
+++ b/www/p5-Newsletter/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Newsletter/.packlist
 %%SITE_PERL%%/Newsletter.pm
 %%SITE_PERL%%/Newsletter/Html.pm
 %%SITE_PERL%%/Newsletter/Html/Templ.pm
@@ -9,6 +8,3 @@
 %%PERL5_MAN3%%/Newsletter::Html::CSS.3.gz
 %%PERL5_MAN3%%/Newsletter::Html::Upload.3.gz
 %%PERL5_MAN3%%/Newsletter.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Newsletter
-@dirrmtry %%SITE_PERL%%/Newsletter/Html
-@dirrmtry %%SITE_PERL%%/Newsletter
diff --git a/www/p5-Nginx-ReadBody/Makefile b/www/p5-Nginx-ReadBody/Makefile
index 83f020014051..b7e7cd34ce94 100644
--- a/www/p5-Nginx-ReadBody/Makefile
+++ b/www/p5-Nginx-ReadBody/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nginx-ReadBody
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TPABA/Nginx
diff --git a/www/p5-Nginx-ReadBody/pkg-plist b/www/p5-Nginx-ReadBody/pkg-plist
index 26252a32b08d..8ff1cd38be32 100644
--- a/www/p5-Nginx-ReadBody/pkg-plist
+++ b/www/p5-Nginx-ReadBody/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/Nginx::ReadBody::Russian.3.gz
 %%SITE_PERL%%/Nginx/ReadBody.pm
 %%SITE_PERL%%/Nginx/ReadBody/Russian.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nginx/ReadBody/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nginx/ReadBody
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nginx
-@dirrmtry %%SITE_PERL%%/Nginx/ReadBody
-@dirrmtry %%SITE_PERL%%/Nginx
diff --git a/www/p5-Nginx-Simple/Makefile b/www/p5-Nginx-Simple/Makefile
index f82f9e00240c..6940b6a151c6 100644
--- a/www/p5-Nginx-Simple/Makefile
+++ b/www/p5-Nginx-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Nginx-Simple
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Nginx-Simple/pkg-plist b/www/p5-Nginx-Simple/pkg-plist
index 000ab624cb81..12066fc89f4c 100644
--- a/www/p5-Nginx-Simple/pkg-plist
+++ b/www/p5-Nginx-Simple/pkg-plist
@@ -1,5 +1,4 @@
 bin/ngs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nginx/Simple/.packlist
 %%SITE_PERL%%/Nginx/Simple.pm
 %%SITE_PERL%%/Nginx/Simple/Dispatch.pm
 %%SITE_PERL%%/Nginx/Simple/Ajax.pm
@@ -12,8 +11,3 @@ bin/ngs
 %%PERL5_MAN3%%/Nginx::Simple.3.gz
 %%PERL5_MAN3%%/Nginx::Simple::Dispatcher::Attributes.3.gz
 %%PERL5_MAN3%%/Nginx::Simple::Dispatcher.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nginx/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nginx
-@dirrmtry %%SITE_PERL%%/Nginx/Simple/Dispatcher
-@dirrmtry %%SITE_PERL%%/Nginx/Simple
-@dirrmtry %%SITE_PERL%%/Nginx
diff --git a/www/p5-PHP-Session/Makefile b/www/p5-PHP-Session/Makefile
index 27fe5b54e96c..81907cd45659 100644
--- a/www/p5-PHP-Session/Makefile
+++ b/www/p5-PHP-Session/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PHP-Session
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-PHP-Session/pkg-plist b/www/p5-PHP-Session/pkg-plist
index c35f0cdb2d87..24facd5cc366 100644
--- a/www/p5-PHP-Session/pkg-plist
+++ b/www/p5-PHP-Session/pkg-plist
@@ -2,9 +2,3 @@
 %%PERL5_MAN3%%/PHP::Session::Serializer::PHP.3.gz
 %%SITE_PERL%%/PHP/Session.pm
 %%SITE_PERL%%/PHP/Session/Serializer/PHP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Session/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP
-@dirrmtry %%SITE_PERL%%/PHP/Session/Serializer
-@dirrmtry %%SITE_PERL%%/PHP/Session
-@dirrmtry %%SITE_PERL%%/PHP
diff --git a/www/p5-POE-Component-Client-HTTP/Makefile b/www/p5-POE-Component-Client-HTTP/Makefile
index d50435924f7d..03bc7719ec0a 100644
--- a/www/p5-POE-Component-Client-HTTP/Makefile
+++ b/www/p5-POE-Component-Client-HTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-HTTP
 PORTVERSION=	0.9480
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RCAPUTO
diff --git a/www/p5-POE-Component-Client-HTTP/pkg-plist b/www/p5-POE-Component-Client-HTTP/pkg-plist
index 29f1a5fb66c4..3605350a5953 100644
--- a/www/p5-POE-Component-Client-HTTP/pkg-plist
+++ b/www/p5-POE-Component-Client-HTTP/pkg-plist
@@ -8,13 +8,3 @@
 %%SITE_PERL%%/POE/Component/Client/HTTP/RequestFactory.pm
 %%SITE_PERL%%/POE/Filter/HTTPChunk.pm
 %%SITE_PERL%%/POE/Filter/HTTPHead.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE/Component/Client/HTTP
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Client-UserAgent/Makefile b/www/p5-POE-Component-Client-UserAgent/Makefile
index 549f0bc0c148..a41c1fa3a4da 100644
--- a/www/p5-POE-Component-Client-UserAgent/Makefile
+++ b/www/p5-POE-Component-Client-UserAgent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-UserAgent
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RCAPUTO
diff --git a/www/p5-POE-Component-Client-UserAgent/pkg-plist b/www/p5-POE-Component-Client-UserAgent/pkg-plist
index 266851da118d..cf7def7bb222 100644
--- a/www/p5-POE-Component-Client-UserAgent/pkg-plist
+++ b/www/p5-POE-Component-Client-UserAgent/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/POE/Component/Client/UserAgent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent/.packlist
 %%PERL5_MAN3%%/POE::Component::Client::UserAgent.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-HTTP/Makefile b/www/p5-POE-Component-Server-HTTP/Makefile
index 1b09248e8bec..459087998eae 100644
--- a/www/p5-POE-Component-Server-HTTP/Makefile
+++ b/www/p5-POE-Component-Server-HTTP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	POE-Component-Server-HTTP
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-POE-Component-Server-HTTP/pkg-plist b/www/p5-POE-Component-Server-HTTP/pkg-plist
index 273174d117ea..1743f847d778 100644
--- a/www/p5-POE-Component-Server-HTTP/pkg-plist
+++ b/www/p5-POE-Component-Server-HTTP/pkg-plist
@@ -3,12 +3,3 @@
 %%SITE_PERL%%/POE/Component/Server/HTTP/Connection.pm
 %%SITE_PERL%%/POE/Component/Server/HTTP/Request.pm
 %%SITE_PERL%%/POE/Component/Server/HTTP/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Server/HTTP
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-HTTPServer/Makefile b/www/p5-POE-Component-Server-HTTPServer/Makefile
index 968856f23204..537dd18dd335 100644
--- a/www/p5-POE-Component-Server-HTTPServer/Makefile
+++ b/www/p5-POE-Component-Server-HTTPServer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Server-HTTPServer
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-POE-Component-Server-HTTPServer/pkg-plist b/www/p5-POE-Component-Server-HTTPServer/pkg-plist
index 3030c56de0a0..ef13e5f927a1 100644
--- a/www/p5-POE-Component-Server-HTTPServer/pkg-plist
+++ b/www/p5-POE-Component-Server-HTTPServer/pkg-plist
@@ -6,7 +6,6 @@
 %%SITE_PERL%%/POE/Component/Server/HTTPServer/ParameterParseHandler.pm
 %%SITE_PERL%%/POE/Component/Server/HTTPServer/StaticHandler.pm
 %%SITE_PERL%%/POE/Component/Server/HTTPServer/TemplateHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTPServer/.packlist
 %%PERL5_MAN3%%/POE::Component::Server::HTTPServer.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::HTTPServer::BasicAuthenHandler.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::HTTPServer::Examples.3.gz
@@ -15,11 +14,3 @@
 %%PERL5_MAN3%%/POE::Component::Server::HTTPServer::ParameterParseHandler.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::HTTPServer::StaticHandler.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::HTTPServer::TemplateHandler.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTPServer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrm %%SITE_PERL%%/POE/Component/Server/HTTPServer
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-PSGI/Makefile b/www/p5-POE-Component-Server-PSGI/Makefile
index e605804f6c47..031fcc23d055 100644
--- a/www/p5-POE-Component-Server-PSGI/Makefile
+++ b/www/p5-POE-Component-Server-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POE-Component-Server-PSGI
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-POE-Component-Server-PSGI/pkg-plist b/www/p5-POE-Component-Server-PSGI/pkg-plist
index bae68b5a44f6..0c04b81d90cc 100644
--- a/www/p5-POE-Component-Server-PSGI/pkg-plist
+++ b/www/p5-POE-Component-Server-PSGI/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/PSGI/.packlist
 %%SITE_PERL%%/POE/Component/Server/PSGI.pm
 %%SITE_PERL%%/Plack/Server/POE.pm
 %%PERL5_MAN3%%/POE::Component::Server::PSGI.3.gz
 %%PERL5_MAN3%%/Plack::Server::POE.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/PSGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/Plack/Server
diff --git a/www/p5-POE-Component-Server-SOAP/Makefile b/www/p5-POE-Component-Server-SOAP/Makefile
index 13f91edd6a9c..be6075bb7619 100644
--- a/www/p5-POE-Component-Server-SOAP/Makefile
+++ b/www/p5-POE-Component-Server-SOAP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Server-SOAP
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-POE-Component-Server-SOAP/pkg-plist b/www/p5-POE-Component-Server-SOAP/pkg-plist
index 5c18a41d9011..030bd486b6fe 100644
--- a/www/p5-POE-Component-Server-SOAP/pkg-plist
+++ b/www/p5-POE-Component-Server-SOAP/pkg-plist
@@ -1,13 +1,4 @@
 %%SITE_PERL%%/POE/Component/Server/SOAP.pm
 %%SITE_PERL%%/POE/Component/Server/SOAP/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SOAP/.packlist
 %%PERL5_MAN3%%/POE::Component::Server::SOAP.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::SOAP::Response.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SOAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Server/SOAP
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/Makefile b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
index b20acb73c87e..a8555a855b8a 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/Makefile
+++ b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POE-Component-Server-SimpleHTTP
 PORTVERSION=	2.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
index 08efad01675b..336a362fa9c9 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
+++ b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
@@ -5,12 +5,3 @@
 %%SITE_PERL%%/POE/Component/Server/SimpleHTTP/Connection.pm
 %%SITE_PERL%%/POE/Component/Server/SimpleHTTP/Response.pm
 %%SITE_PERL%%/POE/Component/Server/SimpleHTTP/State.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP
-@dirrm %%SITE_PERL%%/POE/Component/Server/SimpleHTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Filter-HTTP-Parser/Makefile b/www/p5-POE-Filter-HTTP-Parser/Makefile
index 6ad94edc5134..4ae7c85de526 100644
--- a/www/p5-POE-Filter-HTTP-Parser/Makefile
+++ b/www/p5-POE-Filter-HTTP-Parser/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	POE-Filter-HTTP-Parser
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-POE-Filter-HTTP-Parser/pkg-plist b/www/p5-POE-Filter-HTTP-Parser/pkg-plist
index 2fa9facff314..13a4db2f5c79 100644
--- a/www/p5-POE-Filter-HTTP-Parser/pkg-plist
+++ b/www/p5-POE-Filter-HTTP-Parser/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/POE/Filter/HTTP/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/HTTP/Parser/.packlist
 %%PERL5_MAN3%%/POE::Filter::HTTP::Parser.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/HTTP/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter/HTTP
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POEx-Role-PSGIServer/Makefile b/www/p5-POEx-Role-PSGIServer/Makefile
index cb3d5bd6a955..bba76062e78f 100644
--- a/www/p5-POEx-Role-PSGIServer/Makefile
+++ b/www/p5-POEx-Role-PSGIServer/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	POEx-Role-PSGIServer
 PORTVERSION=	1.110670
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FRODWITH
diff --git a/www/p5-POEx-Role-PSGIServer/pkg-plist b/www/p5-POEx-Role-PSGIServer/pkg-plist
index c85e5ffdab29..7a45261dc5d2 100644
--- a/www/p5-POEx-Role-PSGIServer/pkg-plist
+++ b/www/p5-POEx-Role-PSGIServer/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Role/PSGIServer/.packlist
 %%SITE_PERL%%/POEx/Role/PSGIServer.pm
 %%SITE_PERL%%/POEx/Role/PSGIServer/ProxyWriter.pm
 %%SITE_PERL%%/POEx/Role/PSGIServer/Streamer.pm
@@ -7,7 +6,3 @@
 %%PERL5_MAN3%%/POEx::Role::PSGIServer::ProxyWriter.3.gz
 %%PERL5_MAN3%%/POEx::Role::PSGIServer::Streamer.3.gz
 %%PERL5_MAN3%%/POEx::Types::PSGIServer.3.gz
-@dirrmtry %%SITE_PERL%%/POEx/Types
-@dirrmtry %%SITE_PERL%%/POEx/Role/PSGIServer
-@dirrmtry %%SITE_PERL%%/POEx/Role
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Role/PSGIServer
diff --git a/www/p5-PSGI/Makefile b/www/p5-PSGI/Makefile
index 4c7e706d0147..1d074db72bcc 100644
--- a/www/p5-PSGI/Makefile
+++ b/www/p5-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	PSGI
 PORTVERSION=	1.102
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-PSGI/pkg-plist b/www/p5-PSGI/pkg-plist
index 633e15f0e170..688a3dbfbaa7 100644
--- a/www/p5-PSGI/pkg-plist
+++ b/www/p5-PSGI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PSGI/.packlist
 %%SITE_PERL%%/PSGI.pm
 %%SITE_PERL%%/PSGI.pod
 %%SITE_PERL%%/PSGI/Extensions.pod
@@ -6,5 +5,3 @@
 %%PERL5_MAN3%%/PSGI::Extensions.3.gz
 %%PERL5_MAN3%%/PSGI::FAQ.3.gz
 %%PERL5_MAN3%%/PSGI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PSGI
-@dirrmtry %%SITE_PERL%%/PSGI
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 7c0519e64739..045b8571a703 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ParallelUA
 PORTVERSION=	2.57
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN/LWP
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-ParallelUA/pkg-plist b/www/p5-ParallelUA/pkg-plist
index cdfaa1ad9632..8a5a9882d79a 100644
--- a/www/p5-ParallelUA/pkg-plist
+++ b/www/p5-ParallelUA/pkg-plist
@@ -9,7 +9,6 @@
 %%SITE_PERL%%/LWP/Parallel/UserAgent.pm
 %%SITE_PERL%%/LWP/ParallelUA.pm
 %%SITE_PERL%%/LWP/RobotPUA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel/.packlist
 %%PERL5_MAN3%%/Bundle::ParallelUA.3.gz
 %%PERL5_MAN3%%/LWP::Parallel.3.gz
 %%PERL5_MAN3%%/LWP::Parallel::Protocol.3.gz
diff --git a/www/p5-Parse-HTTP-UserAgent/Makefile b/www/p5-Parse-HTTP-UserAgent/Makefile
index 65ab57042613..e53058403c89 100644
--- a/www/p5-Parse-HTTP-UserAgent/Makefile
+++ b/www/p5-Parse-HTTP-UserAgent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Parse-HTTP-UserAgent
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BURAK
diff --git a/www/p5-Parse-HTTP-UserAgent/pkg-plist b/www/p5-Parse-HTTP-UserAgent/pkg-plist
index f6f2d3349ee9..a42fc4c4a5da 100644
--- a/www/p5-Parse-HTTP-UserAgent/pkg-plist
+++ b/www/p5-Parse-HTTP-UserAgent/pkg-plist
@@ -4,17 +4,9 @@
 %%SITE_PERL%%/Parse/HTTP/UserAgent/Base/IS.pm
 %%SITE_PERL%%/Parse/HTTP/UserAgent/Base/Parsers.pm
 %%SITE_PERL%%/Parse/HTTP/UserAgent/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/HTTP/UserAgent/.packlist
 %%PERL5_MAN3%%/Parse::HTTP::UserAgent.3.gz
 %%PERL5_MAN3%%/Parse::HTTP::UserAgent::Base::Accessors.3.gz
 %%PERL5_MAN3%%/Parse::HTTP::UserAgent::Base::Dumper.3.gz
 %%PERL5_MAN3%%/Parse::HTTP::UserAgent::Base::IS.3.gz
 %%PERL5_MAN3%%/Parse::HTTP::UserAgent::Base::Parsers.3.gz
 %%PERL5_MAN3%%/Parse::HTTP::UserAgent::Constants.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/HTTP/UserAgent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrm %%SITE_PERL%%/Parse/HTTP/UserAgent/Base
-@dirrm %%SITE_PERL%%/Parse/HTTP/UserAgent
-@dirrmtry %%SITE_PERL%%/Parse/HTTP
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/www/p5-Path-Class-URI/Makefile b/www/p5-Path-Class-URI/Makefile
index 8a7f134a6a79..3c5f55e3c418 100644
--- a/www/p5-Path-Class-URI/Makefile
+++ b/www/p5-Path-Class-URI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Path-Class-URI
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Path-Class-URI/pkg-plist b/www/p5-Path-Class-URI/pkg-plist
index fc2d04f19afb..a95a2505effd 100644
--- a/www/p5-Path-Class-URI/pkg-plist
+++ b/www/p5-Path-Class-URI/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Class/URI/.packlist
 %%SITE_PERL%%/Path/Class/URI.pm
 %%SITE_PERL%%/Path/Class/Unicode.pm
 %%PERL5_MAN3%%/Path::Class::URI.3.gz
 %%PERL5_MAN3%%/Path::Class::Unicode.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Class/URI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path
diff --git a/www/p5-Perlanet/Makefile b/www/p5-Perlanet/Makefile
index 35c21dc00d78..1508e1d12f49 100644
--- a/www/p5-Perlanet/Makefile
+++ b/www/p5-Perlanet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perlanet
 PORTVERSION=	0.56
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAVECROSS
diff --git a/www/p5-Perlanet/pkg-plist b/www/p5-Perlanet/pkg-plist
index 0c640d61818f..1c121db722db 100644
--- a/www/p5-Perlanet/pkg-plist
+++ b/www/p5-Perlanet/pkg-plist
@@ -22,5 +22,3 @@ bin/perlanet
 %%SITE_PERL%%/Perlanet/Trait/Tidy.pm
 %%SITE_PERL%%/Perlanet/Trait/YAMLConfig.pm
 man/man1/perlanet.1.gz
-@dirrmtry %%SITE_PERL%%/Perlanet/Trait
-@dirrmtry %%SITE_PERL%%/Perlanet
diff --git a/www/p5-Perlbal-Plugin-PSGI/Makefile b/www/p5-Perlbal-Plugin-PSGI/Makefile
index b941d097aa49..db38bddacc91 100644
--- a/www/p5-Perlbal-Plugin-PSGI/Makefile
+++ b/www/p5-Perlbal-Plugin-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Perlbal-Plugin-PSGI
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Perlbal-Plugin-PSGI/pkg-plist b/www/p5-Perlbal-Plugin-PSGI/pkg-plist
index fc6f76d82f7b..6df00c1253fe 100644
--- a/www/p5-Perlbal-Plugin-PSGI/pkg-plist
+++ b/www/p5-Perlbal-Plugin-PSGI/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perlbal/Plugin/PSGI/.packlist
 %%SITE_PERL%%/Perlbal/Plugin/PSGI.pm
 %%PERL5_MAN3%%/Perlbal::Plugin::PSGI.3.gz
-@dirrmtry %%SITE_PERL%%/Perlbal/Plugin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perlbal/Plugin/PSGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perlbal/Plugin
diff --git a/www/p5-Plack-App-Proxy/Makefile b/www/p5-Plack-App-Proxy/Makefile
index 9b03314f113a..ae0610566387 100644
--- a/www/p5-Plack-App-Proxy/Makefile
+++ b/www/p5-Plack-App-Proxy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-App-Proxy
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LEEDO
diff --git a/www/p5-Plack-App-Proxy/pkg-plist b/www/p5-Plack-App-Proxy/pkg-plist
index d9cd80caa11a..1dfbb33ce470 100644
--- a/www/p5-Plack-App-Proxy/pkg-plist
+++ b/www/p5-Plack-App-Proxy/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/App/Proxy/.packlist
 %%SITE_PERL%%/Plack/App/Proxy.pm
 %%SITE_PERL%%/Plack/App/Proxy/Backend.pm
 %%SITE_PERL%%/Plack/App/Proxy/Backend/AnyEvent/HTTP.pm
@@ -17,9 +16,3 @@
 %%PERL5_MAN3%%/Plack::Middleware::Proxy::Connect.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Proxy::LoadBalancer.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Proxy::RewriteLocation.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Middleware/Proxy
-@dirrm %%SITE_PERL%%/Plack/App/Proxy/Backend/AnyEvent
-@dirrm %%SITE_PERL%%/Plack/App/Proxy/Backend
-@dirrm %%SITE_PERL%%/Plack/App/Proxy
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/App/Proxy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/App
diff --git a/www/p5-Plack-Builder-Conditionals/Makefile b/www/p5-Plack-Builder-Conditionals/Makefile
index d3d611db376e..ed6e22157407 100644
--- a/www/p5-Plack-Builder-Conditionals/Makefile
+++ b/www/p5-Plack-Builder-Conditionals/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Builder-Conditionals
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Builder-Conditionals/pkg-plist b/www/p5-Plack-Builder-Conditionals/pkg-plist
index 323def491537..415c6e4084db 100644
--- a/www/p5-Plack-Builder-Conditionals/pkg-plist
+++ b/www/p5-Plack-Builder-Conditionals/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Plack::Builder::Conditionals.3.gz
 %%SITE_PERL%%/Plack/Builder/Conditionals.pm
-@dirrmtry %%SITE_PERL%%/Plack/Builder
diff --git a/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile b/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
index 2892a6e7b9f7..30021e8b02de 100644
--- a/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Handler-AnyEvent-HTTPD
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Handler-AnyEvent-HTTPD/pkg-plist b/www/p5-Plack-Handler-AnyEvent-HTTPD/pkg-plist
index 6f9e39961d78..11e4dafbc0ba 100644
--- a/www/p5-Plack-Handler-AnyEvent-HTTPD/pkg-plist
+++ b/www/p5-Plack-Handler-AnyEvent-HTTPD/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/AnyEvent/HTTPD/.packlist
 %%SITE_PERL%%/Plack/Handler/AnyEvent/HTTPD.pm
 %%PERL5_MAN3%%/Plack::Handler::AnyEvent::HTTPD.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Handler/AnyEvent
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/AnyEvent/HTTPD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/AnyEvent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler
diff --git a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
index 77d2fa031024..abaf2e54b07f 100644
--- a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Handler-AnyEvent-ReverseHTTP
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/pkg-plist b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/pkg-plist
index 633d0a953cb6..9b571a8cff2b 100644
--- a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/pkg-plist
+++ b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/AnyEvent/ReverseHTTP/.packlist
 %%SITE_PERL%%/Plack/Handler/AnyEvent/ReverseHTTP.pm
 %%SITE_PERL%%/Plack/Server/ReverseHTTP.pm
 %%PERL5_MAN3%%/Plack::Handler::AnyEvent::ReverseHTTP.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Handler/AnyEvent
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/AnyEvent/ReverseHTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/AnyEvent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler
-@dirrmtry %%SITE_PERL%%/Plack/Server
diff --git a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
index 3419179804c2..b48a121b62f5 100644
--- a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Handler-AnyEvent-SCGI
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Handler-AnyEvent-SCGI/pkg-plist b/www/p5-Plack-Handler-AnyEvent-SCGI/pkg-plist
index 505bad13854a..ed4cb666a3e2 100644
--- a/www/p5-Plack-Handler-AnyEvent-SCGI/pkg-plist
+++ b/www/p5-Plack-Handler-AnyEvent-SCGI/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/AnyEvent/SCGI/.packlist
 %%SITE_PERL%%/Plack/Handler/AnyEvent/SCGI.pm
 %%PERL5_MAN3%%/Plack::Handler::AnyEvent::SCGI.3.gz
diff --git a/www/p5-Plack-Handler-CLI/Makefile b/www/p5-Plack-Handler-CLI/Makefile
index 2a0d9b3211c0..10d94f331534 100644
--- a/www/p5-Plack-Handler-CLI/Makefile
+++ b/www/p5-Plack-Handler-CLI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Handler-CLI
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Handler-SCGI/Makefile b/www/p5-Plack-Handler-SCGI/Makefile
index 6b9df63b4a47..2532178f81e6 100644
--- a/www/p5-Plack-Handler-SCGI/Makefile
+++ b/www/p5-Plack-Handler-SCGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Handler-SCGI
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Handler-SCGI/pkg-plist b/www/p5-Plack-Handler-SCGI/pkg-plist
index f2a5bf5c4594..e064cd36bf6d 100644
--- a/www/p5-Plack-Handler-SCGI/pkg-plist
+++ b/www/p5-Plack-Handler-SCGI/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/SCGI/.packlist
 %%SITE_PERL%%/Plack/Handler/SCGI.pm
 %%PERL5_MAN3%%/Plack::Handler::SCGI.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler/SCGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Handler
diff --git a/www/p5-Plack-Middleware-AMF/Makefile b/www/p5-Plack-Middleware-AMF/Makefile
index f6a4ba7740ad..de62f64d371e 100644
--- a/www/p5-Plack-Middleware-AMF/Makefile
+++ b/www/p5-Plack-Middleware-AMF/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-AMF
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-AMF/pkg-plist b/www/p5-Plack-Middleware-AMF/pkg-plist
index e335a1cf485e..a3be7806ad99 100644
--- a/www/p5-Plack-Middleware-AMF/pkg-plist
+++ b/www/p5-Plack-Middleware-AMF/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/AMF/.packlist
 %%SITE_PERL%%/Plack/Middleware/AMF.pm
 %%PERL5_MAN3%%/Plack::Middleware::AMF.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/AMF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-AddDefaultCharset/Makefile b/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
index 25ee69605b14..4afce628d9a7 100644
--- a/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
+++ b/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-AddDefaultCharset
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-AddDefaultCharset/pkg-plist b/www/p5-Plack-Middleware-AddDefaultCharset/pkg-plist
index c92101c07d89..bd8f1d3d84b8 100644
--- a/www/p5-Plack-Middleware-AddDefaultCharset/pkg-plist
+++ b/www/p5-Plack-Middleware-AddDefaultCharset/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/AddDefaultCharset/.packlist
 %%SITE_PERL%%/Plack/Middleware/AddDefaultCharset.pm
 %%PERL5_MAN3%%/Plack::Middleware::AddDefaultCharset.3.gz
-@comment @dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/AddDefaultCharset
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-Auth-Digest/Makefile b/www/p5-Plack-Middleware-Auth-Digest/Makefile
index 895b86d15dcc..cc7d826e694c 100644
--- a/www/p5-Plack-Middleware-Auth-Digest/Makefile
+++ b/www/p5-Plack-Middleware-Auth-Digest/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Auth-Digest
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Auth-Digest/pkg-plist b/www/p5-Plack-Middleware-Auth-Digest/pkg-plist
index 0b56bf0f8a17..971735b80d58 100644
--- a/www/p5-Plack-Middleware-Auth-Digest/pkg-plist
+++ b/www/p5-Plack-Middleware-Auth-Digest/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Auth/Digest/.packlist
 %%SITE_PERL%%/Plack/Middleware/Auth/Digest.pm
 %%PERL5_MAN3%%/Plack::Middleware::Auth::Digest.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Middleware/Auth
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Auth/Digest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Auth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-AutoRefresh/Makefile b/www/p5-Plack-Middleware-AutoRefresh/Makefile
index eefd4f83cd8f..760eb9e87ccc 100644
--- a/www/p5-Plack-Middleware-AutoRefresh/Makefile
+++ b/www/p5-Plack-Middleware-AutoRefresh/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-AutoRefresh
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-AutoRefresh/pkg-plist b/www/p5-Plack-Middleware-AutoRefresh/pkg-plist
index fadff127492e..03548b9be485 100644
--- a/www/p5-Plack-Middleware-AutoRefresh/pkg-plist
+++ b/www/p5-Plack-Middleware-AutoRefresh/pkg-plist
@@ -2,5 +2,3 @@
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-AutoRefresh/js/plackAutoRefresh.js
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-AutoRefresh/js/plackAutoRefresh.min.js
 %%PERL5_MAN3%%/Plack::Middleware::AutoRefresh.3.gz
-@dirrm %%SITE_PERL%%/auto/share/dist/Plack-Middleware-AutoRefresh/js
-@dirrm %%SITE_PERL%%/auto/share/dist/Plack-Middleware-AutoRefresh
diff --git a/www/p5-Plack-Middleware-ConsoleLogger/Makefile b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
index 43410979e950..11a1925a6d0c 100644
--- a/www/p5-Plack-Middleware-ConsoleLogger/Makefile
+++ b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-ConsoleLogger
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-ConsoleLogger/pkg-plist b/www/p5-Plack-Middleware-ConsoleLogger/pkg-plist
index 0b1e4eedc9da..6a2fcce4bbd7 100644
--- a/www/p5-Plack-Middleware-ConsoleLogger/pkg-plist
+++ b/www/p5-Plack-Middleware-ConsoleLogger/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/ConsoleLogger/.packlist
 %%SITE_PERL%%/Plack/Middleware/ConsoleLogger.pm
 %%PERL5_MAN3%%/Plack::Middleware::ConsoleLogger.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/ConsoleLogger
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-Debug/Makefile b/www/p5-Plack-Middleware-Debug/Makefile
index d340c8a2ab21..4fbba3617e73 100644
--- a/www/p5-Plack-Middleware-Debug/Makefile
+++ b/www/p5-Plack-Middleware-Debug/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Debug
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Plack-Middleware-Debug/pkg-plist b/www/p5-Plack-Middleware-Debug/pkg-plist
index d0357c675900..ca05bb21ac95 100644
--- a/www/p5-Plack-Middleware-Debug/pkg-plist
+++ b/www/p5-Plack-Middleware-Debug/pkg-plist
@@ -12,7 +12,6 @@
 %%PERL5_MAN3%%/Plack::Middleware::Debug::Session.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Debug::Timer.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Debug::TrackObjects.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Debug/.packlist
 %%SITE_PERL%%/Plack/Middleware/Debug.pm
 %%SITE_PERL%%/Plack/Middleware/Debug/Base.pm
 %%SITE_PERL%%/Plack/Middleware/Debug/CatalystLog.pm
@@ -40,9 +39,3 @@
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-Debug/debug_toolbar/toolbar.js
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-Debug/debug_toolbar/toolbar.min.css
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-Debug/debug_toolbar/toolbar.min.js
-@dirrm %%SITE_PERL%%/auto/share/dist/Plack-Middleware-Debug/debug_toolbar
-@dirrm %%SITE_PERL%%/auto/share/dist/Plack-Middleware-Debug
-@dirrmtry %%SITE_PERL%%/auto/share/dist
-@dirrm %%SITE_PERL%%/Plack/Middleware/Debug
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Debug
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-Deflater/Makefile b/www/p5-Plack-Middleware-Deflater/Makefile
index 11ee1555ffc3..cd0b09bb6e55 100644
--- a/www/p5-Plack-Middleware-Deflater/Makefile
+++ b/www/p5-Plack-Middleware-Deflater/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Deflater
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZEBURO
diff --git a/www/p5-Plack-Middleware-Deflater/pkg-plist b/www/p5-Plack-Middleware-Deflater/pkg-plist
index 5266c7836d57..fd30cc1955da 100644
--- a/www/p5-Plack-Middleware-Deflater/pkg-plist
+++ b/www/p5-Plack-Middleware-Deflater/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Plack::Middleware::Deflater.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Deflater/.packlist
 %%SITE_PERL%%/Plack/Middleware/Deflater.pm
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Deflater
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
diff --git a/www/p5-Plack-Middleware-Expires/Makefile b/www/p5-Plack-Middleware-Expires/Makefile
index 03a00db86daf..4d922e40b9aa 100644
--- a/www/p5-Plack-Middleware-Expires/Makefile
+++ b/www/p5-Plack-Middleware-Expires/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Middleware-Expires
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Expires/pkg-plist b/www/p5-Plack-Middleware-Expires/pkg-plist
index dd2bad6a1811..3e60faa92fbd 100644
--- a/www/p5-Plack-Middleware-Expires/pkg-plist
+++ b/www/p5-Plack-Middleware-Expires/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Plack/Middleware/Expires.pm
 %%PERL5_MAN3%%/Plack::Middleware::Expires.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/Plack
diff --git a/www/p5-Plack-Middleware-File-Sass/Makefile b/www/p5-Plack-Middleware-File-Sass/Makefile
index 69352ea464f5..d2d34d17cddd 100644
--- a/www/p5-Plack-Middleware-File-Sass/Makefile
+++ b/www/p5-Plack-Middleware-File-Sass/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-File-Sass
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-File-Sass/pkg-plist b/www/p5-Plack-Middleware-File-Sass/pkg-plist
index 5d3220c2a72f..8e19dfad364c 100644
--- a/www/p5-Plack-Middleware-File-Sass/pkg-plist
+++ b/www/p5-Plack-Middleware-File-Sass/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/File/Sass/.packlist
 %%SITE_PERL%%/Plack/Middleware/File/Sass.pm
 %%PERL5_MAN3%%/Plack::Middleware::File::Sass.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Middleware/File
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/File/Sass
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
index 28c996212feb..096cae108d68 100644
--- a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
+++ b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Middleware-FixMissingBodyInRedirect
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/pkg-plist b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/pkg-plist
index 403cea453815..99cdaf6d3c86 100644
--- a/www/p5-Plack-Middleware-FixMissingBodyInRedirect/pkg-plist
+++ b/www/p5-Plack-Middleware-FixMissingBodyInRedirect/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Plack/Middleware/FixMissingBodyInRedirect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/FixMissingBodyInRedirect/.packlist
 %%PERL5_MAN3%%/Plack::Middleware::FixMissingBodyInRedirect.3.gz
diff --git a/www/p5-Plack-Middleware-ForceEnv/Makefile b/www/p5-Plack-Middleware-ForceEnv/Makefile
index 50f475ec214d..a34150fd00c8 100644
--- a/www/p5-Plack-Middleware-ForceEnv/Makefile
+++ b/www/p5-Plack-Middleware-ForceEnv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Middleware-ForceEnv
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-ForceEnv/pkg-plist b/www/p5-Plack-Middleware-ForceEnv/pkg-plist
index 4be16776bdbb..49af8926a38d 100644
--- a/www/p5-Plack-Middleware-ForceEnv/pkg-plist
+++ b/www/p5-Plack-Middleware-ForceEnv/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Plack/Middleware/ForceEnv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/ForceEnv/.packlist
 %%PERL5_MAN3%%/Plack::Middleware::ForceEnv.3.gz
diff --git a/www/p5-Plack-Middleware-Header/Makefile b/www/p5-Plack-Middleware-Header/Makefile
index 685db4301af2..8e8a2b4eeb6c 100644
--- a/www/p5-Plack-Middleware-Header/Makefile
+++ b/www/p5-Plack-Middleware-Header/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Header
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Header/pkg-plist b/www/p5-Plack-Middleware-Header/pkg-plist
index fe7f6decc130..6b0d59ffe5e2 100644
--- a/www/p5-Plack-Middleware-Header/pkg-plist
+++ b/www/p5-Plack-Middleware-Header/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Header/.packlist
 %%SITE_PERL%%/Plack/Middleware/Header.pm
 %%PERL5_MAN3%%/Plack::Middleware::Header.3.gz
-@comment @dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Header
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-IEnosniff/Makefile b/www/p5-Plack-Middleware-IEnosniff/Makefile
index b42cba38fc55..775a9b53c33a 100644
--- a/www/p5-Plack-Middleware-IEnosniff/Makefile
+++ b/www/p5-Plack-Middleware-IEnosniff/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-IEnosniff
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BAYASHI
diff --git a/www/p5-Plack-Middleware-IEnosniff/pkg-plist b/www/p5-Plack-Middleware-IEnosniff/pkg-plist
index 88044fc3d89d..1efbf80e50f9 100644
--- a/www/p5-Plack-Middleware-IEnosniff/pkg-plist
+++ b/www/p5-Plack-Middleware-IEnosniff/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/IEnosniff/.packlist
 %%SITE_PERL%%/Plack/Middleware/IEnosniff.pm
 %%PERL5_MAN3%%/Plack::Middleware::IEnosniff.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/IEnosniff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-InteractiveDebugger/Makefile b/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
index d81fa1c56f84..fc440b122813 100644
--- a/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
+++ b/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-InteractiveDebugger
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-InteractiveDebugger/pkg-plist b/www/p5-Plack-Middleware-InteractiveDebugger/pkg-plist
index c243321e1e69..6733e990da4c 100644
--- a/www/p5-Plack-Middleware-InteractiveDebugger/pkg-plist
+++ b/www/p5-Plack-Middleware-InteractiveDebugger/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/InteractiveDebugger/.packlist
 %%SITE_PERL%%/Plack/Middleware/InteractiveDebugger.pm
 %%SITE_PERL%%/Plack/Middleware/InteractiveDebugger/HTML.pm
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-InteractiveDebugger/console.png
@@ -10,8 +9,3 @@
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-InteractiveDebugger/source.png
 %%SITE_PERL%%/auto/share/dist/Plack-Middleware-InteractiveDebugger/style.css
 %%PERL5_MAN3%%/Plack::Middleware::InteractiveDebugger.3.gz
-@dirrm %%SITE_PERL%%/auto/share/dist/Plack-Middleware-InteractiveDebugger
-@dirrm %%SITE_PERL%%/Plack/Middleware/InteractiveDebugger
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/InteractiveDebugger
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-JSConcat/Makefile b/www/p5-Plack-Middleware-JSConcat/Makefile
index 114e1819ee62..c9733af19aaa 100644
--- a/www/p5-Plack-Middleware-JSConcat/Makefile
+++ b/www/p5-Plack-Middleware-JSConcat/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-JSConcat
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-JSConcat/pkg-plist b/www/p5-Plack-Middleware-JSConcat/pkg-plist
index b9b45f43d580..ff0bfd87d93f 100644
--- a/www/p5-Plack-Middleware-JSConcat/pkg-plist
+++ b/www/p5-Plack-Middleware-JSConcat/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/JSConcat/.packlist
 %%SITE_PERL%%/Plack/Middleware/JSConcat.pm
 %%PERL5_MAN3%%/Plack::Middleware::JSConcat.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/JSConcat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
diff --git a/www/p5-Plack-Middleware-MemoryUsage/Makefile b/www/p5-Plack-Middleware-MemoryUsage/Makefile
index 4729da0e8022..ce0021bb1943 100644
--- a/www/p5-Plack-Middleware-MemoryUsage/Makefile
+++ b/www/p5-Plack-Middleware-MemoryUsage/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-MemoryUsage
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-MemoryUsage/pkg-plist b/www/p5-Plack-Middleware-MemoryUsage/pkg-plist
index dc9b42a4019c..e5a208bdd817 100644
--- a/www/p5-Plack-Middleware-MemoryUsage/pkg-plist
+++ b/www/p5-Plack-Middleware-MemoryUsage/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/MemoryUsage/.packlist
 %%SITE_PERL%%/Plack/Middleware/MemoryUsage.pm
 %%PERL5_MAN3%%/Plack::Middleware::MemoryUsage.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/MemoryUsage
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-MethodOverride/Makefile b/www/p5-Plack-Middleware-MethodOverride/Makefile
index 94d3e5fa0d8a..3540988af6aa 100644
--- a/www/p5-Plack-Middleware-MethodOverride/Makefile
+++ b/www/p5-Plack-Middleware-MethodOverride/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Middleware-MethodOverride
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-MethodOverride/pkg-plist b/www/p5-Plack-Middleware-MethodOverride/pkg-plist
index 85601aaf6a82..60a0164069ec 100644
--- a/www/p5-Plack-Middleware-MethodOverride/pkg-plist
+++ b/www/p5-Plack-Middleware-MethodOverride/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Plack/Middleware/MethodOverride.pm
 %%PERL5_MAN3%%/Plack::Middleware::MethodOverride.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/Plack
diff --git a/www/p5-Plack-Middleware-Precompressed/Makefile b/www/p5-Plack-Middleware-Precompressed/Makefile
index 10f9b5d742ee..ebb7a1534666 100644
--- a/www/p5-Plack-Middleware-Precompressed/Makefile
+++ b/www/p5-Plack-Middleware-Precompressed/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Precompressed
 PORTVERSION=	1.101
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ARISTOTLE
diff --git a/www/p5-Plack-Middleware-Precompressed/pkg-plist b/www/p5-Plack-Middleware-Precompressed/pkg-plist
index 115887cef822..27ee24647c14 100644
--- a/www/p5-Plack-Middleware-Precompressed/pkg-plist
+++ b/www/p5-Plack-Middleware-Precompressed/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Precompressed/.packlist
 %%SITE_PERL%%/Plack/Middleware/Precompressed.pm
 %%PERL5_MAN3%%/Plack::Middleware::Precompressed.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Precompressed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
index bcfde6ce47be..c348b16f932e 100644
--- a/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
+++ b/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Middleware-RemoveRedundantBody
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-RemoveRedundantBody/pkg-plist b/www/p5-Plack-Middleware-RemoveRedundantBody/pkg-plist
index dad060b9929d..51f8e50cde71 100644
--- a/www/p5-Plack-Middleware-RemoveRedundantBody/pkg-plist
+++ b/www/p5-Plack-Middleware-RemoveRedundantBody/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Plack/Middleware/RemoveRedundantBody.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/RemoveRedundantBody/.packlist
 %%PERL5_MAN3%%/Plack::Middleware::RemoveRedundantBody.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/RemoveRedundantBody
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/Plack
diff --git a/www/p5-Plack-Middleware-Reproxy/Makefile b/www/p5-Plack-Middleware-Reproxy/Makefile
index 52a7170b5684..e6d8b8ba59e0 100644
--- a/www/p5-Plack-Middleware-Reproxy/Makefile
+++ b/www/p5-Plack-Middleware-Reproxy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Reproxy
 PORTVERSION=	0.00004
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Reproxy/pkg-plist b/www/p5-Plack-Middleware-Reproxy/pkg-plist
index 4fc620cc3a65..15cd7135a6e4 100644
--- a/www/p5-Plack-Middleware-Reproxy/pkg-plist
+++ b/www/p5-Plack-Middleware-Reproxy/pkg-plist
@@ -1,10 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Reproxy/.packlist
 %%SITE_PERL%%/Plack/Middleware/Reproxy.pm
 %%SITE_PERL%%/Plack/Middleware/Reproxy/Callback.pm
 %%SITE_PERL%%/Plack/Middleware/Reproxy/Furl.pm
 %%PERL5_MAN3%%/Plack::Middleware::Reproxy.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Reproxy::Callback.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Reproxy::Furl.3.gz
-@dirrm %%SITE_PERL%%/Plack/Middleware/Reproxy
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Reproxy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-ReverseProxy/Makefile b/www/p5-Plack-Middleware-ReverseProxy/Makefile
index 76b7f7d99176..ba9e780cedde 100644
--- a/www/p5-Plack-Middleware-ReverseProxy/Makefile
+++ b/www/p5-Plack-Middleware-ReverseProxy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-ReverseProxy
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-ReverseProxy/pkg-plist b/www/p5-Plack-Middleware-ReverseProxy/pkg-plist
index 208bbbfbdc45..fea34705d70f 100644
--- a/www/p5-Plack-Middleware-ReverseProxy/pkg-plist
+++ b/www/p5-Plack-Middleware-ReverseProxy/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/ReverseProxy/.packlist
 %%SITE_PERL%%/Plack/Middleware/ReverseProxy.pm
 %%PERL5_MAN3%%/Plack::Middleware::ReverseProxy.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/ReverseProxy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile b/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
index 10d9c29bafde..ec9859e03d6b 100644
--- a/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
+++ b/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-ServerStatus-Lite
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Session/Makefile b/www/p5-Plack-Middleware-Session/Makefile
index 97565b79bc18..5efa667d8816 100644
--- a/www/p5-Plack-Middleware-Session/Makefile
+++ b/www/p5-Plack-Middleware-Session/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Session
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Session/pkg-plist b/www/p5-Plack-Middleware-Session/pkg-plist
index 282827608d3b..1c7f76c75087 100644
--- a/www/p5-Plack-Middleware-Session/pkg-plist
+++ b/www/p5-Plack-Middleware-Session/pkg-plist
@@ -8,7 +8,6 @@
 %%PERL5_MAN3%%/Plack::Session::Store::DBI.3.gz
 %%PERL5_MAN3%%/Plack::Session::Store::File.3.gz
 %%PERL5_MAN3%%/Plack::Session::Store::Null.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Session/.packlist
 %%SITE_PERL%%/Plack/Middleware/Session.pm
 %%SITE_PERL%%/Plack/Middleware/Session/Cookie.pm
 %%SITE_PERL%%/Plack/Session.pm
diff --git a/www/p5-Plack-Middleware-SocketIO/Makefile b/www/p5-Plack-Middleware-SocketIO/Makefile
index 9f4c0b63e40f..c479a590ae2a 100644
--- a/www/p5-Plack-Middleware-SocketIO/Makefile
+++ b/www/p5-Plack-Middleware-SocketIO/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Plack-Middleware-SocketIO
 PORTVERSION=	0.00904
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-SocketIO/pkg-plist b/www/p5-Plack-Middleware-SocketIO/pkg-plist
index 1d190f6dbe6c..4d88793f574e 100644
--- a/www/p5-Plack-Middleware-SocketIO/pkg-plist
+++ b/www/p5-Plack-Middleware-SocketIO/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/SocketIO/.packlist
 %%SITE_PERL%%/Plack/Middleware/SocketIO.pm
 %%SITE_PERL%%/Plack/Middleware/SocketIO/Base.pm
 %%SITE_PERL%%/Plack/Middleware/SocketIO/Connection.pm
@@ -19,6 +18,3 @@
 %%PERL5_MAN3%%/Plack::Middleware::SocketIO::WebSocket.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::SocketIO::XHRMultipart.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::SocketIO::XHRPolling.3.gz
-@dirrm %%SITE_PERL%%/Plack/Middleware/SocketIO
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/SocketIO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-Status/Makefile b/www/p5-Plack-Middleware-Status/Makefile
index 37bbdedaace0..e5ccc7955119 100644
--- a/www/p5-Plack-Middleware-Status/Makefile
+++ b/www/p5-Plack-Middleware-Status/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Status
 PORTVERSION=	1.101150
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Status/pkg-plist b/www/p5-Plack-Middleware-Status/pkg-plist
index 74d2fb3ac292..fec8361c2c37 100644
--- a/www/p5-Plack-Middleware-Status/pkg-plist
+++ b/www/p5-Plack-Middleware-Status/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Status/.packlist
 %%SITE_PERL%%/Plack/Middleware/Status.pm
 %%PERL5_MAN3%%/Plack::Middleware::Status.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Status
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-Test-StashWarnings/Makefile b/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
index 95e85c107212..bfcb306bbfb6 100644
--- a/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
+++ b/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Middleware-Test-StashWarnings
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Test-StashWarnings/pkg-plist b/www/p5-Plack-Middleware-Test-StashWarnings/pkg-plist
index 054334f72f65..e9042d2d8edb 100644
--- a/www/p5-Plack-Middleware-Test-StashWarnings/pkg-plist
+++ b/www/p5-Plack-Middleware-Test-StashWarnings/pkg-plist
@@ -1,11 +1,3 @@
 %%PERL5_MAN3%%/Plack::Middleware::Test::StashWarnings.3.gz
 %%SITE_PERL%%/Plack/Middleware/Test/StashWarnings.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Test/StashWarnings/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Test/StashWarnings
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Test
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
-@dirrmtry %%SITE_PERL%%/Plack/Middleware/Test
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/Plack
 
diff --git a/www/p5-Plack-Middleware-Throttle/Makefile b/www/p5-Plack-Middleware-Throttle/Makefile
index 8014c79bc15c..4babee356e9c 100644
--- a/www/p5-Plack-Middleware-Throttle/Makefile
+++ b/www/p5-Plack-Middleware-Throttle/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Middleware-Throttle
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-Throttle/pkg-plist b/www/p5-Plack-Middleware-Throttle/pkg-plist
index c4e41884f1d9..ddecbe8b3e39 100644
--- a/www/p5-Plack-Middleware-Throttle/pkg-plist
+++ b/www/p5-Plack-Middleware-Throttle/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Throttle/.packlist
 %%SITE_PERL%%/Plack/Middleware/Throttle.pm
 %%SITE_PERL%%/Plack/Middleware/Throttle/Backend/Hash.pm
 %%SITE_PERL%%/Plack/Middleware/Throttle/Daily.pm
@@ -10,8 +9,3 @@
 %%PERL5_MAN3%%/Plack::Middleware::Throttle::Hourly.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Throttle::Interval.3.gz
 %%PERL5_MAN3%%/Plack::Middleware::Throttle::Limiter.3.gz
-@dirrm %%SITE_PERL%%/Plack/Middleware/Throttle/Backend
-@dirrm %%SITE_PERL%%/Plack/Middleware/Throttle
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Throttle
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Middleware-XForwardedFor/Makefile b/www/p5-Plack-Middleware-XForwardedFor/Makefile
index 69613f6b113a..4c2a96268635 100644
--- a/www/p5-Plack-Middleware-XForwardedFor/Makefile
+++ b/www/p5-Plack-Middleware-XForwardedFor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Middleware-XForwardedFor
 PORTVERSION=	0.103060
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Middleware-XForwardedFor/pkg-plist b/www/p5-Plack-Middleware-XForwardedFor/pkg-plist
index fba3383dce9c..ced6a4ef64b5 100644
--- a/www/p5-Plack-Middleware-XForwardedFor/pkg-plist
+++ b/www/p5-Plack-Middleware-XForwardedFor/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Plack/Middleware/XForwardedFor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/XForwardedFor/.packlist
 %%PERL5_MAN3%%/Plack::Middleware::XForwardedFor.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/XForwardedFor
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
-@dirrmtry %%SITE_PERL%%/Plack/Middleware
-@dirrmtry %%SITE_PERL%%/Plack
diff --git a/www/p5-Plack-Server-Coro/Makefile b/www/p5-Plack-Server-Coro/Makefile
index 00433da7b052..cc4648339249 100644
--- a/www/p5-Plack-Server-Coro/Makefile
+++ b/www/p5-Plack-Server-Coro/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Server-Coro
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Plack-Server-Coro/pkg-plist b/www/p5-Plack-Server-Coro/pkg-plist
index f620203a14bd..1f53fc3b41be 100644
--- a/www/p5-Plack-Server-Coro/pkg-plist
+++ b/www/p5-Plack-Server-Coro/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/Coro/.packlist
 %%SITE_PERL%%/Plack/Server/Coro.pm
 %%PERL5_MAN3%%/Plack::Server::Coro.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Server
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/Coro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
diff --git a/www/p5-Plack-Server-POE/Makefile b/www/p5-Plack-Server-POE/Makefile
index d5bbadf304d1..12a6e62a8288 100644
--- a/www/p5-Plack-Server-POE/Makefile
+++ b/www/p5-Plack-Server-POE/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Server-POE
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Server-POE/pkg-plist b/www/p5-Plack-Server-POE/pkg-plist
index 0477a217a955..26637458f99b 100644
--- a/www/p5-Plack-Server-POE/pkg-plist
+++ b/www/p5-Plack-Server-POE/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/POE/.packlist
 %%SITE_PERL%%/Plack/Server/POE.pm
 %%PERL5_MAN3%%/Plack::Server::POE.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Server
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
diff --git a/www/p5-Plack-Server-ReverseHTTP/Makefile b/www/p5-Plack-Server-ReverseHTTP/Makefile
index a0f3c94c4c94..9ab288f8257e 100644
--- a/www/p5-Plack-Server-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Server-ReverseHTTP/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack-Server-ReverseHTTP
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Plack-Server-ReverseHTTP/pkg-plist b/www/p5-Plack-Server-ReverseHTTP/pkg-plist
index e8493061e469..7946f134ed08 100644
--- a/www/p5-Plack-Server-ReverseHTTP/pkg-plist
+++ b/www/p5-Plack-Server-ReverseHTTP/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/ReverseHTTP/.packlist
 %%SITE_PERL%%/Plack/Server/ReverseHTTP.pm
 %%PERL5_MAN3%%/Plack::Server::ReverseHTTP.3.gz
-@dirrmtry %%SITE_PERL%%/Plack/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/ReverseHTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server
diff --git a/www/p5-Plack-Test-ExternalServer/Makefile b/www/p5-Plack-Test-ExternalServer/Makefile
index e3ce6c60e8a3..2f5e2199ace5 100644
--- a/www/p5-Plack-Test-ExternalServer/Makefile
+++ b/www/p5-Plack-Test-ExternalServer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Plack-Test-ExternalServer
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Plack-Test-ExternalServer/pkg-plist b/www/p5-Plack-Test-ExternalServer/pkg-plist
index 562ccd140b25..79a7c3b1b902 100644
--- a/www/p5-Plack-Test-ExternalServer/pkg-plist
+++ b/www/p5-Plack-Test-ExternalServer/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Plack/Test/ExternalServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Test/ExternalServer/.packlist
 %%PERL5_MAN3%%/Plack::Test::ExternalServer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Test/ExternalServer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Test
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack
-@dirrmtry %%SITE_PERL%%/Plack/Test
-@dirrmtry %%SITE_PERL%%/Plack
diff --git a/www/p5-Plack/Makefile b/www/p5-Plack/Makefile
index 9d9277071734..d4305d1c4bea 100644
--- a/www/p5-Plack/Makefile
+++ b/www/p5-Plack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Plack
 PORTVERSION=	1.0033
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Plack/pkg-plist b/www/p5-Plack/pkg-plist
index ef2542ce0a55..59d4d1a6d1fb 100644
--- a/www/p5-Plack/pkg-plist
+++ b/www/p5-Plack/pkg-plist
@@ -69,7 +69,6 @@ man/man1/plackup.1.gz
 %%PERL5_MAN3%%/Plack::Util.3.gz
 %%PERL5_MAN3%%/Plack::Util::Accessor.3.gz
 bin/plackup
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/.packlist
 %%SITE_PERL%%/HTTP/Message/PSGI.pm
 %%SITE_PERL%%/HTTP/Server/PSGI.pm
 %%SITE_PERL%%/Plack.pm
diff --git a/www/p5-PocketIO/Makefile b/www/p5-PocketIO/Makefile
index a8f2fc4ae0f7..346adb5a04ae 100644
--- a/www/p5-PocketIO/Makefile
+++ b/www/p5-PocketIO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PocketIO
 PORTVERSION=	0.14000
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VTI
diff --git a/www/p5-PocketIO/pkg-plist b/www/p5-PocketIO/pkg-plist
index 5bdf5a56df78..a2bf3291c6f0 100644
--- a/www/p5-PocketIO/pkg-plist
+++ b/www/p5-PocketIO/pkg-plist
@@ -19,7 +19,6 @@
 %%SITE_PERL%%/PocketIO/Transport/XHRMultipart.pm
 %%SITE_PERL%%/PocketIO/Transport/XHRPolling.pm
 %%SITE_PERL%%/PocketIO/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PocketIO/.packlist
 %%PERL5_MAN3%%/PocketIO.3.gz
 %%PERL5_MAN3%%/PocketIO::Broadcast.3.gz
 %%PERL5_MAN3%%/PocketIO::Connection.3.gz
@@ -38,7 +37,3 @@
 %%PERL5_MAN3%%/PocketIO::Transport::WebSocket.3.gz
 %%PERL5_MAN3%%/PocketIO::Transport::XHRMultipart.3.gz
 %%PERL5_MAN3%%/PocketIO::Transport::XHRPolling.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PocketIO
-@dirrm %%SITE_PERL%%/PocketIO/Transport
-@dirrm %%SITE_PERL%%/PocketIO/Pool
-@dirrm %%SITE_PERL%%/PocketIO
diff --git a/www/p5-Pod-Site/Makefile b/www/p5-Pod-Site/Makefile
index 86a647227f3e..edd07bd3e456 100644
--- a/www/p5-Pod-Site/Makefile
+++ b/www/p5-Pod-Site/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Pod-Site
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DWHEELER
diff --git a/www/p5-Pod-Site/pkg-plist b/www/p5-Pod-Site/pkg-plist
index 2ceb4bfa59bb..f44548351b30 100644
--- a/www/p5-Pod-Site/pkg-plist
+++ b/www/p5-Pod-Site/pkg-plist
@@ -4,5 +4,3 @@ man/man1/podsite.1.gz
 %%SITE_PERL%%/Pod/Site.pm
 %%SITE_PERL%%/Pod/Site/podsite.css
 %%SITE_PERL%%/Pod/Site/podsite.js
-@dirrmtry %%SITE_PERL%%/Pod/Site
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile
index 5486573ae6c7..c901dee2056b 100644
--- a/www/p5-PodToHTML/Makefile
+++ b/www/p5-PodToHTML/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PodToHTML
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Pod
diff --git a/www/p5-PodToHTML/pkg-plist b/www/p5-PodToHTML/pkg-plist
index 55b206990553..87896a5b3cef 100644
--- a/www/p5-PodToHTML/pkg-plist
+++ b/www/p5-PodToHTML/pkg-plist
@@ -1,9 +1,6 @@
 bin/podtohtml
 %%SITE_PERL%%/Pod/HTML_Elements.pm
 %%SITE_PERL%%/Pod/Links.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML/.packlist
 %%PERL5_MAN3%%/Pod::HTML_Elements.3.gz
 %%PERL5_MAN3%%/Pod::Links.3.gz
 man/man1/podtohtml.1.gz
-@dirrmtry %%SITE_PERL%%/Pod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML
diff --git a/www/p5-Protocol-SocketIO/Makefile b/www/p5-Protocol-SocketIO/Makefile
index beafad45c170..dff0893f19ef 100644
--- a/www/p5-Protocol-SocketIO/Makefile
+++ b/www/p5-Protocol-SocketIO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Protocol-SocketIO
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VTI
diff --git a/www/p5-Protocol-SocketIO/pkg-plist b/www/p5-Protocol-SocketIO/pkg-plist
index 165af8941d5f..ddf0a9baf53d 100644
--- a/www/p5-Protocol-SocketIO/pkg-plist
+++ b/www/p5-Protocol-SocketIO/pkg-plist
@@ -6,5 +6,3 @@
 %%PERL5_MAN3%%/Protocol::SocketIO::Handshake.3.gz
 %%PERL5_MAN3%%/Protocol::SocketIO::Message.3.gz
 %%PERL5_MAN3%%/Protocol::SocketIO::Path.3.gz
-@dirrm %%SITE_PERL%%/Protocol/SocketIO
-@dirrmtry %%SITE_PERL%%/Protocol
diff --git a/www/p5-Protocol-WebSocket/Makefile b/www/p5-Protocol-WebSocket/Makefile
index 73e15253b8eb..d333d9230237 100644
--- a/www/p5-Protocol-WebSocket/Makefile
+++ b/www/p5-Protocol-WebSocket/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Protocol-WebSocket
 PORTVERSION=	0.00906
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VTI
diff --git a/www/p5-Protocol-WebSocket/pkg-plist b/www/p5-Protocol-WebSocket/pkg-plist
index b4a46bba99d8..fb32f3190b70 100644
--- a/www/p5-Protocol-WebSocket/pkg-plist
+++ b/www/p5-Protocol-WebSocket/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/Protocol/WebSocket/Response.pm
 %%SITE_PERL%%/Protocol/WebSocket/Stateful.pm
 %%SITE_PERL%%/Protocol/WebSocket/URL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/WebSocket/.packlist
 %%PERL5_MAN3%%/Protocol::WebSocket.3.gz
 %%PERL5_MAN3%%/Protocol::WebSocket::Cookie.3.gz
 %%PERL5_MAN3%%/Protocol::WebSocket::Cookie::Request.3.gz
@@ -25,9 +24,3 @@
 %%PERL5_MAN3%%/Protocol::WebSocket::Response.3.gz
 %%PERL5_MAN3%%/Protocol::WebSocket::Stateful.3.gz
 %%PERL5_MAN3%%/Protocol::WebSocket::URL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/WebSocket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol
-@dirrm %%SITE_PERL%%/Protocol/WebSocket/Handshake
-@dirrm %%SITE_PERL%%/Protocol/WebSocket/Cookie
-@dirrm %%SITE_PERL%%/Protocol/WebSocket
-@dirrmtry %%SITE_PERL%%/Protocol
diff --git a/www/p5-Protocol-XMLRPC/Makefile b/www/p5-Protocol-XMLRPC/Makefile
index d18985f5013f..0a7da4504583 100644
--- a/www/p5-Protocol-XMLRPC/Makefile
+++ b/www/p5-Protocol-XMLRPC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Protocol-XMLRPC
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VTI
diff --git a/www/p5-Protocol-XMLRPC/pkg-plist b/www/p5-Protocol-XMLRPC/pkg-plist
index 294114c78031..7e5a8e0c2242 100644
--- a/www/p5-Protocol-XMLRPC/pkg-plist
+++ b/www/p5-Protocol-XMLRPC/pkg-plist
@@ -14,7 +14,6 @@
 %%SITE_PERL%%/Protocol/XMLRPC/Value/String.pm
 %%SITE_PERL%%/Protocol/XMLRPC/Value/Struct.pm
 %%SITE_PERL%%/Protocol/XMLRPC/ValueFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/XMLRPC/.packlist
 %%PERL5_MAN3%%/Protocol::XMLRPC.3.gz
 %%PERL5_MAN3%%/Protocol::XMLRPC::Client.3.gz
 %%PERL5_MAN3%%/Protocol::XMLRPC::Method.3.gz
diff --git a/www/p5-REST-Client/Makefile b/www/p5-REST-Client/Makefile
index 8fc2e08ea2de..34646473e273 100644
--- a/www/p5-REST-Client/Makefile
+++ b/www/p5-REST-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	REST-Client
 PORTVERSION=	249
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-REST-Client/pkg-plist b/www/p5-REST-Client/pkg-plist
index 23fb9ee979ed..06e91aa94909 100644
--- a/www/p5-REST-Client/pkg-plist
+++ b/www/p5-REST-Client/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/REST/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Client/.packlist
 %%PERL5_MAN3%%/REST::Client.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST
-@dirrmtry %%SITE_PERL%%/REST
diff --git a/www/p5-REST-Google-Apps-Provisioning/Makefile b/www/p5-REST-Google-Apps-Provisioning/Makefile
index 06f9faec3de6..3b6c747e4d4d 100644
--- a/www/p5-REST-Google-Apps-Provisioning/Makefile
+++ b/www/p5-REST-Google-Apps-Provisioning/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	REST-Google-Apps-Provisioning
 PORTVERSION=	1.1.10
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SSCHNEID
diff --git a/www/p5-REST-Google-Apps-Provisioning/pkg-plist b/www/p5-REST-Google-Apps-Provisioning/pkg-plist
index 224467c89eee..0f61bf29c74e 100644
--- a/www/p5-REST-Google-Apps-Provisioning/pkg-plist
+++ b/www/p5-REST-Google-Apps-Provisioning/pkg-plist
@@ -1,11 +1,3 @@
 %%SITE_PERL%%/REST/Google/Apps/Provisioning.pm
 %%SITE_PERL%%/REST/Google/Apps/Provisioning.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Google/Apps/Provisioning/.packlist
 %%PERL5_MAN3%%/REST::Google::Apps::Provisioning.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Google/Apps/Provisioning
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Google/Apps
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST
-@dirrmtry %%SITE_PERL%%/REST/Google/Apps
-@dirrmtry %%SITE_PERL%%/REST/Google
-@dirrmtry %%SITE_PERL%%/REST
diff --git a/www/p5-RPC-ExtDirect/Makefile b/www/p5-RPC-ExtDirect/Makefile
index 473636798aff..702af781fe08 100644
--- a/www/p5-RPC-ExtDirect/Makefile
+++ b/www/p5-RPC-ExtDirect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RPC-ExtDirect
 PORTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-RPC-ExtDirect/pkg-plist b/www/p5-RPC-ExtDirect/pkg-plist
index 055419598987..84d00284686f 100644
--- a/www/p5-RPC-ExtDirect/pkg-plist
+++ b/www/p5-RPC-ExtDirect/pkg-plist
@@ -16,7 +16,6 @@
 %%SITE_PERL%%/RPC/ExtDirect/Demo/PollProvider.pm
 %%SITE_PERL%%/RPC/ExtDirect/Demo/Profile.pm
 %%SITE_PERL%%/RPC/ExtDirect/Request/PollHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/ExtDirect/.packlist
 %%PERL5_MAN3%%/RPC::ExtDirect.3.gz
 %%PERL5_MAN3%%/RPC::ExtDirect::API.3.gz
 %%PERL5_MAN3%%/RPC::ExtDirect::Config.3.gz
@@ -32,9 +31,3 @@
 %%PERL5_MAN3%%/RPC::ExtDirect::Request.3.gz
 %%PERL5_MAN3%%/RPC::ExtDirect::Router.3.gz
 %%PERL5_MAN3%%/RPC::ExtDirect::Serialize.3.gz
-@dirrm %%SITE_PERL%%/RPC/ExtDirect/Request
-@dirrm %%SITE_PERL%%/RPC/ExtDirect/Demo
-@dirrm %%SITE_PERL%%/RPC/ExtDirect
-@dirrmtry %%SITE_PERL%%/RPC
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/ExtDirect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC
diff --git a/www/p5-RT-Authen-ExternalAuth/Makefile b/www/p5-RT-Authen-ExternalAuth/Makefile
index dcdb2c1d8df9..c06c78547d9f 100644
--- a/www/p5-RT-Authen-ExternalAuth/Makefile
+++ b/www/p5-RT-Authen-ExternalAuth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RT-Authen-ExternalAuth
 DISTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -57,4 +58,8 @@ do-configure:
 	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
 	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//;' Makefile
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/man/auto/RT/Authen/ExternalAuth/.packlist
+	${RMDIR} -p ${STAGEDIR}${PREFIX}/man/auto/RT/Authen/ExternalAuth 2>/dev/null || :
+
 .include <bsd.port.mk>
diff --git a/www/p5-RT-Authen-ExternalAuth/pkg-plist b/www/p5-RT-Authen-ExternalAuth/pkg-plist
index 3bbd06a30081..1338210416b4 100644
--- a/www/p5-RT-Authen-ExternalAuth/pkg-plist
+++ b/www/p5-RT-Authen-ExternalAuth/pkg-plist
@@ -10,4 +10,3 @@ man/man3/RT::Authen::ExternalAuth.3.gz
 man/man3/RT::Authen::ExternalAuth::DBI.3.gz
 man/man3/RT::Authen::ExternalAuth::DBI::Cookie.3.gz
 man/man3/RT::Authen::ExternalAuth::LDAP.3.gz
-man/auto/RT/Authen/ExternalAuth/.packlist.gz
diff --git a/www/p5-RT-Client-REST/Makefile b/www/p5-RT-Client-REST/Makefile
index c17d07d083da..d31c4cc822ad 100644
--- a/www/p5-RT-Client-REST/Makefile
+++ b/www/p5-RT-Client-REST/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	RT-Client-REST
 PORTVERSION=	0.49
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-RT-Client-REST/pkg-plist b/www/p5-RT-Client-REST/pkg-plist
index a5e107bee181..a95c4a651dcf 100644
--- a/www/p5-RT-Client-REST/pkg-plist
+++ b/www/p5-RT-Client-REST/pkg-plist
@@ -11,7 +11,6 @@
 %%SITE_PERL%%/RT/Client/REST/Ticket.pm
 %%SITE_PERL%%/RT/Client/REST/Transaction.pm
 %%SITE_PERL%%/RT/Client/REST/User.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RT/Client/REST/.packlist
 %%PERL5_MAN3%%/RT::Client::REST.3.gz
 %%PERL5_MAN3%%/RT::Client::REST::Attachment.3.gz
 %%PERL5_MAN3%%/RT::Client::REST::Exception.3.gz
@@ -22,10 +21,3 @@
 %%PERL5_MAN3%%/RT::Client::REST::Ticket.3.gz
 %%PERL5_MAN3%%/RT::Client::REST::Transaction.3.gz
 %%PERL5_MAN3%%/RT::Client::REST::User.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RT/Client/REST
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RT/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RT
-@dirrmtry %%SITE_PERL%%/RT/Client/REST/Object
-@dirrmtry %%SITE_PERL%%/RT/Client/REST
-@dirrmtry %%SITE_PERL%%/RT/Client
-@dirrmtry %%SITE_PERL%%/RT
diff --git a/www/p5-RT-Extension-LDAPImport/Makefile b/www/p5-RT-Extension-LDAPImport/Makefile
index 53d8ca7960cc..15cc0209e946 100644
--- a/www/p5-RT-Extension-LDAPImport/Makefile
+++ b/www/p5-RT-Extension-LDAPImport/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RT-Extension-LDAPImport
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -56,4 +57,8 @@ do-configure:
 	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
 	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/man/auto/RT/Extension/LDAPImport/.packlist
+	${RMDIR} -p ${STAGEDIR}${PREFIX}/man/auto/RT/Extension/LDAPImport 2>/dev/null || :
+
 .include <bsd.port.mk>
diff --git a/www/p5-RT-Extension-LDAPImport/pkg-plist b/www/p5-RT-Extension-LDAPImport/pkg-plist
index 3f586c51da1f..0e20e2167fa7 100644
--- a/www/p5-RT-Extension-LDAPImport/pkg-plist
+++ b/www/p5-RT-Extension-LDAPImport/pkg-plist
@@ -1,4 +1,3 @@
 %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib/RT/Extension/LDAPImport.pm
 %%RTHOME%%/plugins/RT-Extension-LDAPImport/bin/rtldapimport
-man/auto/RT/Extension/LDAPImport/.packlist.gz
 man/man3/RT::Extension::LDAPImport.3.gz
diff --git a/www/p5-RT-Extension-MandatoryOnTransition/Makefile b/www/p5-RT-Extension-MandatoryOnTransition/Makefile
index bdc5da18d544..f802d9fb65ec 100644
--- a/www/p5-RT-Extension-MandatoryOnTransition/Makefile
+++ b/www/p5-RT-Extension-MandatoryOnTransition/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RT-Extension-MandatoryOnTransition
 DISTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -50,4 +51,8 @@ do-configure:
 		${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
 		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/man/auto/RT/Extension/MandatoryOnTransition/.packlist
+	${RMDIR} -p ${STAGEDIR}${PREFIX}/man/auto/RT/Extension/MandatoryOnTransition 2>/dev/null || :
+
 .include <bsd.port.mk>
diff --git a/www/p5-RT-Extension-MandatoryOnTransition/pkg-plist b/www/p5-RT-Extension-MandatoryOnTransition/pkg-plist
index d2f199a757b4..5619f157bdea 100644
--- a/www/p5-RT-Extension-MandatoryOnTransition/pkg-plist
+++ b/www/p5-RT-Extension-MandatoryOnTransition/pkg-plist
@@ -1,4 +1,3 @@
-man/auto/RT/Extension/MandatoryOnTransition/.packlist.gz
 man/man3/RT::Extension::MandatoryOnTransition.3.gz
 share/rt%%RT_VER%%/plugins/RT-Extension-MandatoryOnTransition/html/Callbacks/RT-Extension-MandatoryOnTransition/Ticket/Create.html/BeforeCreate
 share/rt%%RT_VER%%/plugins/RT-Extension-MandatoryOnTransition/html/Callbacks/RT-Extension-MandatoryOnTransition/Ticket/Elements/EditCustomFields/MassageCustomFields
diff --git a/www/p5-RT-Extension-SLA/Makefile b/www/p5-RT-Extension-SLA/Makefile
index 9fa99e9cae5b..9fe5161a6e4b 100644
--- a/www/p5-RT-Extension-SLA/Makefile
+++ b/www/p5-RT-Extension-SLA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RT-Extension-SLA
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -60,4 +61,8 @@ do-configure:
 	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
 	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/man/auto/RT/Extension/SLA/.packlist
+	${RMDIR} -p ${STAGEDIR}${PREFIX}/man/auto/RT/Extension/SLA 2>/dev/null || :
+
 .include <bsd.port.mk>
diff --git a/www/p5-RT-Extension-SLA/pkg-plist b/www/p5-RT-Extension-SLA/pkg-plist
index f3be7022fa8c..aaa4af1425c4 100644
--- a/www/p5-RT-Extension-SLA/pkg-plist
+++ b/www/p5-RT-Extension-SLA/pkg-plist
@@ -22,18 +22,3 @@ man/man3/RT::Condition::SLA_RequireDueSet.3.gz
 man/man3/RT::Condition::SLA_RequireStartsSet.3.gz
 man/man3/RT::Extension::SLA.3.gz
 man/man3/RT::Queue_SLA.3.gz
-man/auto/RT/Extension/SLA/.packlist.gz
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Extension/SLA
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Extension
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Condition
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Action
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/etc/upgrade/0.06
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/etc/upgrade
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA/etc
-@dirrm %%RTHOME%%/plugins/RT-Extension-SLA
-@dirrm man/auto/RT/Extension/SLA
-@dirrmtry man/auto/RT/Extension
-@dirrmtry man/auto/RT
-@dirrmtry man/auto
diff --git a/www/p5-RTx-Calendar/Makefile b/www/p5-RTx-Calendar/Makefile
index 946f6295885b..0350318e2184 100644
--- a/www/p5-RTx-Calendar/Makefile
+++ b/www/p5-RTx-Calendar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RTx-Calendar
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -60,4 +61,8 @@ do-configure:
 	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
 	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/man/auto/RTx/Calendar/.packlist
+	${RMDIR} -p ${STAGEDIR}${PREFIX}/man/auto/RTx/Calendar 2>/dev/null || :
+
 .include <bsd.port.mk>
diff --git a/www/p5-RTx-Calendar/pkg-plist b/www/p5-RTx-Calendar/pkg-plist
index bf52d589b1af..a28c52aa1289 100644
--- a/www/p5-RTx-Calendar/pkg-plist
+++ b/www/p5-RTx-Calendar/pkg-plist
@@ -1,4 +1,3 @@
-man/auto/RTx/Calendar/.packlist.gz
 man/man3/RTx::Calendar.3.gz
 %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements/Tabs/Privileged
 %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket/Elements/Tabs/Default
@@ -20,29 +19,3 @@ man/man3/RTx::Calendar.3.gz
 %%RTHOME%%/plugins/RTx-Calendar/static/images/starts.png
 %%RTHOME%%/plugins/RTx-Calendar/static/images/starts_due.png
 %%RTHOME%%/plugins/RTx-Calendar/static/images/updated.png
-@dirrmtry man/auto/RTx/Calendar
-@dirrmtry man/auto/RTx
-@dirrmtry man/auto
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements/Tabs
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket/Elements/Tabs
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket/Elements
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User/Elements/Tabs
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User/Elements
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Elements
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/Calendar
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/NoAuth
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Prefs/Elements
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Prefs
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html/Search
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/html
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/lib/RTx
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/lib
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/static/css
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/static/images
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar/static
-@dirrmtry %%RTHOME%%/plugins/RTx-Calendar
diff --git a/www/p5-Reaction/Makefile b/www/p5-Reaction/Makefile
index 968c9baac3e3..ed6f56ed6162 100644
--- a/www/p5-Reaction/Makefile
+++ b/www/p5-Reaction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Reaction
 PORTVERSION=	0.002005
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Reaction/pkg-plist b/www/p5-Reaction/pkg-plist
index 36fb4e392976..3912c66be59a 100644
--- a/www/p5-Reaction/pkg-plist
+++ b/www/p5-Reaction/pkg-plist
@@ -449,121 +449,8 @@ bin/rclass_back_to_moose.pl
 %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/site_layout.tt
 %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/skin.conf
 %%SITE_PERL%%/auto/share/dist/Reaction/skin/defaults.conf
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Reaction/.packlist
 man/man1/componentui_cgi.pl.1.gz
 man/man1/componentui_create.pl.1.gz
 man/man1/componentui_fastcgi.pl.1.gz
 man/man1/componentui_server.pl.1.gz
 man/man1/componentui_test.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Reaction
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/field/mutable
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/field
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/collection/grid/member
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/collection/grid
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/collection
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/action
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/default
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/componentui/web
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/componentui/layout/bar
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/componentui/layout
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/componentui
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout/value
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout/field/mutable
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout/field
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout/collection/grid/member
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout/collection/grid
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout/collection
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout/action
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base/layout
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin/base
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction/skin
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Reaction
-@dirrmtry %%SITE_PERL%%/auto/share/dist
-@dirrmtry %%SITE_PERL%%/auto/share
-@dirrmtry %%SITE_PERL%%/Reaction/UI/WidgetClass
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Value
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Search
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Object
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Field/Mutable
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Field
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Collection/Grid/Member
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Collection/Grid
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Collection
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget/Action
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Widget
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Role
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Object
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Field/String
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Field/Role/Mutable
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Field/Role
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Field/Mutable
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Field/.ToDo
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Field
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Collection/Role
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Collection/Grid/Member
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Collection/Grid
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Collection
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Action/Role
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort/Action
-@dirrmtry %%SITE_PERL%%/Reaction/UI/ViewPort
-@dirrmtry %%SITE_PERL%%/Reaction/UI/View
-@dirrmtry %%SITE_PERL%%/Reaction/UI/RenderingContext
-@dirrmtry %%SITE_PERL%%/Reaction/UI/LayoutSet
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Controller/Role/Action
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Controller/Role
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Controller/Collection/CRUD
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Controller/Collection
-@dirrmtry %%SITE_PERL%%/Reaction/UI/Controller
-@dirrmtry %%SITE_PERL%%/Reaction/UI
-@dirrmtry %%SITE_PERL%%/Reaction/Types
-@dirrmtry %%SITE_PERL%%/Reaction/Test
-@dirrmtry %%SITE_PERL%%/Reaction/Role/Meta
-@dirrmtry %%SITE_PERL%%/Reaction/Role
-@dirrmtry %%SITE_PERL%%/Reaction/Meta/InterfaceModel/Object
-@dirrmtry %%SITE_PERL%%/Reaction/Meta/InterfaceModel/Action
-@dirrmtry %%SITE_PERL%%/Reaction/Meta/InterfaceModel
-@dirrmtry %%SITE_PERL%%/Reaction/Meta
-@dirrmtry %%SITE_PERL%%/Reaction/Manual
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Search
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Reflector
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Object/User/Role
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Object/User
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Object
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Collection/Virtual
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Collection/Persistent
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Collection/DBIC/Role
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Collection/DBIC
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Collection
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/User
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/Search
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/Role
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/DBIC/User/Role
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/DBIC/User
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/DBIC/Role
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/DBIC/ResultSet
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/DBIC/Result
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action/DBIC
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel/Action
-@dirrmtry %%SITE_PERL%%/Reaction/InterfaceModel
-@dirrmtry %%SITE_PERL%%/Reaction
-@dirrmtry %%SITE_PERL%%/ComponentUI/View/Site/Widget
-@dirrmtry %%SITE_PERL%%/ComponentUI/View/Site
-@dirrmtry %%SITE_PERL%%/ComponentUI/View
-@dirrmtry %%SITE_PERL%%/ComponentUI/UI/Widget
-@dirrmtry %%SITE_PERL%%/ComponentUI/UI/ViewPort/Baz/ListView
-@dirrmtry %%SITE_PERL%%/ComponentUI/UI/ViewPort/Baz
-@dirrmtry %%SITE_PERL%%/ComponentUI/UI/ViewPort
-@dirrmtry %%SITE_PERL%%/ComponentUI/UI
-@dirrmtry %%SITE_PERL%%/ComponentUI/TestModel/Foo/Action/SearchSpec
-@dirrmtry %%SITE_PERL%%/ComponentUI/TestModel/Foo/Action
-@dirrmtry %%SITE_PERL%%/ComponentUI/TestModel/Foo
-@dirrmtry %%SITE_PERL%%/ComponentUI/TestModel
-@dirrmtry %%SITE_PERL%%/ComponentUI/Model
-@dirrmtry %%SITE_PERL%%/ComponentUI/Controller/TestModel
-@dirrmtry %%SITE_PERL%%/ComponentUI/Controller
-@dirrmtry %%SITE_PERL%%/ComponentUI
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/Reaction/InterfaceModel
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/Reaction
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Reddit/Makefile b/www/p5-Reddit/Makefile
index 0bc150cf34c2..1bd884c4438b 100644
--- a/www/p5-Reddit/Makefile
+++ b/www/p5-Reddit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Reddit
 PORTVERSION=	0.3.02.20120418
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CRITICAL
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Reddit/pkg-plist b/www/p5-Reddit/pkg-plist
index 9f066a520dee..5bcad1622590 100644
--- a/www/p5-Reddit/pkg-plist
+++ b/www/p5-Reddit/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/Reddit.pm
 %%SITE_PERL%%/Reddit/Type/User.pm
 %%SITE_PERL%%/Reddit/Type/Subreddit.pm
-%%SITE_PERL%%/mach/auto/Reddit/.packlist
 %%PERL5_MAN3%%/Reddit.3.gz
diff --git a/www/p5-Rose-HTML-Objects/Makefile b/www/p5-Rose-HTML-Objects/Makefile
index 483a635d9e6c..a2edd26a32d6 100644
--- a/www/p5-Rose-HTML-Objects/Makefile
+++ b/www/p5-Rose-HTML-Objects/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Rose-HTML-Objects
 PORTVERSION=	0.621
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Rose-HTML-Objects/pkg-plist b/www/p5-Rose-HTML-Objects/pkg-plist
index 7d3fbbb6b0ab..ef35f62dad4f 100644
--- a/www/p5-Rose-HTML-Objects/pkg-plist
+++ b/www/p5-Rose-HTML-Objects/pkg-plist
@@ -120,24 +120,3 @@
 %%SITE_PERL%%/Rose/HTML/Script.pm
 %%SITE_PERL%%/Rose/HTML/Text.pm
 %%SITE_PERL%%/Rose/HTML/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/HTML/Objects/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/HTML/Objects
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rose
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Object/Message
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Object/MakeMethods
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Object/Error
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Object
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/Time/Split
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/Time
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/PhoneNumber/US
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/PhoneNumber
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/Option
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/OnOff
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/Group
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/DateTime/Split
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field/DateTime
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form/Field
-@dirrmtry %%SITE_PERL%%/Rose/HTML/Form
-@dirrmtry %%SITE_PERL%%/Rose/HTML
-@dirrmtry %%SITE_PERL%%/Rose
diff --git a/www/p5-Router-Boom/Makefile b/www/p5-Router-Boom/Makefile
index 2f7ee93e0f54..547f3d29f62e 100644
--- a/www/p5-Router-Boom/Makefile
+++ b/www/p5-Router-Boom/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Router-Boom
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Router-Simple-Sinatraish/Makefile b/www/p5-Router-Simple-Sinatraish/Makefile
index d4e7cf996e02..cc5cd19c8aee 100644
--- a/www/p5-Router-Simple-Sinatraish/Makefile
+++ b/www/p5-Router-Simple-Sinatraish/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Router-Simple-Sinatraish
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Router-Simple/Makefile b/www/p5-Router-Simple/Makefile
index 30ffd7075f77..e761b4670290 100644
--- a/www/p5-Router-Simple/Makefile
+++ b/www/p5-Router-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Router-Simple
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/www/p5-SCGI/Makefile b/www/p5-SCGI/Makefile
index 6623eb7f1169..56c824855fc1 100644
--- a/www/p5-SCGI/Makefile
+++ b/www/p5-SCGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SCGI
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VIPERCODE
diff --git a/www/p5-SOAP-Transport-HTTP-Plack/Makefile b/www/p5-SOAP-Transport-HTTP-Plack/Makefile
index ea71790e3b5e..e6be4c6fa160 100644
--- a/www/p5-SOAP-Transport-HTTP-Plack/Makefile
+++ b/www/p5-SOAP-Transport-HTTP-Plack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	SOAP-Transport-HTTP-Plack
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-SOAP-Transport-HTTP-Plack/pkg-plist b/www/p5-SOAP-Transport-HTTP-Plack/pkg-plist
index 92d6f921886e..d83bafbae871 100644
--- a/www/p5-SOAP-Transport-HTTP-Plack/pkg-plist
+++ b/www/p5-SOAP-Transport-HTTP-Plack/pkg-plist
@@ -1,10 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/HTTP/Plack/.packlist
 %%SITE_PERL%%/SOAP/Transport/HTTP/Plack.pm
 %%SITE_PERL%%/XMLRPC/Transport/HTTP/Plack.pm
 %%PERL5_MAN3%%/SOAP::Transport::HTTP::Plack.3.gz
 %%PERL5_MAN3%%/XMLRPC::Transport::HTTP::Plack.3.gz
-@dirrmtry %%SITE_PERL%%/XMLRPC/Transport/HTTP
-@dirrmtry %%SITE_PERL%%/SOAP/Transport/HTTP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/HTTP/Plack
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport
diff --git a/www/p5-SRU/Makefile b/www/p5-SRU/Makefile
index 05da5141837e..f04ec00bc619 100644
--- a/www/p5-SRU/Makefile
+++ b/www/p5-SRU/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SRU
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRICAS
diff --git a/www/p5-SRU/pkg-plist b/www/p5-SRU/pkg-plist
index 49720b902380..b6b6fb8153e4 100644
--- a/www/p5-SRU/pkg-plist
+++ b/www/p5-SRU/pkg-plist
@@ -15,7 +15,6 @@
 %%SITE_PERL%%/SRU/Utils.pm
 %%SITE_PERL%%/SRU/Utils/XML.pm
 %%SITE_PERL%%/SRU/Utils/XMLTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SRU/.packlist
 %%PERL5_MAN3%%/Catalyst::Controller::SRU.3.gz
 %%PERL5_MAN3%%/SRU.3.gz
 %%PERL5_MAN3%%/SRU::Request.3.gz
@@ -33,10 +32,3 @@
 %%PERL5_MAN3%%/SRU::Utils.3.gz
 %%PERL5_MAN3%%/SRU::Utils::XML.3.gz
 %%PERL5_MAN3%%/SRU::Utils::XMLTest.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SRU
-@dirrm %%SITE_PERL%%/SRU/Utils
-@dirrm %%SITE_PERL%%/SRU/Response
-@dirrm %%SITE_PERL%%/SRU/Request
-@dirrmtry %%SITE_PERL%%/SRU
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-STF-Dispatcher-PSGI/Makefile b/www/p5-STF-Dispatcher-PSGI/Makefile
index 0bcd49f86606..55d33b02387b 100644
--- a/www/p5-STF-Dispatcher-PSGI/Makefile
+++ b/www/p5-STF-Dispatcher-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	STF-Dispatcher-PSGI
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/www/p5-SWF-Chart/Makefile b/www/p5-SWF-Chart/Makefile
index 9fa0f745c034..c2431cd86c69 100644
--- a/www/p5-SWF-Chart/Makefile
+++ b/www/p5-SWF-Chart/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SWF-Chart
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GARTH
diff --git a/www/p5-SWF-Chart/pkg-plist b/www/p5-SWF-Chart/pkg-plist
index c787d3cf0c40..0b84c537e513 100644
--- a/www/p5-SWF-Chart/pkg-plist
+++ b/www/p5-SWF-Chart/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/SWF/Chart.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/Chart/.packlist
 %%PERL5_MAN3%%/SWF::Chart.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/Chart
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF
-@dirrmtry %%SITE_PERL%%/SWF
diff --git a/www/p5-Scrappy/Makefile b/www/p5-Scrappy/Makefile
index 046b866baf03..e561c036de95 100644
--- a/www/p5-Scrappy/Makefile
+++ b/www/p5-Scrappy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Scrappy
 PORTVERSION=	0.94112090
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AWNCORP
diff --git a/www/p5-Scrappy/pkg-plist b/www/p5-Scrappy/pkg-plist
index 4d1aa4f3288a..847148985b07 100644
--- a/www/p5-Scrappy/pkg-plist
+++ b/www/p5-Scrappy/pkg-plist
@@ -20,7 +20,6 @@ bin/scrappy
 %%SITE_PERL%%/auto/share/dist/Scrappy/support/firefox.txt
 %%SITE_PERL%%/auto/share/dist/Scrappy/support/opera.txt
 %%SITE_PERL%%/auto/share/dist/Scrappy/support/safari.txt
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scrappy/.packlist
 %%PERL5_MAN3%%/Scrappy.3.gz
 %%PERL5_MAN3%%/Scrappy::Logger.3.gz
 %%PERL5_MAN3%%/Scrappy::Queue.3.gz
@@ -28,13 +27,3 @@ bin/scrappy
 %%PERL5_MAN3%%/Scrappy::Scraper::Parser.3.gz
 %%PERL5_MAN3%%/Scrappy::Session.3.gz
 man/man1/scrappy.1.gz
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Scrappy/support
-@dirrmtry %%SITE_PERL%%/auto/share/dist/Scrappy
-@dirrmtry %%SITE_PERL%%/auto/share/dist
-@dirrmtry %%SITE_PERL%%/auto/share
-@dirrmtry %%SITE_PERL%%/Scrappy/Scraper
-@dirrmtry %%SITE_PERL%%/Scrappy/Project
-@dirrmtry %%SITE_PERL%%/Scrappy/Plugin
-@dirrmtry %%SITE_PERL%%/Scrappy/Action
-@dirrmtry %%SITE_PERL%%/Scrappy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scrappy
diff --git a/www/p5-Session-Storage-Secure/Makefile b/www/p5-Session-Storage-Secure/Makefile
index 172f69e88f71..8be2719b4450 100644
--- a/www/p5-Session-Storage-Secure/Makefile
+++ b/www/p5-Session-Storage-Secure/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Session-Storage-Secure
 PORTVERSION=	0.010
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
diff --git a/www/p5-Session-Storage-Secure/pkg-plist b/www/p5-Session-Storage-Secure/pkg-plist
index ac8abb967354..6da61c7bd14a 100644
--- a/www/p5-Session-Storage-Secure/pkg-plist
+++ b/www/p5-Session-Storage-Secure/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Session/Storage/Secure/.packlist
 %%SITE_PERL%%/Session/Storage/Secure.pm
 %%PERL5_MAN3%%/Session::Storage::Secure.3.gz
diff --git a/www/p5-Squatting-On-PSGI/Makefile b/www/p5-Squatting-On-PSGI/Makefile
index 3c0059479b41..a463a6bf5547 100644
--- a/www/p5-Squatting-On-PSGI/Makefile
+++ b/www/p5-Squatting-On-PSGI/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Squatting-On-PSGI
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BEPPU
diff --git a/www/p5-Squatting-On-PSGI/pkg-plist b/www/p5-Squatting-On-PSGI/pkg-plist
index 4a6df9fa388e..d2c356a4d679 100644
--- a/www/p5-Squatting-On-PSGI/pkg-plist
+++ b/www/p5-Squatting-On-PSGI/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting/On/PSGI/.packlist
 %%SITE_PERL%%/Squatting/On/PSGI.pm
 %%PERL5_MAN3%%/Squatting::On::PSGI.3.gz
-@dirrmtry %%SITE_PERL%%/Squatting/On
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting/On/PSGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting/On
diff --git a/www/p5-Squatting/Makefile b/www/p5-Squatting/Makefile
index 813a02a2d318..4c2d09ea9841 100644
--- a/www/p5-Squatting/Makefile
+++ b/www/p5-Squatting/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Squatting
 PORTVERSION=	0.82
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BEPPU
diff --git a/www/p5-Squatting/pkg-plist b/www/p5-Squatting/pkg-plist
index 628d73a65ad4..9c0e0bf978ab 100644
--- a/www/p5-Squatting/pkg-plist
+++ b/www/p5-Squatting/pkg-plist
@@ -15,7 +15,6 @@ bin/squatting
 %%PERL5_MAN3%%/Squatting::With::MockRequest.3.gz
 %%PERL5_MAN3%%/Squatting::With::Mount.3.gz
 man/man1/squatting.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting/.packlist
 %%SITE_PERL%%/Squatting.pm
 %%SITE_PERL%%/Squatting/Controller.pm
 %%SITE_PERL%%/Squatting/H.pm
@@ -33,8 +32,3 @@ man/man1/squatting.1.gz
 %%SITE_PERL%%/Squatting/With/MockRequest.pm
 %%SITE_PERL%%/Squatting/With/Mount.pm
 %%SITE_PERL%%/squatting.pl
-@dirrmtry %%SITE_PERL%%/Squatting/With/Coro
-@dirrmtry %%SITE_PERL%%/Squatting/With
-@dirrmtry %%SITE_PERL%%/Squatting/On
-@dirrmtry %%SITE_PERL%%/Squatting
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting
diff --git a/www/p5-Starlet/Makefile b/www/p5-Starlet/Makefile
index 0bc55f9a0f85..6d42ed82a550 100644
--- a/www/p5-Starlet/Makefile
+++ b/www/p5-Starlet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Starlet
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZUHO
diff --git a/www/p5-Starlet/pkg-plist b/www/p5-Starlet/pkg-plist
index aa6e186e03bd..a917017a40c9 100644
--- a/www/p5-Starlet/pkg-plist
+++ b/www/p5-Starlet/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Starlet.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Starlet/.packlist
 %%SITE_PERL%%/Plack/Handler/Starlet.pm
 %%SITE_PERL%%/Starlet.pm
 %%SITE_PERL%%/Starlet/Server.pm
diff --git a/www/p5-Starman/Makefile b/www/p5-Starman/Makefile
index 59ede5da20d6..d81e3f4256b6 100644
--- a/www/p5-Starman/Makefile
+++ b/www/p5-Starman/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Starman
 PORTVERSION=	0.4011
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Starman/pkg-plist b/www/p5-Starman/pkg-plist
index 9073ff4e0837..7676def85d77 100644
--- a/www/p5-Starman/pkg-plist
+++ b/www/p5-Starman/pkg-plist
@@ -4,7 +4,6 @@ man/man1/starman.1.gz
 %%PERL5_MAN3%%/Starman.3.gz
 %%PERL5_MAN3%%/Starman::Server.3.gz
 bin/starman
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Starman/.packlist
 %%SITE_PERL%%/HTTP/Server/PSGI/Net/Server/PreFork.pm
 %%SITE_PERL%%/Plack/Handler/Starman.pm
 %%SITE_PERL%%/Starman.pm
diff --git a/www/p5-Syntax-Highlight-HTML/Makefile b/www/p5-Syntax-Highlight-HTML/Makefile
index 8a3380206a78..02bdf82c75a3 100644
--- a/www/p5-Syntax-Highlight-HTML/Makefile
+++ b/www/p5-Syntax-Highlight-HTML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Syntax-Highlight-HTML
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Syntax-Highlight-HTML/pkg-plist b/www/p5-Syntax-Highlight-HTML/pkg-plist
index 6ecc090bfa7a..d16ca46d5aee 100644
--- a/www/p5-Syntax-Highlight-HTML/pkg-plist
+++ b/www/p5-Syntax-Highlight-HTML/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Syntax/Highlight/HTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/HTML/.packlist
 %%PERL5_MAN3%%/Syntax::Highlight::HTML.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax
-@dirrmtry %%SITE_PERL%%/Syntax
diff --git a/www/p5-Syntax-Highlight-Shell/Makefile b/www/p5-Syntax-Highlight-Shell/Makefile
index e5018e51fda4..68abd21a6de3 100644
--- a/www/p5-Syntax-Highlight-Shell/Makefile
+++ b/www/p5-Syntax-Highlight-Shell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Syntax-Highlight-Shell
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Syntax-Highlight-Shell/pkg-plist b/www/p5-Syntax-Highlight-Shell/pkg-plist
index 44bc3ef1c3b6..9a50a495ec24 100644
--- a/www/p5-Syntax-Highlight-Shell/pkg-plist
+++ b/www/p5-Syntax-Highlight-Shell/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Syntax::Highlight::Shell.3.gz
 %%SITE_PERL%%/Syntax/Highlight/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Shell/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Shell
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax
-@dirrmtry %%SITE_PERL%%/Syntax/Highlight
-@dirrmtry %%SITE_PERL%%/Syntax
diff --git a/www/p5-Task-Catalyst/Makefile b/www/p5-Task-Catalyst/Makefile
index 90518463476f..3b9bc6da097b 100644
--- a/www/p5-Task-Catalyst/Makefile
+++ b/www/p5-Task-Catalyst/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Task-Catalyst
 PORTVERSION=	4.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Task-Catalyst/pkg-plist b/www/p5-Task-Catalyst/pkg-plist
index 53dfea6c377e..f53004bb00ea 100644
--- a/www/p5-Task-Catalyst/pkg-plist
+++ b/www/p5-Task-Catalyst/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Task::Catalyst.3.gz
 %%SITE_PERL%%/Task/Catalyst.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task
-@dirrmtry %%SITE_PERL%%/Task
diff --git a/www/p5-Task-Plack/Makefile b/www/p5-Task-Plack/Makefile
index 782c24ffbdf8..0fceb6c3297d 100644
--- a/www/p5-Task-Plack/Makefile
+++ b/www/p5-Task-Plack/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Task-Plack
 PORTVERSION=	0.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Task-Plack/pkg-plist b/www/p5-Task-Plack/pkg-plist
index fc629df761a4..3b6284c532fd 100644
--- a/www/p5-Task-Plack/pkg-plist
+++ b/www/p5-Task-Plack/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Task::Plack.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Plack/.packlist
 %%SITE_PERL%%/Task/Plack.pm
 %%SITE_PERL%%/Task/versions.pl
-@dirrmtry %%SITE_PERL%%/Task
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Plack
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task
diff --git a/www/p5-Tatsumaki/Makefile b/www/p5-Tatsumaki/Makefile
index 1dd3fe95f0d9..84ab91298a9a 100644
--- a/www/p5-Tatsumaki/Makefile
+++ b/www/p5-Tatsumaki/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tatsumaki
 PORTVERSION=	0.1013
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Tatsumaki/pkg-plist b/www/p5-Tatsumaki/pkg-plist
index af788c5a7963..ecba3d94bee1 100644
--- a/www/p5-Tatsumaki/pkg-plist
+++ b/www/p5-Tatsumaki/pkg-plist
@@ -12,7 +12,3 @@
 %%SITE_PERL%%/Tatsumaki/Service.pm
 %%SITE_PERL%%/Tatsumaki/Template.pm
 %%SITE_PERL%%/Tatsumaki/Template/Micro.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tatsumaki/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tatsumaki
-@dirrmtry %%SITE_PERL%%/Tatsumaki/Template
-@dirrmtry %%SITE_PERL%%/Tatsumaki
diff --git a/www/p5-Template-Alloy/Makefile b/www/p5-Template-Alloy/Makefile
index 2302491f5fdd..8d14682c7f1f 100644
--- a/www/p5-Template-Alloy/Makefile
+++ b/www/p5-Template-Alloy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Alloy
 PORTVERSION=	1.020
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RHANDOM
diff --git a/www/p5-Template-Alloy/pkg-plist b/www/p5-Template-Alloy/pkg-plist
index 69b3d67b7579..c7f156bd4fa1 100644
--- a/www/p5-Template-Alloy/pkg-plist
+++ b/www/p5-Template-Alloy/pkg-plist
@@ -13,7 +13,6 @@
 %%SITE_PERL%%/Template/Alloy/Tmpl.pm
 %%SITE_PERL%%/Template/Alloy/VMethod.pm
 %%SITE_PERL%%/Template/Alloy/Velocity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Alloy/.packlist
 %%PERL5_MAN3%%/Template::Alloy.3.gz
 %%PERL5_MAN3%%/Template::Alloy::Compile.3.gz
 %%PERL5_MAN3%%/Template::Alloy::Context.3.gz
@@ -28,7 +27,3 @@
 %%PERL5_MAN3%%/Template::Alloy::Tmpl.3.gz
 %%PERL5_MAN3%%/Template::Alloy::VMethod.3.gz
 %%PERL5_MAN3%%/Template::Alloy::Velocity.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Alloy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Alloy
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-GD/Makefile b/www/p5-Template-GD/Makefile
index 392254692262..4403d7a3c507 100644
--- a/www/p5-Template-GD/Makefile
+++ b/www/p5-Template-GD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-GD
 PORTVERSION=	2.66
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-GD/pkg-plist b/www/p5-Template-GD/pkg-plist
index cdfc45f527fd..52526ddff6e8 100644
--- a/www/p5-Template-GD/pkg-plist
+++ b/www/p5-Template-GD/pkg-plist
@@ -15,7 +15,6 @@
 %%SITE_PERL%%/Template/Plugin/GD/Text.pm
 %%SITE_PERL%%/Template/Plugin/GD/Text/Align.pm
 %%SITE_PERL%%/Template/Plugin/GD/Text/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/GD/.packlist
 %%PERL5_MAN3%%/Template::Plugin::GD.3.gz
 %%PERL5_MAN3%%/Template::Plugin::GD::Constants.3.gz
 %%PERL5_MAN3%%/Template::Plugin::GD::Graph::area.3.gz
@@ -33,10 +32,3 @@
 %%PERL5_MAN3%%/Template::Plugin::GD::Text.3.gz
 %%PERL5_MAN3%%/Template::Plugin::GD::Text::Align.3.gz
 %%PERL5_MAN3%%/Template::Plugin::GD::Text::Wrap.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/GD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin/GD/Text
-@dirrmtry %%SITE_PERL%%/Template/Plugin/GD/Graph
-@dirrmtry %%SITE_PERL%%/Template/Plugin/GD
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile b/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
index 92c13578614f..df6e18bf08d2 100644
--- a/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
+++ b/www/p5-Template-Iterator-AlzaboWrapperCursor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Iterator-AlzaboWrapperCursor
 DISTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Iterator-AlzaboWrapperCursor/pkg-plist b/www/p5-Template-Iterator-AlzaboWrapperCursor/pkg-plist
index 59721265577b..8d8f8656f1f7 100644
--- a/www/p5-Template-Iterator-AlzaboWrapperCursor/pkg-plist
+++ b/www/p5-Template-Iterator-AlzaboWrapperCursor/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Template::Iterator::AlzaboWrapperCursor.3.gz
 %%SITE_PERL%%/Template/Iterator/AlzaboWrapperCursor.pm
-@dirrmtry %%SITE_PERL%%/Template/Iterator
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Multilingual/Makefile b/www/p5-Template-Multilingual/Makefile
index 6ad439d16540..e25812d8fa57 100644
--- a/www/p5-Template-Multilingual/Makefile
+++ b/www/p5-Template-Multilingual/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Multilingual
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Multilingual/pkg-plist b/www/p5-Template-Multilingual/pkg-plist
index 16f41beb3a46..88fde4b9fcf9 100644
--- a/www/p5-Template-Multilingual/pkg-plist
+++ b/www/p5-Template-Multilingual/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Multilingual/.packlist
 %%SITE_PERL%%/Template/Multilingual/Parser.pm
 %%SITE_PERL%%/Template/Multilingual.pm
 %%PERL5_MAN3%%/Template::Multilingual.3.gz
 %%PERL5_MAN3%%/Template::Multilingual::Parser.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Multilingual
-@dirrm %%SITE_PERL%%/Template/Multilingual
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Mustache/Makefile b/www/p5-Template-Mustache/Makefile
index 782d51f1369a..6bb52c40eb81 100644
--- a/www/p5-Template-Mustache/Makefile
+++ b/www/p5-Template-Mustache/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Template-Mustache
 PORTVERSION=	v0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PVANDE
diff --git a/www/p5-Template-Mustache/pkg-plist b/www/p5-Template-Mustache/pkg-plist
index d4ca78ce7724..d272348605c7 100644
--- a/www/p5-Template-Mustache/pkg-plist
+++ b/www/p5-Template-Mustache/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/Template/Mustache.pm
 %%SITE_PERL%%/Template/Mustache.pod
 %%SITE_PERL%%/Template/benchmark.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Mustache/.packlist
 %%PERL5_MAN3%%/Template::Mustache.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Mustache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Class/Makefile b/www/p5-Template-Plugin-Class/Makefile
index dda1d3f4a07e..a107b1ce2f41 100644
--- a/www/p5-Template-Plugin-Class/Makefile
+++ b/www/p5-Template-Plugin-Class/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Class
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Class/pkg-plist b/www/p5-Template-Plugin-Class/pkg-plist
index e7182e7f5bcc..59d920d133d9 100644
--- a/www/p5-Template-Plugin-Class/pkg-plist
+++ b/www/p5-Template-Plugin-Class/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Class/.packlist
 %%PERL5_MAN3%%/Template::Plugin::Class.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Clickable-Email/Makefile b/www/p5-Template-Plugin-Clickable-Email/Makefile
index 6a69309af9b2..aa8664cd3dd8 100644
--- a/www/p5-Template-Plugin-Clickable-Email/Makefile
+++ b/www/p5-Template-Plugin-Clickable-Email/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Clickable-Email
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Clickable-Email/pkg-plist b/www/p5-Template-Plugin-Clickable-Email/pkg-plist
index 289e152eee56..c43666d539c0 100644
--- a/www/p5-Template-Plugin-Clickable-Email/pkg-plist
+++ b/www/p5-Template-Plugin-Clickable-Email/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::Clickable::Email.3.gz
 %%SITE_PERL%%/Template/Plugin/Clickable/Email.pm
-@dirrmtry %%SITE_PERL%%/Template/Plugin/Clickable
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Clickable/Makefile b/www/p5-Template-Plugin-Clickable/Makefile
index 51a18e0b494d..dfc1713b1bbd 100644
--- a/www/p5-Template-Plugin-Clickable/Makefile
+++ b/www/p5-Template-Plugin-Clickable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Clickable
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Clickable/pkg-plist b/www/p5-Template-Plugin-Clickable/pkg-plist
index 84cd43e5105c..8bceb5fa06f8 100644
--- a/www/p5-Template-Plugin-Clickable/pkg-plist
+++ b/www/p5-Template-Plugin-Clickable/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/Clickable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Clickable/.packlist
 %%PERL5_MAN3%%/Template::Plugin::Clickable.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Clickable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Comma/Makefile b/www/p5-Template-Plugin-Comma/Makefile
index 7cff44a1d19c..f41c60067f5a 100644
--- a/www/p5-Template-Plugin-Comma/Makefile
+++ b/www/p5-Template-Plugin-Comma/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Comma
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Comma/pkg-plist b/www/p5-Template-Plugin-Comma/pkg-plist
index 6671b5dac20e..4afd32ed0c1b 100644
--- a/www/p5-Template-Plugin-Comma/pkg-plist
+++ b/www/p5-Template-Plugin-Comma/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Comma/.packlist
 %%SITE_PERL%%/Template/Plugin/Comma.pm
 %%PERL5_MAN3%%/Template::Plugin::Comma.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Comma
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-FillInForm/Makefile b/www/p5-Template-Plugin-FillInForm/Makefile
index faaa2a6cf047..46d019165d9a 100644
--- a/www/p5-Template-Plugin-FillInForm/Makefile
+++ b/www/p5-Template-Plugin-FillInForm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-FillInForm
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Template
diff --git a/www/p5-Template-Plugin-FillInForm/pkg-plist b/www/p5-Template-Plugin-FillInForm/pkg-plist
index 8909295d066c..e87df88d4176 100644
--- a/www/p5-Template-Plugin-FillInForm/pkg-plist
+++ b/www/p5-Template-Plugin-FillInForm/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/FillInForm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/FillInForm/.packlist
 %%PERL5_MAN3%%/Template::Plugin::FillInForm.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/FillInForm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-JSON/Makefile b/www/p5-Template-Plugin-JSON/Makefile
index 5330ba8b7483..ba12a49bbcef 100644
--- a/www/p5-Template-Plugin-JSON/Makefile
+++ b/www/p5-Template-Plugin-JSON/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Template-Plugin-JSON
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-JSON/pkg-plist b/www/p5-Template-Plugin-JSON/pkg-plist
index 711fc3d763c2..215588429942 100644
--- a/www/p5-Template-Plugin-JSON/pkg-plist
+++ b/www/p5-Template-Plugin-JSON/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/JSON.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/JSON/.packlist
 %%PERL5_MAN3%%/Template::Plugin::JSON.3.gz
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
diff --git a/www/p5-Template-Plugin-JavaScript/Makefile b/www/p5-Template-Plugin-JavaScript/Makefile
index c86fe36c06e3..8ff69e77b195 100644
--- a/www/p5-Template-Plugin-JavaScript/Makefile
+++ b/www/p5-Template-Plugin-JavaScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-JavaScript
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-JavaScript/pkg-plist b/www/p5-Template-Plugin-JavaScript/pkg-plist
index 3c1436b1aa98..4038a9578413 100644
--- a/www/p5-Template-Plugin-JavaScript/pkg-plist
+++ b/www/p5-Template-Plugin-JavaScript/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/JavaScript/.packlist
 %%SITE_PERL%%/Template/Plugin/JavaScript.pm
 %%PERL5_MAN3%%/Template::Plugin::JavaScript.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/JavaScript
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-MP3/Makefile b/www/p5-Template-Plugin-MP3/Makefile
index 153070adc607..27e24ecafd5f 100644
--- a/www/p5-Template-Plugin-MP3/Makefile
+++ b/www/p5-Template-Plugin-MP3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-MP3
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www textproc audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-MP3/pkg-plist b/www/p5-Template-Plugin-MP3/pkg-plist
index 477e924554eb..7f01505e8923 100644
--- a/www/p5-Template-Plugin-MP3/pkg-plist
+++ b/www/p5-Template-Plugin-MP3/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::MP3.3.gz
 %%SITE_PERL%%/Template/Plugin/MP3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/MP3/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/MP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Markdown/Makefile b/www/p5-Template-Plugin-Markdown/Makefile
index d262e6dba80a..fbcb68468c9e 100644
--- a/www/p5-Template-Plugin-Markdown/Makefile
+++ b/www/p5-Template-Plugin-Markdown/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Markdown
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Markdown/pkg-plist b/www/p5-Template-Plugin-Markdown/pkg-plist
index 6360142bc5e4..6fc5a1689fd2 100644
--- a/www/p5-Template-Plugin-Markdown/pkg-plist
+++ b/www/p5-Template-Plugin-Markdown/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::Markdown.3.gz
 %%SITE_PERL%%/Template/Plugin/Markdown.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Markdown/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Markdown
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Monta/Makefile b/www/p5-Template-Plugin-Monta/Makefile
index 2aff214fa05b..6c4a0c8d0b41 100644
--- a/www/p5-Template-Plugin-Monta/Makefile
+++ b/www/p5-Template-Plugin-Monta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Monta
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Monta/pkg-plist b/www/p5-Template-Plugin-Monta/pkg-plist
index 7ca1e1d8a61e..8c1ca11e7c0c 100644
--- a/www/p5-Template-Plugin-Monta/pkg-plist
+++ b/www/p5-Template-Plugin-Monta/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Monta/.packlist
 %%SITE_PERL%%/Template/Plugin/Monta.pm
 %%PERL5_MAN3%%/Template::Plugin::Monta.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Monta
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Number-Format/Makefile b/www/p5-Template-Plugin-Number-Format/Makefile
index fe03cb9017af..b17c3f4b3c7f 100644
--- a/www/p5-Template-Plugin-Number-Format/Makefile
+++ b/www/p5-Template-Plugin-Number-Format/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Number-Format
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Number-Format/pkg-plist b/www/p5-Template-Plugin-Number-Format/pkg-plist
index db1d8e21c0d7..76256465c753 100644
--- a/www/p5-Template-Plugin-Number-Format/pkg-plist
+++ b/www/p5-Template-Plugin-Number-Format/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/Number/Format.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Number/Format/.packlist
 %%PERL5_MAN3%%/Template::Plugin::Number::Format.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Number/Format
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Number
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrm %%SITE_PERL%%/Template/Plugin/Number
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-StripScripts/Makefile b/www/p5-Template-Plugin-StripScripts/Makefile
index 4514587c3359..e60e25e26079 100644
--- a/www/p5-Template-Plugin-StripScripts/Makefile
+++ b/www/p5-Template-Plugin-StripScripts/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-StripScripts
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-StripScripts/pkg-plist b/www/p5-Template-Plugin-StripScripts/pkg-plist
index b86075d81392..8e4692967854 100644
--- a/www/p5-Template-Plugin-StripScripts/pkg-plist
+++ b/www/p5-Template-Plugin-StripScripts/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Template/Plugin/StripScripts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/StripScripts/.packlist
 %%PERL5_MAN3%%/Template::Plugin::StripScripts.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/StripScripts
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Subst/Makefile b/www/p5-Template-Plugin-Subst/Makefile
index d98274aaa94d..0d5913cf7a64 100644
--- a/www/p5-Template-Plugin-Subst/Makefile
+++ b/www/p5-Template-Plugin-Subst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Plugin-Subst
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-Subst/pkg-plist b/www/p5-Template-Plugin-Subst/pkg-plist
index 70f0b3566185..264db0e93b27 100644
--- a/www/p5-Template-Plugin-Subst/pkg-plist
+++ b/www/p5-Template-Plugin-Subst/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/Template::Plugin::Subst.3.gz
 %%SITE_PERL%%/Template/Plugin/Subst.pm
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-VMethods/Makefile b/www/p5-Template-Plugin-VMethods/Makefile
index d98a2bf1e965..7fdbb982f5c9 100644
--- a/www/p5-Template-Plugin-VMethods/Makefile
+++ b/www/p5-Template-Plugin-VMethods/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Template-Plugin-VMethods
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Plugin-VMethods/pkg-plist b/www/p5-Template-Plugin-VMethods/pkg-plist
index 04d8811e5aec..823b04054d7b 100644
--- a/www/p5-Template-Plugin-VMethods/pkg-plist
+++ b/www/p5-Template-Plugin-VMethods/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/Template/Plugin/VMethods.pm
 %%SITE_PERL%%/Template/Plugin/VMethods/VMethodContainer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/VMethods/.packlist
 %%PERL5_MAN3%%/Template::Plugin::VMethods.3.gz
-@dirrm %%SITE_PERL%%/Template/Plugin/VMethods
-@dirrm %%SITE_PERL%%/Template/Plugin
-@dirrm %%SITE_PERL%%/Template
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/VMethods
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
diff --git a/www/p5-Template-Provider-Encoding/Makefile b/www/p5-Template-Provider-Encoding/Makefile
index 327db09a8f3b..00f6aaf8cfca 100644
--- a/www/p5-Template-Provider-Encoding/Makefile
+++ b/www/p5-Template-Provider-Encoding/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Template-Provider-Encoding
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Provider-Encoding/pkg-plist b/www/p5-Template-Provider-Encoding/pkg-plist
index be9921164ef8..f4e219d33bd4 100644
--- a/www/p5-Template-Provider-Encoding/pkg-plist
+++ b/www/p5-Template-Provider-Encoding/pkg-plist
@@ -1,14 +1,6 @@
 %%SITE_PERL%%/Template/Plugin/encoding.pm
 %%SITE_PERL%%/Template/Provider/Encoding.pm
 %%SITE_PERL%%/Template/Stash/ForceUTF8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider/Encoding/.packlist
 %%PERL5_MAN3%%/Template::Plugin::encoding.3.gz
 %%PERL5_MAN3%%/Template::Provider::Encoding.3.gz
 %%PERL5_MAN3%%/Template::Stash::ForceUTF8.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider/Encoding
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Stash
-@dirrmtry %%SITE_PERL%%/Template/Provider
-@dirrmtry %%SITE_PERL%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Provider-FromDATA/Makefile b/www/p5-Template-Provider-FromDATA/Makefile
index 5b7f88fe9066..710a0ca13941 100644
--- a/www/p5-Template-Provider-FromDATA/Makefile
+++ b/www/p5-Template-Provider-FromDATA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Provider-FromDATA
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Provider-FromDATA/pkg-plist b/www/p5-Template-Provider-FromDATA/pkg-plist
index c386eb2ed9bc..81956b702de0 100644
--- a/www/p5-Template-Provider-FromDATA/pkg-plist
+++ b/www/p5-Template-Provider-FromDATA/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider/FromDATA/.packlist
 %%SITE_PERL%%/Template/Provider/FromDATA.pm
 %%PERL5_MAN3%%/Template::Provider::FromDATA.3.gz
-@dirrmtry %%SITE_PERL%%/Template/Provider
-@dirrmtry %%SITE_PERL%%/Template
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider/FromDATA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
diff --git a/www/p5-Template-Simple/Makefile b/www/p5-Template-Simple/Makefile
index be46fa354cb0..4d184b1c6567 100644
--- a/www/p5-Template-Simple/Makefile
+++ b/www/p5-Template-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Simple
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Simple/pkg-plist b/www/p5-Template-Simple/pkg-plist
index e5fb5b9d8df0..7380bc981340 100644
--- a/www/p5-Template-Simple/pkg-plist
+++ b/www/p5-Template-Simple/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/Template/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Simple/.packlist
 %%PERL5_MAN3%%/Template::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Stash-AutoEscape/Makefile b/www/p5-Template-Stash-AutoEscape/Makefile
index 9326b4003add..10455163d8f8 100644
--- a/www/p5-Template-Stash-AutoEscape/Makefile
+++ b/www/p5-Template-Stash-AutoEscape/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Template-Stash-AutoEscape
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Stash-AutoEscape/pkg-plist b/www/p5-Template-Stash-AutoEscape/pkg-plist
index deedd6258c62..78d567577597 100644
--- a/www/p5-Template-Stash-AutoEscape/pkg-plist
+++ b/www/p5-Template-Stash-AutoEscape/pkg-plist
@@ -1,12 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/AutoEscape/.packlist
 %%SITE_PERL%%/Template/Stash/AutoEscape.pm
 %%SITE_PERL%%/Template/Stash/AutoEscape/Escaped/Base.pm
 %%SITE_PERL%%/Template/Stash/AutoEscape/Escaped/HTML.pm
 %%SITE_PERL%%/Template/Stash/AutoEscape/Escaped/YourCode.pm
 %%SITE_PERL%%/Template/Stash/AutoEscape/RawString.pm
 %%PERL5_MAN3%%/Template::Stash::AutoEscape.3.gz
-@dirrm %%SITE_PERL%%/Template/Stash/AutoEscape/Escaped
-@dirrm %%SITE_PERL%%/Template/Stash/AutoEscape
-@dirrmtry %%SITE_PERL%%/Template/Stash
-@dirrmtry %%SITE_PERL%%/Template
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/AutoEscape
diff --git a/www/p5-Template-Timer/Makefile b/www/p5-Template-Timer/Makefile
index 6218249dfeec..9251f0782b18 100644
--- a/www/p5-Template-Timer/Makefile
+++ b/www/p5-Template-Timer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Template-Timer
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Timer/pkg-plist b/www/p5-Template-Timer/pkg-plist
index 633e45f12912..b30d0c097dfc 100644
--- a/www/p5-Template-Timer/pkg-plist
+++ b/www/p5-Template-Timer/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Template/Timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Timer/.packlist
 %%PERL5_MAN3%%/Template::Timer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Timer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Toolkit-Simple/Makefile b/www/p5-Template-Toolkit-Simple/Makefile
index cdc86522ae26..ec84a86ddd40 100644
--- a/www/p5-Template-Toolkit-Simple/Makefile
+++ b/www/p5-Template-Toolkit-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Toolkit-Simple
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Template-Toolkit-Simple/pkg-plist b/www/p5-Template-Toolkit-Simple/pkg-plist
index fc623b0ca26d..5746309f5e46 100644
--- a/www/p5-Template-Toolkit-Simple/pkg-plist
+++ b/www/p5-Template-Toolkit-Simple/pkg-plist
@@ -1,10 +1,4 @@
 bin/tt-render
 %%SITE_PERL%%/Template/Toolkit/Simple.pm
 %%SITE_PERL%%/Template/Toolkit/Simple.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Toolkit/Simple/.packlist
 %%PERL5_MAN3%%/Template::Toolkit::Simple.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Toolkit/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Toolkit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/Template/Toolkit
-@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index d088246ad6eb..5689f5c12d14 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Toolkit
 PORTVERSION=	2.25
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN \
 		http://www.template-toolkit.org/download/
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index ce91b2a56aaf..539b05ea8fa8 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -65,82 +65,71 @@ bin/ttree
 %%PERL5_MAN3%%/Template::Tutorial::Web.3.gz
 %%PERL5_MAN3%%/Template::VMethods.3.gz
 %%PERL5_MAN3%%/Template::View.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Template.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Directive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Document.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Exception.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/FAQ.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Filters.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Grammar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Config.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Credits.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Directives.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Filters.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Internals.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Intro.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Plugins.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Syntax.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/VMethods.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Variables.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Views.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Modules.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Assert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Datafile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Directory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Dumper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Format.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/HTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Image.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Iterator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Math.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Pod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Procedural.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Scalar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/URL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/View.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugins.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Provider.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Service.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/Context.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/XS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Toolkit.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/tpage.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/ttree.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial/Datafile.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial/Web.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/VMethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/View.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
+%%SITE_ARCH%%/Template.pm
+%%SITE_ARCH%%/Template/Base.pm
+%%SITE_ARCH%%/Template/Config.pm
+%%SITE_ARCH%%/Template/Constants.pm
+%%SITE_ARCH%%/Template/Context.pm
+%%SITE_ARCH%%/Template/Directive.pm
+%%SITE_ARCH%%/Template/Document.pm
+%%SITE_ARCH%%/Template/Exception.pm
+%%SITE_ARCH%%/Template/FAQ.pod
+%%SITE_ARCH%%/Template/Filters.pm
+%%SITE_ARCH%%/Template/Grammar.pm
+%%SITE_ARCH%%/Template/Iterator.pm
+%%SITE_ARCH%%/Template/Manual.pod
+%%SITE_ARCH%%/Template/Manual/Config.pod
+%%SITE_ARCH%%/Template/Manual/Credits.pod
+%%SITE_ARCH%%/Template/Manual/Directives.pod
+%%SITE_ARCH%%/Template/Manual/Filters.pod
+%%SITE_ARCH%%/Template/Manual/Internals.pod
+%%SITE_ARCH%%/Template/Manual/Intro.pod
+%%SITE_ARCH%%/Template/Manual/Plugins.pod
+%%SITE_ARCH%%/Template/Manual/Syntax.pod
+%%SITE_ARCH%%/Template/Manual/VMethods.pod
+%%SITE_ARCH%%/Template/Manual/Variables.pod
+%%SITE_ARCH%%/Template/Manual/Views.pod
+%%SITE_ARCH%%/Template/Modules.pod
+%%SITE_ARCH%%/Template/Namespace/Constants.pm
+%%SITE_ARCH%%/Template/Parser.pm
+%%SITE_ARCH%%/Template/Plugin.pm
+%%SITE_ARCH%%/Template/Plugin/Assert.pm
+%%SITE_ARCH%%/Template/Plugin/CGI.pm
+%%SITE_ARCH%%/Template/Plugin/Datafile.pm
+%%SITE_ARCH%%/Template/Plugin/Date.pm
+%%SITE_ARCH%%/Template/Plugin/Directory.pm
+%%SITE_ARCH%%/Template/Plugin/Dumper.pm
+%%SITE_ARCH%%/Template/Plugin/File.pm
+%%SITE_ARCH%%/Template/Plugin/Filter.pm
+%%SITE_ARCH%%/Template/Plugin/Format.pm
+%%SITE_ARCH%%/Template/Plugin/HTML.pm
+%%SITE_ARCH%%/Template/Plugin/Image.pm
+%%SITE_ARCH%%/Template/Plugin/Iterator.pm
+%%SITE_ARCH%%/Template/Plugin/Math.pm
+%%SITE_ARCH%%/Template/Plugin/Pod.pm
+%%SITE_ARCH%%/Template/Plugin/Procedural.pm
+%%SITE_ARCH%%/Template/Plugin/Scalar.pm
+%%SITE_ARCH%%/Template/Plugin/String.pm
+%%SITE_ARCH%%/Template/Plugin/Table.pm
+%%SITE_ARCH%%/Template/Plugin/URL.pm
+%%SITE_ARCH%%/Template/Plugin/View.pm
+%%SITE_ARCH%%/Template/Plugin/Wrap.pm
+%%SITE_ARCH%%/Template/Plugins.pm
+%%SITE_ARCH%%/Template/Provider.pm
+%%SITE_ARCH%%/Template/Service.pm
+%%SITE_ARCH%%/Template/Stash.pm
+%%SITE_ARCH%%/Template/Stash/Context.pm
+%%SITE_ARCH%%/Template/Stash/XS.pm
+%%SITE_ARCH%%/Template/Test.pm
+%%SITE_ARCH%%/Template/Toolkit.pod
+%%SITE_ARCH%%/Template/Tools.pod
+%%SITE_ARCH%%/Template/Tools/tpage.pod
+%%SITE_ARCH%%/Template/Tools/ttree.pod
+%%SITE_ARCH%%/Template/Tutorial.pod
+%%SITE_ARCH%%/Template/Tutorial/Datafile.pod
+%%SITE_ARCH%%/Template/Tutorial/Web.pod
+%%SITE_ARCH%%/Template/VMethods.pm
+%%SITE_ARCH%%/Template/View.pm
+%%SITE_ARCH%%/auto/Template/Stash/XS/XS.so
 man/man1/tpage.1.gz
 man/man1/ttree.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template
diff --git a/www/p5-Tenjin/Makefile b/www/p5-Tenjin/Makefile
index 00ef74509ec9..f1d44bc4a04e 100644
--- a/www/p5-Tenjin/Makefile
+++ b/www/p5-Tenjin/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Tenjin
 PORTVERSION=	0.070001
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Tenjin/pkg-plist b/www/p5-Tenjin/pkg-plist
index ebb06b509b9c..b747744b94d1 100644
--- a/www/p5-Tenjin/pkg-plist
+++ b/www/p5-Tenjin/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tenjin/.packlist
 %%SITE_PERL%%/Tenjin.pm
 %%SITE_PERL%%/Tenjin/Context.pm
 %%SITE_PERL%%/Tenjin/Preprocessor.pm
@@ -9,5 +8,3 @@
 %%PERL5_MAN3%%/Tenjin::Preprocessor.3.gz
 %%PERL5_MAN3%%/Tenjin::Template.3.gz
 %%PERL5_MAN3%%/Tenjin::Util.3.gz
-@dirrmtry %%SITE_PERL%%/Tenjin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tenjin
diff --git a/www/p5-Test-HTTP-Server-Simple/Makefile b/www/p5-Test-HTTP-Server-Simple/Makefile
index 979942864c88..c344d80fa8c5 100644
--- a/www/p5-Test-HTTP-Server-Simple/Makefile
+++ b/www/p5-Test-HTTP-Server-Simple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-HTTP-Server-Simple
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Test-HTTP-Server-Simple/pkg-plist b/www/p5-Test-HTTP-Server-Simple/pkg-plist
index d8c4e28fd527..47d628adb4d4 100644
--- a/www/p5-Test-HTTP-Server-Simple/pkg-plist
+++ b/www/p5-Test-HTTP-Server-Simple/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/Test/HTTP/Server/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple/.packlist
 %%PERL5_MAN3%%/Test::HTTP::Server::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP
-@dirrmtry %%SITE_PERL%%/Test/HTTP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
-@dirrmtry %%SITE_PERL%%/Test/HTTP
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/www/p5-Test-HTTP/Makefile b/www/p5-Test-HTTP/Makefile
index 0a5ac5135474..bd5fe750f957 100644
--- a/www/p5-Test-HTTP/Makefile
+++ b/www/p5-Test-HTTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-HTTP
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Test-HTTP/pkg-plist b/www/p5-Test-HTTP/pkg-plist
index 213ebf264eb9..5532fabd221c 100644
--- a/www/p5-Test-HTTP/pkg-plist
+++ b/www/p5-Test-HTTP/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/.packlist
 %%SITE_PERL%%/Test/HTTP.pm
 %%SITE_PERL%%/Test/HTTP/Syntax.pm
 %%PERL5_MAN3%%/Test::HTTP.3.gz
 %%PERL5_MAN3%%/Test::HTTP::Syntax.3.gz
-@dirrmtry %%SITE_PERL%%/Test/HTTP
-@dirrmtry %%SITE_PERL%%/Test
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
diff --git a/www/p5-Test-Nginx/Makefile b/www/p5-Test-Nginx/Makefile
index b2cdf362c764..af0a355cb7e6 100644
--- a/www/p5-Test-Nginx/Makefile
+++ b/www/p5-Test-Nginx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Test-Nginx
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Test-Nginx/pkg-plist b/www/p5-Test-Nginx/pkg-plist
index 19d3ad04749e..83d680f3c8e2 100644
--- a/www/p5-Test-Nginx/pkg-plist
+++ b/www/p5-Test-Nginx/pkg-plist
@@ -7,9 +7,3 @@
 %%SITE_PERL%%/Test/Nginx/Socket.pm
 %%SITE_PERL%%/Test/Nginx/Socket/Lua.pm
 %%SITE_PERL%%/Test/Nginx/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Nginx/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Nginx
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
-@dirrmtry %%SITE_PERL%%/Test/Nginx/Socket
-@dirrmtry %%SITE_PERL%%/Test/Nginx
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/www/p5-TestGen4Web-Runner/Makefile b/www/p5-TestGen4Web-Runner/Makefile
index 833f1c2cb3f4..b87cefd7e6d3 100644
--- a/www/p5-TestGen4Web-Runner/Makefile
+++ b/www/p5-TestGen4Web-Runner/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TestGen4Web-Runner
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	WWW/MACKERS
diff --git a/www/p5-TestGen4Web-Runner/pkg-plist b/www/p5-TestGen4Web-Runner/pkg-plist
index 117bf552aedc..f6ab3cb5d256 100644
--- a/www/p5-TestGen4Web-Runner/pkg-plist
+++ b/www/p5-TestGen4Web-Runner/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/TestGen4Web/Runner.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/TestGen4Web/Runner/.packlist
 %%PERL5_MAN3%%/TestGen4Web::Runner.3.gz
-@dirrmtry %%SITE_PERL%%/TestGen4Web
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TestGen4Web/Runner
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/TestGen4Web
diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
index 048b0da82158..175712196f35 100644
--- a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
+++ b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-MultiMarkdown-ApacheHandler
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/pkg-plist b/www/p5-Text-MultiMarkdown-ApacheHandler/pkg-plist
index a60fa9450fe3..737e993cd97c 100644
--- a/www/p5-Text-MultiMarkdown-ApacheHandler/pkg-plist
+++ b/www/p5-Text-MultiMarkdown-ApacheHandler/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/Text::MultiMarkdown::ApacheHandler.3.gz
 %%SITE_PERL%%/Text/MultiMarkdown/ApacheHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MultiMarkdown/ApacheHandler/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MultiMarkdown/ApacheHandler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MultiMarkdown
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/Text/MultiMarkdown
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/www/p5-Tie-TinyURL/Makefile b/www/p5-Tie-TinyURL/Makefile
index 0647160b6e20..6daa564803d6 100644
--- a/www/p5-Tie-TinyURL/Makefile
+++ b/www/p5-Tie-TinyURL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tie-TinyURL
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Tie-TinyURL/pkg-plist b/www/p5-Tie-TinyURL/pkg-plist
index a4127e450806..d6ea96992f53 100644
--- a/www/p5-Tie-TinyURL/pkg-plist
+++ b/www/p5-Tie-TinyURL/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Tie::TinyURL.3.gz
 %%SITE_PERL%%/Tie/TinyURL.pm
-@dirrmtry %%SITE_PERL%%/Tie
diff --git a/www/p5-Toader/Makefile b/www/p5-Toader/Makefile
index fdf6fad1b43f..d74cd70208a7 100644
--- a/www/p5-Toader/Makefile
+++ b/www/p5-Toader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Toader
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/www/p5-Toader/pkg-plist b/www/p5-Toader/pkg-plist
index 789da1ec6776..ef4c5211589e 100644
--- a/www/p5-Toader/pkg-plist
+++ b/www/p5-Toader/pkg-plist
@@ -85,17 +85,3 @@ bin/toader-temp
 %%SITE_PERL%%/Toader/findToaderRoot.pm
 %%SITE_PERL%%/Toader/isaToaderDir.pm
 %%SITE_PERL%%/Toader/pathHelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Toader/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Toader
-@dirrm %%SITE_PERL%%/Toader/Templates
-@dirrm %%SITE_PERL%%/Toader/Render/Page/backends
-@dirrm %%SITE_PERL%%/Toader/Render/Page
-@dirrm %%SITE_PERL%%/Toader/Render/Entry/backends
-@dirrm %%SITE_PERL%%/Toader/Render/Entry
-@dirrm %%SITE_PERL%%/Toader/Render/Directory/backends
-@dirrm %%SITE_PERL%%/Toader/Render/Directory
-@dirrm %%SITE_PERL%%/Toader/Render/AutoDoc
-@dirrm %%SITE_PERL%%/Toader/Render
-@dirrm %%SITE_PERL%%/Toader/Page
-@dirrm %%SITE_PERL%%/Toader/Entry
-@dirrm %%SITE_PERL%%/Toader
diff --git a/www/p5-Twiggy-TLS/Makefile b/www/p5-Twiggy-TLS/Makefile
index 704f6dcd96fa..fdd3ddcd890d 100644
--- a/www/p5-Twiggy-TLS/Makefile
+++ b/www/p5-Twiggy-TLS/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Twiggy-TLS
 PORTVERSION=	0.0019
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:UNDEF
diff --git a/www/p5-Twiggy-TLS/pkg-plist b/www/p5-Twiggy-TLS/pkg-plist
index 5c47fa990720..e95d98b866b8 100644
--- a/www/p5-Twiggy-TLS/pkg-plist
+++ b/www/p5-Twiggy-TLS/pkg-plist
@@ -1,15 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Twiggy/TLS/.packlist
 %%SITE_PERL%%/Plack/Handler/Twiggy/TLS.pm
 %%SITE_PERL%%/Twiggy/Server/TLS.pm
 %%SITE_PERL%%/Twiggy/TLS.pm
 %%SITE_PERL%%/Twiggy/TLS/Info.pm
 %%PERL5_MAN3%%/Twiggy::TLS.3.gz
 %%PERL5_MAN3%%/Twiggy::TLS::Info.3.gz
-@dirrm %%SITE_PERL%%/Twiggy/TLS
-@dirrmtry %%SITE_PERL%%/Twiggy/Server
-@dirrmtry %%SITE_PERL%%/Twiggy
-@dirrm %%SITE_PERL%%/Plack/Handler/Twiggy
-@dirrmtry %%SITE_PERL%%/Plack/Handler
-@dirrmtry %%SITE_PERL%%/Plack
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Twiggy/TLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Twiggy
diff --git a/www/p5-Twiggy/Makefile b/www/p5-Twiggy/Makefile
index 4d42b800bbdc..da18c08c8187 100644
--- a/www/p5-Twiggy/Makefile
+++ b/www/p5-Twiggy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Twiggy
 PORTVERSION=	0.1024
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Twiggy/pkg-plist b/www/p5-Twiggy/pkg-plist
index 5129d5fc7e1b..f58c6e8836bd 100644
--- a/www/p5-Twiggy/pkg-plist
+++ b/www/p5-Twiggy/pkg-plist
@@ -2,14 +2,8 @@ man/man1/twiggy.1.gz
 %%PERL5_MAN3%%/Plack::Handler::Twiggy.3.gz
 %%PERL5_MAN3%%/Twiggy.3.gz
 bin/twiggy
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Twiggy/.packlist
 %%SITE_PERL%%/AnyEvent/Server/PSGI.pm
 %%SITE_PERL%%/Plack/Handler/Twiggy.pm
 %%SITE_PERL%%/Twiggy.pm
 %%SITE_PERL%%/Twiggy/Server.pm
 %%SITE_PERL%%/Twiggy/Server/SS.pm
-@dirrm %%SITE_PERL%%/Twiggy/Server
-@dirrm %%SITE_PERL%%/Twiggy
-@dirrmtry %%SITE_PERL%%/AnyEvent/Server
-@dirrmtry %%SITE_PERL%%/AnyEvent
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Twiggy
diff --git a/www/p5-URI-Encode/Makefile b/www/p5-URI-Encode/Makefile
index 47fea4ec9727..4e92c217a3cf 100644
--- a/www/p5-URI-Encode/Makefile
+++ b/www/p5-URI-Encode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Encode
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MITHUN
diff --git a/www/p5-URI-Encode/pkg-plist b/www/p5-URI-Encode/pkg-plist
index 2af849b4ac83..20eaa5d21f2c 100644
--- a/www/p5-URI-Encode/pkg-plist
+++ b/www/p5-URI-Encode/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/URI/Encode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Encode/.packlist
 %%PERL5_MAN3%%/URI::Encode.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Encode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-URI-Escape-JavaScript/Makefile b/www/p5-URI-Escape-JavaScript/Makefile
index 1f14d103f888..df433f96c77e 100644
--- a/www/p5-URI-Escape-JavaScript/Makefile
+++ b/www/p5-URI-Escape-JavaScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Escape-JavaScript
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN \
 		http://kostjn.spb.ru/freebsd/
diff --git a/www/p5-URI-Escape-JavaScript/pkg-plist b/www/p5-URI-Escape-JavaScript/pkg-plist
index f639e402446d..3012fdb3ef8d 100644
--- a/www/p5-URI-Escape-JavaScript/pkg-plist
+++ b/www/p5-URI-Escape-JavaScript/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Escape/JavaScript/.packlist
 %%SITE_PERL%%/URI/Escape/JavaScript.pm
 %%PERL5_MAN3%%/URI::Escape::JavaScript.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Escape/JavaScript
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Escape
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/
-@dirrmtry %%SITE_PERL%%/URI/Escape
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-URI-Escape-XS/Makefile b/www/p5-URI-Escape-XS/Makefile
index 53bfcaa7ae0d..bd91921a25cf 100644
--- a/www/p5-URI-Escape-XS/Makefile
+++ b/www/p5-URI-Escape-XS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Escape-XS
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-URI-Escape-XS/pkg-plist b/www/p5-URI-Escape-XS/pkg-plist
index 968067d10517..c88f8b49430c 100644
--- a/www/p5-URI-Escape-XS/pkg-plist
+++ b/www/p5-URI-Escape-XS/pkg-plist
@@ -1,9 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Escape/XS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Escape/XS/XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/URI/Escape/XS.pm
+%%SITE_ARCH%%/auto/URI/Escape/XS/XS.so
+%%SITE_ARCH%%/URI/Escape/XS.pm
 %%PERL5_MAN3%%/URI::Escape::XS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/URI/Escape/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/URI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Escape/XS/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Escape
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile
index 8ed5dd7816a1..1a78a80d62c8 100644
--- a/www/p5-URI-Fetch/Makefile
+++ b/www/p5-URI-Fetch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Fetch
 PORTVERSION=	0.100
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-URI-Fetch/pkg-plist b/www/p5-URI-Fetch/pkg-plist
index 5423c29dee08..bf4ddf0f68e1 100644
--- a/www/p5-URI-Fetch/pkg-plist
+++ b/www/p5-URI-Fetch/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/URI::Fetch::Response.3.gz
 %%SITE_PERL%%/URI/Fetch.pm
 %%SITE_PERL%%/URI/Fetch/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Fetch/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Fetch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI/Fetch
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-URI-ParseSearchString/Makefile b/www/p5-URI-ParseSearchString/Makefile
index 41241a1bca02..5883bcff9019 100644
--- a/www/p5-URI-ParseSearchString/Makefile
+++ b/www/p5-URI-ParseSearchString/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-ParseSearchString
 PORTVERSION=	3.51.0
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-URI-ParseSearchString/pkg-plist b/www/p5-URI-ParseSearchString/pkg-plist
index 07700144965e..4d8dc88c056b 100644
--- a/www/p5-URI-ParseSearchString/pkg-plist
+++ b/www/p5-URI-ParseSearchString/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/ParseSearchString/.packlist
 %%SITE_PERL%%/URI/ParseSearchString.pm
 %%PERL5_MAN3%%/URI::ParseSearchString.3.gz
-@dirrmtry %%SITE_PERL%%/URI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/ParseSearchString
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
diff --git a/www/p5-URI-Sequin/Makefile b/www/p5-URI-Sequin/Makefile
index e145c1f64ee7..bd339c934d03 100644
--- a/www/p5-URI-Sequin/Makefile
+++ b/www/p5-URI-Sequin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	URI-Sequin
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARGIE
diff --git a/www/p5-URI-Sequin/pkg-plist b/www/p5-URI-Sequin/pkg-plist
index 4761e1f96d06..bff7bffbd37b 100644
--- a/www/p5-URI-Sequin/pkg-plist
+++ b/www/p5-URI-Sequin/pkg-plist
@@ -1,11 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin/.packlist
 %%SITE_PERL%%/URI/Sequin.pm
 %%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/example.pl
 %%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/ref1.log
 %%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/ref2.log
-%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin/examples
-%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin
 %%PERL5_MAN3%%/URI::Sequin.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-URI-Title/Makefile b/www/p5-URI-Title/Makefile
index 3aa6f3ad9d48..12266956d99e 100644
--- a/www/p5-URI-Title/Makefile
+++ b/www/p5-URI-Title/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	URI-Title
 PORTVERSION=	1.86
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	URI
diff --git a/www/p5-URI-Title/pkg-plist b/www/p5-URI-Title/pkg-plist
index 6cc10e73cd1c..025f7263e1bc 100644
--- a/www/p5-URI-Title/pkg-plist
+++ b/www/p5-URI-Title/pkg-plist
@@ -4,9 +4,4 @@
 %%SITE_PERL%%/URI/Title/MP3.pm
 %%SITE_PERL%%/URI/Title/PDF.pm
 %%SITE_PERL%%/URI/title.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Title/.packlist
 %%PERL5_MAN3%%/URI::Title.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Title
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI/Title
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-URI-ToDisk/Makefile b/www/p5-URI-ToDisk/Makefile
index e7ff12424b31..c5e89a125c93 100644
--- a/www/p5-URI-ToDisk/Makefile
+++ b/www/p5-URI-ToDisk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	URI-ToDisk
 PORTVERSION=	1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-URI-ToDisk/pkg-plist b/www/p5-URI-ToDisk/pkg-plist
index 06e965236e58..713db5c260ce 100644
--- a/www/p5-URI-ToDisk/pkg-plist
+++ b/www/p5-URI-ToDisk/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/URI/ToDisk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/ToDisk/.packlist
 %%PERL5_MAN3%%/URI::ToDisk.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/ToDisk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-VUser-Google-ProvisioningAPI/Makefile b/www/p5-VUser-Google-ProvisioningAPI/Makefile
index 3a3deb7d3be8..bc938d0baa75 100644
--- a/www/p5-VUser-Google-ProvisioningAPI/Makefile
+++ b/www/p5-VUser-Google-ProvisioningAPI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	VUser-Google-ProvisioningAPI
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSMITH/vuser
diff --git a/www/p5-VUser-Google-ProvisioningAPI/pkg-plist b/www/p5-VUser-Google-ProvisioningAPI/pkg-plist
index 04f4d157bfaf..bb52a90b1bb4 100644
--- a/www/p5-VUser-Google-ProvisioningAPI/pkg-plist
+++ b/www/p5-VUser-Google-ProvisioningAPI/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/VUser/Google/ProvisioningAPI/V2_0/NicknameEntry.pm
 %%SITE_PERL%%/VUser/Google/ProvisioningAPI/V2_0/EmailListRecipientEntry.pm
 %%SITE_PERL%%/VUser/Google/ProvisioningAPI/V2_0/UserEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/VUser-Google-ProvisioningAPI/.packlist
 %%PERL5_MAN3%%/VUser::Google::ProvisioningAPI::V2_0::EmailListEntry.3.gz
 %%PERL5_MAN3%%/VUser::Google::ProvisioningAPI::V2_0::NicknameEntry.3.gz
 %%PERL5_MAN3%%/VUser::Google::ProvisioningAPI::V2_0.3.gz
@@ -13,8 +12,3 @@
 %%PERL5_MAN3%%/VUser::Google::ProvisioningAPI.3.gz
 %%PERL5_MAN3%%/VUser::Google::ProvisioningAPI::V2_0::EmailListRecipientEntry.3.gz
 %%PERL5_MAN3%%/VUser::Google::ProvisioningAPI::V2_0::UserEntry.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/VUser-Google-ProvisioningAPI
-@dirrm %%SITE_PERL%%/VUser/Google/ProvisioningAPI/V2_0
-@dirrm %%SITE_PERL%%/VUser/Google/ProvisioningAPI
-@dirrmtry %%SITE_PERL%%/VUser/Google
-@dirrmtry %%SITE_PERL%%/VUser
diff --git a/www/p5-W3C-LinkChecker/Makefile b/www/p5-W3C-LinkChecker/Makefile
index 3e6c0d72df80..4d42e25f0915 100644
--- a/www/p5-W3C-LinkChecker/Makefile
+++ b/www/p5-W3C-LinkChecker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	W3C-LinkChecker
 PORTVERSION=	4.81
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SCOP
diff --git a/www/p5-W3C-LinkChecker/pkg-plist b/www/p5-W3C-LinkChecker/pkg-plist
index adae012a4bb6..b38c3c8dc698 100644
--- a/www/p5-W3C-LinkChecker/pkg-plist
+++ b/www/p5-W3C-LinkChecker/pkg-plist
@@ -1,7 +1,3 @@
 bin/checklink
 man/man1/checklink.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LinkChecker/.packlist
 %%SITE_PERL%%/W3C/LinkChecker.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LinkChecker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C
-@dirrm %%SITE_PERL%%/W3C
diff --git a/www/p5-W3C-LogValidator/Makefile b/www/p5-W3C-LogValidator/Makefile
index a4ee1d16b574..6d46dcbfa974 100644
--- a/www/p5-W3C-LogValidator/Makefile
+++ b/www/p5-W3C-LogValidator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	W3C-LogValidator
 PORTVERSION=	1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-W3C-LogValidator/pkg-plist b/www/p5-W3C-LogValidator/pkg-plist
index 5030b793706e..9201dd13c411 100644
--- a/www/p5-W3C-LogValidator/pkg-plist
+++ b/www/p5-W3C-LogValidator/pkg-plist
@@ -10,7 +10,6 @@ bin/logprocess.pl
 %%SITE_PERL%%/W3C/LogValidator/Output/Mail.pm
 %%SITE_PERL%%/W3C/LogValidator/Output/Raw.pm
 %%SITE_PERL%%/W3C/LogValidator/SurveyEngine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LogValidator/.packlist
 %%PERL5_MAN3%%/W3C::LogValidator.3.gz
 %%PERL5_MAN3%%/W3C::LogValidator::Basic.3.gz
 %%PERL5_MAN3%%/W3C::LogValidator::CSSValidator.3.gz
@@ -24,8 +23,3 @@ bin/logprocess.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/NewOutputModule.pm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logprocess.conf
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LogValidator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C
-@dirrm %%SITE_PERL%%/W3C/LogValidator/Output
-@dirrm %%SITE_PERL%%/W3C/LogValidator
-@dirrmtry %%SITE_PERL%%/W3C
diff --git a/www/p5-WWW-AtMovies-TV/Makefile b/www/p5-WWW-AtMovies-TV/Makefile
index fc6a76d90bd2..8bc194f46db6 100644
--- a/www/p5-WWW-AtMovies-TV/Makefile
+++ b/www/p5-WWW-AtMovies-TV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-AtMovies-TV
 PORTVERSION=	0.04
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-WWW-AtMovies-TV/pkg-plist b/www/p5-WWW-AtMovies-TV/pkg-plist
index 37c0251583a6..4f89e280f357 100644
--- a/www/p5-WWW-AtMovies-TV/pkg-plist
+++ b/www/p5-WWW-AtMovies-TV/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/WWW::AtMovies::TV.3.gz
 %%SITE_PERL%%/WWW/AtMovies/TV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/AtMovies/TV/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/AtMovies/TV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/AtMovies
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/AtMovies
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Babelfish/Makefile b/www/p5-WWW-Babelfish/Makefile
index 552609eff2ad..3ccf80a51567 100644
--- a/www/p5-WWW-Babelfish/Makefile
+++ b/www/p5-WWW-Babelfish/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Babelfish
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Babelfish/pkg-plist b/www/p5-WWW-Babelfish/pkg-plist
index 19b2e68a929b..968984fe460a 100644
--- a/www/p5-WWW-Babelfish/pkg-plist
+++ b/www/p5-WWW-Babelfish/pkg-plist
@@ -1,9 +1,3 @@
 %%SITE_PERL%%/WWW/Babelfish.pm
 %%SITE_PERL%%/auto/WWW/Babelfish/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Babelfish/.packlist
 %%PERL5_MAN3%%/WWW::Babelfish.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Babelfish
-@dirrm %%SITE_PERL%%/auto/WWW/Babelfish
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Baseball-NPB/Makefile b/www/p5-WWW-Baseball-NPB/Makefile
index 90173ab81e63..ee1cea4bbe6b 100644
--- a/www/p5-WWW-Baseball-NPB/Makefile
+++ b/www/p5-WWW-Baseball-NPB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Baseball-NPB
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www japanese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Baseball-NPB/pkg-plist b/www/p5-WWW-Baseball-NPB/pkg-plist
index deba5f11ef79..e8d44c5065b0 100644
--- a/www/p5-WWW-Baseball-NPB/pkg-plist
+++ b/www/p5-WWW-Baseball-NPB/pkg-plist
@@ -1,11 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Baseball/NPB/.packlist
 %%SITE_PERL%%/WWW/Baseball/NPB.pm
 %%SITE_PERL%%/WWW/Baseball/NPB/Game.pm
 %%PERL5_MAN3%%/WWW::Baseball::NPB.3.gz
 %%PERL5_MAN3%%/WWW::Baseball::NPB::Game.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Baseball/NPB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Baseball
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Baseball/NPB
-@dirrmtry %%SITE_PERL%%/WWW/Baseball
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Comic/Makefile b/www/p5-WWW-Comic/Makefile
index f8864c8aa80f..67a43b4c9cd0 100644
--- a/www/p5-WWW-Comic/Makefile
+++ b/www/p5-WWW-Comic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Comic
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Comic/pkg-plist b/www/p5-WWW-Comic/pkg-plist
index ac375abc04b9..7924848ddda2 100644
--- a/www/p5-WWW-Comic/pkg-plist
+++ b/www/p5-WWW-Comic/pkg-plist
@@ -16,6 +16,3 @@
 %%SITE_PERL%%/WWW/Comic/Plugin/UserFriendly.pm
 %%SITE_PERL%%/WWW/Comic/Plugin/VenusEnvy.pm
 %%SITE_PERL%%/WWW/Comic/Plugin/uComics.pm
-@dirrmtry %%SITE_PERL%%/WWW/Comic/Plugin
-@dirrmtry %%SITE_PERL%%/WWW/Comic
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Contact/Makefile b/www/p5-WWW-Contact/Makefile
index e3d97f687684..c32b43c67b6d 100644
--- a/www/p5-WWW-Contact/Makefile
+++ b/www/p5-WWW-Contact/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Contact
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FAYLAND
diff --git a/www/p5-WWW-Contact/pkg-plist b/www/p5-WWW-Contact/pkg-plist
index 49ddabec9adf..417cd068c81c 100644
--- a/www/p5-WWW-Contact/pkg-plist
+++ b/www/p5-WWW-Contact/pkg-plist
@@ -13,7 +13,6 @@
 %%SITE_PERL%%/WWW/Contact/CN/163.pm
 %%SITE_PERL%%/WWW/Contact/BG/Abv.pm
 %%SITE_PERL%%/WWW/Contact/BG/Mail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Contact/.packlist
 %%PERL5_MAN3%%/WWW::Contact.3.gz
 %%PERL5_MAN3%%/WWW::Contact::AOL.3.gz
 %%PERL5_MAN3%%/WWW::Contact::BG::Abv.3.gz
@@ -29,8 +28,3 @@
 %%PERL5_MAN3%%/WWW::Contact::Plaxo.3.gz
 %%PERL5_MAN3%%/WWW::Contact::Rediffmail.3.gz
 %%PERL5_MAN3%%/WWW::Contact::Yahoo.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Contact
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Contact/BG
-@dirrmtry %%SITE_PERL%%/WWW/Contact/CN
-@dirrmtry %%SITE_PERL%%/WWW/Contact
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index e506d7cce3e2..87a8c6280884 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Curl
 PORTVERSION=	4.17
+PORTREVISION=	1
 CATEGORIES=	www ftp perl5
 MASTER_SITES=	CPAN \
 		http://curl.haxx.se/libcurl/perl/
diff --git a/www/p5-WWW-Curl/pkg-plist b/www/p5-WWW-Curl/pkg-plist
index 772fa5aceb3d..e4a9a3c86379 100644
--- a/www/p5-WWW-Curl/pkg-plist
+++ b/www/p5-WWW-Curl/pkg-plist
@@ -1,12 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Easy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Form.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Multi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Share.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Curl.so
+%%SITE_ARCH%%/WWW/Curl.pm
+%%SITE_ARCH%%/WWW/Curl/Easy.pm
+%%SITE_ARCH%%/WWW/Curl/Form.pm
+%%SITE_ARCH%%/WWW/Curl/Multi.pm
+%%SITE_ARCH%%/WWW/Curl/Share.pm
+%%SITE_ARCH%%/auto/WWW/Curl/Curl.so
 %%PERL5_MAN3%%/WWW::Curl.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/WWW
diff --git a/www/p5-WWW-DHL/Makefile b/www/p5-WWW-DHL/Makefile
index 3ae2e852ed68..0c3e754204b0 100644
--- a/www/p5-WWW-DHL/Makefile
+++ b/www/p5-WWW-DHL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-DHL
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	WWW
diff --git a/www/p5-WWW-DHL/pkg-plist b/www/p5-WWW-DHL/pkg-plist
index c5361a44c8d9..99b4f6c0c921 100644
--- a/www/p5-WWW-DHL/pkg-plist
+++ b/www/p5-WWW-DHL/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/WWW::DHL.3.gz
 %%SITE_PERL%%/WWW/DHL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/DHL/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/DHL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Dilbert/Makefile b/www/p5-WWW-Dilbert/Makefile
index 2472b2f85f56..3b761545916f 100644
--- a/www/p5-WWW-Dilbert/Makefile
+++ b/www/p5-WWW-Dilbert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Dilbert
 PORTVERSION=	1.19
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-WWW-Dilbert/pkg-plist b/www/p5-WWW-Dilbert/pkg-plist
index ce7b9075c884..0366bb1916ce 100644
--- a/www/p5-WWW-Dilbert/pkg-plist
+++ b/www/p5-WWW-Dilbert/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/WWW::Dilbert.3.gz
 %%SITE_PERL%%/WWW/Dilbert.pm
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Facebook-API/Makefile b/www/p5-WWW-Facebook-API/Makefile
index 864cbd53e0f2..0d17a137cfa7 100644
--- a/www/p5-WWW-Facebook-API/Makefile
+++ b/www/p5-WWW-Facebook-API/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Facebook-API
 PORTVERSION=	0.4.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Facebook-API/pkg-plist b/www/p5-WWW-Facebook-API/pkg-plist
index 033857fb8d2c..c0952b493edd 100644
--- a/www/p5-WWW-Facebook-API/pkg-plist
+++ b/www/p5-WWW-Facebook-API/pkg-plist
@@ -28,7 +28,6 @@
 %%SITE_PERL%%/WWW/Facebook/API/Stream.pm
 %%SITE_PERL%%/WWW/Facebook/API/Users.pm
 %%SITE_PERL%%/WWW/Facebook/API/Video.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Facebook/API/.packlist
 %%PERL5_MAN3%%/WWW::Facebook::API.3.gz
 %%PERL5_MAN3%%/WWW::Facebook::API::Admin.3.gz
 %%PERL5_MAN3%%/WWW::Facebook::API::Application.3.gz
@@ -59,9 +58,3 @@
 %%PERL5_MAN3%%/WWW::Facebook::API::Stream.3.gz
 %%PERL5_MAN3%%/WWW::Facebook::API::Users.3.gz
 %%PERL5_MAN3%%/WWW::Facebook::API::Video.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Facebook/API
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Facebook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Facebook/API
-@dirrmtry %%SITE_PERL%%/WWW/Facebook
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-FreeProxy/Makefile b/www/p5-WWW-FreeProxy/Makefile
index a592207ffb97..61c1f7876672 100644
--- a/www/p5-WWW-FreeProxy/Makefile
+++ b/www/p5-WWW-FreeProxy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-FreeProxy
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-FreeProxy/pkg-plist b/www/p5-WWW-FreeProxy/pkg-plist
index 7ab1c329a2a3..c9330bbd59e4 100644
--- a/www/p5-WWW-FreeProxy/pkg-plist
+++ b/www/p5-WWW-FreeProxy/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/WWW/FreeProxy/Proxy4Free.pm
 %%SITE_PERL%%/WWW/FreeProxy/PublicProxyServers.pm
 %%SITE_PERL%%/WWW/FreeProxy/Samair.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/FreeProxy/.packlist
 %%PERL5_MAN3%%/WWW::FreeProxy.3.gz
 %%PERL5_MAN3%%/WWW::FreeProxy::Proxy4Free.3.gz
 %%PERL5_MAN3%%/WWW::FreeProxy::Samair.3.gz
 %%PERL5_MAN3%%/WWW::FreeProxy::Look.3.gz
 %%PERL5_MAN3%%/WWW::FreeProxy::PublicProxyServers.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/FreeProxy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/FreeProxy
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-GitHub-Gist/Makefile b/www/p5-WWW-GitHub-Gist/Makefile
index 7e2034cb22ef..b946bc9afaa7 100644
--- a/www/p5-WWW-GitHub-Gist/Makefile
+++ b/www/p5-WWW-GitHub-Gist/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-GitHub-Gist
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-GitHub-Gist/pkg-plist b/www/p5-WWW-GitHub-Gist/pkg-plist
index ec8c8a721abe..c7628b9bd78d 100644
--- a/www/p5-WWW-GitHub-Gist/pkg-plist
+++ b/www/p5-WWW-GitHub-Gist/pkg-plist
@@ -2,10 +2,3 @@
 %%PERL5_MAN3%%/WWW::GitHub::Gist::v3.3.gz
 %%SITE_PERL%%/WWW/GitHub/Gist.pm
 %%SITE_PERL%%/WWW/GitHub/Gist/v3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GitHub/Gist/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GitHub/Gist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GitHub
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/GitHub/Gist
-@dirrmtry %%SITE_PERL%%/WWW/GitHub
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Google-Calculator/Makefile b/www/p5-WWW-Google-Calculator/Makefile
index b3c1f8110f20..803d942295b7 100644
--- a/www/p5-WWW-Google-Calculator/Makefile
+++ b/www/p5-WWW-Google-Calculator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Google-Calculator
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Google-Calculator/pkg-plist b/www/p5-WWW-Google-Calculator/pkg-plist
index ac966aa48cba..27ae60659d58 100644
--- a/www/p5-WWW-Google-Calculator/pkg-plist
+++ b/www/p5-WWW-Google-Calculator/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/Calculator/.packlist
 %%SITE_PERL%%/WWW/Google/Calculator.pm
 %%PERL5_MAN3%%/WWW::Google::Calculator.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/Calculator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Google-News-TW/Makefile b/www/p5-WWW-Google-News-TW/Makefile
index fc35d157d50e..95b369db6bbe 100644
--- a/www/p5-WWW-Google-News-TW/Makefile
+++ b/www/p5-WWW-Google-News-TW/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Google-News-TW
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Google-News-TW/pkg-plist b/www/p5-WWW-Google-News-TW/pkg-plist
index 96adcece2e54..9d8da7d31eaa 100644
--- a/www/p5-WWW-Google-News-TW/pkg-plist
+++ b/www/p5-WWW-Google-News-TW/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/WWW/Google/News/TW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/News/TW/.packlist
 %%PERL5_MAN3%%/WWW::Google::News::TW.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/News/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/News
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/WWW/Google/News
-@dirrmtry %%SITE_PERL%%/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Google-News/Makefile b/www/p5-WWW-Google-News/Makefile
index b8ca94213c01..4bf28b4f7a9a 100644
--- a/www/p5-WWW-Google-News/Makefile
+++ b/www/p5-WWW-Google-News/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Google-News
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Google-News/pkg-plist b/www/p5-WWW-Google-News/pkg-plist
index 72066a5c0916..a451eab32813 100644
--- a/www/p5-WWW-Google-News/pkg-plist
+++ b/www/p5-WWW-Google-News/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Google/News.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/News/.packlist
 %%PERL5_MAN3%%/WWW::Google::News.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/News
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Google-Notebook/Makefile b/www/p5-WWW-Google-Notebook/Makefile
index 0b4f9bb891d8..31a3b91f3344 100644
--- a/www/p5-WWW-Google-Notebook/Makefile
+++ b/www/p5-WWW-Google-Notebook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Google-Notebook
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Google-Notebook/pkg-plist b/www/p5-WWW-Google-Notebook/pkg-plist
index 92df8343c7ed..ec2d4b24c7d5 100644
--- a/www/p5-WWW-Google-Notebook/pkg-plist
+++ b/www/p5-WWW-Google-Notebook/pkg-plist
@@ -1,13 +1,6 @@
 %%SITE_PERL%%/WWW/Google/Notebook.pm
 %%SITE_PERL%%/WWW/Google/Notebook/Note.pm
 %%SITE_PERL%%/WWW/Google/Notebook/Notebook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/Notebook/.packlist
 %%PERL5_MAN3%%/WWW::Google::Notebook.3.gz
 %%PERL5_MAN3%%/WWW::Google::Notebook::Note.3.gz
 %%PERL5_MAN3%%/WWW::Google::Notebook::Notebook.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/Notebook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Google/Notebook
-@dirrmtry %%SITE_PERL%%/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Google-PageRank/Makefile b/www/p5-WWW-Google-PageRank/Makefile
index deeebc1bc35d..95c9d5aaa749 100644
--- a/www/p5-WWW-Google-PageRank/Makefile
+++ b/www/p5-WWW-Google-PageRank/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Google-PageRank
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Google-PageRank/pkg-plist b/www/p5-WWW-Google-PageRank/pkg-plist
index f0246cf60383..d287e86a653d 100644
--- a/www/p5-WWW-Google-PageRank/pkg-plist
+++ b/www/p5-WWW-Google-PageRank/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Google/PageRank.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/PageRank/.packlist
 %%PERL5_MAN3%%/WWW::Google::PageRank.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/PageRank
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Google-Video/Makefile b/www/p5-WWW-Google-Video/Makefile
index 38f5f22ba43d..5ac5421ffa8d 100644
--- a/www/p5-WWW-Google-Video/Makefile
+++ b/www/p5-WWW-Google-Video/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Google-Video
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Google-Video/pkg-plist b/www/p5-WWW-Google-Video/pkg-plist
index 7bb176df1504..fdaf297213a4 100644
--- a/www/p5-WWW-Google-Video/pkg-plist
+++ b/www/p5-WWW-Google-Video/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Google/Video.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/Video/.packlist
 %%PERL5_MAN3%%/WWW::Google::Video.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google/Video
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Google
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-HatenaDiary/Makefile b/www/p5-WWW-HatenaDiary/Makefile
index d9ea0af38e03..c9f0c0820eb2 100644
--- a/www/p5-WWW-HatenaDiary/Makefile
+++ b/www/p5-WWW-HatenaDiary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-HatenaDiary
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-HatenaDiary/pkg-plist b/www/p5-WWW-HatenaDiary/pkg-plist
index 20e2c40b2d8b..656e72634f9f 100644
--- a/www/p5-WWW-HatenaDiary/pkg-plist
+++ b/www/p5-WWW-HatenaDiary/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/HatenaDiary/.packlist
 %%SITE_PERL%%/WWW/HatenaDiary.pm
 %%PERL5_MAN3%%/WWW::HatenaDiary.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/HatenaDiary
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-HatenaLogin/Makefile b/www/p5-WWW-HatenaLogin/Makefile
index 26874ba68ea2..97f89bb1e944 100644
--- a/www/p5-WWW-HatenaLogin/Makefile
+++ b/www/p5-WWW-HatenaLogin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-HatenaLogin
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-HatenaLogin/pkg-plist b/www/p5-WWW-HatenaLogin/pkg-plist
index 0ec4dc774361..646bff3cd2ae 100644
--- a/www/p5-WWW-HatenaLogin/pkg-plist
+++ b/www/p5-WWW-HatenaLogin/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/HatenaLogin/.packlist
 %%SITE_PERL%%/WWW/HatenaLogin.pm
 %%PERL5_MAN3%%/WWW::HatenaLogin.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/HatenaLogin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-HatenaStar/Makefile b/www/p5-WWW-HatenaStar/Makefile
index 0a26afce0c91..73ad49241437 100644
--- a/www/p5-WWW-HatenaStar/Makefile
+++ b/www/p5-WWW-HatenaStar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-HatenaStar
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-HatenaStar/pkg-plist b/www/p5-WWW-HatenaStar/pkg-plist
index dfd8c51aebf1..962d58bda23d 100644
--- a/www/p5-WWW-HatenaStar/pkg-plist
+++ b/www/p5-WWW-HatenaStar/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/HatenaStar/.packlist
 %%SITE_PERL%%/WWW/HatenaStar.pm
 %%PERL5_MAN3%%/WWW::HatenaStar.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/HatenaStar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-IMDb/Makefile b/www/p5-WWW-IMDb/Makefile
index 1cacacaf62a5..434b6e3b8cc7 100644
--- a/www/p5-WWW-IMDb/Makefile
+++ b/www/p5-WWW-IMDb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	IMDb
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	ftp://ftp.rhapsodyk.net/pub/devel/perl/
 PKGNAMEPREFIX=	p5-WWW-
diff --git a/www/p5-WWW-IMDb/pkg-plist b/www/p5-WWW-IMDb/pkg-plist
index 226931132548..16ed80a554de 100644
--- a/www/p5-WWW-IMDb/pkg-plist
+++ b/www/p5-WWW-IMDb/pkg-plist
@@ -2,9 +2,6 @@
 %%SITE_PERL%%/IMDb/Generique.pm
 %%SITE_PERL%%/IMDb/People.pm
 %%SITE_PERL%%/IMDb.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDb/.packlist
 %%PERL5_MAN3%%/IMDb.3.gz
 %%PERL5_MAN3%%/IMDb::People.3.gz
 %%PERL5_MAN3%%/IMDb::Title.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDb
-@dirrm %%SITE_PERL%%/IMDb
diff --git a/www/p5-WWW-Instapaper-Client/Makefile b/www/p5-WWW-Instapaper-Client/Makefile
index 1402ae42c4ee..60f0214b6b7b 100644
--- a/www/p5-WWW-Instapaper-Client/Makefile
+++ b/www/p5-WWW-Instapaper-Client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Instapaper-Client
 PORTVERSION=	0.901
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Instapaper-Client/pkg-plist b/www/p5-WWW-Instapaper-Client/pkg-plist
index f682e61a410b..47fd83b89e39 100644
--- a/www/p5-WWW-Instapaper-Client/pkg-plist
+++ b/www/p5-WWW-Instapaper-Client/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/WWW/Instapaper/Client.pm
 %%PERL5_MAN3%%/WWW::Instapaper::Client.3.gz
-@dirrm %%SITE_PERL%%/WWW/Instapaper
diff --git a/www/p5-WWW-LongURL/Makefile b/www/p5-WWW-LongURL/Makefile
index ad0d99557e31..175a16bec852 100644
--- a/www/p5-WWW-LongURL/Makefile
+++ b/www/p5-WWW-LongURL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-LongURL
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-LongURL/pkg-plist b/www/p5-WWW-LongURL/pkg-plist
index fcc57a5e7603..cc2922a65d00 100644
--- a/www/p5-WWW-LongURL/pkg-plist
+++ b/www/p5-WWW-LongURL/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/WWW/LongURL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/LongURL/.packlist
 %%PERL5_MAN3%%/WWW::LongURL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/LongURL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-CGI/Makefile b/www/p5-WWW-Mechanize-CGI/Makefile
index b11df138aa67..bc455ec8f169 100644
--- a/www/p5-WWW-Mechanize-CGI/Makefile
+++ b/www/p5-WWW-Mechanize-CGI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-CGI
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-CGI/pkg-plist b/www/p5-WWW-Mechanize-CGI/pkg-plist
index 95bccfc084e9..6f63bbe4eb87 100644
--- a/www/p5-WWW-Mechanize-CGI/pkg-plist
+++ b/www/p5-WWW-Mechanize-CGI/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Mechanize/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/CGI/.packlist
 %%PERL5_MAN3%%/WWW::Mechanize::CGI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-Cached/Makefile b/www/p5-WWW-Mechanize-Cached/Makefile
index 467439ebf91b..30d9adf233a9 100644
--- a/www/p5-WWW-Mechanize-Cached/Makefile
+++ b/www/p5-WWW-Mechanize-Cached/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	WWW-Mechanize-Cached
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-Cached/pkg-plist b/www/p5-WWW-Mechanize-Cached/pkg-plist
index fbe07b303cce..0883cfc94fac 100644
--- a/www/p5-WWW-Mechanize-Cached/pkg-plist
+++ b/www/p5-WWW-Mechanize-Cached/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Cached/.packlist
 %%SITE_PERL%%/WWW/Mechanize/Cached.pm
 %%PERL5_MAN3%%/WWW::Mechanize::Cached.3.gz
diff --git a/www/p5-WWW-Mechanize-DecodedContent/Makefile b/www/p5-WWW-Mechanize-DecodedContent/Makefile
index d8e78c1fcf56..71a45e187a69 100644
--- a/www/p5-WWW-Mechanize-DecodedContent/Makefile
+++ b/www/p5-WWW-Mechanize-DecodedContent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-DecodedContent
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-WWW-Mechanize-DecodedContent/pkg-plist b/www/p5-WWW-Mechanize-DecodedContent/pkg-plist
index 0f572f7ab00d..8c92a7510cb1 100644
--- a/www/p5-WWW-Mechanize-DecodedContent/pkg-plist
+++ b/www/p5-WWW-Mechanize-DecodedContent/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/DecodedContent/.packlist
 %%SITE_PERL%%/WWW/Mechanize/DecodedContent.pm
 %%PERL5_MAN3%%/WWW::Mechanize::DecodedContent.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/DecodedContent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-FormFiller/Makefile b/www/p5-WWW-Mechanize-FormFiller/Makefile
index fcfdb7cf3856..35292d75c3ff 100644
--- a/www/p5-WWW-Mechanize-FormFiller/Makefile
+++ b/www/p5-WWW-Mechanize-FormFiller/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-FormFiller
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-FormFiller/pkg-plist b/www/p5-WWW-Mechanize-FormFiller/pkg-plist
index d7786a7f6031..17ce39067cfd 100644
--- a/www/p5-WWW-Mechanize-FormFiller/pkg-plist
+++ b/www/p5-WWW-Mechanize-FormFiller/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/FormFiller/.packlist
 %%SITE_PERL%%/WWW/Mechanize/FormFiller.pm
 %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value.pm
 %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value/Keep.pm
@@ -21,11 +20,3 @@
 %%PERL5_MAN3%%/WWW::Mechanize::FormFiller::Value::Random::Chars.3.gz
 %%PERL5_MAN3%%/WWW::Mechanize::FormFiller::Value::Random::Date.3.gz
 %%PERL5_MAN3%%/WWW::Mechanize::FormFiller::Value::Random::Word.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/FormFiller
-@dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value/Random
-@dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value
-@dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-GZip/Makefile b/www/p5-WWW-Mechanize-GZip/Makefile
index 211946bea2af..3b862d552476 100644
--- a/www/p5-WWW-Mechanize-GZip/Makefile
+++ b/www/p5-WWW-Mechanize-GZip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-GZip
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-GZip/pkg-plist b/www/p5-WWW-Mechanize-GZip/pkg-plist
index 016770483bff..563023df4e3d 100644
--- a/www/p5-WWW-Mechanize-GZip/pkg-plist
+++ b/www/p5-WWW-Mechanize-GZip/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/WWW::Mechanize::GZip.3.gz
 %%SITE_PERL%%/WWW/Mechanize/GZip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/GZip/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/GZip
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-Meta/Makefile b/www/p5-WWW-Mechanize-Meta/Makefile
index d27b55adc5c5..5b1efabaac62 100644
--- a/www/p5-WWW-Mechanize-Meta/Makefile
+++ b/www/p5-WWW-Mechanize-Meta/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-Meta
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-Meta/pkg-plist b/www/p5-WWW-Mechanize-Meta/pkg-plist
index b1a4c2caf136..973e61514fc6 100644
--- a/www/p5-WWW-Mechanize-Meta/pkg-plist
+++ b/www/p5-WWW-Mechanize-Meta/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/WWW/Mechanize/Meta.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Meta/.packlist
 %%PERL5_MAN3%%/WWW::Mechanize::Meta.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Meta
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
diff --git a/www/p5-WWW-Mechanize-Pluggable/Makefile b/www/p5-WWW-Mechanize-Pluggable/Makefile
index 31a97f1e195e..c06f63469860 100644
--- a/www/p5-WWW-Mechanize-Pluggable/Makefile
+++ b/www/p5-WWW-Mechanize-Pluggable/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-Pluggable
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-Pluggable/pkg-plist b/www/p5-WWW-Mechanize-Pluggable/pkg-plist
index d6cfd1fafbcc..1b91bd81c4dd 100644
--- a/www/p5-WWW-Mechanize-Pluggable/pkg-plist
+++ b/www/p5-WWW-Mechanize-Pluggable/pkg-plist
@@ -6,11 +6,3 @@
 %%SITE_PERL%%/WWW/Mechanize/Pluggable/Design.pm
 %%SITE_PERL%%/WWW/Mechanize/Plugin/Cookbook.pm
 %%SITE_PERL%%/WWW/Mechanize/Plugin/HelloWorld.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Pluggable/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Pluggable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize/Plugin
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize/Pluggable
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
index 5f5653059153..c757a6fed120 100644
--- a/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
+++ b/www/p5-WWW-Mechanize-Plugin-phpBB/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-Plugin-phpBB
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-plist b/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-plist
index e8bb1769428a..8bd4f9b4428e 100644
--- a/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-plist
+++ b/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/WWW::Mechanize::Plugin::phpBB.3.gz
 %%SITE_PERL%%/WWW/Mechanize/Plugin/phpBB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Plugin/phpBB/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Plugin/phpBB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize/Plugin
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-Shell/Makefile b/www/p5-WWW-Mechanize-Shell/Makefile
index 2c08b0a9d616..da61b5746020 100644
--- a/www/p5-WWW-Mechanize-Shell/Makefile
+++ b/www/p5-WWW-Mechanize-Shell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-Shell
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CORION
diff --git a/www/p5-WWW-Mechanize-Shell/pkg-plist b/www/p5-WWW-Mechanize-Shell/pkg-plist
index 11f6eb416c92..1e16eec1e752 100644
--- a/www/p5-WWW-Mechanize-Shell/pkg-plist
+++ b/www/p5-WWW-Mechanize-Shell/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/WWW::Mechanize::Shell.3.gz
 %%SITE_PERL%%/WWW/Mechanize/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Shell/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/Changes
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/banking.postbank.de.mech
@@ -8,8 +7,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wwwshell.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Shell
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-SpamCop/Makefile b/www/p5-WWW-Mechanize-SpamCop/Makefile
index 3d48e6f89d0d..28bfe3add7b5 100644
--- a/www/p5-WWW-Mechanize-SpamCop/Makefile
+++ b/www/p5-WWW-Mechanize-SpamCop/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-SpamCop
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	www mail
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-SpamCop/pkg-plist b/www/p5-WWW-Mechanize-SpamCop/pkg-plist
index a6f545c41b8b..00f54bda31ab 100644
--- a/www/p5-WWW-Mechanize-SpamCop/pkg-plist
+++ b/www/p5-WWW-Mechanize-SpamCop/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Mechanize/SpamCop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/SpamCop/.packlist
 %%PERL5_MAN3%%/WWW::Mechanize::SpamCop.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/SpamCop
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-TreeBuilder/Makefile b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
index 5200be71ecee..eb167659c943 100644
--- a/www/p5-WWW-Mechanize-TreeBuilder/Makefile
+++ b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize-TreeBuilder
 PORTVERSION=	1.10003
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize-TreeBuilder/pkg-plist b/www/p5-WWW-Mechanize-TreeBuilder/pkg-plist
index 82c62d338f3d..55dcc4c89578 100644
--- a/www/p5-WWW-Mechanize-TreeBuilder/pkg-plist
+++ b/www/p5-WWW-Mechanize-TreeBuilder/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Mechanize/TreeBuilder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/TreeBuilder/.packlist
 %%PERL5_MAN3%%/WWW::Mechanize::TreeBuilder.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/TreeBuilder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize/Makefile b/www/p5-WWW-Mechanize/Makefile
index 0c1341eaa0dd..acd604f4942d 100644
--- a/www/p5-WWW-Mechanize/Makefile
+++ b/www/p5-WWW-Mechanize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mechanize
 PORTVERSION=	1.73
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mechanize/pkg-plist b/www/p5-WWW-Mechanize/pkg-plist
index 446794a41cbc..2d49811e7e6a 100644
--- a/www/p5-WWW-Mechanize/pkg-plist
+++ b/www/p5-WWW-Mechanize/pkg-plist
@@ -11,9 +11,4 @@ bin/mech-dump
 %%SITE_PERL%%/WWW/Mechanize/FAQ.pod
 %%SITE_PERL%%/WWW/Mechanize/Image.pm
 %%SITE_PERL%%/WWW/Mechanize/Link.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/.packlist
 man/man1/mech-dump.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mechanize
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mediawiki-Client/Makefile b/www/p5-WWW-Mediawiki-Client/Makefile
index 104e971563c4..f6f3d8a1e49e 100644
--- a/www/p5-WWW-Mediawiki-Client/Makefile
+++ b/www/p5-WWW-Mediawiki-Client/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Mediawiki-Client
 PORTVERSION=	0.31
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mediawiki-Client/pkg-plist b/www/p5-WWW-Mediawiki-Client/pkg-plist
index b15184571770..24741e832886 100644
--- a/www/p5-WWW-Mediawiki-Client/pkg-plist
+++ b/www/p5-WWW-Mediawiki-Client/pkg-plist
@@ -3,11 +3,4 @@ bin/mvs
 %%PERL5_MAN3%%/WWW::Mediawiki::Client::Exceptions.3.gz
 %%SITE_PERL%%/WWW/Mediawiki/Client.pm
 %%SITE_PERL%%/WWW/Mediawiki/Client/Exceptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mediawiki/Client/.packlist
 man/man1/mvs.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mediawiki/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mediawiki
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mediawiki/Client
-@dirrmtry %%SITE_PERL%%/WWW/Mediawiki
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mixi-Scraper/Makefile b/www/p5-WWW-Mixi-Scraper/Makefile
index 18b163e9e68b..c8cf328d8470 100644
--- a/www/p5-WWW-Mixi-Scraper/Makefile
+++ b/www/p5-WWW-Mixi-Scraper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mixi-Scraper
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mixi-Scraper/pkg-plist b/www/p5-WWW-Mixi-Scraper/pkg-plist
index bfb992fcae3e..b92842483cb9 100644
--- a/www/p5-WWW-Mixi-Scraper/pkg-plist
+++ b/www/p5-WWW-Mixi-Scraper/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mixi/Scraper/.packlist
 %%SITE_PERL%%/WWW/Mixi/Scraper.pm
 %%SITE_PERL%%/WWW/Mixi/Scraper/Utils.pm
 %%SITE_PERL%%/WWW/Mixi/Scraper/Mech.pm
@@ -47,10 +46,3 @@
 %%PERL5_MAN3%%/WWW::Mixi::Scraper::Plugin::ListEcho.3.gz
 %%PERL5_MAN3%%/WWW::Mixi::Scraper::Plugin::RecentEcho.3.gz
 %%PERL5_MAN3%%/WWW::Mixi::Scraper::Plugin::ShowSchedule.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mixi/Scraper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mixi
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Mixi/Scraper/Plugin
-@dirrmtry %%SITE_PERL%%/WWW/Mixi/Scraper
-@dirrmtry %%SITE_PERL%%/WWW/Mixi
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mixi/Makefile b/www/p5-WWW-Mixi/Makefile
index cbfcedb749e7..c019bdb12e0f 100644
--- a/www/p5-WWW-Mixi/Makefile
+++ b/www/p5-WWW-Mixi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Mixi
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Mixi/pkg-plist b/www/p5-WWW-Mixi/pkg-plist
index 8c1b58629886..6805fd9db9cd 100644
--- a/www/p5-WWW-Mixi/pkg-plist
+++ b/www/p5-WWW-Mixi/pkg-plist
@@ -1,11 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mixi/.packlist
 %%SITE_PERL%%/WWW/Mixi.pm
 %%SITE_PERL%%/WWW/Mixi/Cookbook.pod
 %%SITE_PERL%%/WWW/Mixi/Mixi.pod
 %%PERL5_MAN3%%/WWW::Mixi.3.gz
 %%PERL5_MAN3%%/WWW::Mixi::Cookbook.3.gz
 %%PERL5_MAN3%%/WWW::Mixi::Mixi.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mixi
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/WWW/Mixi
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Myspace/Makefile b/www/p5-WWW-Myspace/Makefile
index 391189d7dfa6..33e5c7327410 100644
--- a/www/p5-WWW-Myspace/Makefile
+++ b/www/p5-WWW-Myspace/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Myspace
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Myspace/pkg-plist b/www/p5-WWW-Myspace/pkg-plist
index 3c19d91cf40a..2ec4ce69a330 100644
--- a/www/p5-WWW-Myspace/pkg-plist
+++ b/www/p5-WWW-Myspace/pkg-plist
@@ -11,11 +11,6 @@ bin/message_group
 %%SITE_PERL%%/WWW/Myspace/FriendChanges.pm
 %%SITE_PERL%%/WWW/Myspace/Message.pm
 %%SITE_PERL%%/WWW/Myspace/MyBase.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Myspace/.packlist
 man/man1/approve_friends.1.gz
 man/man1/comment_myspace.1.gz
 man/man1/message_group.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Myspace
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Myspace
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-NicoVideo-Download/Makefile b/www/p5-WWW-NicoVideo-Download/Makefile
index d6cdf1b0b892..d1536b6ed367 100644
--- a/www/p5-WWW-NicoVideo-Download/Makefile
+++ b/www/p5-WWW-NicoVideo-Download/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-NicoVideo-Download
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-NicoVideo-Download/pkg-plist b/www/p5-WWW-NicoVideo-Download/pkg-plist
index 4faff40ee47e..8bcb142a245a 100644
--- a/www/p5-WWW-NicoVideo-Download/pkg-plist
+++ b/www/p5-WWW-NicoVideo-Download/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/NicoVideo/Download/.packlist
 %%SITE_PERL%%/WWW/NicoVideo/Download.pm
 %%PERL5_MAN3%%/WWW::NicoVideo::Download.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/NicoVideo/Download
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/NicoVideo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/NicoVideo
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-NioTV/Makefile b/www/p5-WWW-NioTV/Makefile
index 2a26ba12d16e..d1dc658ef728 100644
--- a/www/p5-WWW-NioTV/Makefile
+++ b/www/p5-WWW-NioTV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-NioTV
 PORTVERSION=	0.04
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-WWW-NioTV/pkg-plist b/www/p5-WWW-NioTV/pkg-plist
index 4c11660f72d8..c2761ecfeadd 100644
--- a/www/p5-WWW-NioTV/pkg-plist
+++ b/www/p5-WWW-NioTV/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/WWW::NioTV.3.gz
 %%SITE_PERL%%/WWW/NioTV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/NioTV/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/NioTV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-OpenSVN/Makefile b/www/p5-WWW-OpenSVN/Makefile
index 68a0fc314fc3..e74365a963e7 100644
--- a/www/p5-WWW-OpenSVN/Makefile
+++ b/www/p5-WWW-OpenSVN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-OpenSVN
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-OpenSearch/Makefile b/www/p5-WWW-OpenSearch/Makefile
index aad2c8f0a73d..9fba412cb746 100644
--- a/www/p5-WWW-OpenSearch/Makefile
+++ b/www/p5-WWW-OpenSearch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-OpenSearch
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-OpenSearch/pkg-plist b/www/p5-WWW-OpenSearch/pkg-plist
index a2dcff88f70d..e82fcfe8977c 100644
--- a/www/p5-WWW-OpenSearch/pkg-plist
+++ b/www/p5-WWW-OpenSearch/pkg-plist
@@ -14,8 +14,3 @@
 %%SITE_PERL%%/WWW/OpenSearch/Request.pm
 %%SITE_PERL%%/WWW/OpenSearch/Response.pm
 %%SITE_PERL%%/WWW/OpenSearch/Url.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/OpenSearch/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/OpenSearch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/OpenSearch
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
index 7925979dbc23..6578c04d5820 100644
--- a/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
+++ b/www/p5-WWW-Pastebin-PastebinCom-Create/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	WWW-Pastebin-PastebinCom-Create
 PORTVERSION=	1.003
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Pastebin-PastebinCom-Create/pkg-plist b/www/p5-WWW-Pastebin-PastebinCom-Create/pkg-plist
index a0d1991571b1..8c4278407e92 100644
--- a/www/p5-WWW-Pastebin-PastebinCom-Create/pkg-plist
+++ b/www/p5-WWW-Pastebin-PastebinCom-Create/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/WWW::Pastebin::PastebinCom::Create.3.gz
 %%SITE_PERL%%/WWW/Pastebin/PastebinCom/Create.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Pastebin/PastebinCom/Create/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Pastebin/PastebinCom/Create
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Pastebin/PastebinCom
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Pastebin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Pastebin/PastebinCom
-@dirrmtry %%SITE_PERL%%/WWW/Pastebin
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Plurk/Makefile b/www/p5-WWW-Plurk/Makefile
index 1311823e6690..a0e62f4ffbb5 100644
--- a/www/p5-WWW-Plurk/Makefile
+++ b/www/p5-WWW-Plurk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-Plurk
 PORTVERSION=	0.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Plurk/pkg-plist b/www/p5-WWW-Plurk/pkg-plist
index 0ad63603e737..8621487c4a7b 100644
--- a/www/p5-WWW-Plurk/pkg-plist
+++ b/www/p5-WWW-Plurk/pkg-plist
@@ -2,11 +2,6 @@ bin/plurk
 %%SITE_PERL%%/WWW/Plurk.pm
 %%SITE_PERL%%/WWW/Plurk/Friend.pm
 %%SITE_PERL%%/WWW/Plurk/Message.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Plurk/.packlist
 %%PERL5_MAN3%%/WWW::Plurk.3.gz
 %%PERL5_MAN3%%/WWW::Plurk::Friend.3.gz
 %%PERL5_MAN3%%/WWW::Plurk::Message.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Plurk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/WWW/Plurk
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index 7017dea824c5..66fadc87680c 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Robot
 PORTVERSION=	0.026
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Robot/pkg-plist b/www/p5-WWW-Robot/pkg-plist
index 971f849549e0..baf908fea022 100644
--- a/www/p5-WWW-Robot/pkg-plist
+++ b/www/p5-WWW-Robot/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/WWW::Robot.3.gz
 %%SITE_PERL%%/WWW/Robot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-RobotRules-Parser/Makefile b/www/p5-WWW-RobotRules-Parser/Makefile
index 3ff3eebf17cc..0e20b3bc71d3 100644
--- a/www/p5-WWW-RobotRules-Parser/Makefile
+++ b/www/p5-WWW-RobotRules-Parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-RobotRules-Parser
 PORTVERSION=	0.04001
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-RobotRules-Parser/pkg-plist b/www/p5-WWW-RobotRules-Parser/pkg-plist
index e5737a2fa19b..71d83460e976 100644
--- a/www/p5-WWW-RobotRules-Parser/pkg-plist
+++ b/www/p5-WWW-RobotRules-Parser/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/RobotRules/Parser/.packlist
 %%SITE_PERL%%/WWW/RobotRules/Parser.pm
 %%PERL5_MAN3%%/WWW::RobotRules::Parser.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/RobotRules/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/RobotRules
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/RobotRules
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-RobotRules/Makefile b/www/p5-WWW-RobotRules/Makefile
index 480133ef8211..8f53c13e2e4d 100644
--- a/www/p5-WWW-RobotRules/Makefile
+++ b/www/p5-WWW-RobotRules/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-RobotRules
 PORTVERSION=	6.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-RobotRules/pkg-plist b/www/p5-WWW-RobotRules/pkg-plist
index 8a0688e0d879..d65e5dbc0826 100644
--- a/www/p5-WWW-RobotRules/pkg-plist
+++ b/www/p5-WWW-RobotRules/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/WWW::RobotRules::AnyDBM_File.3.gz
 %%SITE_PERL%%/WWW/RobotRules.pm
 %%SITE_PERL%%/WWW/RobotRules/AnyDBM_File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/RobotRules/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/RobotRules
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/RobotRules
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
index 4fd127606502..a913f0777072 100644
--- a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scraper-ISBN-Amazon_Driver
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist
index 13f130cdedef..4ff51ecd6b90 100644
--- a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist
@@ -1,12 +1,4 @@
 %%SITE_PERL%%/WWW/Scraper/ISBN/AmazonUK_Driver.pm
 %%SITE_PERL%%/WWW/Scraper/ISBN/AmazonUS_Driver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Amazon_Driver/.packlist
 %%PERL5_MAN3%%/WWW::Scraper::ISBN::AmazonUK_Driver.3.gz
 %%PERL5_MAN3%%/WWW::Scraper::ISBN::AmazonUS_Driver.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Amazon_Driver
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN
-@dirrmtry %%SITE_PERL%%/WWW/Scraper
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Scraper-ISBN-Driver/Makefile b/www/p5-WWW-Scraper-ISBN-Driver/Makefile
index a43e9e5d30aa..ef5e97663193 100644
--- a/www/p5-WWW-Scraper-ISBN-Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-Driver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scraper-ISBN-Driver
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist
index 03ca58fe4563..26eb0c4e0f6d 100644
--- a/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/WWW/Scraper/ISBN/Driver.pm
 %%PERL5_MAN3%%/WWW::Scraper::ISBN::Driver.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Scraper-ISBN-Driver/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Scraper-ISBN-Driver
-@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN
-@dirrmtry %%SITE_PERL%%/WWW/Scraper
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile b/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
index 68e56ef1b22e..32033a99ff71 100644
--- a/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-ORA_Driver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scraper-ISBN-ORA_Driver
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist
index a907c7934bc9..9bb8e9ba3737 100644
--- a/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/WWW/Scraper/ISBN/ORA_Driver.pm
 %%PERL5_MAN3%%/WWW::Scraper::ISBN::ORA_Driver.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Scraper-ISBN-ORA_Driver/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Scraper-ISBN-ORA_Driver
diff --git a/www/p5-WWW-Scraper-ISBN-Record/Makefile b/www/p5-WWW-Scraper-ISBN-Record/Makefile
index 8f09de46e851..c06998ed4788 100644
--- a/www/p5-WWW-Scraper-ISBN-Record/Makefile
+++ b/www/p5-WWW-Scraper-ISBN-Record/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scraper-ISBN-Record
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scraper-ISBN-Record/pkg-plist b/www/p5-WWW-Scraper-ISBN-Record/pkg-plist
index a96f187ec767..63bcd64284be 100644
--- a/www/p5-WWW-Scraper-ISBN-Record/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-Record/pkg-plist
@@ -1,7 +1,2 @@
 %%PERL5_MAN3%%/WWW::Scraper::ISBN::Record.3.gz
 %%SITE_PERL%%/WWW/Scraper/ISBN/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Scraper-ISBN-Record/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Scraper-ISBN-Record
-@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN
-@dirrmtry %%SITE_PERL%%/WWW/Scraper
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Scraper-ISBN/Makefile b/www/p5-WWW-Scraper-ISBN/Makefile
index 03b297cd8cb4..3578c4124617 100644
--- a/www/p5-WWW-Scraper-ISBN/Makefile
+++ b/www/p5-WWW-Scraper-ISBN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scraper-ISBN
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scraper-ISBN/pkg-plist b/www/p5-WWW-Scraper-ISBN/pkg-plist
index b56ddf1f35e7..99f6304ff9a2 100644
--- a/www/p5-WWW-Scraper-ISBN/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/WWW::Scraper::ISBN.3.gz
 %%SITE_PERL%%/WWW/Scraper/ISBN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Scraper
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Scripter-Plugin-Ajax/Makefile b/www/p5-WWW-Scripter-Plugin-Ajax/Makefile
index 4ca0d8fecbbe..961687743697 100644
--- a/www/p5-WWW-Scripter-Plugin-Ajax/Makefile
+++ b/www/p5-WWW-Scripter-Plugin-Ajax/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scripter-Plugin-Ajax
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scripter-Plugin-Ajax/pkg-plist b/www/p5-WWW-Scripter-Plugin-Ajax/pkg-plist
index 9445b507013c..ce911a8b39e4 100644
--- a/www/p5-WWW-Scripter-Plugin-Ajax/pkg-plist
+++ b/www/p5-WWW-Scripter-Plugin-Ajax/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_PERL%%/WWW/Scripter/Plugin/Ajax/_xml_stuff.pm
 %%SITE_PERL%%/WWW/Scripter/Plugin/Ajax.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scripter/Plugin/Ajax/.packlist
 %%PERL5_MAN3%%/WWW::Scripter::Plugin::Ajax.3.gz
diff --git a/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile b/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile
index 95687b64ef08..07774a04805d 100644
--- a/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile
+++ b/www/p5-WWW-Scripter-Plugin-JavaScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scripter-Plugin-JavaScript
 PORTVERSION=	0.008
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scripter-Plugin-JavaScript/pkg-plist b/www/p5-WWW-Scripter-Plugin-JavaScript/pkg-plist
index c52c12706bd4..ee9b15bf36be 100644
--- a/www/p5-WWW-Scripter-Plugin-JavaScript/pkg-plist
+++ b/www/p5-WWW-Scripter-Plugin-JavaScript/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/WWW/Scripter/Plugin/JavaScript.pm
 %%SITE_PERL%%/WWW/Scripter/Plugin/JavaScript/JE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scripter/Plugin/JavaScript/.packlist
 %%PERL5_MAN3%%/WWW::Scripter::Plugin::JavaScript.3.gz
 %%PERL5_MAN3%%/WWW::Scripter::Plugin::JavaScript::JE.3.gz
diff --git a/www/p5-WWW-Scripter/Makefile b/www/p5-WWW-Scripter/Makefile
index 5a5702751804..fcd4cb5b9c13 100644
--- a/www/p5-WWW-Scripter/Makefile
+++ b/www/p5-WWW-Scripter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Scripter
 PORTVERSION=	0.030
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Scripter/pkg-plist b/www/p5-WWW-Scripter/pkg-plist
index 81d40d8bb25f..ea5ff92f6251 100644
--- a/www/p5-WWW-Scripter/pkg-plist
+++ b/www/p5-WWW-Scripter/pkg-plist
@@ -3,7 +3,6 @@
 %%SITE_PERL%%/WWW/Scripter/WindowGroup.pm
 %%SITE_PERL%%/WWW/Scripter.pm
 %%SITE_PERL%%/WWW/Scripter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scripter/.packlist
 %%PERL5_MAN3%%/WWW::Scripter::Location.3.gz
 %%PERL5_MAN3%%/WWW::Scripter.3.gz
 %%PERL5_MAN3%%/WWW::Scripter::History.3.gz
diff --git a/www/p5-WWW-Search-AltaVista/Makefile b/www/p5-WWW-Search-AltaVista/Makefile
index 48878385f12d..67713115005f 100644
--- a/www/p5-WWW-Search-AltaVista/Makefile
+++ b/www/p5-WWW-Search-AltaVista/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Search-AltaVista
 PORTVERSION=	2.154
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Search-AltaVista/pkg-plist b/www/p5-WWW-Search-AltaVista/pkg-plist
index e18262ad46ef..b6c9f42135dd 100644
--- a/www/p5-WWW-Search-AltaVista/pkg-plist
+++ b/www/p5-WWW-Search-AltaVista/pkg-plist
@@ -18,10 +18,3 @@
 %%SITE_PERL%%/WWW/Search/AltaVista/NL.pm
 %%SITE_PERL%%/WWW/Search/AltaVista/News.pm
 %%SITE_PERL%%/WWW/Search/AltaVista/Web.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/AltaVista/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/AltaVista
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Search/AltaVista
-@dirrmtry %%SITE_PERL%%/WWW/Search
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Search-Google/Makefile b/www/p5-WWW-Search-Google/Makefile
index 966a740e87cc..5567ca99cf42 100644
--- a/www/p5-WWW-Search-Google/Makefile
+++ b/www/p5-WWW-Search-Google/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Search-Google
 PORTVERSION=	0.23
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-WWW-Search-Google/pkg-plist b/www/p5-WWW-Search-Google/pkg-plist
index d7bafbff39b2..bacec831e3e7 100644
--- a/www/p5-WWW-Search-Google/pkg-plist
+++ b/www/p5-WWW-Search-Google/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/WWW::Search::Google.3.gz
 %%SITE_PERL%%/WWW/Search/Google.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Search
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Search-MSN/Makefile b/www/p5-WWW-Search-MSN/Makefile
index a79bc3f4c3db..608cf5d02d50 100644
--- a/www/p5-WWW-Search-MSN/Makefile
+++ b/www/p5-WWW-Search-MSN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Search-MSN
 PORTVERSION=	0.0200
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Search-MSN/pkg-plist b/www/p5-WWW-Search-MSN/pkg-plist
index 604befa2df95..6a8b9b6d9bc8 100644
--- a/www/p5-WWW-Search-MSN/pkg-plist
+++ b/www/p5-WWW-Search-MSN/pkg-plist
@@ -1,8 +1,2 @@
 %%PERL5_MAN3%%/WWW::Search::MSN.3.gz
 %%SITE_PERL%%/WWW/Search/MSN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/MSN/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/MSN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Search
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index 216ec56ccbd5..870bbafce719 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Search
 PORTVERSION=	2.513
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Search/pkg-plist b/www/p5-WWW-Search/pkg-plist
index 1193c8cfbaf3..c94985c60930 100644
--- a/www/p5-WWW-Search/pkg-plist
+++ b/www/p5-WWW-Search/pkg-plist
@@ -12,7 +12,6 @@ man/man1/WebSearch.1.gz
 %%SITE_PERL%%/WWW/Search/Simple.pm
 %%SITE_PERL%%/WWW/Search/Test.pm
 %%SITE_PERL%%/WWW/SearchResult.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/.packlist
 %%PERL5_MAN3%%/WWW::Search.3.gz
 %%PERL5_MAN3%%/WWW::SearchResult.3.gz
 %%PERL5_MAN3%%/WWW::Search::Null.3.gz
@@ -23,8 +22,3 @@ man/man1/WebSearch.1.gz
 %%PERL5_MAN3%%/WWW::Search::Result.3.gz
 %%PERL5_MAN3%%/WWW::Search::Simple.3.gz
 %%PERL5_MAN3%%/WWW::Search::Test.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/WWW/Search/Null
-@dirrmtry %%SITE_PERL%%/WWW/Search
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten-0rz/Makefile b/www/p5-WWW-Shorten-0rz/Makefile
index 94b2dff06c4a..edf7ee6b48c4 100644
--- a/www/p5-WWW-Shorten-0rz/Makefile
+++ b/www/p5-WWW-Shorten-0rz/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Shorten-0rz
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten-0rz/pkg-plist b/www/p5-WWW-Shorten-0rz/pkg-plist
index 06124e4a55e8..c859a8e0f185 100644
--- a/www/p5-WWW-Shorten-0rz/pkg-plist
+++ b/www/p5-WWW-Shorten-0rz/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Shorten/0rz.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/0rz/.packlist
 %%PERL5_MAN3%%/WWW::Shorten::0rz.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/0rz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten-Bitly/Makefile b/www/p5-WWW-Shorten-Bitly/Makefile
index dc403bca3d8e..8e61d60c4ced 100644
--- a/www/p5-WWW-Shorten-Bitly/Makefile
+++ b/www/p5-WWW-Shorten-Bitly/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Shorten-Bitly
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten-Bitly/pkg-plist b/www/p5-WWW-Shorten-Bitly/pkg-plist
index dfdfacdee5db..b004296148b5 100644
--- a/www/p5-WWW-Shorten-Bitly/pkg-plist
+++ b/www/p5-WWW-Shorten-Bitly/pkg-plist
@@ -2,9 +2,3 @@ bin/bitly_url
 %%PERL5_MAN3%%/WWW::Shorten::Bitly.3.gz
 man/man1/bitly_url.1.gz
 %%SITE_PERL%%/WWW/Shorten/Bitly.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/Bitly/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/Bitly
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten-Googl/Makefile b/www/p5-WWW-Shorten-Googl/Makefile
index 113d1bf9742a..a0f033ad6068 100644
--- a/www/p5-WWW-Shorten-Googl/Makefile
+++ b/www/p5-WWW-Shorten-Googl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Shorten-Googl
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten-Googl/pkg-plist b/www/p5-WWW-Shorten-Googl/pkg-plist
index 0a162edc764d..fac2b4d26c09 100644
--- a/www/p5-WWW-Shorten-Googl/pkg-plist
+++ b/www/p5-WWW-Shorten-Googl/pkg-plist
@@ -1,9 +1,3 @@
 bin/goo.gl
 %%SITE_PERL%%/WWW/Shorten/Googl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/Googl/.packlist
 %%PERL5_MAN3%%/WWW::Shorten::Googl.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/Googl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten-KUSO/Makefile b/www/p5-WWW-Shorten-KUSO/Makefile
index d9636b89f045..c951b31c39d9 100644
--- a/www/p5-WWW-Shorten-KUSO/Makefile
+++ b/www/p5-WWW-Shorten-KUSO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Shorten-KUSO
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten-KUSO/pkg-plist b/www/p5-WWW-Shorten-KUSO/pkg-plist
index d053ef7e64d2..a6ab6921386b 100644
--- a/www/p5-WWW-Shorten-KUSO/pkg-plist
+++ b/www/p5-WWW-Shorten-KUSO/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Shorten/KUSO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/KUSO/.packlist
 %%PERL5_MAN3%%/WWW::Shorten::KUSO.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/KUSO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten-NotLong/Makefile b/www/p5-WWW-Shorten-NotLong/Makefile
index d1589a60a1fc..c4a06960c428 100644
--- a/www/p5-WWW-Shorten-NotLong/Makefile
+++ b/www/p5-WWW-Shorten-NotLong/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Shorten-NotLong
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten-NotLong/pkg-plist b/www/p5-WWW-Shorten-NotLong/pkg-plist
index 96eb4be2f047..322e34efd626 100644
--- a/www/p5-WWW-Shorten-NotLong/pkg-plist
+++ b/www/p5-WWW-Shorten-NotLong/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Shorten/NotLong.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/NotLong/.packlist
 %%PERL5_MAN3%%/WWW::Shorten::NotLong.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/NotLong
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten-Yourls/Makefile b/www/p5-WWW-Shorten-Yourls/Makefile
index f7e884fa9b5c..18de387f7659 100644
--- a/www/p5-WWW-Shorten-Yourls/Makefile
+++ b/www/p5-WWW-Shorten-Yourls/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Shorten-Yourls
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten-Yourls/pkg-plist b/www/p5-WWW-Shorten-Yourls/pkg-plist
index 3535553c1c9d..e20110a7776e 100644
--- a/www/p5-WWW-Shorten-Yourls/pkg-plist
+++ b/www/p5-WWW-Shorten-Yourls/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Shorten/Yourls.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/Yourls/.packlist
 %%PERL5_MAN3%%/WWW::Shorten::Yourls.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/Yourls
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten-isgd/Makefile b/www/p5-WWW-Shorten-isgd/Makefile
index c73c8c40a522..52a1959c0f96 100644
--- a/www/p5-WWW-Shorten-isgd/Makefile
+++ b/www/p5-WWW-Shorten-isgd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Shorten-isgd
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten-isgd/pkg-plist b/www/p5-WWW-Shorten-isgd/pkg-plist
index 5beed4b68516..f0ce3b156ea4 100644
--- a/www/p5-WWW-Shorten-isgd/pkg-plist
+++ b/www/p5-WWW-Shorten-isgd/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/WWW/Shorten/isgd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/isgd/.packlist
 %%PERL5_MAN3%%/WWW::Shorten::isgd.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/isgd
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten/Makefile b/www/p5-WWW-Shorten/Makefile
index d06a933de687..50d4d89a9b94 100644
--- a/www/p5-WWW-Shorten/Makefile
+++ b/www/p5-WWW-Shorten/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	WWW-Shorten
 PORTVERSION=	3.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Shorten/pkg-plist b/www/p5-WWW-Shorten/pkg-plist
index 73f967baedbe..538211a91744 100644
--- a/www/p5-WWW-Shorten/pkg-plist
+++ b/www/p5-WWW-Shorten/pkg-plist
@@ -22,8 +22,3 @@ man/man1/shorten.1.gz
 %%SITE_PERL%%/WWW/Shorten/UserAgent.pm
 %%SITE_PERL%%/WWW/Shorten/_dead.pm
 %%SITE_PERL%%/WWW/Shorten/generic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Shorten
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-SourceForge/Makefile b/www/p5-WWW-SourceForge/Makefile
index 383fc1673668..91818dbd8cd9 100644
--- a/www/p5-WWW-SourceForge/Makefile
+++ b/www/p5-WWW-SourceForge/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-SourceForge
 PORTVERSION=	0.70
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
diff --git a/www/p5-WWW-SourceForge/pkg-plist b/www/p5-WWW-SourceForge/pkg-plist
index c474fd53f4ba..6bbb9826a28d 100644
--- a/www/p5-WWW-SourceForge/pkg-plist
+++ b/www/p5-WWW-SourceForge/pkg-plist
@@ -9,8 +9,3 @@
 %%PERL5_MAN3%%/WWW::SourceForge::Project.3.gz
 %%PERL5_MAN3%%/WWW::SourceForge::User.3.gz
 %%PERL5_MAN3%%/WWW::SourceForge::Wiki.3.gz
-@dirrm %%SITE_PERL%%/WWW/SourceForge
-@dirrmtry %%SITE_PERL%%/WWW
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/SourceForge/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/SourceForge
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
diff --git a/www/p5-WWW-Spinn3r/Makefile b/www/p5-WWW-Spinn3r/Makefile
index 07dfd08db2b9..d7e799048deb 100644
--- a/www/p5-WWW-Spinn3r/Makefile
+++ b/www/p5-WWW-Spinn3r/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Spinn3r
 PORTVERSION=	3.00700001
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Spinn3r/pkg-plist b/www/p5-WWW-Spinn3r/pkg-plist
index 8cb0313053e3..9a68289daeb6 100644
--- a/www/p5-WWW-Spinn3r/pkg-plist
+++ b/www/p5-WWW-Spinn3r/pkg-plist
@@ -6,8 +6,3 @@
 %%SITE_PERL%%/WWW/Spinn3r/item.pm
 %%SITE_PERL%%/WWW/Spinn3r/link.pm
 %%SITE_PERL%%/WWW/Spinn3r/next_request_url.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Spinn3r/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Spinn3r
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Spinn3r
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-TV/Makefile b/www/p5-WWW-TV/Makefile
index 440b73677cc4..f521e20368e4 100644
--- a/www/p5-WWW-TV/Makefile
+++ b/www/p5-WWW-TV/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-TV
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-TV/pkg-plist b/www/p5-WWW-TV/pkg-plist
index 24afdf34a76e..e9a19926607a 100644
--- a/www/p5-WWW-TV/pkg-plist
+++ b/www/p5-WWW-TV/pkg-plist
@@ -1,11 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TV/.packlist
 %%SITE_PERL%%/WWW/TV.pm
 %%SITE_PERL%%/WWW/TV/Episode.pm
 %%SITE_PERL%%/WWW/TV/Series.pm
 %%PERL5_MAN3%%/WWW::TV.3.gz
 %%PERL5_MAN3%%/WWW::TV::Episode.3.gz
 %%PERL5_MAN3%%/WWW::TV::Series.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/WWW/TV
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-TWSMS/Makefile b/www/p5-WWW-TWSMS/Makefile
index 2b601315ab5b..03bb07c01108 100644
--- a/www/p5-WWW-TWSMS/Makefile
+++ b/www/p5-WWW-TWSMS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-TWSMS
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-TWSMS/pkg-plist b/www/p5-WWW-TWSMS/pkg-plist
index 693c3658fc89..0c90c9a0522c 100644
--- a/www/p5-WWW-TWSMS/pkg-plist
+++ b/www/p5-WWW-TWSMS/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/WWW/TWSMS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TWSMS/.packlist
 %%PERL5_MAN3%%/WWW::TWSMS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TWSMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-TinySong/Makefile b/www/p5-WWW-TinySong/Makefile
index 058c139587ce..ce09c332f4a9 100644
--- a/www/p5-WWW-TinySong/Makefile
+++ b/www/p5-WWW-TinySong/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-TinySong
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-TinySong/pkg-plist b/www/p5-WWW-TinySong/pkg-plist
index 3c577a6dfbe5..f7c73d4bded7 100644
--- a/www/p5-WWW-TinySong/pkg-plist
+++ b/www/p5-WWW-TinySong/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/WWW/TinySong.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TinySong/.packlist
 %%PERL5_MAN3%%/WWW::TinySong.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TinySong
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%//WWW
diff --git a/www/p5-WWW-Tumblr/Makefile b/www/p5-WWW-Tumblr/Makefile
index 3c0ebc974046..1d5ab41e7556 100644
--- a/www/p5-WWW-Tumblr/Makefile
+++ b/www/p5-WWW-Tumblr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Tumblr
 PORTVERSION=	5.00
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Tumblr/pkg-plist b/www/p5-WWW-Tumblr/pkg-plist
index 747ebffb865f..e48f61271959 100644
--- a/www/p5-WWW-Tumblr/pkg-plist
+++ b/www/p5-WWW-Tumblr/pkg-plist
@@ -9,14 +9,8 @@
 %%SITE_PERL%%/WWW/Tumblr/Tagged.pm
 %%SITE_PERL%%/WWW/Tumblr/Test.pm
 %%SITE_PERL%%/WWW/Tumblr/User.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Tumblr/.packlist
 %%PERL5_MAN3%%/WWW::Tumblr.3.gz
 %%PERL5_MAN3%%/WWW::Tumblr::Blog.3.gz
 %%PERL5_MAN3%%/WWW::Tumblr::ResponseError.3.gz
 %%PERL5_MAN3%%/WWW::Tumblr::Tagged.3.gz
 %%PERL5_MAN3%%/WWW::Tumblr::User.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Tumblr
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/WWW/Tumblr/Authentication
-@dirrm %%SITE_PERL%%/WWW/Tumblr
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-VenusEnvy/Makefile b/www/p5-WWW-VenusEnvy/Makefile
index fc604361c54e..918c65af7bd1 100644
--- a/www/p5-WWW-VenusEnvy/Makefile
+++ b/www/p5-WWW-VenusEnvy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-VenusEnvy
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-VenusEnvy/pkg-plist b/www/p5-WWW-VenusEnvy/pkg-plist
index 61a7cfaba4a1..3c2a3ed7bea0 100644
--- a/www/p5-WWW-VenusEnvy/pkg-plist
+++ b/www/p5-WWW-VenusEnvy/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/WWW::VenusEnvy.3.gz
 %%SITE_PERL%%/WWW/VenusEnvy.pm
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-WebArchive/Makefile b/www/p5-WWW-WebArchive/Makefile
index 98f255988cbc..104e8f5f92b7 100644
--- a/www/p5-WWW-WebArchive/Makefile
+++ b/www/p5-WWW-WebArchive/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-WebArchive
 PORTVERSION=	0.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-WebArchive/pkg-plist b/www/p5-WWW-WebArchive/pkg-plist
index cbef2adc4f53..76fd6ef756da 100644
--- a/www/p5-WWW-WebArchive/pkg-plist
+++ b/www/p5-WWW-WebArchive/pkg-plist
@@ -2,11 +2,6 @@ bin/webarchive
 %%SITE_PERL%%/WWW/WebArchive.pm
 %%SITE_PERL%%/WWW/WebArchive/Agent.pm
 %%SITE_PERL%%/WWW/WebArchive/WaybackMachine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/WebArchive/.packlist
 %%PERL5_MAN3%%/WWW::WebArchive.3.gz
 %%PERL5_MAN3%%/WWW::WebArchive::Agent.3.gz
 %%PERL5_MAN3%%/WWW::WebArchive::WaybackMachine.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/WebArchive
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrm %%SITE_PERL%%/WWW/WebArchive
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Wikipedia/Makefile b/www/p5-WWW-Wikipedia/Makefile
index 7977e4169cdb..dc6c20a26e6a 100644
--- a/www/p5-WWW-Wikipedia/Makefile
+++ b/www/p5-WWW-Wikipedia/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Wikipedia
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRICAS
diff --git a/www/p5-WWW-Wikipedia/pkg-plist b/www/p5-WWW-Wikipedia/pkg-plist
index b38e1bfac77a..d8db4dfcd010 100644
--- a/www/p5-WWW-Wikipedia/pkg-plist
+++ b/www/p5-WWW-Wikipedia/pkg-plist
@@ -3,9 +3,4 @@ bin/wikipedia
 %%PERL5_MAN3%%/WWW::Wikipedia::Entry.3.gz
 %%SITE_PERL%%/WWW/Wikipedia.pm
 %%SITE_PERL%%/WWW/Wikipedia/Entry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wikipedia/.packlist
 man/man1/wikipedia.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wikipedia
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Wikipedia
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Yandex-TIC/Makefile b/www/p5-WWW-Yandex-TIC/Makefile
index 68c8727f545a..a891164f578f 100644
--- a/www/p5-WWW-Yandex-TIC/Makefile
+++ b/www/p5-WWW-Yandex-TIC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Yandex-TIC
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WWW-Yandex-TIC/pkg-plist b/www/p5-WWW-Yandex-TIC/pkg-plist
index d9f12111c56b..8fa41399cfde 100644
--- a/www/p5-WWW-Yandex-TIC/pkg-plist
+++ b/www/p5-WWW-Yandex-TIC/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Yandex/TIC/.packlist
 %%SITE_PERL%%/WWW/Yandex/TIC.pm
 %%PERL5_MAN3%%/WWW::Yandex::TIC.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Yandex/TIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Yandex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW/Yandex
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-iTunesConnect/Makefile b/www/p5-WWW-iTunesConnect/Makefile
index c0c48cf857b2..78a6759b7412 100644
--- a/www/p5-WWW-iTunesConnect/Makefile
+++ b/www/p5-WWW-iTunesConnect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-iTunesConnect
 PORTVERSION=	1.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -22,10 +22,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 PLIST_FILES=	%%SITE_PERL%%/WWW/iTunesConnect.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/iTunesConnect/.packlist \
 		%%PERL5_MAN3%%/WWW::iTunesConnect.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/WWW \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/iTunesConnect \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 
 .include <bsd.port.mk>
diff --git a/www/p5-Web-Query/Makefile b/www/p5-Web-Query/Makefile
index 8af17ba51441..1f0f18e92efb 100644
--- a/www/p5-Web-Query/Makefile
+++ b/www/p5-Web-Query/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Web-Query
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
diff --git a/www/p5-Web-Query/pkg-plist b/www/p5-Web-Query/pkg-plist
index 393995687a8b..3cf8acf66860 100644
--- a/www/p5-Web-Query/pkg-plist
+++ b/www/p5-Web-Query/pkg-plist
@@ -2,5 +2,3 @@
 %%SITE_PERL%%/Web/Query/LibXML.pm
 %%PERL5_MAN3%%/Web::Query.3.gz
 %%PERL5_MAN3%%/Web::Query::LibXML.3.gz
-@dirrm %%SITE_PERL%%/Web/Query
-@dirrmtry %%SITE_PERL%%/Web
diff --git a/www/p5-Web-Scraper-Config/Makefile b/www/p5-Web-Scraper-Config/Makefile
index 7e6b5a5542cd..1650619d1eb9 100644
--- a/www/p5-Web-Scraper-Config/Makefile
+++ b/www/p5-Web-Scraper-Config/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Web-Scraper-Config
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Web-Scraper-Config/pkg-plist b/www/p5-Web-Scraper-Config/pkg-plist
index 8e36b9d7416f..a63da9c560d2 100644
--- a/www/p5-Web-Scraper-Config/pkg-plist
+++ b/www/p5-Web-Scraper-Config/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Web/Scraper/Config/.packlist
 %%SITE_PERL%%/Web/Scraper/Config.pm
 %%PERL5_MAN3%%/Web::Scraper::Config.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Web/Scraper/Config
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Web/Scraper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Web
-@dirrmtry %%SITE_PERL%%/Web/Scraper
-@dirrmtry %%SITE_PERL%%/Web
diff --git a/www/p5-Web-Scraper/Makefile b/www/p5-Web-Scraper/Makefile
index 25e7353766d7..3993752362d7 100644
--- a/www/p5-Web-Scraper/Makefile
+++ b/www/p5-Web-Scraper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Web-Scraper
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
diff --git a/www/p5-Web-Scraper/pkg-plist b/www/p5-Web-Scraper/pkg-plist
index 4e80a62975bb..efedb6606f4e 100644
--- a/www/p5-Web-Scraper/pkg-plist
+++ b/www/p5-Web-Scraper/pkg-plist
@@ -5,8 +5,3 @@ bin/scraper
 %%SITE_PERL%%/Web/Scraper.pm
 %%SITE_PERL%%/Web/Scraper/Filter.pm
 %%SITE_PERL%%/Web/Scraper/LibXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Web/Scraper/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Web/Scraper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Web
-@dirrmtry %%SITE_PERL%%/Web/Scraper
-@dirrmtry %%SITE_PERL%%/Web
diff --git a/www/p5-Web-oEmbed/Makefile b/www/p5-Web-oEmbed/Makefile
index 14217a4dd7c0..82c1d4b090f7 100644
--- a/www/p5-Web-oEmbed/Makefile
+++ b/www/p5-Web-oEmbed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Web-oEmbed
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Web-oEmbed/pkg-plist b/www/p5-Web-oEmbed/pkg-plist
index 37fff907fcb7..581cc8bfcf09 100644
--- a/www/p5-Web-oEmbed/pkg-plist
+++ b/www/p5-Web-oEmbed/pkg-plist
@@ -1,8 +1,3 @@
 %%SITE_PERL%%/Web/oEmbed.pm
 %%SITE_PERL%%/Web/oEmbed/Response.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Web/oEmbed/.packlist
 %%PERL5_MAN3%%/Web::oEmbed.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Web/oEmbed
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Web
-@dirrm %%SITE_PERL%%/Web/oEmbed
-@dirrmtry %%SITE_PERL%%/Web
diff --git a/www/p5-WebDAO/Makefile b/www/p5-WebDAO/Makefile
index adf1e9e7f470..3bf8dc311275 100644
--- a/www/p5-WebDAO/Makefile
+++ b/www/p5-WebDAO/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebDAO
 PORTVERSION=	2.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ZAG
diff --git a/www/p5-WebDAO/pkg-plist b/www/p5-WebDAO/pkg-plist
index ae9576c53867..5faa8cbd2d22 100644
--- a/www/p5-WebDAO/pkg-plist
+++ b/www/p5-WebDAO/pkg-plist
@@ -28,7 +28,6 @@ bin/webdao.psgi
 %%SITE_PERL%%/WebDAO/Store/Storable.pm
 %%SITE_PERL%%/WebDAO/Test.pm
 %%SITE_PERL%%/WebDAO/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebDAO/.packlist
 %%PERL5_MAN3%%/WebDAO.3.gz
 %%PERL5_MAN3%%/WebDAO::Base.3.gz
 %%PERL5_MAN3%%/WebDAO::CV.3.gz
@@ -57,9 +56,3 @@ bin/webdao.psgi
 %%PERL5_MAN3%%/WebDAO::Util.3.gz
 man/man1/wd_fcgi.fpl.1.gz
 man/man1/wd_shell.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebDAO
-@dirrmtry %%SITE_PERL%%/WebDAO/Store
-@dirrmtry %%SITE_PERL%%/WebDAO/Lib
-@dirrmtry %%SITE_PERL%%/WebDAO/Lexer
-@dirrmtry %%SITE_PERL%%/WebDAO/FCGI
-@dirrmtry %%SITE_PERL%%/WebDAO
diff --git a/www/p5-WebService-Basecamp/Makefile b/www/p5-WebService-Basecamp/Makefile
index c9b8610d9928..e5fdb8fb298b 100644
--- a/www/p5-WebService-Basecamp/Makefile
+++ b/www/p5-WebService-Basecamp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Basecamp
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Basecamp/pkg-plist b/www/p5-WebService-Basecamp/pkg-plist
index baa6155a7ca6..71a2635baad3 100644
--- a/www/p5-WebService-Basecamp/pkg-plist
+++ b/www/p5-WebService-Basecamp/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Basecamp/.packlist
 %%SITE_PERL%%/WebService/Basecamp.pm
 %%PERL5_MAN3%%/WebService::Basecamp.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Basecamp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Bloglines/Makefile b/www/p5-WebService-Bloglines/Makefile
index 996717209abc..36def79324ad 100644
--- a/www/p5-WebService-Bloglines/Makefile
+++ b/www/p5-WebService-Bloglines/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Bloglines
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Bloglines/pkg-plist b/www/p5-WebService-Bloglines/pkg-plist
index 2afdc53f5d15..1564bc673adc 100644
--- a/www/p5-WebService-Bloglines/pkg-plist
+++ b/www/p5-WebService-Bloglines/pkg-plist
@@ -1,9 +1,4 @@
 %%SITE_PERL%%/WebService/Bloglines.pm
 %%SITE_PERL%%/WebService/Bloglines/Entries.pm
 %%SITE_PERL%%/WebService/Bloglines/Subscriptions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Bloglines/.packlist
 %%PERL5_MAN3%%/WebService::Bloglines.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Bloglines
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrm %%SITE_PERL%%/WebService/Bloglines
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-BuzzurlAPI/Makefile b/www/p5-WebService-BuzzurlAPI/Makefile
index c7682209a591..11befd2dcf76 100644
--- a/www/p5-WebService-BuzzurlAPI/Makefile
+++ b/www/p5-WebService-BuzzurlAPI/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WebService-BuzzurlAPI
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HOLLY
diff --git a/www/p5-WebService-BuzzurlAPI/pkg-plist b/www/p5-WebService-BuzzurlAPI/pkg-plist
index 8ad78f071689..e4886a3bddc6 100644
--- a/www/p5-WebService-BuzzurlAPI/pkg-plist
+++ b/www/p5-WebService-BuzzurlAPI/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/BuzzurlAPI/.packlist
 %%SITE_PERL%%/WebService/BuzzurlAPI.pm
 %%SITE_PERL%%/WebService/BuzzurlAPI/Util.pm
 %%SITE_PERL%%/WebService/BuzzurlAPI/Response.pm
@@ -16,8 +15,3 @@
 %%PERL5_MAN3%%/WebService::BuzzurlAPI::Util.3.gz
 %%PERL5_MAN3%%/WebService::BuzzurlAPI::Response.3.gz
 %%PERL5_MAN3%%/WebService::BuzzurlAPI::Request.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/BuzzurlAPI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/BuzzurlAPI/Request
-@dirrmtry %%SITE_PERL%%/WebService/BuzzurlAPI
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-CIA/Makefile b/www/p5-WebService-CIA/Makefile
index 53125a65cd83..a52a7383e14c 100644
--- a/www/p5-WebService-CIA/Makefile
+++ b/www/p5-WebService-CIA/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-CIA
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-CIA/pkg-plist b/www/p5-WebService-CIA/pkg-plist
index 451df882d7cf..fcc311ecd6a4 100644
--- a/www/p5-WebService-CIA/pkg-plist
+++ b/www/p5-WebService-CIA/pkg-plist
@@ -9,6 +9,3 @@ bin/webservice-cia-makedbm.pl
 %%SITE_PERL%%/WebService/CIA/Source.pm
 %%SITE_PERL%%/WebService/CIA/Source/DBM.pm
 %%SITE_PERL%%/WebService/CIA/Source/Web.pm
-@dirrmtry %%SITE_PERL%%/WebService/CIA/Source
-@dirrmtry %%SITE_PERL%%/WebService/CIA
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-GData/Makefile b/www/p5-WebService-GData/Makefile
index 5c7de19a3dc6..12965e099451 100644
--- a/www/p5-WebService-GData/Makefile
+++ b/www/p5-WebService-GData/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WebService-GData
 PORTVERSION=	0.0600
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SZABGAB
diff --git a/www/p5-WebService-GData/pkg-plist b/www/p5-WebService-GData/pkg-plist
index d2200f60a005..3bc0d4a70384 100644
--- a/www/p5-WebService-GData/pkg-plist
+++ b/www/p5-WebService-GData/pkg-plist
@@ -161,7 +161,6 @@
 %%SITE_PERL%%/WebService/GData/YouTube/YT/Uploaded.pm
 %%SITE_PERL%%/WebService/GData/YouTube/YT/Username.pm
 %%SITE_PERL%%/WebService/GData/YouTube/YT/Videoid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/GData/.packlist
 %%PERL5_MAN3%%/WebService::GData::Error.3.gz
 %%PERL5_MAN3%%/WebService::GData::ClientLogin.3.gz
 %%PERL5_MAN3%%/WebService::GData::Collection.3.gz
@@ -188,24 +187,3 @@
 %%PERL5_MAN3%%/WebService::GData::YouTube::Feed::Comment.3.gz
 %%PERL5_MAN3%%/WebService::GData::YouTube::Feed::PlaylistLink.3.gz
 %%PERL5_MAN3%%/WebService::GData::YouTube::Feed::VideoMessage.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/GData
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrm %%SITE_PERL%%/WebService/GData/YouTube/YT/Media
-@dirrm %%SITE_PERL%%/WebService/GData/YouTube/YT
-@dirrm %%SITE_PERL%%/WebService/GData/YouTube/Feed
-@dirrm %%SITE_PERL%%/WebService/GData/YouTube/Doc
-@dirrm %%SITE_PERL%%/WebService/GData/YouTube
-@dirrm %%SITE_PERL%%/WebService/GData/Serialize
-@dirrm %%SITE_PERL%%/WebService/GData/Node/OpenSearch
-@dirrm %%SITE_PERL%%/WebService/GData/Node/Media
-@dirrm %%SITE_PERL%%/WebService/GData/Node/GeoRSS
-@dirrm %%SITE_PERL%%/WebService/GData/Node/GML
-@dirrm %%SITE_PERL%%/WebService/GData/Node/GD
-@dirrm %%SITE_PERL%%/WebService/GData/Node/Atom
-@dirrm %%SITE_PERL%%/WebService/GData/Node/APP
-@dirrm %%SITE_PERL%%/WebService/GData/Node
-@dirrm %%SITE_PERL%%/WebService/GData/Feed
-@dirrm %%SITE_PERL%%/WebService/GData/Error
-@dirrm %%SITE_PERL%%/WebService/GData/Batch
-@dirrm %%SITE_PERL%%/WebService/GData
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Google-Reader/Makefile b/www/p5-WebService-Google-Reader/Makefile
index ce245147b18b..248bf7c6bd0e 100644
--- a/www/p5-WebService-Google-Reader/Makefile
+++ b/www/p5-WebService-Google-Reader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Google-Reader
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Google-Reader/pkg-plist b/www/p5-WebService-Google-Reader/pkg-plist
index 9b4060035381..466f353cbcce 100644
--- a/www/p5-WebService-Google-Reader/pkg-plist
+++ b/www/p5-WebService-Google-Reader/pkg-plist
@@ -2,14 +2,7 @@
 %%SITE_PERL%%/WebService/Google/Reader/Constants.pm
 %%SITE_PERL%%/WebService/Google/Reader/Feed.pm
 %%SITE_PERL%%/WebService/Google/Reader/ListElement.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Google/Reader/.packlist
 %%PERL5_MAN3%%/WebService::Google::Reader.3.gz
 %%PERL5_MAN3%%/WebService::Google::Reader::Constants.3.gz
 %%PERL5_MAN3%%/WebService::Google::Reader::Feed.3.gz
 %%PERL5_MAN3%%/WebService::Google::Reader::ListElement.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Google/Reader
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/Google/Reader
-@dirrmtry %%SITE_PERL%%/WebService/Google
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Google-Sets/Makefile b/www/p5-WebService-Google-Sets/Makefile
index 0a4c829427f1..d198a4920f30 100644
--- a/www/p5-WebService-Google-Sets/Makefile
+++ b/www/p5-WebService-Google-Sets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Google-Sets
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	WebService
diff --git a/www/p5-WebService-Google-Sets/pkg-plist b/www/p5-WebService-Google-Sets/pkg-plist
index 0fd4da26cf1e..9c31acbcc9b8 100644
--- a/www/p5-WebService-Google-Sets/pkg-plist
+++ b/www/p5-WebService-Google-Sets/pkg-plist
@@ -1,9 +1,3 @@
 bin/get_gset
 %%SITE_PERL%%/WebService/Google/Sets.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Google/Sets/.packlist
 %%PERL5_MAN3%%/WebService::Google::Sets.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Google/Sets
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Google
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/Google
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-IMDB/Makefile b/www/p5-WebService-IMDB/Makefile
index 1665ad1ae2ae..ee4ed795881d 100644
--- a/www/p5-WebService-IMDB/Makefile
+++ b/www/p5-WebService-IMDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-IMDB
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-IMDB/pkg-plist b/www/p5-WebService-IMDB/pkg-plist
index 854debbc6112..0068582b2df4 100644
--- a/www/p5-WebService-IMDB/pkg-plist
+++ b/www/p5-WebService-IMDB/pkg-plist
@@ -65,10 +65,3 @@
 %%SITE_PERL%%/WebService/IMDB/Trivium.pm
 %%SITE_PERL%%/WebService/IMDB/UserComment.pm
 %%SITE_PERL%%/WebService/IMDB/WhereNow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/IMDB/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/IMDB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/IMDB/Title
-@dirrmtry %%SITE_PERL%%/WebService/IMDB/Name
-@dirrmtry %%SITE_PERL%%/WebService/IMDB
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-ISBNDB/Makefile b/www/p5-WebService-ISBNDB/Makefile
index 3205f114e10b..bc9faf39b7e7 100644
--- a/www/p5-WebService-ISBNDB/Makefile
+++ b/www/p5-WebService-ISBNDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-ISBNDB
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-ISBNDB/pkg-plist b/www/p5-WebService-ISBNDB/pkg-plist
index 453f3cef2f0e..915038ed080e 100644
--- a/www/p5-WebService-ISBNDB/pkg-plist
+++ b/www/p5-WebService-ISBNDB/pkg-plist
@@ -18,7 +18,3 @@
 %%SITE_PERL%%/WebService/ISBNDB/Agent.pm
 %%SITE_PERL%%/WebService/ISBNDB/Agent/REST.pm
 %%SITE_PERL%%/WebService/ISBNDB/Iterator.pm
-@dirrmtry %%SITE_PERL%%/WebService/ISBNDB/Agent
-@dirrmtry %%SITE_PERL%%/WebService/ISBNDB/API
-@dirrmtry %%SITE_PERL%%/WebService/ISBNDB
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Linode/Makefile b/www/p5-WebService-Linode/Makefile
index bd5499290c3c..1c1cb5d0d332 100644
--- a/www/p5-WebService-Linode/Makefile
+++ b/www/p5-WebService-Linode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Linode
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Linode/pkg-plist b/www/p5-WebService-Linode/pkg-plist
index f077faba413a..78786e200731 100644
--- a/www/p5-WebService-Linode/pkg-plist
+++ b/www/p5-WebService-Linode/pkg-plist
@@ -1,11 +1,6 @@
 %%SITE_PERL%%/WebService/Linode.pm
 %%SITE_PERL%%/WebService/Linode/Base.pm
 %%SITE_PERL%%/WebService/Linode/DNS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Linode/.packlist
 %%PERL5_MAN3%%/WebService::Linode.3.gz
 %%PERL5_MAN3%%/WebService::Linode::Base.3.gz
 %%PERL5_MAN3%%/WebService::Linode::DNS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Linode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/Linode
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-MoviePosterDB/Makefile b/www/p5-WebService-MoviePosterDB/Makefile
index b74245e78343..9234baecf08b 100644
--- a/www/p5-WebService-MoviePosterDB/Makefile
+++ b/www/p5-WebService-MoviePosterDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-MoviePosterDB
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-MoviePosterDB/pkg-plist b/www/p5-WebService-MoviePosterDB/pkg-plist
index e04e1b204f8c..8476edce3cd5 100644
--- a/www/p5-WebService-MoviePosterDB/pkg-plist
+++ b/www/p5-WebService-MoviePosterDB/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/WebService/MoviePosterDB.pm
 %%SITE_PERL%%/WebService/MoviePosterDB/Movie.pm
 %%SITE_PERL%%/WebService/MoviePosterDB/Poster.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/MoviePosterDB/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/MoviePosterDB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/MoviePosterDB
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-MusicBrainz/Makefile b/www/p5-WebService-MusicBrainz/Makefile
index a88a3a668594..a7f9dbdbbea4 100644
--- a/www/p5-WebService-MusicBrainz/Makefile
+++ b/www/p5-WebService-MusicBrainz/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-MusicBrainz
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-MusicBrainz/pkg-plist b/www/p5-WebService-MusicBrainz/pkg-plist
index 7f73a453c52d..ec5518ebdeb3 100644
--- a/www/p5-WebService-MusicBrainz/pkg-plist
+++ b/www/p5-WebService-MusicBrainz/pkg-plist
@@ -72,9 +72,3 @@
 %%SITE_PERL%%/WebService/MusicBrainz/Response/UserTag.pm
 %%SITE_PERL%%/WebService/MusicBrainz/Response/UserTagList.pm
 %%SITE_PERL%%/WebService/MusicBrainz/Track.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/MusicBrainz/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/MusicBrainz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/MusicBrainz/Response
-@dirrmtry %%SITE_PERL%%/WebService/MusicBrainz
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index e0aacef8109b..4ff4565dbdad 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-NoPaste
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-NoPaste/pkg-plist b/www/p5-WebService-NoPaste/pkg-plist
index ad84ebad6fbf..64d59f1451f2 100644
--- a/www/p5-WebService-NoPaste/pkg-plist
+++ b/www/p5-WebService-NoPaste/pkg-plist
@@ -1,7 +1,3 @@
 bin/nopaste
 %%SITE_PERL%%/WebService/NoPaste.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/NoPaste/.packlist
 %%PERL5_MAN3%%/WebService::NoPaste.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/NoPaste
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Pushover/Makefile b/www/p5-WebService-Pushover/Makefile
index 20237594fee7..0e7924e14e14 100644
--- a/www/p5-WebService-Pushover/Makefile
+++ b/www/p5-WebService-Pushover/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Pushover
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Pushover/pkg-plist b/www/p5-WebService-Pushover/pkg-plist
index 4d0d55345572..78b719fb22d6 100644
--- a/www/p5-WebService-Pushover/pkg-plist
+++ b/www/p5-WebService-Pushover/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/WebService/Pushover.json
 %%SITE_PERL%%/WebService/Pushover.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Pushover/.packlist
 %%PERL5_MAN3%%/WebService::Pushover.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Pushover
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Rakuten/Makefile b/www/p5-WebService-Rakuten/Makefile
index 96a3ba3b0415..6c88ac7a8e2a 100644
--- a/www/p5-WebService-Rakuten/Makefile
+++ b/www/p5-WebService-Rakuten/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Rakuten
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Rakuten/pkg-plist b/www/p5-WebService-Rakuten/pkg-plist
index eca3a898ebc2..5b7364826b7c 100644
--- a/www/p5-WebService-Rakuten/pkg-plist
+++ b/www/p5-WebService-Rakuten/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/WebService::Rakuten.3.gz
 %%SITE_PERL%%/WebService/Rakuten.pm
 %%SITE_PERL%%/WebService/Rakuten.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Rakuten/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Rakuten
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Simple/Makefile b/www/p5-WebService-Simple/Makefile
index 523632435cd0..d6340056fb0d 100644
--- a/www/p5-WebService-Simple/Makefile
+++ b/www/p5-WebService-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Simple
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Simple/pkg-plist b/www/p5-WebService-Simple/pkg-plist
index 524df691cacd..2485f6030f15 100644
--- a/www/p5-WebService-Simple/pkg-plist
+++ b/www/p5-WebService-Simple/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Simple/.packlist
 %%SITE_PERL%%/WebService/Simple.pm
 %%SITE_PERL%%/WebService/Simple/Parser.pm
 %%SITE_PERL%%/WebService/Simple/Response.pm
@@ -15,9 +14,3 @@
 %%PERL5_MAN3%%/WebService::Simple::Parser::XML::Lite.3.gz
 %%PERL5_MAN3%%/WebService::Simple::Parser::XML::Simple.3.gz
 %%PERL5_MAN3%%/WebService::Simple::Response.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/Simple/Parser/XML
-@dirrmtry %%SITE_PERL%%/WebService/Simple/Parser
-@dirrmtry %%SITE_PERL%%/WebService/Simple
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-Technorati/Makefile b/www/p5-WebService-Technorati/Makefile
index b6feb9b56a68..d755fdb06b59 100644
--- a/www/p5-WebService-Technorati/Makefile
+++ b/www/p5-WebService-Technorati/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WebService-Technorati
 PORTVERSION=	0.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-Technorati/pkg-plist b/www/p5-WebService-Technorati/pkg-plist
index 47f519d9eb44..2dc63db60ca1 100644
--- a/www/p5-WebService-Technorati/pkg-plist
+++ b/www/p5-WebService-Technorati/pkg-plist
@@ -29,11 +29,3 @@
 %%SITE_PERL%%/WebService/Technorati/SearchTerm.pm
 %%SITE_PERL%%/WebService/pod2html.pl
 %%SITE_PERL%%/auto/WebService/Technorati/BaseTechnoratiObject/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Technorati/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Technorati
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/auto/WebService/Technorati/BaseTechnoratiObject
-@dirrmtry %%SITE_PERL%%/auto/WebService/Technorati
-@dirrmtry %%SITE_PERL%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/Technorati
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-YouTube/Makefile b/www/p5-WebService-YouTube/Makefile
index fecf22d4dacd..5bdc1e5c0b75 100644
--- a/www/p5-WebService-YouTube/Makefile
+++ b/www/p5-WebService-YouTube/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-YouTube
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-WebService-YouTube/pkg-plist b/www/p5-WebService-YouTube/pkg-plist
index 99a41cce4e55..e022c997d971 100644
--- a/www/p5-WebService-YouTube/pkg-plist
+++ b/www/p5-WebService-YouTube/pkg-plist
@@ -4,14 +4,9 @@
 %%SITE_PERL%%/WebService/YouTube/Util.pm
 %%SITE_PERL%%/WebService/YouTube/Video.pm
 %%SITE_PERL%%/WebService/YouTube/Videos.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/YouTube/.packlist
 %%PERL5_MAN3%%/WebService::YouTube.3.gz
 %%PERL5_MAN3%%/WebService::YouTube::Feeds.3.gz
 %%PERL5_MAN3%%/WebService::YouTube::User.3.gz
 %%PERL5_MAN3%%/WebService::YouTube::Util.3.gz
 %%PERL5_MAN3%%/WebService::YouTube::Video.3.gz
 %%PERL5_MAN3%%/WebService::YouTube::Videos.3.gz
-@dirrm %%SITE_PERL%%/WebService/YouTube
-@dirrmtry %%SITE_PERL%%/WebService
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/YouTube
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
diff --git a/www/p5-WordPress-XMLRPC/Makefile b/www/p5-WordPress-XMLRPC/Makefile
index 768e6cfd252a..d3933842374e 100644
--- a/www/p5-WordPress-XMLRPC/Makefile
+++ b/www/p5-WordPress-XMLRPC/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	WordPress-XMLRPC
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LEOCHARRE
diff --git a/www/p5-WordPress-XMLRPC/pkg-plist b/www/p5-WordPress-XMLRPC/pkg-plist
index 7bc998a5314e..ae8563e0a575 100644
--- a/www/p5-WordPress-XMLRPC/pkg-plist
+++ b/www/p5-WordPress-XMLRPC/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/WordPress::XMLRPC.3.gz
 %%SITE_PERL%%/WordPress/XMLRPC.pm
 %%SITE_PERL%%/WordPress/XMLRPC.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordPress/XMLRPC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordPress/XMLRPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordPress
-@dirrmtry %%SITE_PERL%%/WordPress
diff --git a/www/p5-Yahoo-Lifestyle/Makefile b/www/p5-Yahoo-Lifestyle/Makefile
index bc3857511ad7..4c95153b2adf 100644
--- a/www/p5-Yahoo-Lifestyle/Makefile
+++ b/www/p5-Yahoo-Lifestyle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Yahoo-Lifestyle
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Yahoo-Lifestyle/pkg-plist b/www/p5-Yahoo-Lifestyle/pkg-plist
index ccfe7a0f250b..d23b0bb95c24 100644
--- a/www/p5-Yahoo-Lifestyle/pkg-plist
+++ b/www/p5-Yahoo-Lifestyle/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo/Lifestyle/.packlist
 %%SITE_PERL%%/Yahoo/Lifestyle.pm
 %%PERL5_MAN3%%/Yahoo::Lifestyle.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo/Lifestyle
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo
-@dirrmtry %%SITE_PERL%%/Yahoo
diff --git a/www/p5-Yahoo-Search/Makefile b/www/p5-Yahoo-Search/Makefile
index e6a1bad04ec1..24a4bb541c37 100644
--- a/www/p5-Yahoo-Search/Makefile
+++ b/www/p5-Yahoo-Search/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Yahoo-Search
 PORTVERSION=	1.11.3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Yahoo-Search/pkg-plist b/www/p5-Yahoo-Search/pkg-plist
index 303ae2e72d43..4f519c20e152 100644
--- a/www/p5-Yahoo-Search/pkg-plist
+++ b/www/p5-Yahoo-Search/pkg-plist
@@ -3,13 +3,8 @@
 %%SITE_PERL%%/Yahoo/Search/Response.pm
 %%SITE_PERL%%/Yahoo/Search/Result.pm
 %%SITE_PERL%%/Yahoo/Search/XML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo/Search/.packlist
 %%PERL5_MAN3%%/Yahoo::Search.3.gz
 %%PERL5_MAN3%%/Yahoo::Search::Request.3.gz
 %%PERL5_MAN3%%/Yahoo::Search::Response.3.gz
 %%PERL5_MAN3%%/Yahoo::Search::Result.3.gz
 %%PERL5_MAN3%%/Yahoo::Search::XML.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo/Search
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Yahoo
-@dirrmtry %%SITE_PERL%%/Yahoo/Search
-@dirrmtry %%SITE_PERL%%/Yahoo
diff --git a/www/p5-ZConf-RSS-GUI-GTK/Makefile b/www/p5-ZConf-RSS-GUI-GTK/Makefile
index 3ffade7ebce4..bc3e0be251f4 100644
--- a/www/p5-ZConf-RSS-GUI-GTK/Makefile
+++ b/www/p5-ZConf-RSS-GUI-GTK/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ZConf-RSS-GUI-GTK
 PORTVERSION=	0.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/www/p5-ZConf-RSS-GUI-GTK/pkg-plist b/www/p5-ZConf-RSS-GUI-GTK/pkg-plist
index 61ec1b24c4b0..f39b5aa157dd 100644
--- a/www/p5-ZConf-RSS-GUI-GTK/pkg-plist
+++ b/www/p5-ZConf-RSS-GUI-GTK/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/ZConf/RSS/GUI/GTK.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/RSS/GUI/GTK/.packlist
 %%PERL5_MAN3%%/ZConf::RSS::GUI::GTK.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/RSS/GUI/GTK
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/RSS/GUI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/RSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
-@dirrmtry %%SITE_PERL%%/ZConf/RSS/GUI
-@dirrmtry %%SITE_PERL%%/ZConf/RSS
-@dirrmtry %%SITE_PERL%%/ZConf
diff --git a/www/p5-ZConf-RSS/Makefile b/www/p5-ZConf-RSS/Makefile
index 1e56c8deec99..cb7db59b65d5 100644
--- a/www/p5-ZConf-RSS/Makefile
+++ b/www/p5-ZConf-RSS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ZConf-RSS
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/www/p5-ZConf-RSS/pkg-plist b/www/p5-ZConf-RSS/pkg-plist
index 4078a6ae26e4..7dafbc428b15 100644
--- a/www/p5-ZConf-RSS/pkg-plist
+++ b/www/p5-ZConf-RSS/pkg-plist
@@ -5,10 +5,5 @@ bin/zcrss-get
 bin/zcrss-managetemplates
 %%SITE_PERL%%/ZConf/RSS.pm
 %%SITE_PERL%%/ZConf/RSS/GUI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/RSS/.packlist
 %%PERL5_MAN3%%/ZConf::RSS.3.gz
 %%PERL5_MAN3%%/ZConf::RSS::GUI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/RSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
-@dirrmtry %%SITE_PERL%%/ZConf/RSS
-@dirrmtry %%SITE_PERL%%/ZConf
diff --git a/www/p5-chklinks/Makefile b/www/p5-chklinks/Makefile
index 0aaf19752ff5..201bb63171c8 100644
--- a/www/p5-chklinks/Makefile
+++ b/www/p5-chklinks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	chklinks
 PORTVERSION=	3.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Locale/IMACAT
diff --git a/www/p5-chklinks/pkg-plist b/www/p5-chklinks/pkg-plist
index 1aa4adf63c73..e0d647467cfb 100644
--- a/www/p5-chklinks/pkg-plist
+++ b/www/p5-chklinks/pkg-plist
@@ -1,4 +1,2 @@
 bin/chklinks
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/chklinks/.packlist
 man/man1/chklinks.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/chklinks
diff --git a/www/p5-jQuery-File-Upload/Makefile b/www/p5-jQuery-File-Upload/Makefile
index c17cc2b2c187..c860fad38ac0 100644
--- a/www/p5-jQuery-File-Upload/Makefile
+++ b/www/p5-jQuery-File-Upload/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	jQuery-File-Upload
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-jQuery-File-Upload/pkg-plist b/www/p5-jQuery-File-Upload/pkg-plist
index ea23413d3efa..998c498268ff 100644
--- a/www/p5-jQuery-File-Upload/pkg-plist
+++ b/www/p5-jQuery-File-Upload/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/jQuery/File/Upload/.packlist
 %%SITE_PERL%%/jQuery/File/Upload.pm
 %%PERL5_MAN3%%/jQuery::File::Upload.3.gz
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 91fbce77d0a5..0691c1f155c0 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
@@ -16,7 +16,7 @@ LICENSE=	APACHE20
 
 USES=		gmake libtool perl5
 USE_APACHE=	22+
-USE_PERL5=	fixpacklist run
+USE_PERL5=	run
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} \
@@ -46,11 +46,10 @@ post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_apreq2*
 	${RMDIR} -p ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/apreq2 \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR} 2>/dev/null || :
-	${FIND} ${STAGEDIR} -name '*.bs' -type f -size 0c -exec ${RM} {} \;
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/APR/Request/Request.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/APR/Request/Request.so
 .for i in Apache2 CGI Cookie Error Hook Param Parser
 	${STRIP_CMD} \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/APR/Request/${i}/${i}.so
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/APR/Request/${i}/${i}.so
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/p5-libapreq2/pkg-plist b/www/p5-libapreq2/pkg-plist
index 6b807129b3b7..4bc210748115 100644
--- a/www/p5-libapreq2/pkg-plist
+++ b/www/p5-libapreq2/pkg-plist
@@ -9,43 +9,30 @@
 %%PERL5_MAN3%%/Apache2::Cookie.3.gz
 %%PERL5_MAN3%%/Apache2::Request.3.gz
 %%PERL5_MAN3%%/Apache2::Upload.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Cookie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Request.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Upload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/%%AP_NAME%%/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/Request
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR
+%%SITE_ARCH%%/APR/Request.pm
+%%SITE_ARCH%%/APR/Request.pod
+%%SITE_ARCH%%/APR/Request/Apache2.pm
+%%SITE_ARCH%%/APR/Request/Apache2.pod
+%%SITE_ARCH%%/APR/Request/CGI.pm
+%%SITE_ARCH%%/APR/Request/CGI.pod
+%%SITE_ARCH%%/APR/Request/Cookie.pm
+%%SITE_ARCH%%/APR/Request/Cookie.pod
+%%SITE_ARCH%%/APR/Request/Error.pm
+%%SITE_ARCH%%/APR/Request/Error.pod
+%%SITE_ARCH%%/APR/Request/Hook.pm
+%%SITE_ARCH%%/APR/Request/Hook.pod
+%%SITE_ARCH%%/APR/Request/Param.pm
+%%SITE_ARCH%%/APR/Request/Param.pod
+%%SITE_ARCH%%/APR/Request/Parser.pm
+%%SITE_ARCH%%/APR/Request/Parser.pod
+%%SITE_ARCH%%/Apache2/Cookie.pm
+%%SITE_ARCH%%/Apache2/Request.pm
+%%SITE_ARCH%%/Apache2/Upload.pm
+%%SITE_ARCH%%/auto/APR/Request/Apache2/Apache2.so
+%%SITE_ARCH%%/auto/APR/Request/CGI/CGI.so
+%%SITE_ARCH%%/auto/APR/Request/Cookie/Cookie.so
+%%SITE_ARCH%%/auto/APR/Request/Error/Error.so
+%%SITE_ARCH%%/auto/APR/Request/Hook/Hook.so
+%%SITE_ARCH%%/auto/APR/Request/Param/Param.so
+%%SITE_ARCH%%/auto/APR/Request/Parser/Parser.so
+%%SITE_ARCH%%/auto/APR/Request/Request.so
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index de38e73b55eb..a1761dc981d0 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libservlet
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-libservlet/pkg-plist b/www/p5-libservlet/pkg-plist
index 5ecf2f8a267e..1b99cc9d7cfb 100644
--- a/www/p5-libservlet/pkg-plist
+++ b/www/p5-libservlet/pkg-plist
@@ -76,8 +76,3 @@
 %%SITE_PERL%%/Servlet/Util/Event.pm
 %%SITE_PERL%%/Servlet/Util/Exception.pm
 %%SITE_PERL%%/Servlet/Util/Principal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libservlet/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/libservlet
-@dirrmtry %%SITE_PERL%%/Servlet/Util
-@dirrmtry %%SITE_PERL%%/Servlet/Http
-@dirrmtry %%SITE_PERL%%/Servlet
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index b083973cca7e..b8e48de94809 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libwww
 PORTVERSION=	6.08
+PORTREVISION=	1
 CATEGORIES=	www devel perl5
 MASTER_SITES=	CPAN/LWP
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-libwww/pkg-plist b/www/p5-libwww/pkg-plist
index 44940b56e380..c5b5b4d67006 100644
--- a/www/p5-libwww/pkg-plist
+++ b/www/p5-libwww/pkg-plist
@@ -30,7 +30,6 @@ bin/lwp-request
 %%SITE_PERL%%/LWP/UserAgent.pm
 %%SITE_PERL%%/lwpcook.pod
 %%SITE_PERL%%/lwptut.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/.packlist
 %%PERL5_MAN3%%/LWP.3.gz
 %%PERL5_MAN3%%/LWP::Authen::Ntlm.3.gz
 %%PERL5_MAN3%%/LWP::ConnCache.3.gz
@@ -49,7 +48,3 @@ man/man1/lwp-download.1.gz
 man/man1/lwp-dump.1.gz
 man/man1/lwp-mirror.1.gz
 man/man1/lwp-request.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
-@dirrmtry %%SITE_PERL%%/LWP/Protocol
-@dirrmtry %%SITE_PERL%%/LWP/Authen
-@dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-pQuery/Makefile b/www/p5-pQuery/Makefile
index 361b55a3c21a..45f0f484143d 100644
--- a/www/p5-pQuery/Makefile
+++ b/www/p5-pQuery/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pQuery
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INGY
diff --git a/www/p5-pQuery/pkg-plist b/www/p5-pQuery/pkg-plist
index 45a5ce27a3b8..cf86340fb53f 100644
--- a/www/p5-pQuery/pkg-plist
+++ b/www/p5-pQuery/pkg-plist
@@ -1,9 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/pQuery/.packlist
 %%SITE_PERL%%/pQuery.pm
 %%SITE_PERL%%/pQuery.pod
 %%SITE_PERL%%/pQuery/DOM.pm
 %%SITE_PERL%%/pQuery/DOM.pod
 %%PERL5_MAN3%%/pQuery.3.gz
 %%PERL5_MAN3%%/pQuery::DOM.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/pQuery
-@dirrmtry %%SITE_PERL%%/pQuery
diff --git a/www/p5-webservice-validator-css-w3c/Makefile b/www/p5-webservice-validator-css-w3c/Makefile
index 044dc621687a..6f2b2d4feaf2 100644
--- a/www/p5-webservice-validator-css-w3c/Makefile
+++ b/www/p5-webservice-validator-css-w3c/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Validator-CSS-W3C
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-webservice-validator-css-w3c/pkg-plist b/www/p5-webservice-validator-css-w3c/pkg-plist
index 9177945661a6..c814de68e829 100644
--- a/www/p5-webservice-validator-css-w3c/pkg-plist
+++ b/www/p5-webservice-validator-css-w3c/pkg-plist
@@ -1,10 +1,2 @@
 %%SITE_PERL%%/WebService/Validator/CSS/W3C.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/CSS/W3C/.packlist
 %%PERL5_MAN3%%/WebService::Validator::CSS::W3C.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/CSS/W3C
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/CSS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/Validator/CSS
-@dirrmtry %%SITE_PERL%%/WebService/Validator
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-webservice-validator-html-w3c/Makefile b/www/p5-webservice-validator-html-w3c/Makefile
index 193986bacfb2..91137345a784 100644
--- a/www/p5-webservice-validator-html-w3c/Makefile
+++ b/www/p5-webservice-validator-html-w3c/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WebService-Validator-HTML-W3C
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-webservice-validator-html-w3c/pkg-plist b/www/p5-webservice-validator-html-w3c/pkg-plist
index c3556d66191a..076c714a4e6f 100644
--- a/www/p5-webservice-validator-html-w3c/pkg-plist
+++ b/www/p5-webservice-validator-html-w3c/pkg-plist
@@ -1,14 +1,5 @@
 %%SITE_PERL%%/WebService/Validator/HTML/W3C/Warning.pm
 %%SITE_PERL%%/WebService/Validator/HTML/W3C/Error.pm
 %%SITE_PERL%%/WebService/Validator/HTML/W3C.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/HTML/W3C/.packlist
 %%PERL5_MAN3%%/WebService::Validator::HTML::W3C::Error.3.gz
 %%PERL5_MAN3%%/WebService::Validator::HTML::W3C.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/HTML/W3C
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/HTML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@dirrmtry %%SITE_PERL%%/WebService/Validator/HTML/W3C
-@dirrmtry %%SITE_PERL%%/WebService/Validator/HTML
-@dirrmtry %%SITE_PERL%%/WebService/Validator
-@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/perlbal/Makefile b/www/perlbal/Makefile
index 4b82af353e2d..811a2d056427 100644
--- a/www/perlbal/Makefile
+++ b/www/perlbal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Perlbal
 PORTVERSION=	1.80
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DORMANDO
diff --git a/www/perlbal/pkg-plist b/www/perlbal/pkg-plist
index 75258fac5db8..e1c046d1f4c3 100644
--- a/www/perlbal/pkg-plist
+++ b/www/perlbal/pkg-plist
@@ -60,7 +60,6 @@ bin/perlbal
 %%SITE_PERL%%/Perlbal/Test/WebServer.pm
 %%SITE_PERL%%/Perlbal/UploadListener.pm
 %%SITE_PERL%%/Perlbal/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perlbal/.packlist
 %%PERL5_MAN3%%/Perlbal.3.gz
 %%PERL5_MAN3%%/Perlbal::FAQ.3.gz
 %%PERL5_MAN3%%/Perlbal::Manual.3.gz
@@ -103,8 +102,3 @@ man/man1/perlbal.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/service-parameters.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/hacking
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perlbal
-@dirrm %%SITE_PERL%%/Perlbal/Test
-@dirrm %%SITE_PERL%%/Perlbal/Plugin
-@dirrm %%SITE_PERL%%/Perlbal/Manual
-@dirrm %%SITE_PERL%%/Perlbal
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index b63f5cfb3d82..e7971e447d88 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rt
 PORTVERSION=	4.0.22
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	40
diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist
index cae49345b00e..c6807da5fc65 100644
--- a/www/rt40/pkg-plist
+++ b/www/rt40/pkg-plist
@@ -1731,30 +1731,5 @@ sbin/standalone_httpd
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/extending
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/customizing
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%SITE_PERL%%/RT/URI
-@dirrmtry %%SITE_PERL%%/RT/Test
-@dirrmtry %%SITE_PERL%%/RT/Squish
-@dirrmtry %%SITE_PERL%%/RT/Shredder/Plugin/Base
-@dirrmtry %%SITE_PERL%%/RT/Shredder/Plugin
-@dirrmtry %%SITE_PERL%%/RT/Shredder
-@dirrmtry %%SITE_PERL%%/RT/Search
-@dirrmtry %%SITE_PERL%%/RT/Report/Tickets
-@dirrmtry %%SITE_PERL%%/RT/Report
-@dirrmtry %%SITE_PERL%%/RT/Pod
-@dirrmtry %%SITE_PERL%%/RT/Interface/Web/QueryBuilder
-@dirrmtry %%SITE_PERL%%/RT/Interface/Web
-@dirrmtry %%SITE_PERL%%/RT/Interface/Email/Auth
-@dirrmtry %%SITE_PERL%%/RT/Interface/Email
-@dirrmtry %%SITE_PERL%%/RT/Interface
-@dirrmtry %%SITE_PERL%%/RT/I18N
-@dirrmtry %%SITE_PERL%%/RT/Graph
-@dirrmtry %%SITE_PERL%%/RT/Dashboard
-@dirrmtry %%SITE_PERL%%/RT/CustomFieldValues
-@dirrmtry %%SITE_PERL%%/RT/Crypt
-@dirrmtry %%SITE_PERL%%/RT/Condition
-@dirrmtry %%SITE_PERL%%/RT/Approval/Rule
-@dirrmtry %%SITE_PERL%%/RT/Approval
-@dirrmtry %%SITE_PERL%%/RT/Action
-@dirrmtry %%SITE_PERL%%/RT
 @dirrmtry etc/rt40
 
diff --git a/www/rt42/Makefile b/www/rt42/Makefile
index 2e31457e44bd..3a8f4a457706 100644
--- a/www/rt42/Makefile
+++ b/www/rt42/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rt
 DISTVERSION=	4.2.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	42
diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index 09380c228381..3a5d2b5d627f 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	swish++
 PORTVERSION=	6.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www textproc
 MASTER_SITES=	SF/swishplusplus/swishplusplus/${PORTVERSION}
 
@@ -14,7 +14,7 @@ RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 USES=		gmake perl5
 MAKEFILE=	GNUmakefile
-MAKE_ENV=	PERL="${PERL}" PERL_VER="${PERL_VER}"
+MAKE_ENV=	PERL="${PERL}"
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^#error/d' ${WRKSRC}/config.h
diff --git a/www/swish++/files/patch-GNUmakefile b/www/swish++/files/patch-GNUmakefile
index ab0ce4186d6b..1830d9b93ad4 100644
--- a/www/swish++/files/patch-GNUmakefile
+++ b/www/swish++/files/patch-GNUmakefile
@@ -5,7 +5,7 @@
  
  install_lib: $(I_LIB)
 -	$(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) $(LIB_TARGET) $(I_LIB)
-+	$(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) $(LIB_TARGET) $(I_LIB)/perl5/site_perl/${PERL_VER}
++	$(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) $(LIB_TARGET) $(I_LIB)/perl5/site_perl
  
  install_man:
  	@$(MAKE) -C man install
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index 9ab959e1f8b9..4df13dadfafe 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	syndigator
 PORTVERSION=	0.15.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/Syndigator/${PORTVERSION}
 
diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist
index c74c889d9300..c2e5050e0c4e 100644
--- a/www/syndigator/pkg-plist
+++ b/www/syndigator/pkg-plist
@@ -73,15 +73,3 @@ share/pixmaps/syndigator/tokeep-gtk2.png
 share/pixmaps/syndigator/trayicon-notify.gif
 share/pixmaps/syndigator/trayicon.gif
 @dirrm share/pixmaps/syndigator
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/UI
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Parser
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Importer
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Fetcher
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Feed
-@dirrm %%SITE_PERL%%/syndigator/RSSReader/Exporter
-@dirrm %%SITE_PERL%%/syndigator/RSSReader
-@dirrm %%SITE_PERL%%/syndigator
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index 3f7b7ac7ced9..6a38a681146f 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tengine
 PORTVERSION=	2.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	GH
 
@@ -876,21 +876,18 @@ do-install:
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
-	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
-	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
-		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/
+		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 .endif
 
 post-install:
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
-	${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx/nginx.so >> ${TMPPLIST}
-	${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx/nginx.bs >> ${TMPPLIST}
-	${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/nginx.pm >> ${TMPPLIST}
-	${ECHO_CMD} @dirrm ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx >> ${TMPPLIST}
+	${ECHO_CMD} ${SITE_ARCH_REL}/auto/nginx/nginx.so >> ${TMPPLIST}
+	${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST}
+	${ECHO_CMD} @dirrm ${SITE_ARCH_REL}/auto/nginx >> ${TMPPLIST}
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index f5cda4e63379..5dfd5cf14606 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trafficserver
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
 
@@ -24,7 +24,7 @@ INSTALL_TARGET=	install-strip
 USES=		cpe gmake libtool perl5 pkgconfig tar:bzip2 tcl
 CPE_VENDOR=	apache
 CPE_PRODUCT=	traffic_server
-USE_PERL5=	build run fixpacklist
+USE_PERL5=	build run
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	${PORTNAME}
@@ -93,7 +93,6 @@ post-patch:
 		${WRKSRC}/lib/Makefile.in
 
 post-install:
-	@${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
 	@${RMDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
 	(cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.sample; done)
diff --git a/www/trafficserver/pkg-plist b/www/trafficserver/pkg-plist
index eb6337fe3e65..f0a250541767 100644
--- a/www/trafficserver/pkg-plist
+++ b/www/trafficserver/pkg-plist
@@ -142,7 +142,6 @@ libexec/trafficserver/tcpinfo.so
 %%SITE_PERL%%/Apache/TS/AdminClient.pm
 %%SITE_PERL%%/Apache/TS/Config.pm
 %%SITE_PERL%%/Apache/TS/Config/Records.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/TS/.packlist
 %%PERL5_MAN3%%/Apache::TS.3.gz
 %%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz
 %%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz
@@ -176,11 +175,6 @@ libexec/trafficserver/tcpinfo.so
 %%PORTDOCS%%%%DOCSDIR%%/trafficshell/show_virtual-ip.1
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/trafficshell
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/TS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrm %%SITE_PERL%%/Apache/TS/Config
-@dirrm %%SITE_PERL%%/Apache/TS
-@dirrm %%SITE_PERL%%/Apache
 @dirrm libexec/trafficserver
 @dirrm include/ts
 @dirrm include/atscppapi
diff --git a/www/w3mir/Makefile b/www/w3mir/Makefile
index 97cf1c415b79..a6994f771679 100644
--- a/www/w3mir/Makefile
+++ b/www/w3mir/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	w3mir
 PORTVERSION=	1.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	http://langfeldt.net/w3mir/
 
diff --git a/www/w3mir/pkg-plist b/www/w3mir/pkg-plist
index 20f5cf55af7a..853506982237 100644
--- a/www/w3mir/pkg-plist
+++ b/www/w3mir/pkg-plist
@@ -3,7 +3,6 @@ bin/w3mir
 %%SITE_PERL%%/htmlop.pm
 %%SITE_PERL%%/w3http.pm
 %%SITE_PERL%%/w3pdfuri.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/w3mir/.packlist
 man/man1/w3mfix.1.gz
 man/man1/w3mir.1.gz
 share/doc/w3mir/Artistic
@@ -11,5 +10,4 @@ share/doc/w3mir/README
 share/doc/w3mir/example.cfg
 share/doc/w3mir/multiscope.cfg
 share/doc/w3mir/w3mir-HOWTO.html
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/w3mir
 @dirrm share/doc/w3mir
diff --git a/www/weblint++/Makefile b/www/weblint++/Makefile
index 68ef5cb0bc31..0d7beac56ba5 100644
--- a/www/weblint++/Makefile
+++ b/www/weblint++/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	weblint++
 PORTVERSION=	1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BDFOY
diff --git a/www/weblint++/pkg-plist b/www/weblint++/pkg-plist
index 93ba05fa600f..aa658abca744 100644
--- a/www/weblint++/pkg-plist
+++ b/www/weblint++/pkg-plist
@@ -1,4 +1,2 @@
 bin/weblint++
 man/man1/weblint++.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/weblint++/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/weblint++
diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile
index a99b5442b45d..4d95afad2786 100644
--- a/www/wwwstat/Makefile
+++ b/www/wwwstat/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wwwstat
 PORTVERSION=	2.01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/websoft/wwwstat/ \
 		ftp://ftp.gwdg.de/pub/misc/www-stat/websoft/wwwstat/
@@ -20,16 +20,16 @@ USE_APACHE_RUN=	22+
 USES=		perl5
 MAKE_ENV+=	PERL=${PERL}
 SUB_FILES=	pkg-message
-SUB_LIST=	SITE_PERL=${SITE_PERL}
+SUB_LIST=	SITE_PERL=${PREFIX}/${SITE_PERL}
 
 BIN_FILES=	monthly oldlog2new splitlog wwwerrs wwwstat
 SPERL_FILES=	domains.pl splitlog.rc wwwstat.rc
 MAN1_FILES=	wwwstat.1 splitlog.1
 
 do-install:
-	@${INSTALL_SCRIPT} ${BIN_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}
-	@${INSTALL_DATA} ${SPERL_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${SITE_PERL}
-	@${INSTALL_MAN} ${MAN1_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${BIN_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_DATA} ${SPERL_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_MAN} ${MAN1_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/intclock/Makefile b/x11-clocks/intclock/Makefile
index 33f2abfd39f6..b5a6073bfb0a 100644
--- a/x11-clocks/intclock/Makefile
+++ b/x11-clocks/intclock/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	intclock
 PORTVERSION=	2.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks perl5
 MASTER_SITES=	http://www.peterverthez.net/projects/${PORTNAME}/ CENKES
 
diff --git a/x11-clocks/intclock/pkg-plist b/x11-clocks/intclock/pkg-plist
index 245b3342787f..95318d1070c8 100644
--- a/x11-clocks/intclock/pkg-plist
+++ b/x11-clocks/intclock/pkg-plist
@@ -16,7 +16,6 @@ bin/intclock
 %%SITE_PERL%%/Intclock/UI_gtk2.pm
 %%SITE_PERL%%/Intclock/UI_tty.pm
 %%SITE_PERL%%/Intclock.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Intclock/.packlist
 share/applications/intclock.desktop
 %%DATADIR%%/intclock.png
 %%DATADIR%%/territories.dat
diff --git a/x11-fm/p5-PerlFM/Makefile b/x11-fm/p5-PerlFM/Makefile
index 0dc575c48f08..3364e7dfb27f 100644
--- a/x11-fm/p5-PerlFM/Makefile
+++ b/x11-fm/p5-PerlFM/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PerlFM
 PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/x11-fm/p5-PerlFM/pkg-plist b/x11-fm/p5-PerlFM/pkg-plist
index ee4f535bb089..b96b76ebfa59 100644
--- a/x11-fm/p5-PerlFM/pkg-plist
+++ b/x11-fm/p5-PerlFM/pkg-plist
@@ -1,5 +1,3 @@
 bin/pfm
 %%SITE_PERL%%/PerlFM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlFM/.packlist
 %%PERL5_MAN3%%/PerlFM.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlFM
diff --git a/x11-fonts/p5-Font-AFM/Makefile b/x11-fonts/p5-Font-AFM/Makefile
index c5a0f6a2d7ff..d6d2b15cf1af 100644
--- a/x11-fonts/p5-Font-AFM/Makefile
+++ b/x11-fonts/p5-Font-AFM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Font-AFM
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	x11-fonts perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-fonts/p5-Font-AFM/pkg-plist b/x11-fonts/p5-Font-AFM/pkg-plist
index 9dac371daec7..98ad7c9693bf 100644
--- a/x11-fonts/p5-Font-AFM/pkg-plist
+++ b/x11-fonts/p5-Font-AFM/pkg-plist
@@ -12,8 +12,3 @@
 %%SITE_PERL%%/Font/Metrics/TimesBoldItalic.pm
 %%SITE_PERL%%/Font/Metrics/TimesItalic.pm
 %%SITE_PERL%%/Font/Metrics/TimesRoman.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/AFM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/AFM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font
-@dirrmtry %%SITE_PERL%%/Font/Metrics
-@dirrmtry %%SITE_PERL%%/Font
diff --git a/x11-fonts/p5-Font-TTF/Makefile b/x11-fonts/p5-Font-TTF/Makefile
index d8e6093f5a24..6e2dd93f67af 100644
--- a/x11-fonts/p5-Font-TTF/Makefile
+++ b/x11-fonts/p5-Font-TTF/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Font-TTF
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	x11-fonts perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-fonts/p5-Font-TTF/pkg-plist b/x11-fonts/p5-Font-TTF/pkg-plist
index 356753913d40..814d902d5017 100644
--- a/x11-fonts/p5-Font-TTF/pkg-plist
+++ b/x11-fonts/p5-Font-TTF/pkg-plist
@@ -152,13 +152,4 @@
 %%SITE_PERL%%/Font/TTF/Woff/MetaData.pm
 %%SITE_PERL%%/Font/TTF/Woff/PrivateData.pm
 %%SITE_PERL%%/Font/TTF/XMLparse.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/TTF/.packlist
 %%SITE_PERL%%/ttfmod.pl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/TTF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font
-@dirrmtry %%SITE_PERL%%/Font/TTF/Woff
-@dirrmtry %%SITE_PERL%%/Font/TTF/Mort
-@dirrmtry %%SITE_PERL%%/Font/TTF/Kern
-@dirrmtry %%SITE_PERL%%/Font/TTF/Features
-@dirrmtry %%SITE_PERL%%/Font/TTF
-@dirrmtry %%SITE_PERL%%/Font
diff --git a/x11-fonts/p5-Font-TTFMetrics/Makefile b/x11-fonts/p5-Font-TTFMetrics/Makefile
index 1e0214e0c368..aae9e6b4cdd0 100644
--- a/x11-fonts/p5-Font-TTFMetrics/Makefile
+++ b/x11-fonts/p5-Font-TTFMetrics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Font-TTFMetrics
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-fonts/p5-Font-TTFMetrics/pkg-plist b/x11-fonts/p5-Font-TTFMetrics/pkg-plist
index 89894d31360f..7b95cc1b1927 100644
--- a/x11-fonts/p5-Font-TTFMetrics/pkg-plist
+++ b/x11-fonts/p5-Font-TTFMetrics/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Font::TTFMetrics.3.gz
 %%SITE_PERL%%/Font/TTFMetrics.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/TTFMetrics/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/TTFMetrics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font
-@dirrmtry %%SITE_PERL%%/Font
diff --git a/x11-toolkits/p5-Alien-wxWidgets/Makefile b/x11-toolkits/p5-Alien-wxWidgets/Makefile
index c34841816e6a..3a26aa4ec724 100644
--- a/x11-toolkits/p5-Alien-wxWidgets/Makefile
+++ b/x11-toolkits/p5-Alien-wxWidgets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Alien-wxWidgets
 PORTVERSION=	0.65
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Alien-wxWidgets/pkg-plist b/x11-toolkits/p5-Alien-wxWidgets/pkg-plist
index ff3c47547ed0..09730e82aa96 100644
--- a/x11-toolkits/p5-Alien-wxWidgets/pkg-plist
+++ b/x11-toolkits/p5-Alien-wxWidgets/pkg-plist
@@ -1,7 +1,4 @@
 %%PERL5_MAN3%%/Alien::wxWidgets.3.gz
 %%PERL5_MAN3%%/Alien::wxWidgets::Utility.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets/Utility.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets/Config
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Alien
+%%SITE_ARCH%%/Alien/wxWidgets/Utility.pm
+%%SITE_ARCH%%/Alien/wxWidgets.pm
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 8850b60245c7..63207d410892 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Glade
 PORTVERSION=	1.007
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TSCH
diff --git a/x11-toolkits/p5-Glade2/pkg-plist b/x11-toolkits/p5-Glade2/pkg-plist
index 7631662e2a5d..1e825d4de9eb 100644
--- a/x11-toolkits/p5-Glade2/pkg-plist
+++ b/x11-toolkits/p5-Glade2/pkg-plist
@@ -1,12 +1,6 @@
 %%PERL5_MAN3%%/Gtk2::GladeXML.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML/GladeXML.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
+%%SITE_ARCH%%/Gtk2/GladeXML.pm
+%%SITE_ARCH%%/Gtk2/GladeXML/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.h
+%%SITE_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.typemap
+%%SITE_ARCH%%/auto/Gtk2/GladeXML/GladeXML.so
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index 9858d1474334..757bf5513ff0 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gnome2-Canvas
 PORTVERSION=	1.002
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	CPAN/Gnome2 \
 		SF/gtk2-perl/Gnome2_Canvas/${PORTVERSION}
diff --git a/x11-toolkits/p5-Gnome2-Canvas/pkg-plist b/x11-toolkits/p5-Gnome2-Canvas/pkg-plist
index 684e76315e9f..7ae09b086a11 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/pkg-plist
+++ b/x11-toolkits/p5-Gnome2-Canvas/pkg-plist
@@ -14,33 +14,27 @@
 %%PERL5_MAN3%%/Gnome2::Canvas::Widget.3.gz
 %%PERL5_MAN3%%/Gnome2::Canvas::index.3.gz
 %%PERL5_MAN3%%/Gnome2::Canvas::version.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Bpath.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Ellipse.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Group.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install/canvas.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl-version.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Item.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Line.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/PathDef.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Pixbuf.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/RE.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Rect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/RichText.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Shape.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Text.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Widget.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/Canvas/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/Canvas/Canvas.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/Canvas
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2
+%%SITE_ARCH%%/Gnome2/Canvas.pm
+%%SITE_ARCH%%/Gnome2/Canvas.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Bpath.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Ellipse.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Group.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Install/Files.pm
+%%SITE_ARCH%%/Gnome2/Canvas/Install/canvas.typemap
+%%SITE_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl-autogen.h
+%%SITE_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl-version.h
+%%SITE_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl.h
+%%SITE_ARCH%%/Gnome2/Canvas/Install/gnomecanvasperl.typemap
+%%SITE_ARCH%%/Gnome2/Canvas/Item.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Line.pod
+%%SITE_ARCH%%/Gnome2/Canvas/PathDef.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Pixbuf.pod
+%%SITE_ARCH%%/Gnome2/Canvas/RE.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Rect.pod
+%%SITE_ARCH%%/Gnome2/Canvas/RichText.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Shape.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Text.pod
+%%SITE_ARCH%%/Gnome2/Canvas/Widget.pod
+%%SITE_ARCH%%/Gnome2/Canvas/index.pod
+%%SITE_ARCH%%/Gnome2/Canvas/version.pod
+%%SITE_ARCH%%/auto/Gnome2/Canvas/Canvas.so
diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile
index cdeb11e7a8ae..a9a5716cc97c 100644
--- a/x11-toolkits/p5-Gnome2-VFS/Makefile
+++ b/x11-toolkits/p5-Gnome2-VFS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gnome2-VFS
 PORTVERSION=	1.082
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	SF/gtk2-perl/Gnome2_VFS/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gnome2-VFS/pkg-plist b/x11-toolkits/p5-Gnome2-VFS/pkg-plist
index f80d0b4b8565..1149afab2c23 100644
--- a/x11-toolkits/p5-Gnome2-VFS/pkg-plist
+++ b/x11-toolkits/p5-Gnome2-VFS/pkg-plist
@@ -1,41 +1,40 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Address.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Application.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/ApplicationRegistry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Async.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Async/Handle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/DNSSD.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/DNSSD/Browse/Handle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/DNSSD/Resolve/Handle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Directory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Directory/Handle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Drive.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/FileInfo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Handle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/vfs.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/vfs2perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/vfs2perl-gtypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/vfs2perl-version.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/vfs2perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install/vfs2perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Mime.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Mime/Application.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Mime/Monitor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Mime/Type.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Monitor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Monitor/Handle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Resolve.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Resolve/Handle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/URI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Volume.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/VolumeMonitor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Xfer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/main.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/VFS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/VFS/VFS.so
+%%SITE_ARCH%%/Gnome2/VFS.pm
+%%SITE_ARCH%%/Gnome2/VFS/Address.pod
+%%SITE_ARCH%%/Gnome2/VFS/Application.pod
+%%SITE_ARCH%%/Gnome2/VFS/ApplicationRegistry.pod
+%%SITE_ARCH%%/Gnome2/VFS/Async.pod
+%%SITE_ARCH%%/Gnome2/VFS/Async/Handle.pod
+%%SITE_ARCH%%/Gnome2/VFS/DNSSD.pod
+%%SITE_ARCH%%/Gnome2/VFS/DNSSD/Browse/Handle.pod
+%%SITE_ARCH%%/Gnome2/VFS/DNSSD/Resolve/Handle.pod
+%%SITE_ARCH%%/Gnome2/VFS/Directory.pod
+%%SITE_ARCH%%/Gnome2/VFS/Directory/Handle.pod
+%%SITE_ARCH%%/Gnome2/VFS/Drive.pod
+%%SITE_ARCH%%/Gnome2/VFS/FileInfo.pod
+%%SITE_ARCH%%/Gnome2/VFS/Handle.pod
+%%SITE_ARCH%%/Gnome2/VFS/Install/Files.pm
+%%SITE_ARCH%%/Gnome2/VFS/Install/doctypes
+%%SITE_ARCH%%/Gnome2/VFS/Install/vfs.typemap
+%%SITE_ARCH%%/Gnome2/VFS/Install/vfs2perl-autogen.h
+%%SITE_ARCH%%/Gnome2/VFS/Install/vfs2perl-gtypes.h
+%%SITE_ARCH%%/Gnome2/VFS/Install/vfs2perl-version.h
+%%SITE_ARCH%%/Gnome2/VFS/Install/vfs2perl.h
+%%SITE_ARCH%%/Gnome2/VFS/Install/vfs2perl.typemap
+%%SITE_ARCH%%/Gnome2/VFS/Mime.pod
+%%SITE_ARCH%%/Gnome2/VFS/Mime/Application.pod
+%%SITE_ARCH%%/Gnome2/VFS/Mime/Monitor.pod
+%%SITE_ARCH%%/Gnome2/VFS/Mime/Type.pod
+%%SITE_ARCH%%/Gnome2/VFS/Monitor.pod
+%%SITE_ARCH%%/Gnome2/VFS/Monitor/Handle.pod
+%%SITE_ARCH%%/Gnome2/VFS/Resolve.pod
+%%SITE_ARCH%%/Gnome2/VFS/Resolve/Handle.pod
+%%SITE_ARCH%%/Gnome2/VFS/URI.pod
+%%SITE_ARCH%%/Gnome2/VFS/Volume.pod
+%%SITE_ARCH%%/Gnome2/VFS/VolumeMonitor.pod
+%%SITE_ARCH%%/Gnome2/VFS/Xfer.pod
+%%SITE_ARCH%%/Gnome2/VFS/index.pod
+%%SITE_ARCH%%/Gnome2/VFS/main.pod
+%%SITE_ARCH%%/auto/Gnome2/VFS/VFS.so
 %%PERL5_MAN3%%/Gnome2::VFS.3.gz
 %%PERL5_MAN3%%/Gnome2::VFS::Address.3.gz
 %%PERL5_MAN3%%/Gnome2::VFS::Application.3.gz
@@ -64,16 +63,3 @@
 %%PERL5_MAN3%%/Gnome2::VFS::Xfer.3.gz
 %%PERL5_MAN3%%/Gnome2::VFS::index.3.gz
 %%PERL5_MAN3%%/Gnome2::VFS::main.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/VFS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Resolve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Monitor
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Mime
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Directory
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/DNSSD/Resolve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/DNSSD/Browse
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/DNSSD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Async
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2
diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile
index b918c7069ef7..4710436dea05 100644
--- a/x11-toolkits/p5-Gnome2/Makefile
+++ b/x11-toolkits/p5-Gnome2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gnome2
 PORTVERSION=	1.045
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	CPAN \
 		SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
diff --git a/x11-toolkits/p5-Gnome2/pkg-plist b/x11-toolkits/p5-Gnome2/pkg-plist
index 925d0956ebd5..7f2ad7f00cec 100644
--- a/x11-toolkits/p5-Gnome2/pkg-plist
+++ b/x11-toolkits/p5-Gnome2/pkg-plist
@@ -1,59 +1,58 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/About.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/App.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/AppBar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/AppHelper.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/AuthenticationManager.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Bonobo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Bonobo/Dock.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Bonobo/DockItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Client.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/ColorPicker.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Config.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Config/Iterator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/DateEdit.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Druid.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/DruidPage.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/DruidPageEdge.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/DruidPageStandard.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Entry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/FileEntry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/FontPicker.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/HRef.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Help.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/I18N.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/IconEntry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/IconList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/IconSelection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/IconTextItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/IconTheme.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl-versions.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/ModuleInfo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/PasswordDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/PixmapEntry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/PopupMenu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Program.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Score.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Scores.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Sound.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Thumbnail.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/ThumbnailFactory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/UIDefs.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/URL.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Util.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Window.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/WindowIcon.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/enums.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/main.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/Gnome2.so
+%%SITE_ARCH%%/Gnome2.pm
+%%SITE_ARCH%%/Gnome2/About.pod
+%%SITE_ARCH%%/Gnome2/App.pod
+%%SITE_ARCH%%/Gnome2/AppBar.pod
+%%SITE_ARCH%%/Gnome2/AppHelper.pod
+%%SITE_ARCH%%/Gnome2/AuthenticationManager.pod
+%%SITE_ARCH%%/Gnome2/Bonobo.pod
+%%SITE_ARCH%%/Gnome2/Bonobo/Dock.pod
+%%SITE_ARCH%%/Gnome2/Bonobo/DockItem.pod
+%%SITE_ARCH%%/Gnome2/Client.pod
+%%SITE_ARCH%%/Gnome2/ColorPicker.pod
+%%SITE_ARCH%%/Gnome2/Config.pod
+%%SITE_ARCH%%/Gnome2/Config/Iterator.pod
+%%SITE_ARCH%%/Gnome2/DateEdit.pod
+%%SITE_ARCH%%/Gnome2/Druid.pod
+%%SITE_ARCH%%/Gnome2/DruidPage.pod
+%%SITE_ARCH%%/Gnome2/DruidPageEdge.pod
+%%SITE_ARCH%%/Gnome2/DruidPageStandard.pod
+%%SITE_ARCH%%/Gnome2/Entry.pod
+%%SITE_ARCH%%/Gnome2/FileEntry.pod
+%%SITE_ARCH%%/Gnome2/FontPicker.pod
+%%SITE_ARCH%%/Gnome2/HRef.pod
+%%SITE_ARCH%%/Gnome2/Help.pod
+%%SITE_ARCH%%/Gnome2/I18N.pod
+%%SITE_ARCH%%/Gnome2/IconEntry.pod
+%%SITE_ARCH%%/Gnome2/IconList.pod
+%%SITE_ARCH%%/Gnome2/IconSelection.pod
+%%SITE_ARCH%%/Gnome2/IconTextItem.pod
+%%SITE_ARCH%%/Gnome2/IconTheme.pod
+%%SITE_ARCH%%/Gnome2/Install/Files.pm
+%%SITE_ARCH%%/Gnome2/Install/doctypes
+%%SITE_ARCH%%/Gnome2/Install/gnome.typemap
+%%SITE_ARCH%%/Gnome2/Install/gnome2perl-autogen.h
+%%SITE_ARCH%%/Gnome2/Install/gnome2perl-versions.h
+%%SITE_ARCH%%/Gnome2/Install/gnome2perl.h
+%%SITE_ARCH%%/Gnome2/Install/gnome2perl.typemap
+%%SITE_ARCH%%/Gnome2/ModuleInfo.pod
+%%SITE_ARCH%%/Gnome2/PasswordDialog.pod
+%%SITE_ARCH%%/Gnome2/PixmapEntry.pod
+%%SITE_ARCH%%/Gnome2/PopupMenu.pod
+%%SITE_ARCH%%/Gnome2/Program.pod
+%%SITE_ARCH%%/Gnome2/Score.pod
+%%SITE_ARCH%%/Gnome2/Scores.pod
+%%SITE_ARCH%%/Gnome2/Sound.pod
+%%SITE_ARCH%%/Gnome2/Thumbnail.pod
+%%SITE_ARCH%%/Gnome2/ThumbnailFactory.pod
+%%SITE_ARCH%%/Gnome2/UIDefs.pod
+%%SITE_ARCH%%/Gnome2/URL.pod
+%%SITE_ARCH%%/Gnome2/Util.pod
+%%SITE_ARCH%%/Gnome2/Window.pod
+%%SITE_ARCH%%/Gnome2/WindowIcon.pod
+%%SITE_ARCH%%/Gnome2/enums.pod
+%%SITE_ARCH%%/Gnome2/index.pod
+%%SITE_ARCH%%/Gnome2/main.pod
+%%SITE_ARCH%%/auto/Gnome2/Gnome2.so
 %%PERL5_MAN3%%/Gnome2.3.gz
 %%PERL5_MAN3%%/Gnome2::About.3.gz
 %%PERL5_MAN3%%/Gnome2::App.3.gz
@@ -101,8 +100,3 @@
 %%PERL5_MAN3%%/Gnome2::enums.3.gz
 %%PERL5_MAN3%%/Gnome2::index.3.gz
 %%PERL5_MAN3%%/Gnome2::main.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Config
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Bonobo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 2d16da63d6cd..ea6ce9cd268b 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk
 PORTVERSION=	0.7010
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk/pkg-plist b/x11-toolkits/p5-Gtk/pkg-plist
index 9cec2f7878d4..b469a4958f83 100644
--- a/x11-toolkits/p5-Gtk/pkg-plist
+++ b/x11-toolkits/p5-Gtk/pkg-plist
@@ -1,51 +1,44 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Atoms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/CListModel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/ColorSelectButton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Keysyms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GdkTypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkDefs.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkTypemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkTypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/MiscTypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkExt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkInt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gendefs.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gendoc.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/genext.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gpdoc2pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.0.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.1.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.3.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.4.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.6.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/ppport.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP/http.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LogHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/TypesLazy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/io.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/lazy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gtk.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/base/.packlist
+%%SITE_ARCH%%/Gtk.pm
+%%SITE_ARCH%%/Gtk/Atoms.pm
+%%SITE_ARCH%%/Gtk/CListModel.pm
+%%SITE_ARCH%%/Gtk/ColorSelectButton.pm
+%%SITE_ARCH%%/Gtk/Gdk.pm
+%%SITE_ARCH%%/Gtk/Keysyms.pm
+%%SITE_ARCH%%/Gtk/Install/Files.pm
+%%SITE_ARCH%%/Gtk/Install/GdkTypes.h
+%%SITE_ARCH%%/Gtk/Install/GtkDefs.h
+%%SITE_ARCH%%/Gtk/Install/GtkTypemap
+%%SITE_ARCH%%/Gtk/Install/GtkTypes.h
+%%SITE_ARCH%%/Gtk/Install/MiscTypes.h
+%%SITE_ARCH%%/Gtk/Install/PerlGtkExt.h
+%%SITE_ARCH%%/Gtk/Install/PerlGtkInt.h
+%%SITE_ARCH%%/Gtk/Install/gendefs.pl
+%%SITE_ARCH%%/Gtk/Install/gendoc.pl
+%%SITE_ARCH%%/Gtk/Install/genext.pl
+%%SITE_ARCH%%/Gtk/Install/gpdoc2pod
+%%SITE_ARCH%%/Gtk/Install/gtk-0.99.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-0.99.typemap
+%%SITE_ARCH%%/Gtk/Install/gtk-1.0.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.1.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.3.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.4.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.6.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.2.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.2.typemap
+%%SITE_ARCH%%/Gtk/Install/ppport.h
+%%SITE_ARCH%%/Gtk/LWP.pm
+%%SITE_ARCH%%/Gtk/LWP/http.pm
+%%SITE_ARCH%%/Gtk/LogHandler.pm
+%%SITE_ARCH%%/Gtk/Types.pm
+%%SITE_ARCH%%/Gtk/TypesLazy.pm
+%%SITE_ARCH%%/Gtk/io.pm
+%%SITE_ARCH%%/Gtk/lazy.pm
+%%SITE_ARCH%%/auto/Gtk/Gdk/autosplit.ix
+%%SITE_ARCH%%/auto/Gtk/Gtk.so
+%%SITE_ARCH%%/auto/Gtk/autosplit.ix
 %%PERL5_MAN3%%/Gtk.3pm.gz
 %%PERL5_MAN3%%/Gtk::CListModel.3pm.gz
 %%PERL5_MAN3%%/Gtk::cookbook.3pm.gz
 %%PERL5_MAN3%%/Gtk::objects.3pm.gz
 %%PERL5_MAN3%%/Gtk::reference.3pm.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/base
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk
diff --git a/x11-toolkits/p5-Gtk2-Chmod/Makefile b/x11-toolkits/p5-Gtk2-Chmod/Makefile
index 84ff01bdafd5..439d0074f4c0 100644
--- a/x11-toolkits/p5-Gtk2-Chmod/Makefile
+++ b/x11-toolkits/p5-Gtk2-Chmod/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-Chmod
 PORTVERSION=	0.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/x11-toolkits/p5-Gtk2-Chmod/pkg-plist b/x11-toolkits/p5-Gtk2-Chmod/pkg-plist
index 00c74a65a785..93da54af7aa2 100644
--- a/x11-toolkits/p5-Gtk2-Chmod/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Chmod/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Gtk2/Chmod.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Chmod/.packlist
 %%PERL5_MAN3%%/Gtk2::Chmod.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Chmod
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/Gtk2/
diff --git a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
index 118540856636..a983021d7946 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-Ex-Dialogs
 PORTVERSION=	0.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist
index 384050ea5773..427edf5c8c24 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist
@@ -5,7 +5,6 @@
 %%SITE_PERL%%/Gtk2/Ex/Dialogs/ChooseFile.pm
 %%SITE_PERL%%/Gtk2/Ex/Dialogs/ErrorMsg.pm
 %%SITE_PERL%%/Gtk2/Ex/Dialogs/ChoosePreviewFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Dialogs/.packlist
 %%PERL5_MAN3%%/Gtk2::Ex::Dialogs::Question.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::Dialogs::ChooseDirectory.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::Dialogs::Message.3.gz
@@ -13,9 +12,3 @@
 %%PERL5_MAN3%%/Gtk2::Ex::Dialogs::ChooseFile.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::Dialogs::ChoosePreviewFile.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::Dialogs.3.gz
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex/Dialogs
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Dialogs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
index 3c4d6f642e6c..44e38593ad25 100644
--- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-Ex-FormFactory
 PORTVERSION=	0.67
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist
index 39d0916f737a..5f61c2d93c1b 100644
--- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist
@@ -38,7 +38,6 @@
 %%SITE_PERL%%/Gtk2/Ex/FormFactory/Widget.pm
 %%SITE_PERL%%/Gtk2/Ex/FormFactory/Window.pm
 %%SITE_PERL%%/Gtk2/Ex/FormFactory/YesNo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/FormFactory/.packlist
 %%PERL5_MAN3%%/Gtk2::Ex::FormFactory.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Button.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::FormFactory::CheckButton.3.gz
@@ -79,9 +78,3 @@
 %%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Widget.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Window.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::FormFactory::YesNo.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/FormFactory
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrm %%SITE_PERL%%/Gtk2/Ex/FormFactory
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
index 94cdc1656607..bb33fe2a4df8 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-Ex-PodViewer
 PORTVERSION=	0.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
index df070a33f76c..6970ea5fe643 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
@@ -3,11 +3,4 @@ bin/podviewer
 %%PERL5_MAN3%%/Gtk2::Ex::PodViewer::Parser.3.gz
 %%SITE_PERL%%/Gtk2/Ex/PodViewer.pm
 %%SITE_PERL%%/Gtk2/Ex/PodViewer/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/PodViewer/.packlist
 man/man1/podviewer.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/PodViewer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex/PodViewer
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
index b6df89518f67..4a321aea1aed 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-Ex-Simple-List
 PORTVERSION=	0.50
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-Simple-List/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-Simple-List/pkg-plist
index e92086232dc7..3120ca647bcc 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Simple-List/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-Simple-List/pkg-plist
@@ -2,11 +2,3 @@
 %%SITE_PERL%%/Gtk2/Ex/Simple/List.pm
 %%SITE_PERL%%/Gtk2/Ex/Simple/TiedCommon.pm
 %%SITE_PERL%%/Gtk2/Ex/Simple/TiedList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Simple/List/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Simple/List
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex/Simple
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
index 9f72dfcb3462..46cc7da0d2b5 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-Ex-Utils
 PORTVERSION=	0.09
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-Utils/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-Utils/pkg-plist
index 4eada719596b..9d0e5dd33a8b 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Utils/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-Utils/pkg-plist
@@ -1,10 +1,4 @@
 %%SITE_PERL%%/Gtk2/Ex/Constants.pm
 %%SITE_PERL%%/Gtk2/Ex/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Utils/.packlist
 %%PERL5_MAN3%%/Gtk2::Ex::Constants.3.gz
 %%PERL5_MAN3%%/Gtk2::Ex::Utils.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Utils
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-GladeXML/Makefile b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
index 2108392cc977..cb935b99cd5e 100644
--- a/x11-toolkits/p5-Gtk2-GladeXML/Makefile
+++ b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-GladeXML
 PORTVERSION=	1.007
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist b/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist
index df7c5bb0c938..f641fa651582 100644
--- a/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist
@@ -1,12 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML/GladeXML.so
+%%SITE_ARCH%%/Gtk2/GladeXML.pm
+%%SITE_ARCH%%/Gtk2/GladeXML/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.h
+%%SITE_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.typemap
+%%SITE_ARCH%%/auto/Gtk2/GladeXML/GladeXML.so
 %%PERL5_MAN3%%/Gtk2::GladeXML.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-Html2/Makefile b/x11-toolkits/p5-Gtk2-Html2/Makefile
index 936ca0dfe310..0d5525313b3c 100644
--- a/x11-toolkits/p5-Gtk2-Html2/Makefile
+++ b/x11-toolkits/p5-Gtk2-Html2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-Html2
 PORTVERSION=	0.03
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	http://asofyet.org/muppet/software/gtk2-perl/
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Html2/pkg-plist b/x11-toolkits/p5-Gtk2-Html2/pkg-plist
index e400aa5f08be..01c8f3d7ad92 100644
--- a/x11-toolkits/p5-Gtk2-Html2/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Html2/pkg-plist
@@ -1,20 +1,16 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Context.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Document.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Install/gtkhtml2perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Install/gtkhtml2perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Install/gtkhtml2perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Stream.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/View.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Html2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Html2/Html2.so
+%%SITE_ARCH%%/Gtk2/Html2.pm
+%%SITE_ARCH%%/Gtk2/Html2/Context.pod
+%%SITE_ARCH%%/Gtk2/Html2/Document.pod
+%%SITE_ARCH%%/Gtk2/Html2/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/Html2/Install/gtkhtml2perl-autogen.h
+%%SITE_ARCH%%/Gtk2/Html2/Install/gtkhtml2perl.h
+%%SITE_ARCH%%/Gtk2/Html2/Install/gtkhtml2perl.typemap
+%%SITE_ARCH%%/Gtk2/Html2/Stream.pod
+%%SITE_ARCH%%/Gtk2/Html2/View.pod
+%%SITE_ARCH%%/Gtk2/Html2/index.pod
+%%SITE_ARCH%%/auto/Gtk2/Html2/Html2.so
 %%PERL5_MAN3%%/Gtk2::Html2::Context.3.gz
 %%PERL5_MAN3%%/Gtk2::Html2::Document.3.gz
 %%PERL5_MAN3%%/Gtk2::Html2::Stream.3.gz
 %%PERL5_MAN3%%/Gtk2::Html2::View.3.gz
 %%PERL5_MAN3%%/Gtk2::Html2::index.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Html2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Html2
diff --git a/x11-toolkits/p5-Gtk2-ImageView/Makefile b/x11-toolkits/p5-Gtk2-ImageView/Makefile
index 69ba9a78c1d5..439bbf16b954 100644
--- a/x11-toolkits/p5-Gtk2-ImageView/Makefile
+++ b/x11-toolkits/p5-Gtk2-ImageView/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-ImageView
 PORTVERSION=	0.05
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RATCLIFFE
diff --git a/x11-toolkits/p5-Gtk2-ImageView/pkg-plist b/x11-toolkits/p5-Gtk2-ImageView/pkg-plist
index ba2eab123303..d3f66ff2bf4b 100644
--- a/x11-toolkits/p5-Gtk2-ImageView/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-ImageView/pkg-plist
@@ -1,21 +1,20 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/ImageView/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/ImageView/ImageView.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pixbuf/Draw/Cache.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Anim.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Install/gtkimageviewperl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Install/gtkimageviewperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Install/gtkimageviewperl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Nav.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/ScrollWin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Tool.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Tool/Dragger.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Tool/Painter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Tool/Selector.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Zoom.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/index.pod
+%%SITE_ARCH%%/auto/Gtk2/ImageView/ImageView.so
+%%SITE_ARCH%%/Gtk2/Gdk/Pixbuf/Draw/Cache.pod
+%%SITE_ARCH%%/Gtk2/ImageView.pm
+%%SITE_ARCH%%/Gtk2/ImageView.pod
+%%SITE_ARCH%%/Gtk2/ImageView/Anim.pod
+%%SITE_ARCH%%/Gtk2/ImageView/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/ImageView/Install/gtkimageviewperl-autogen.h
+%%SITE_ARCH%%/Gtk2/ImageView/Install/gtkimageviewperl.h
+%%SITE_ARCH%%/Gtk2/ImageView/Install/gtkimageviewperl.typemap
+%%SITE_ARCH%%/Gtk2/ImageView/Nav.pod
+%%SITE_ARCH%%/Gtk2/ImageView/ScrollWin.pod
+%%SITE_ARCH%%/Gtk2/ImageView/Tool.pod
+%%SITE_ARCH%%/Gtk2/ImageView/Tool/Dragger.pod
+%%SITE_ARCH%%/Gtk2/ImageView/Tool/Painter.pod
+%%SITE_ARCH%%/Gtk2/ImageView/Tool/Selector.pod
+%%SITE_ARCH%%/Gtk2/ImageView/Zoom.pod
+%%SITE_ARCH%%/Gtk2/ImageView/index.pod
 %%PERL5_MAN3%%/Gtk2::ImageView.3.gz
 %%PERL5_MAN3%%/Gtk2::Gdk::Pixbuf::Draw::Cache.3.gz
 %%PERL5_MAN3%%/Gtk2::ImageView::Anim.3.gz
@@ -27,12 +26,3 @@
 %%PERL5_MAN3%%/Gtk2::ImageView::Tool::Selector.3.gz
 %%PERL5_MAN3%%/Gtk2::ImageView::Zoom.3.gz
 %%PERL5_MAN3%%/Gtk2::ImageView::index.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/ImageView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Tool
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pixbuf/Draw
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pixbuf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
index 9d92f1272cb6..547e8e6b98f0 100644
--- a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
+++ b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-PathButtonBar
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/x11-toolkits/p5-Gtk2-PathButtonBar/pkg-plist b/x11-toolkits/p5-Gtk2-PathButtonBar/pkg-plist
index 5a3239942a0f..a3d6c706d80e 100644
--- a/x11-toolkits/p5-Gtk2-PathButtonBar/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-PathButtonBar/pkg-plist
@@ -1,7 +1,2 @@
 %%SITE_PERL%%/Gtk2/PathButtonBar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PathButtonBar/.packlist
 %%PERL5_MAN3%%/Gtk2::PathButtonBar.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PathButtonBar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index 66257582a678..f720c3f2e35f 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Gtk2-TrayIcon
 PORTVERSION=	0.06
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BORUP
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
index 8662c09f695c..171719816fec 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
@@ -1,12 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/TrayIcon/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/TrayIcon/TrayIcon.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install/trayicon-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install/trayicon.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon.pm
+%%SITE_ARCH%%/auto/Gtk2/TrayIcon/TrayIcon.so
+%%SITE_ARCH%%/Gtk2/TrayIcon/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/TrayIcon/Install/trayicon-autogen.h
+%%SITE_ARCH%%/Gtk2/TrayIcon/Install/trayicon.typemap
+%%SITE_ARCH%%/Gtk2/TrayIcon.pm
 %%PERL5_MAN3%%/Gtk2::TrayIcon.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/TrayIcon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index f129554ca1ae..ba837caf82df 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Gtk2
 PORTVERSION=	1.2491
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	CPAN SF/${PORTNAME:tl}-perl/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2/pkg-plist b/x11-toolkits/p5-Gtk2/pkg-plist
index 3afe716b6fd0..38b30ef62972 100644
--- a/x11-toolkits/p5-Gtk2/pkg-plist
+++ b/x11-toolkits/p5-Gtk2/pkg-plist
@@ -1,339 +1,338 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AboutDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AccelGroup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AccelLabel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AccelMap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Accelerator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Action.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ActionGroup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Activatable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Adjustment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Alignment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Arrow.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AspectFrame.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Assistant.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Bin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/BindingSet.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Box.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Buildable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Buildable/ParseContext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Builder.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Button.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ButtonBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Calendar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellEditable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellLayout.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRenderer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererAccel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererCombo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererPixbuf.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererProgress.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererSpin.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererSpinner.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererText.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellRendererToggle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CellView.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CheckButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CheckMenuItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Clipboard.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/CodeGen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ColorButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ColorSelection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ColorSelectionDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Combo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ComboBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ComboBoxEntry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Container.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Curve.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Dialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Drag.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/DrawingArea.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Editable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Entry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/EntryBuffer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/EntryCompletion.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/EventBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Expander.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FileChooser.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FileChooserButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FileChooserDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FileChooserWidget.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FileFilter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FileSelection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Fixed.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FontButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FontSelection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/FontSelectionDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Frame.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GC.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GammaCurve.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Atom.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Bitmap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Cairo/Context.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Color.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Colormap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Cursor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Device.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Display.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/DisplayManager.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/DragContext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Drawable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Button.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Client.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Configure.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Crossing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/DND.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Expose.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Focus.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/GrabBroken.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Key.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Motion.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/NoExpose.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/OwnerChange.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Property.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Proximity.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Scroll.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Selection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Setting.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Visibility.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/WindowState.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/GC.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Geometry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Image.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Input.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Keymap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Keysyms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pango/AttrEmbossColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pango/AttrEmbossed.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pango/AttrStipple.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PangoRenderer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pixbuf.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufAnimation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufAnimationIter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufFormat.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufLoader.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufSimpleAnim.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pixmap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Rectangle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Region.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Rgb.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Screen.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Selection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Threads.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Visual.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Window.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/X11.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HButtonBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HPaned.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HRuler.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HSV.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HScale.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HScrollbar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HSeparator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/HandleBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Helper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IMContext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IMContextSimple.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IMMulticontext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IconFactory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IconInfo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IconSet.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IconSize.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IconSource.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IconTheme.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/IconView.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Image.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageMenuItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/InfoBar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/InputDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gdk.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl-versions.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Invisible.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Item.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ItemFactory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Label.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Layout.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/LinkButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/List.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ListItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ListStore.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Menu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/MenuBar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/MenuItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/MenuShell.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/MenuToolButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/MessageDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Misc.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Notebook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Object.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/OffscreenWindow.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/OptionMenu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Orientable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/PageSetup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Paned.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrBackground.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrFallback.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrFamily.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrFontDesc.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrForeground.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrGravity.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrGravityHint.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrInt.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrIterator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrLanguage.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrLetterSpacing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrRise.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrScale.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrShape.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrSize.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrStretch.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrStrikethrough.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrStrikethroughColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrString.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrStyle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrUnderline.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrUnderlineColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrVariant.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/AttrWeight.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Attribute.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Cairo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Cairo/Context.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Cairo/Font.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Cairo/FontMap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Color.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Context.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Font.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontDescription.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontFace.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontFamily.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontMap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontMetrics.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Fontset.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Gravity.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Language.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Layout.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/LayoutIter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/LayoutLine.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Matrix.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Renderer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Script.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/ScriptIter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/TabArray.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/PaperSize.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Plug.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Print.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/PrintContext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/PrintOperation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/PrintOperationPreview.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/PrintSettings.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ProgressBar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RadioAction.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RadioButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RadioMenuItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RadioToolButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Range.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Rc.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RcStyle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentAction.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentChooser.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentChooserDialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentChooserMenu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentChooserWidget.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentFilter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentInfo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RecentManager.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Requisition.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Ruler.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Scale.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ScaleButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Scrollbar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ScrolledWindow.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Selection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/SelectionData.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Separator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/SeparatorMenuItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/SeparatorToolItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/SimpleList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/SimpleMenu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/SizeGroup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Socket.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/SpinButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Spinner.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/StatusIcon.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Statusbar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Stock.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Style.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Table.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TargetEntry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TargetList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TearoffMenuItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TestHelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextAttributes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextBuffer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextChildAnchor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextIter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextMark.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextTag.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextTagTable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextView.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToggleAction.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToggleButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToggleToolButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToolButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToolItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToolItemGroup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToolPalette.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ToolShell.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Toolbar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Tooltip.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Tooltips.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeDragDest.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeDragSource.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeIter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeModel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeModelFilter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeModelSort.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreePath.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeRowReference.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeSelection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeSortable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeStore.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeView.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeViewColumn.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/UIManager.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VButtonBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VPaned.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VRuler.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VScale.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VScrollbar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VSeparator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Viewport.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/VolumeButton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Widget.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Window.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WindowGroup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/api.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/devel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/enums.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/main.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Gtk2.so
+%%SITE_ARCH%%/Gtk2.pm
+%%SITE_ARCH%%/Gtk2/AboutDialog.pod
+%%SITE_ARCH%%/Gtk2/AccelGroup.pod
+%%SITE_ARCH%%/Gtk2/AccelLabel.pod
+%%SITE_ARCH%%/Gtk2/AccelMap.pod
+%%SITE_ARCH%%/Gtk2/Accelerator.pod
+%%SITE_ARCH%%/Gtk2/Action.pod
+%%SITE_ARCH%%/Gtk2/ActionGroup.pod
+%%SITE_ARCH%%/Gtk2/Activatable.pod
+%%SITE_ARCH%%/Gtk2/Adjustment.pod
+%%SITE_ARCH%%/Gtk2/Alignment.pod
+%%SITE_ARCH%%/Gtk2/Arrow.pod
+%%SITE_ARCH%%/Gtk2/AspectFrame.pod
+%%SITE_ARCH%%/Gtk2/Assistant.pod
+%%SITE_ARCH%%/Gtk2/Bin.pod
+%%SITE_ARCH%%/Gtk2/BindingSet.pod
+%%SITE_ARCH%%/Gtk2/Box.pod
+%%SITE_ARCH%%/Gtk2/Buildable.pod
+%%SITE_ARCH%%/Gtk2/Buildable/ParseContext.pod
+%%SITE_ARCH%%/Gtk2/Builder.pod
+%%SITE_ARCH%%/Gtk2/Button.pod
+%%SITE_ARCH%%/Gtk2/ButtonBox.pod
+%%SITE_ARCH%%/Gtk2/Calendar.pod
+%%SITE_ARCH%%/Gtk2/CellEditable.pod
+%%SITE_ARCH%%/Gtk2/CellLayout.pod
+%%SITE_ARCH%%/Gtk2/CellRenderer.pod
+%%SITE_ARCH%%/Gtk2/CellRendererAccel.pod
+%%SITE_ARCH%%/Gtk2/CellRendererCombo.pod
+%%SITE_ARCH%%/Gtk2/CellRendererPixbuf.pod
+%%SITE_ARCH%%/Gtk2/CellRendererProgress.pod
+%%SITE_ARCH%%/Gtk2/CellRendererSpin.pod
+%%SITE_ARCH%%/Gtk2/CellRendererSpinner.pod
+%%SITE_ARCH%%/Gtk2/CellRendererText.pod
+%%SITE_ARCH%%/Gtk2/CellRendererToggle.pod
+%%SITE_ARCH%%/Gtk2/CellView.pod
+%%SITE_ARCH%%/Gtk2/CheckButton.pod
+%%SITE_ARCH%%/Gtk2/CheckMenuItem.pod
+%%SITE_ARCH%%/Gtk2/Clipboard.pod
+%%SITE_ARCH%%/Gtk2/CodeGen.pm
+%%SITE_ARCH%%/Gtk2/ColorButton.pod
+%%SITE_ARCH%%/Gtk2/ColorSelection.pod
+%%SITE_ARCH%%/Gtk2/ColorSelectionDialog.pod
+%%SITE_ARCH%%/Gtk2/Combo.pod
+%%SITE_ARCH%%/Gtk2/ComboBox.pod
+%%SITE_ARCH%%/Gtk2/ComboBoxEntry.pod
+%%SITE_ARCH%%/Gtk2/Container.pod
+%%SITE_ARCH%%/Gtk2/Curve.pod
+%%SITE_ARCH%%/Gtk2/Dialog.pod
+%%SITE_ARCH%%/Gtk2/Drag.pod
+%%SITE_ARCH%%/Gtk2/DrawingArea.pod
+%%SITE_ARCH%%/Gtk2/Editable.pod
+%%SITE_ARCH%%/Gtk2/Entry.pod
+%%SITE_ARCH%%/Gtk2/EntryBuffer.pod
+%%SITE_ARCH%%/Gtk2/EntryCompletion.pod
+%%SITE_ARCH%%/Gtk2/EventBox.pod
+%%SITE_ARCH%%/Gtk2/Expander.pod
+%%SITE_ARCH%%/Gtk2/FileChooser.pod
+%%SITE_ARCH%%/Gtk2/FileChooserButton.pod
+%%SITE_ARCH%%/Gtk2/FileChooserDialog.pod
+%%SITE_ARCH%%/Gtk2/FileChooserWidget.pod
+%%SITE_ARCH%%/Gtk2/FileFilter.pod
+%%SITE_ARCH%%/Gtk2/FileSelection.pod
+%%SITE_ARCH%%/Gtk2/Fixed.pod
+%%SITE_ARCH%%/Gtk2/FontButton.pod
+%%SITE_ARCH%%/Gtk2/FontSelection.pod
+%%SITE_ARCH%%/Gtk2/FontSelectionDialog.pod
+%%SITE_ARCH%%/Gtk2/Frame.pod
+%%SITE_ARCH%%/Gtk2/GC.pod
+%%SITE_ARCH%%/Gtk2/GammaCurve.pod
+%%SITE_ARCH%%/Gtk2/Gdk.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Atom.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Bitmap.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Cairo/Context.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Color.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Colormap.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Cursor.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Device.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Display.pod
+%%SITE_ARCH%%/Gtk2/Gdk/DisplayManager.pod
+%%SITE_ARCH%%/Gtk2/Gdk/DragContext.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Drawable.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Button.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Client.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Configure.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Crossing.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/DND.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Expose.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Focus.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/GrabBroken.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Key.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Motion.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/NoExpose.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/OwnerChange.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Property.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Proximity.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Scroll.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Selection.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Setting.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/Visibility.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Event/WindowState.pod
+%%SITE_ARCH%%/Gtk2/Gdk/GC.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Geometry.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Image.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Input.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Keymap.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Keysyms.pm
+%%SITE_ARCH%%/Gtk2/Gdk/Pango/AttrEmbossColor.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Pango/AttrEmbossed.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Pango/AttrStipple.pod
+%%SITE_ARCH%%/Gtk2/Gdk/PangoRenderer.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Pixbuf.pod
+%%SITE_ARCH%%/Gtk2/Gdk/PixbufAnimation.pod
+%%SITE_ARCH%%/Gtk2/Gdk/PixbufAnimationIter.pod
+%%SITE_ARCH%%/Gtk2/Gdk/PixbufFormat.pod
+%%SITE_ARCH%%/Gtk2/Gdk/PixbufLoader.pod
+%%SITE_ARCH%%/Gtk2/Gdk/PixbufSimpleAnim.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Pixmap.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Rectangle.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Region.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Rgb.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Screen.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Selection.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Threads.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Visual.pod
+%%SITE_ARCH%%/Gtk2/Gdk/Window.pod
+%%SITE_ARCH%%/Gtk2/Gdk/X11.pod
+%%SITE_ARCH%%/Gtk2/HBox.pod
+%%SITE_ARCH%%/Gtk2/HButtonBox.pod
+%%SITE_ARCH%%/Gtk2/HPaned.pod
+%%SITE_ARCH%%/Gtk2/HRuler.pod
+%%SITE_ARCH%%/Gtk2/HSV.pod
+%%SITE_ARCH%%/Gtk2/HScale.pod
+%%SITE_ARCH%%/Gtk2/HScrollbar.pod
+%%SITE_ARCH%%/Gtk2/HSeparator.pod
+%%SITE_ARCH%%/Gtk2/HandleBox.pod
+%%SITE_ARCH%%/Gtk2/Helper.pm
+%%SITE_ARCH%%/Gtk2/IMContext.pod
+%%SITE_ARCH%%/Gtk2/IMContextSimple.pod
+%%SITE_ARCH%%/Gtk2/IMMulticontext.pod
+%%SITE_ARCH%%/Gtk2/IconFactory.pod
+%%SITE_ARCH%%/Gtk2/IconInfo.pod
+%%SITE_ARCH%%/Gtk2/IconSet.pod
+%%SITE_ARCH%%/Gtk2/IconSize.pod
+%%SITE_ARCH%%/Gtk2/IconSource.pod
+%%SITE_ARCH%%/Gtk2/IconTheme.pod
+%%SITE_ARCH%%/Gtk2/IconView.pod
+%%SITE_ARCH%%/Gtk2/Image.pod
+%%SITE_ARCH%%/Gtk2/ImageMenuItem.pod
+%%SITE_ARCH%%/Gtk2/InfoBar.pod
+%%SITE_ARCH%%/Gtk2/InputDialog.pod
+%%SITE_ARCH%%/Gtk2/Install/Files.pm
+%%SITE_ARCH%%/Gtk2/Install/doctypes
+%%SITE_ARCH%%/Gtk2/Install/gdk.typemap
+%%SITE_ARCH%%/Gtk2/Install/gtk.typemap
+%%SITE_ARCH%%/Gtk2/Install/gtk2perl-autogen.h
+%%SITE_ARCH%%/Gtk2/Install/gtk2perl-versions.h
+%%SITE_ARCH%%/Gtk2/Install/gtk2perl.h
+%%SITE_ARCH%%/Gtk2/Install/gtk2perl.typemap
+%%SITE_ARCH%%/Gtk2/Invisible.pod
+%%SITE_ARCH%%/Gtk2/Item.pod
+%%SITE_ARCH%%/Gtk2/ItemFactory.pod
+%%SITE_ARCH%%/Gtk2/Label.pod
+%%SITE_ARCH%%/Gtk2/Layout.pod
+%%SITE_ARCH%%/Gtk2/LinkButton.pod
+%%SITE_ARCH%%/Gtk2/List.pod
+%%SITE_ARCH%%/Gtk2/ListItem.pod
+%%SITE_ARCH%%/Gtk2/ListStore.pod
+%%SITE_ARCH%%/Gtk2/Menu.pod
+%%SITE_ARCH%%/Gtk2/MenuBar.pod
+%%SITE_ARCH%%/Gtk2/MenuItem.pod
+%%SITE_ARCH%%/Gtk2/MenuShell.pod
+%%SITE_ARCH%%/Gtk2/MenuToolButton.pod
+%%SITE_ARCH%%/Gtk2/MessageDialog.pod
+%%SITE_ARCH%%/Gtk2/Misc.pod
+%%SITE_ARCH%%/Gtk2/Notebook.pod
+%%SITE_ARCH%%/Gtk2/Object.pod
+%%SITE_ARCH%%/Gtk2/OffscreenWindow.pod
+%%SITE_ARCH%%/Gtk2/OptionMenu.pod
+%%SITE_ARCH%%/Gtk2/Orientable.pod
+%%SITE_ARCH%%/Gtk2/PageSetup.pod
+%%SITE_ARCH%%/Gtk2/Paned.pod
+%%SITE_ARCH%%/Gtk2/Pango.pm
+%%SITE_ARCH%%/Gtk2/Pango/AttrBackground.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrColor.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrFallback.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrFamily.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrFontDesc.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrForeground.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrGravity.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrGravityHint.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrInt.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrIterator.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrLanguage.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrLetterSpacing.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrList.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrRise.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrScale.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrShape.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrSize.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrStretch.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrStrikethrough.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrStrikethroughColor.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrString.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrStyle.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrUnderline.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrUnderlineColor.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrVariant.pod
+%%SITE_ARCH%%/Gtk2/Pango/AttrWeight.pod
+%%SITE_ARCH%%/Gtk2/Pango/Attribute.pod
+%%SITE_ARCH%%/Gtk2/Pango/Cairo.pod
+%%SITE_ARCH%%/Gtk2/Pango/Cairo/Context.pod
+%%SITE_ARCH%%/Gtk2/Pango/Cairo/Font.pod
+%%SITE_ARCH%%/Gtk2/Pango/Cairo/FontMap.pod
+%%SITE_ARCH%%/Gtk2/Pango/Color.pod
+%%SITE_ARCH%%/Gtk2/Pango/Context.pod
+%%SITE_ARCH%%/Gtk2/Pango/Font.pod
+%%SITE_ARCH%%/Gtk2/Pango/FontDescription.pod
+%%SITE_ARCH%%/Gtk2/Pango/FontFace.pod
+%%SITE_ARCH%%/Gtk2/Pango/FontFamily.pod
+%%SITE_ARCH%%/Gtk2/Pango/FontMap.pod
+%%SITE_ARCH%%/Gtk2/Pango/FontMetrics.pod
+%%SITE_ARCH%%/Gtk2/Pango/Fontset.pod
+%%SITE_ARCH%%/Gtk2/Pango/Gravity.pod
+%%SITE_ARCH%%/Gtk2/Pango/Language.pod
+%%SITE_ARCH%%/Gtk2/Pango/Layout.pod
+%%SITE_ARCH%%/Gtk2/Pango/LayoutIter.pod
+%%SITE_ARCH%%/Gtk2/Pango/LayoutLine.pod
+%%SITE_ARCH%%/Gtk2/Pango/Matrix.pod
+%%SITE_ARCH%%/Gtk2/Pango/Renderer.pod
+%%SITE_ARCH%%/Gtk2/Pango/Script.pod
+%%SITE_ARCH%%/Gtk2/Pango/ScriptIter.pod
+%%SITE_ARCH%%/Gtk2/Pango/TabArray.pod
+%%SITE_ARCH%%/Gtk2/Pango/version.pod
+%%SITE_ARCH%%/Gtk2/PaperSize.pod
+%%SITE_ARCH%%/Gtk2/Plug.pod
+%%SITE_ARCH%%/Gtk2/Print.pod
+%%SITE_ARCH%%/Gtk2/PrintContext.pod
+%%SITE_ARCH%%/Gtk2/PrintOperation.pod
+%%SITE_ARCH%%/Gtk2/PrintOperationPreview.pod
+%%SITE_ARCH%%/Gtk2/PrintSettings.pod
+%%SITE_ARCH%%/Gtk2/ProgressBar.pod
+%%SITE_ARCH%%/Gtk2/RadioAction.pod
+%%SITE_ARCH%%/Gtk2/RadioButton.pod
+%%SITE_ARCH%%/Gtk2/RadioMenuItem.pod
+%%SITE_ARCH%%/Gtk2/RadioToolButton.pod
+%%SITE_ARCH%%/Gtk2/Range.pod
+%%SITE_ARCH%%/Gtk2/Rc.pod
+%%SITE_ARCH%%/Gtk2/RcStyle.pod
+%%SITE_ARCH%%/Gtk2/RecentAction.pod
+%%SITE_ARCH%%/Gtk2/RecentChooser.pod
+%%SITE_ARCH%%/Gtk2/RecentChooserDialog.pod
+%%SITE_ARCH%%/Gtk2/RecentChooserMenu.pod
+%%SITE_ARCH%%/Gtk2/RecentChooserWidget.pod
+%%SITE_ARCH%%/Gtk2/RecentFilter.pod
+%%SITE_ARCH%%/Gtk2/RecentInfo.pod
+%%SITE_ARCH%%/Gtk2/RecentManager.pod
+%%SITE_ARCH%%/Gtk2/Requisition.pod
+%%SITE_ARCH%%/Gtk2/Ruler.pod
+%%SITE_ARCH%%/Gtk2/Scale.pod
+%%SITE_ARCH%%/Gtk2/ScaleButton.pod
+%%SITE_ARCH%%/Gtk2/Scrollbar.pod
+%%SITE_ARCH%%/Gtk2/ScrolledWindow.pod
+%%SITE_ARCH%%/Gtk2/Selection.pod
+%%SITE_ARCH%%/Gtk2/SelectionData.pod
+%%SITE_ARCH%%/Gtk2/Separator.pod
+%%SITE_ARCH%%/Gtk2/SeparatorMenuItem.pod
+%%SITE_ARCH%%/Gtk2/SeparatorToolItem.pod
+%%SITE_ARCH%%/Gtk2/SimpleList.pm
+%%SITE_ARCH%%/Gtk2/SimpleMenu.pm
+%%SITE_ARCH%%/Gtk2/SizeGroup.pod
+%%SITE_ARCH%%/Gtk2/Socket.pod
+%%SITE_ARCH%%/Gtk2/SpinButton.pod
+%%SITE_ARCH%%/Gtk2/Spinner.pod
+%%SITE_ARCH%%/Gtk2/StatusIcon.pod
+%%SITE_ARCH%%/Gtk2/Statusbar.pod
+%%SITE_ARCH%%/Gtk2/Stock.pod
+%%SITE_ARCH%%/Gtk2/Style.pod
+%%SITE_ARCH%%/Gtk2/Table.pod
+%%SITE_ARCH%%/Gtk2/TargetEntry.pod
+%%SITE_ARCH%%/Gtk2/TargetList.pod
+%%SITE_ARCH%%/Gtk2/TearoffMenuItem.pod
+%%SITE_ARCH%%/Gtk2/TestHelper.pm
+%%SITE_ARCH%%/Gtk2/TextAttributes.pod
+%%SITE_ARCH%%/Gtk2/TextBuffer.pod
+%%SITE_ARCH%%/Gtk2/TextChildAnchor.pod
+%%SITE_ARCH%%/Gtk2/TextIter.pod
+%%SITE_ARCH%%/Gtk2/TextMark.pod
+%%SITE_ARCH%%/Gtk2/TextTag.pod
+%%SITE_ARCH%%/Gtk2/TextTagTable.pod
+%%SITE_ARCH%%/Gtk2/TextView.pod
+%%SITE_ARCH%%/Gtk2/ToggleAction.pod
+%%SITE_ARCH%%/Gtk2/ToggleButton.pod
+%%SITE_ARCH%%/Gtk2/ToggleToolButton.pod
+%%SITE_ARCH%%/Gtk2/ToolButton.pod
+%%SITE_ARCH%%/Gtk2/ToolItem.pod
+%%SITE_ARCH%%/Gtk2/ToolItemGroup.pod
+%%SITE_ARCH%%/Gtk2/ToolPalette.pod
+%%SITE_ARCH%%/Gtk2/ToolShell.pod
+%%SITE_ARCH%%/Gtk2/Toolbar.pod
+%%SITE_ARCH%%/Gtk2/Tooltip.pod
+%%SITE_ARCH%%/Gtk2/Tooltips.pod
+%%SITE_ARCH%%/Gtk2/TreeDragDest.pod
+%%SITE_ARCH%%/Gtk2/TreeDragSource.pod
+%%SITE_ARCH%%/Gtk2/TreeIter.pod
+%%SITE_ARCH%%/Gtk2/TreeModel.pod
+%%SITE_ARCH%%/Gtk2/TreeModelFilter.pod
+%%SITE_ARCH%%/Gtk2/TreeModelSort.pod
+%%SITE_ARCH%%/Gtk2/TreePath.pod
+%%SITE_ARCH%%/Gtk2/TreeRowReference.pod
+%%SITE_ARCH%%/Gtk2/TreeSelection.pod
+%%SITE_ARCH%%/Gtk2/TreeSortable.pod
+%%SITE_ARCH%%/Gtk2/TreeStore.pod
+%%SITE_ARCH%%/Gtk2/TreeView.pod
+%%SITE_ARCH%%/Gtk2/TreeViewColumn.pod
+%%SITE_ARCH%%/Gtk2/UIManager.pod
+%%SITE_ARCH%%/Gtk2/VBox.pod
+%%SITE_ARCH%%/Gtk2/VButtonBox.pod
+%%SITE_ARCH%%/Gtk2/VPaned.pod
+%%SITE_ARCH%%/Gtk2/VRuler.pod
+%%SITE_ARCH%%/Gtk2/VScale.pod
+%%SITE_ARCH%%/Gtk2/VScrollbar.pod
+%%SITE_ARCH%%/Gtk2/VSeparator.pod
+%%SITE_ARCH%%/Gtk2/Viewport.pod
+%%SITE_ARCH%%/Gtk2/VolumeButton.pod
+%%SITE_ARCH%%/Gtk2/Widget.pod
+%%SITE_ARCH%%/Gtk2/Window.pod
+%%SITE_ARCH%%/Gtk2/WindowGroup.pod
+%%SITE_ARCH%%/Gtk2/api.pod
+%%SITE_ARCH%%/Gtk2/devel.pod
+%%SITE_ARCH%%/Gtk2/enums.pod
+%%SITE_ARCH%%/Gtk2/index.pod
+%%SITE_ARCH%%/Gtk2/main.pod
+%%SITE_ARCH%%/Gtk2/version.pod
+%%SITE_ARCH%%/auto/Gtk2/Gtk2.so
 %%PERL5_MAN3%%/Gtk2.3.gz
 %%PERL5_MAN3%%/Gtk2::AboutDialog.3.gz
 %%PERL5_MAN3%%/Gtk2::AccelGroup.3.gz
@@ -659,13 +658,3 @@
 %%PERL5_MAN3%%/Gtk2::index.3.gz
 %%PERL5_MAN3%%/Gtk2::main.3.gz
 %%PERL5_MAN3%%/Gtk2::version.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Cairo
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pango
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Cairo
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Buildable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
diff --git a/x11-toolkits/p5-Pango/Makefile b/x11-toolkits/p5-Pango/Makefile
index 8e9c59e911f4..1e724f9dc802 100644
--- a/x11-toolkits/p5-Pango/Makefile
+++ b/x11-toolkits/p5-Pango/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Pango
 PORTVERSION=	1.226
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:XAOC
diff --git a/x11-toolkits/p5-Pango/pkg-plist b/x11-toolkits/p5-Pango/pkg-plist
index 92a40f673291..2d5777c37fb1 100644
--- a/x11-toolkits/p5-Pango/pkg-plist
+++ b/x11-toolkits/p5-Pango/pkg-plist
@@ -1,65 +1,64 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrBackground.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrFallback.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrFamily.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrFontDesc.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrForeground.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrGravity.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrGravityHint.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrInt.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrIterator.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrLanguage.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrLetterSpacing.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrRise.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrScale.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrShape.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrSize.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrStretch.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrStrikethrough.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrStrikethroughColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrString.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrStyle.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrUnderline.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrUnderlineColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrVariant.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/AttrWeight.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Attribute.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Cairo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Cairo/Context.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Cairo/Font.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Cairo/FontMap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Color.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Context.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Font.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/FontDescription.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/FontFace.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/FontFamily.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/FontMap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/FontMetrics.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Fontset.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Gravity.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install/doctypes
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install/pango-perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install/pango-perl-versions.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install/pango-perl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install/pango-perl.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install/pango.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Language.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Layout.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/LayoutIter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/LayoutLine.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Matrix.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Renderer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/Script.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/ScriptIter.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/TabArray.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/index.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Pango/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pango/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pango/Pango.so
+%%SITE_ARCH%%/Pango.pm
+%%SITE_ARCH%%/Pango/AttrBackground.pod
+%%SITE_ARCH%%/Pango/AttrColor.pod
+%%SITE_ARCH%%/Pango/AttrFallback.pod
+%%SITE_ARCH%%/Pango/AttrFamily.pod
+%%SITE_ARCH%%/Pango/AttrFontDesc.pod
+%%SITE_ARCH%%/Pango/AttrForeground.pod
+%%SITE_ARCH%%/Pango/AttrGravity.pod
+%%SITE_ARCH%%/Pango/AttrGravityHint.pod
+%%SITE_ARCH%%/Pango/AttrInt.pod
+%%SITE_ARCH%%/Pango/AttrIterator.pod
+%%SITE_ARCH%%/Pango/AttrLanguage.pod
+%%SITE_ARCH%%/Pango/AttrLetterSpacing.pod
+%%SITE_ARCH%%/Pango/AttrList.pod
+%%SITE_ARCH%%/Pango/AttrRise.pod
+%%SITE_ARCH%%/Pango/AttrScale.pod
+%%SITE_ARCH%%/Pango/AttrShape.pod
+%%SITE_ARCH%%/Pango/AttrSize.pod
+%%SITE_ARCH%%/Pango/AttrStretch.pod
+%%SITE_ARCH%%/Pango/AttrStrikethrough.pod
+%%SITE_ARCH%%/Pango/AttrStrikethroughColor.pod
+%%SITE_ARCH%%/Pango/AttrString.pod
+%%SITE_ARCH%%/Pango/AttrStyle.pod
+%%SITE_ARCH%%/Pango/AttrUnderline.pod
+%%SITE_ARCH%%/Pango/AttrUnderlineColor.pod
+%%SITE_ARCH%%/Pango/AttrVariant.pod
+%%SITE_ARCH%%/Pango/AttrWeight.pod
+%%SITE_ARCH%%/Pango/Attribute.pod
+%%SITE_ARCH%%/Pango/Cairo.pod
+%%SITE_ARCH%%/Pango/Cairo/Context.pod
+%%SITE_ARCH%%/Pango/Cairo/Font.pod
+%%SITE_ARCH%%/Pango/Cairo/FontMap.pod
+%%SITE_ARCH%%/Pango/Color.pod
+%%SITE_ARCH%%/Pango/Context.pod
+%%SITE_ARCH%%/Pango/Font.pod
+%%SITE_ARCH%%/Pango/FontDescription.pod
+%%SITE_ARCH%%/Pango/FontFace.pod
+%%SITE_ARCH%%/Pango/FontFamily.pod
+%%SITE_ARCH%%/Pango/FontMap.pod
+%%SITE_ARCH%%/Pango/FontMetrics.pod
+%%SITE_ARCH%%/Pango/Fontset.pod
+%%SITE_ARCH%%/Pango/Gravity.pod
+%%SITE_ARCH%%/Pango/Install/Files.pm
+%%SITE_ARCH%%/Pango/Install/doctypes
+%%SITE_ARCH%%/Pango/Install/pango-perl-autogen.h
+%%SITE_ARCH%%/Pango/Install/pango-perl-versions.h
+%%SITE_ARCH%%/Pango/Install/pango-perl.h
+%%SITE_ARCH%%/Pango/Install/pango-perl.typemap
+%%SITE_ARCH%%/Pango/Install/pango.typemap
+%%SITE_ARCH%%/Pango/Language.pod
+%%SITE_ARCH%%/Pango/Layout.pod
+%%SITE_ARCH%%/Pango/LayoutIter.pod
+%%SITE_ARCH%%/Pango/LayoutLine.pod
+%%SITE_ARCH%%/Pango/Matrix.pod
+%%SITE_ARCH%%/Pango/Renderer.pod
+%%SITE_ARCH%%/Pango/Script.pod
+%%SITE_ARCH%%/Pango/ScriptIter.pod
+%%SITE_ARCH%%/Pango/TabArray.pod
+%%SITE_ARCH%%/Pango/index.pod
+%%SITE_ARCH%%/Pango/version.pod
+%%SITE_ARCH%%/auto/Pango/Pango.so
 %%PERL5_MAN3%%/Pango.3.gz
 %%PERL5_MAN3%%/Pango::AttrBackground.3.gz
 %%PERL5_MAN3%%/Pango::AttrColor.3.gz
@@ -113,7 +112,3 @@
 %%PERL5_MAN3%%/Pango::TabArray.3.gz
 %%PERL5_MAN3%%/Pango::index.3.gz
 %%PERL5_MAN3%%/Pango::version.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pango
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Pango/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Pango/Cairo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Pango
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index ed31bf0cfe81..62da09c6e789 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Prima
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -37,6 +38,6 @@ XFT_CONFIGURE_ON=	WITH_XFT=1
 XFT_USE=		XORG=xft
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Prima/Prima.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Prima/Prima.so
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Prima/pkg-plist b/x11-toolkits/p5-Prima/pkg-plist
index bf2577830d8e..62fe9a349713 100644
--- a/x11-toolkits/p5-Prima/pkg-plist
+++ b/x11-toolkits/p5-Prima/pkg-plist
@@ -5,260 +5,259 @@ bin/gencls
 bin/p-class
 bin/podview
 bin/tmlink
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Application.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Buttons.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/apricot.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/AbstractMenu.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/AccelTable.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Application.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Clipboard.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Component.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/DeviceBitmap.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Drawable.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/File.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Icon.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Image.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Menu.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Object.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Popup.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Printer.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Timer.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Types.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Utils.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Widget.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Window.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/config.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/guts.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/img.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/img_conv.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/unix/guts.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/unix/queue.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Calendar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Classes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Clipboard.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ColorDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ComboBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/DetailedList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/DetailedOutline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/DockManager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Docks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable/CurvedText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable/Subcanvas.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Edit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/EditDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/EventHook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ExtLists.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/File.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/FileDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/FontDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/FrameSet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Gencls.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Grids.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/HelpViewer.fm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/HelpViewer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/AnimateGIF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/TransparencyControl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/gif.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/jpeg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/tiff.fm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/tiff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ImageDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ImageViewer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/IniFile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/InputLine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/IntUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/KeySelector.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Label.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Lists.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/MDI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Menu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/MsgBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Notebooks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Object.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Outlines.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Drawable.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Encodings.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Fonts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Printer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Setup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-Book
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-BookOblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-Demi
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-DemiOblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-Demi
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-DemiItalic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-Light
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-LightItalic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-Bold
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-BoldOblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-Oblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Bold
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-BoldOblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Bold
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-BoldOblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Oblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Oblique
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Bold
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-BoldItalic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Italic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Roman
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Bold
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-BoldItalic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Italic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Roman
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Symbol
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Bold
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-BoldItalic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Italic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Roman
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/ZapfChancery-MediumItalic
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/ZapfDingbats
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ascii
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ibm-cp437
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ibm-cp850
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-1
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-10
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-13
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-14
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-15
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-2
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-3
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-4
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-7
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-9
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ps-iso-latin1
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ps-standart
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/win-cp1250
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/win-cp1252
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/setup.fm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PodView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PrintDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Printer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/RubberBand.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ScrollBar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ScrollWidget.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Sliders.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/StartupWindow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/StdBitmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/StdDlg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Stress.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Terminals.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/TextView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Themes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Tie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Timer.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/CfgMaint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/Classes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/CoreClasses.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VB.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VB.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VBControls.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VBLoader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/cfgmaint.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/classes.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples/Sample.fm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples/Widgety.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget/pack.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget/place.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widgets.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Window.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/X11.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/codecs.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/Hand.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/amba.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/animate.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/async.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/buttons.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/buttons2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/calendar.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/canvas.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/cv.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/detailedoutline.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/dock.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/drivecombo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/e.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/edit.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/editor.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/extlist.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/eyes.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/f_fill.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/fontdlg.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/frames.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/generic.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/grid.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/grip.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/iv.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/keys.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/label.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/launch.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/listbox.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/macro.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/matrix.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/matrix.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/mdi.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/menu.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/mouse_tale.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/notebk.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/outline.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/ownerchange.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/palette.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/periodic.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/pitch.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/pointers.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/print.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/ps_setup.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/rot.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/rtc.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/scrollbar.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/sheet.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/socket.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/socket_anyevent.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/spline.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/theme.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/transparent.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/triangle.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/faq.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/fontabc.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/gettextbox.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/gp-problems.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/image-load.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/internals.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/leadings.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/noARGV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/noX11.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/gtk2/FileDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/win32/FileDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/win32/sysimage.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/sysimage.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/themes/color.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/themes/round3d.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/themes/sysimage.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/themes/tabset.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello1.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello2.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello3.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello4.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello5.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello6.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/menu1.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/menu2.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/menu3.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima/Prima.so
-%%SITE_PERL%%/%%PERL_ARCH%%/gencls.pod
+%%SITE_ARCH%%/Prima.pm
+%%SITE_ARCH%%/Prima/Application.pm
+%%SITE_ARCH%%/Prima/Buttons.pm
+%%SITE_ARCH%%/Prima/CORE/apricot.h
+%%SITE_ARCH%%/Prima/CORE/generic/AbstractMenu.h
+%%SITE_ARCH%%/Prima/CORE/generic/AccelTable.h
+%%SITE_ARCH%%/Prima/CORE/generic/Application.h
+%%SITE_ARCH%%/Prima/CORE/generic/Clipboard.h
+%%SITE_ARCH%%/Prima/CORE/generic/Component.h
+%%SITE_ARCH%%/Prima/CORE/generic/DeviceBitmap.h
+%%SITE_ARCH%%/Prima/CORE/generic/Drawable.h
+%%SITE_ARCH%%/Prima/CORE/generic/File.h
+%%SITE_ARCH%%/Prima/CORE/generic/Icon.h
+%%SITE_ARCH%%/Prima/CORE/generic/Image.h
+%%SITE_ARCH%%/Prima/CORE/generic/Menu.h
+%%SITE_ARCH%%/Prima/CORE/generic/Object.h
+%%SITE_ARCH%%/Prima/CORE/generic/Popup.h
+%%SITE_ARCH%%/Prima/CORE/generic/Printer.h
+%%SITE_ARCH%%/Prima/CORE/generic/Timer.h
+%%SITE_ARCH%%/Prima/CORE/generic/Types.h
+%%SITE_ARCH%%/Prima/CORE/generic/Utils.h
+%%SITE_ARCH%%/Prima/CORE/generic/Widget.h
+%%SITE_ARCH%%/Prima/CORE/generic/Window.h
+%%SITE_ARCH%%/Prima/CORE/generic/config.h
+%%SITE_ARCH%%/Prima/CORE/guts.h
+%%SITE_ARCH%%/Prima/CORE/img.h
+%%SITE_ARCH%%/Prima/CORE/img_conv.h
+%%SITE_ARCH%%/Prima/CORE/unix/guts.h
+%%SITE_ARCH%%/Prima/CORE/unix/queue.h
+%%SITE_ARCH%%/Prima/Calendar.pm
+%%SITE_ARCH%%/Prima/Classes.pm
+%%SITE_ARCH%%/Prima/Clipboard.pod
+%%SITE_ARCH%%/Prima/ColorDialog.pm
+%%SITE_ARCH%%/Prima/ComboBox.pm
+%%SITE_ARCH%%/Prima/Config.pm
+%%SITE_ARCH%%/Prima/Const.pm
+%%SITE_ARCH%%/Prima/DetailedList.pm
+%%SITE_ARCH%%/Prima/DetailedOutline.pm
+%%SITE_ARCH%%/Prima/DockManager.pm
+%%SITE_ARCH%%/Prima/Docks.pm
+%%SITE_ARCH%%/Prima/Drawable.pod
+%%SITE_ARCH%%/Prima/Drawable/CurvedText.pm
+%%SITE_ARCH%%/Prima/Drawable/Subcanvas.pm
+%%SITE_ARCH%%/Prima/Edit.pm
+%%SITE_ARCH%%/Prima/EditDialog.pm
+%%SITE_ARCH%%/Prima/EventHook.pm
+%%SITE_ARCH%%/Prima/ExtLists.pm
+%%SITE_ARCH%%/Prima/File.pod
+%%SITE_ARCH%%/Prima/FileDialog.pm
+%%SITE_ARCH%%/Prima/FontDialog.pm
+%%SITE_ARCH%%/Prima/FrameSet.pm
+%%SITE_ARCH%%/Prima/Gencls.pm
+%%SITE_ARCH%%/Prima/Grids.pm
+%%SITE_ARCH%%/Prima/Header.pm
+%%SITE_ARCH%%/Prima/HelpViewer.fm
+%%SITE_ARCH%%/Prima/HelpViewer.pm
+%%SITE_ARCH%%/Prima/Image.pod
+%%SITE_ARCH%%/Prima/Image/AnimateGIF.pm
+%%SITE_ARCH%%/Prima/Image/TransparencyControl.pm
+%%SITE_ARCH%%/Prima/Image/gif.pm
+%%SITE_ARCH%%/Prima/Image/jpeg.pm
+%%SITE_ARCH%%/Prima/Image/tiff.fm
+%%SITE_ARCH%%/Prima/Image/tiff.pm
+%%SITE_ARCH%%/Prima/ImageDialog.pm
+%%SITE_ARCH%%/Prima/ImageViewer.pm
+%%SITE_ARCH%%/Prima/IniFile.pm
+%%SITE_ARCH%%/Prima/InputLine.pm
+%%SITE_ARCH%%/Prima/IntUtils.pm
+%%SITE_ARCH%%/Prima/KeySelector.pm
+%%SITE_ARCH%%/Prima/Label.pm
+%%SITE_ARCH%%/Prima/Lists.pm
+%%SITE_ARCH%%/Prima/MDI.pm
+%%SITE_ARCH%%/Prima/Menu.pod
+%%SITE_ARCH%%/Prima/MsgBox.pm
+%%SITE_ARCH%%/Prima/Notebooks.pm
+%%SITE_ARCH%%/Prima/Object.pod
+%%SITE_ARCH%%/Prima/Outlines.pm
+%%SITE_ARCH%%/Prima/PS/Drawable.pm
+%%SITE_ARCH%%/Prima/PS/Encodings.pm
+%%SITE_ARCH%%/Prima/PS/Fonts.pm
+%%SITE_ARCH%%/Prima/PS/Printer.pm
+%%SITE_ARCH%%/Prima/PS/Setup.pm
+%%SITE_ARCH%%/Prima/PS/fonts/AvantGarde-Book
+%%SITE_ARCH%%/Prima/PS/fonts/AvantGarde-BookOblique
+%%SITE_ARCH%%/Prima/PS/fonts/AvantGarde-Demi
+%%SITE_ARCH%%/Prima/PS/fonts/AvantGarde-DemiOblique
+%%SITE_ARCH%%/Prima/PS/fonts/Bookman-Demi
+%%SITE_ARCH%%/Prima/PS/fonts/Bookman-DemiItalic
+%%SITE_ARCH%%/Prima/PS/fonts/Bookman-Light
+%%SITE_ARCH%%/Prima/PS/fonts/Bookman-LightItalic
+%%SITE_ARCH%%/Prima/PS/fonts/Courier
+%%SITE_ARCH%%/Prima/PS/fonts/Courier-Bold
+%%SITE_ARCH%%/Prima/PS/fonts/Courier-BoldOblique
+%%SITE_ARCH%%/Prima/PS/fonts/Courier-Oblique
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica-Bold
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica-BoldOblique
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica-Narrow
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Bold
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-BoldOblique
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Oblique
+%%SITE_ARCH%%/Prima/PS/fonts/Helvetica-Oblique
+%%SITE_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Bold
+%%SITE_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-BoldItalic
+%%SITE_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Italic
+%%SITE_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Roman
+%%SITE_ARCH%%/Prima/PS/fonts/Palatino-Bold
+%%SITE_ARCH%%/Prima/PS/fonts/Palatino-BoldItalic
+%%SITE_ARCH%%/Prima/PS/fonts/Palatino-Italic
+%%SITE_ARCH%%/Prima/PS/fonts/Palatino-Roman
+%%SITE_ARCH%%/Prima/PS/fonts/Symbol
+%%SITE_ARCH%%/Prima/PS/fonts/Times-Bold
+%%SITE_ARCH%%/Prima/PS/fonts/Times-BoldItalic
+%%SITE_ARCH%%/Prima/PS/fonts/Times-Italic
+%%SITE_ARCH%%/Prima/PS/fonts/Times-Roman
+%%SITE_ARCH%%/Prima/PS/fonts/ZapfChancery-MediumItalic
+%%SITE_ARCH%%/Prima/PS/fonts/ZapfDingbats
+%%SITE_ARCH%%/Prima/PS/locale/ascii
+%%SITE_ARCH%%/Prima/PS/locale/ibm-cp437
+%%SITE_ARCH%%/Prima/PS/locale/ibm-cp850
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-1
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-10
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-13
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-14
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-15
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-2
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-3
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-4
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-7
+%%SITE_ARCH%%/Prima/PS/locale/iso8859-9
+%%SITE_ARCH%%/Prima/PS/locale/ps-iso-latin1
+%%SITE_ARCH%%/Prima/PS/locale/ps-standart
+%%SITE_ARCH%%/Prima/PS/locale/win-cp1250
+%%SITE_ARCH%%/Prima/PS/locale/win-cp1252
+%%SITE_ARCH%%/Prima/PS/setup.fm
+%%SITE_ARCH%%/Prima/PodView.pm
+%%SITE_ARCH%%/Prima/PrintDialog.pm
+%%SITE_ARCH%%/Prima/Printer.pod
+%%SITE_ARCH%%/Prima/RubberBand.pm
+%%SITE_ARCH%%/Prima/ScrollBar.pm
+%%SITE_ARCH%%/Prima/ScrollWidget.pm
+%%SITE_ARCH%%/Prima/Sliders.pm
+%%SITE_ARCH%%/Prima/StartupWindow.pm
+%%SITE_ARCH%%/Prima/StdBitmap.pm
+%%SITE_ARCH%%/Prima/StdDlg.pm
+%%SITE_ARCH%%/Prima/Stress.pm
+%%SITE_ARCH%%/Prima/Terminals.pm
+%%SITE_ARCH%%/Prima/TextView.pm
+%%SITE_ARCH%%/Prima/Themes.pm
+%%SITE_ARCH%%/Prima/Tie.pm
+%%SITE_ARCH%%/Prima/Timer.pod
+%%SITE_ARCH%%/Prima/Utils.pm
+%%SITE_ARCH%%/Prima/VB/CfgMaint.pm
+%%SITE_ARCH%%/Prima/VB/Classes.pm
+%%SITE_ARCH%%/Prima/VB/Config.pm
+%%SITE_ARCH%%/Prima/VB/CoreClasses.pm
+%%SITE_ARCH%%/Prima/VB/VB.gif
+%%SITE_ARCH%%/Prima/VB/VB.pl
+%%SITE_ARCH%%/Prima/VB/VBControls.pm
+%%SITE_ARCH%%/Prima/VB/VBLoader.pm
+%%SITE_ARCH%%/Prima/VB/cfgmaint.pl
+%%SITE_ARCH%%/Prima/VB/classes.gif
+%%SITE_ARCH%%/Prima/VB/examples/Sample.fm
+%%SITE_ARCH%%/Prima/VB/examples/Widgety.pm
+%%SITE_ARCH%%/Prima/Widget.pod
+%%SITE_ARCH%%/Prima/Widget/pack.pod
+%%SITE_ARCH%%/Prima/Widget/place.pod
+%%SITE_ARCH%%/Prima/Widgets.pm
+%%SITE_ARCH%%/Prima/Window.pod
+%%SITE_ARCH%%/Prima/X11.pod
+%%SITE_ARCH%%/Prima/codecs.pod
+%%SITE_ARCH%%/Prima/examples/Hand.gif
+%%SITE_ARCH%%/Prima/examples/amba.pl
+%%SITE_ARCH%%/Prima/examples/animate.pl
+%%SITE_ARCH%%/Prima/examples/async.pl
+%%SITE_ARCH%%/Prima/examples/buttons.pl
+%%SITE_ARCH%%/Prima/examples/buttons2.pl
+%%SITE_ARCH%%/Prima/examples/calendar.pl
+%%SITE_ARCH%%/Prima/examples/canvas.pl
+%%SITE_ARCH%%/Prima/examples/cv.pl
+%%SITE_ARCH%%/Prima/examples/detailedoutline.pl
+%%SITE_ARCH%%/Prima/examples/dock.pl
+%%SITE_ARCH%%/Prima/examples/drivecombo.pl
+%%SITE_ARCH%%/Prima/examples/e.pl
+%%SITE_ARCH%%/Prima/examples/edit.pl
+%%SITE_ARCH%%/Prima/examples/editor.pl
+%%SITE_ARCH%%/Prima/examples/extlist.pl
+%%SITE_ARCH%%/Prima/examples/eyes.pl
+%%SITE_ARCH%%/Prima/examples/f_fill.pl
+%%SITE_ARCH%%/Prima/examples/fontdlg.pl
+%%SITE_ARCH%%/Prima/examples/frames.pl
+%%SITE_ARCH%%/Prima/examples/generic.pl
+%%SITE_ARCH%%/Prima/examples/grid.pl
+%%SITE_ARCH%%/Prima/examples/grip.pl
+%%SITE_ARCH%%/Prima/examples/iv.pl
+%%SITE_ARCH%%/Prima/examples/keys.pl
+%%SITE_ARCH%%/Prima/examples/label.pl
+%%SITE_ARCH%%/Prima/examples/launch.pl
+%%SITE_ARCH%%/Prima/examples/listbox.pl
+%%SITE_ARCH%%/Prima/examples/macro.pl
+%%SITE_ARCH%%/Prima/examples/matrix.gif
+%%SITE_ARCH%%/Prima/examples/matrix.pl
+%%SITE_ARCH%%/Prima/examples/mdi.pl
+%%SITE_ARCH%%/Prima/examples/menu.pl
+%%SITE_ARCH%%/Prima/examples/mouse_tale.pl
+%%SITE_ARCH%%/Prima/examples/notebk.pl
+%%SITE_ARCH%%/Prima/examples/outline.pl
+%%SITE_ARCH%%/Prima/examples/ownerchange.pl
+%%SITE_ARCH%%/Prima/examples/palette.pl
+%%SITE_ARCH%%/Prima/examples/periodic.pl
+%%SITE_ARCH%%/Prima/examples/pitch.pl
+%%SITE_ARCH%%/Prima/examples/pointers.pl
+%%SITE_ARCH%%/Prima/examples/print.pl
+%%SITE_ARCH%%/Prima/examples/ps_setup.pl
+%%SITE_ARCH%%/Prima/examples/rot.pl
+%%SITE_ARCH%%/Prima/examples/rtc.pl
+%%SITE_ARCH%%/Prima/examples/scrollbar.pl
+%%SITE_ARCH%%/Prima/examples/sheet.pl
+%%SITE_ARCH%%/Prima/examples/socket.pl
+%%SITE_ARCH%%/Prima/examples/socket_anyevent.pl
+%%SITE_ARCH%%/Prima/examples/spline.pl
+%%SITE_ARCH%%/Prima/examples/theme.pl
+%%SITE_ARCH%%/Prima/examples/transparent.pl
+%%SITE_ARCH%%/Prima/examples/triangle.pl
+%%SITE_ARCH%%/Prima/faq.pod
+%%SITE_ARCH%%/Prima/fontabc.gif
+%%SITE_ARCH%%/Prima/gettextbox.gif
+%%SITE_ARCH%%/Prima/gp-problems.pod
+%%SITE_ARCH%%/Prima/image-load.pod
+%%SITE_ARCH%%/Prima/internals.pod
+%%SITE_ARCH%%/Prima/leadings.gif
+%%SITE_ARCH%%/Prima/noARGV.pm
+%%SITE_ARCH%%/Prima/noX11.pm
+%%SITE_ARCH%%/Prima/sys/gtk2/FileDialog.pm
+%%SITE_ARCH%%/Prima/sys/win32/FileDialog.pm
+%%SITE_ARCH%%/Prima/sys/win32/sysimage.gif
+%%SITE_ARCH%%/Prima/sysimage.gif
+%%SITE_ARCH%%/Prima/themes/color.pm
+%%SITE_ARCH%%/Prima/themes/round3d.pm
+%%SITE_ARCH%%/Prima/themes/sysimage.pm
+%%SITE_ARCH%%/Prima/themes/tabset.pm
+%%SITE_ARCH%%/Prima/tutorial.pod
+%%SITE_ARCH%%/Prima/tutorial/hello1.gif
+%%SITE_ARCH%%/Prima/tutorial/hello2.gif
+%%SITE_ARCH%%/Prima/tutorial/hello3.gif
+%%SITE_ARCH%%/Prima/tutorial/hello4.gif
+%%SITE_ARCH%%/Prima/tutorial/hello5.gif
+%%SITE_ARCH%%/Prima/tutorial/hello6.gif
+%%SITE_ARCH%%/Prima/tutorial/menu1.gif
+%%SITE_ARCH%%/Prima/tutorial/menu2.gif
+%%SITE_ARCH%%/Prima/tutorial/menu3.gif
+%%SITE_ARCH%%/auto/Prima/Prima.so
+%%SITE_ARCH%%/gencls.pod
 %%PERL5_MAN3%%/Prima.3.gz
 %%PERL5_MAN3%%/Prima::Application.3.gz
 %%PERL5_MAN3%%/Prima::Buttons.3.gz
@@ -365,22 +364,3 @@ man/man1/gencls.1.gz
 man/man1/p-class.1.gz
 man/man1/podview.1.gz
 man/man1/tmlink.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/themes
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/win32
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/gtk2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/unix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima
diff --git a/x11-toolkits/p5-Tk-Action/Makefile b/x11-toolkits/p5-Tk-Action/Makefile
index bde7a2a0c336..d7f35d9b94d5 100644
--- a/x11-toolkits/p5-Tk-Action/Makefile
+++ b/x11-toolkits/p5-Tk-Action/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tk-Action
 PORTVERSION=	1.093390
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Action/pkg-plist b/x11-toolkits/p5-Tk-Action/pkg-plist
index 9c7f4c7fe4e5..ee14af235dcc 100644
--- a/x11-toolkits/p5-Tk-Action/pkg-plist
+++ b/x11-toolkits/p5-Tk-Action/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tk/Action.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Action/.packlist
 %%PERL5_MAN3%%/Tk::Action.3.gz
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 4b38422f4689..b80aa1c39956 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-Autoscroll
 PORTVERSION=	1.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
index 882c067f9759..2da1b5b01efa 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
+++ b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Tk/Autoscroll.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll/.packlist
 %%PERL5_MAN3%%/Tk::Autoscroll.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index e89216e3b3c3..d66f414896b8 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-ColourChooser
 PORTVERSION=	1.52
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
index c3dba86418b0..8681039b8ddf 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
+++ b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Tk/ColourChooser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser/.packlist
 %%PERL5_MAN3%%/Tk::ColourChooser.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Contrib/Makefile b/x11-toolkits/p5-Tk-Contrib/Makefile
index e00d41fb2d72..968111d41ba1 100644
--- a/x11-toolkits/p5-Tk-Contrib/Makefile
+++ b/x11-toolkits/p5-Tk-Contrib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-Contrib
 PORTVERSION=	0.07
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits perl5 tk
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Contrib/pkg-plist b/x11-toolkits/p5-Tk-Contrib/pkg-plist
index dc8fc7d2049b..dd1d84986695 100644
--- a/x11-toolkits/p5-Tk-Contrib/pkg-plist
+++ b/x11-toolkits/p5-Tk-Contrib/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Contrib/.packlist
 %%SITE_PERL%%/Tk/Axis.pm
 %%SITE_PERL%%/Tk/Dial.pm
 %%SITE_PERL%%/Tk/OlWm.pm
@@ -7,6 +6,3 @@
 %%PERL5_MAN3%%/Tk::Dial.3.gz
 %%PERL5_MAN3%%/Tk::OlWm.3.gz
 %%PERL5_MAN3%%/Tk::TiedListbox.3.gz
-@dirrmtry %%SITE_PERL%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Contrib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-CursorControl/Makefile b/x11-toolkits/p5-Tk-CursorControl/Makefile
index a492c3d638e4..463cf8865e10 100644
--- a/x11-toolkits/p5-Tk-CursorControl/Makefile
+++ b/x11-toolkits/p5-Tk-CursorControl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-CursorControl
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-CursorControl/pkg-plist b/x11-toolkits/p5-Tk-CursorControl/pkg-plist
index 9bccb9f0b20c..a0ba06be38f6 100644
--- a/x11-toolkits/p5-Tk-CursorControl/pkg-plist
+++ b/x11-toolkits/p5-Tk-CursorControl/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/CursorControl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/cursorcontrol.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/trans_cur.mask
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/trans_cur.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/CursorControl/.packlist
+%%SITE_ARCH%%/Tk/CursorControl.pm
+%%SITE_ARCH%%/Tk/demos/widtrib/cursorcontrol.pl
+%%SITE_ARCH%%/Tk/trans_cur.mask
+%%SITE_ARCH%%/Tk/trans_cur.xbm
 %%PERL5_MAN3%%/Tk::CursorControl.3.gz
diff --git a/x11-toolkits/p5-Tk-DKW/Makefile b/x11-toolkits/p5-Tk-DKW/Makefile
index e3631ba17ea4..4ee02e82cf83 100644
--- a/x11-toolkits/p5-Tk-DKW/Makefile
+++ b/x11-toolkits/p5-Tk-DKW/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-DKW
 PORTVERSION=	0.03
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits perl5 tk
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-DKW/pkg-plist b/x11-toolkits/p5-Tk-DKW/pkg-plist
index fbd9bd9cb3cb..f1508feaa16d 100644
--- a/x11-toolkits/p5-Tk-DKW/pkg-plist
+++ b/x11-toolkits/p5-Tk-DKW/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/DKW/.packlist
 %%SITE_PERL%%/Tk/CheckBox.pm
 %%SITE_PERL%%/Tk/ChildNotification.pm
 %%SITE_PERL%%/Tk/Columns.pm
@@ -25,6 +24,3 @@
 %%PERL5_MAN3%%/Tk::TabFrame.3.gz
 %%PERL5_MAN3%%/Tk::TabbedForm.3.gz
 %%PERL5_MAN3%%/Tk::TableEdit.3.gz
-@dirrmtry %%SITE_PERL%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/DKW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 5e51cc02d529..683f0ec7741c 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-Date
 PORTVERSION=	0.44
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Date/pkg-plist b/x11-toolkits/p5-Tk-Date/pkg-plist
index f0b375331098..4ad096b9f307 100644
--- a/x11-toolkits/p5-Tk-Date/pkg-plist
+++ b/x11-toolkits/p5-Tk-Date/pkg-plist
@@ -1,10 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/date.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/localized_date.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date/.packlist
+%%SITE_ARCH%%/Tk/Date.pm
+%%SITE_ARCH%%/Tk/demos/widtrib/date.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/localized_date.pl
 %%PERL5_MAN3%%/Tk::Date.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
index 52daeda215b9..d0d8a232d96b 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-DynaTabFrame
 PORTVERSION=	0.23
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits perl5 tk
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist b/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist
index 3d0c4f0bf840..7d2ca1c0e29f 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/DynaTabFrame/.packlist
 %%SITE_PERL%%/Tk/DynaTabFrame.pm
 %%PERL5_MAN3%%/Tk::DynaTabFrame.3.gz
-@dirrmtry %%SITE_PERL%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/DynaTabFrame
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index f9fcb910ff35..62e7b3212684 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-Enscript
 PORTVERSION=	1.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Enscript/pkg-plist b/x11-toolkits/p5-Tk-Enscript/pkg-plist
index 9b82306dd4d5..0667e6e69e90 100644
--- a/x11-toolkits/p5-Tk-Enscript/pkg-plist
+++ b/x11-toolkits/p5-Tk-Enscript/pkg-plist
@@ -1,7 +1,3 @@
 %%SITE_PERL%%/Tk/Enscript.pm
 %%SITE_PERL%%/Tk/enscript.cfg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript/.packlist
 %%PERL5_MAN3%%/Tk::Enscript.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index dba41f36e0a1..f0a9d5001351 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-FileDialog
 PORTVERSION=	1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-FileDialog/pkg-plist b/x11-toolkits/p5-Tk-FileDialog/pkg-plist
index 5b1bbf9523ed..d9aa9b7b0ecb 100644
--- a/x11-toolkits/p5-Tk-FileDialog/pkg-plist
+++ b/x11-toolkits/p5-Tk-FileDialog/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog/.packlist
 %%SITE_PERL%%/Tk/FileDialog.pm
 %%PERL5_MAN3%%/Tk::FileDialog.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-FontDialog/Makefile b/x11-toolkits/p5-Tk-FontDialog/Makefile
index 38c7fdb2230e..57f6bd438432 100644
--- a/x11-toolkits/p5-Tk-FontDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FontDialog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tk-FontDialog
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5 tk
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-FontDialog/pkg-plist b/x11-toolkits/p5-Tk-FontDialog/pkg-plist
index 09c8c163060d..27334d4538fb 100644
--- a/x11-toolkits/p5-Tk-FontDialog/pkg-plist
+++ b/x11-toolkits/p5-Tk-FontDialog/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FontDialog/.packlist
 %%SITE_PERL%%/Tk/FontDialog.pm
 %%PERL5_MAN3%%/Tk::FontDialog.3.gz
-@dirrmtry %%SITE_PERL%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FontDialog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index 9cd3cbc5d6df..96ed28da5a91 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-GBARR
 PORTVERSION=	2.08
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-GBARR/pkg-plist b/x11-toolkits/p5-Tk-GBARR/pkg-plist
index cd14d83074da..1348a7837526 100644
--- a/x11-toolkits/p5-Tk-GBARR/pkg-plist
+++ b/x11-toolkits/p5-Tk-GBARR/pkg-plist
@@ -1,21 +1,15 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TFrame.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/NumEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/NumEntryPlain.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/FireButton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Cloth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/cloth.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/firebutton.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/numentry.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/numentryplain.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/tframe.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR/.packlist
+%%SITE_ARCH%%/Tk/TFrame.pm
+%%SITE_ARCH%%/Tk/NumEntry.pm
+%%SITE_ARCH%%/Tk/NumEntryPlain.pm
+%%SITE_ARCH%%/Tk/FireButton.pm
+%%SITE_ARCH%%/Tk/Cloth.pm
+%%SITE_ARCH%%/Tk/demos/widtrib/cloth.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/firebutton.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/numentry.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/numentryplain.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/tframe.pl
 %%PERL5_MAN3%%/Tk::Cloth.3.gz
 %%PERL5_MAN3%%/Tk::FireButton.3.gz
 %%PERL5_MAN3%%/Tk::NumEntry.3.gz
 %%PERL5_MAN3%%/Tk::NumEntryPlain.3.gz
 %%PERL5_MAN3%%/Tk::TFrame.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index b43c9c372dea..7504da537da1 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-Getopt
 PORTVERSION=	0.50
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Getopt/pkg-plist b/x11-toolkits/p5-Tk-Getopt/pkg-plist
index d2d5a12d93cc..8275e9cf7d22 100644
--- a/x11-toolkits/p5-Tk-Getopt/pkg-plist
+++ b/x11-toolkits/p5-Tk-Getopt/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Tk/Getopt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt/.packlist
 %%PERL5_MAN3%%/Tk::Getopt.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 7c7eaa5badcd..fe9f349d739c 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-HistEntry
 PORTVERSION=	0.43
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-HistEntry/pkg-plist b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
index 236241ad3219..bf88f09762c7 100644
--- a/x11-toolkits/p5-Tk-HistEntry/pkg-plist
+++ b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Tk/HistEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry/.packlist
 %%PERL5_MAN3%%/Tk::HistEntry.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-JComboBox/Makefile b/x11-toolkits/p5-Tk-JComboBox/Makefile
index 1c05e3dfd0b3..c58747fd6072 100644
--- a/x11-toolkits/p5-Tk-JComboBox/Makefile
+++ b/x11-toolkits/p5-Tk-JComboBox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-JComboBox
 PORTVERSION=	1.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits perl5 tk
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-JComboBox/pkg-plist b/x11-toolkits/p5-Tk-JComboBox/pkg-plist
index 882f8610c293..a25a79c99014 100644
--- a/x11-toolkits/p5-Tk-JComboBox/pkg-plist
+++ b/x11-toolkits/p5-Tk-JComboBox/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JComboBox/.packlist
 %%SITE_PERL%%/Tk/CWidget.pm
 %%SITE_PERL%%/Tk/CWidget.pod
 %%SITE_PERL%%/Tk/CWidget/Util/Boolean.pm
@@ -10,9 +9,3 @@
 %%PERL5_MAN3%%/Tk::JComboBox.3.gz
 %%PERL5_MAN3%%/Tk::CWidget.3.gz
 %%PERL5_MAN3%%/Tk::JComboBox::tutorial.3.gz
-@dirrmtry %%SITE_PERL%%/Tk/JComboBox
-@dirrmtry %%SITE_PERL%%/Tk/CWidget/Util
-@dirrmtry %%SITE_PERL%%/Tk/CWidget
-@dirrmtry %%SITE_PERL%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JComboBox
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index abd8fcd060ac..b0009150e5c1 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-ResizeButton
 PORTVERSION=	0.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
index d953e9eaff96..746cfe241572 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
+++ b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Tk/ResizeButton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton/.packlist
 %%PERL5_MAN3%%/Tk::ResizeButton.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Role-Dialog/Makefile b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
index 4994b400845c..7262f41a056d 100644
--- a/x11-toolkits/p5-Tk-Role-Dialog/Makefile
+++ b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-Role-Dialog
 PORTVERSION=	1.112.380
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Role-Dialog/pkg-plist b/x11-toolkits/p5-Tk-Role-Dialog/pkg-plist
index e689ef428463..10d8e541f5c3 100644
--- a/x11-toolkits/p5-Tk-Role-Dialog/pkg-plist
+++ b/x11-toolkits/p5-Tk-Role-Dialog/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Tk/Role/Dialog.pm
 %%PERL5_MAN3%%/Tk::Role::Dialog.3.gz
-@dirrmtry %%SITE_PERL%%/Tk/Role
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile b/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
index ac2796199a43..7a1e1f1d4518 100644
--- a/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
+++ b/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tk-Role-HasWidgets
 PORTVERSION=	1.112.380
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Role-HasWidgets/pkg-plist b/x11-toolkits/p5-Tk-Role-HasWidgets/pkg-plist
index 147f7640aa7f..35df96df717d 100644
--- a/x11-toolkits/p5-Tk-Role-HasWidgets/pkg-plist
+++ b/x11-toolkits/p5-Tk-Role-HasWidgets/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/Tk/Role/HasWidgets.pm
 %%PERL5_MAN3%%/Tk::Role::HasWidgets.3.gz
-@dirrmtry %%SITE_PERL%%/Tk/Role
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index 42a2c6d61beb..a18d86a27590 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-Splashscreen
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Splashscreen/pkg-plist b/x11-toolkits/p5-Tk-Splashscreen/pkg-plist
index aa00a8ac924f..cd08da210e4c 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/pkg-plist
+++ b/x11-toolkits/p5-Tk-Splashscreen/pkg-plist
@@ -1,8 +1,4 @@
 %%SITE_PERL%%/Tk/Splashscreen.pm
 %%SITE_PERL%%/Tk/waitVariableX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen/.packlist
 %%PERL5_MAN3%%/Tk::Splashscreen.3.gz
 %%PERL5_MAN3%%/Tk::waitVariableX.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Sugar/Makefile b/x11-toolkits/p5-Tk-Sugar/Makefile
index f55ebeadc8a5..be84f316d67b 100644
--- a/x11-toolkits/p5-Tk-Sugar/Makefile
+++ b/x11-toolkits/p5-Tk-Sugar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tk-Sugar
 PORTVERSION=	1.093190
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Sugar/pkg-plist b/x11-toolkits/p5-Tk-Sugar/pkg-plist
index 3c920d3c18d7..1bb7b4350c87 100644
--- a/x11-toolkits/p5-Tk-Sugar/pkg-plist
+++ b/x11-toolkits/p5-Tk-Sugar/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Tk/Sugar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Sugar/.packlist
 %%PERL5_MAN3%%/Tk::Sugar.3.gz
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 851c8f022337..afadc78564cf 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-TableMatrix
 PORTVERSION=	1.23
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
index 54ef16138039..24f5ee49aa79 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
+++ b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
@@ -1,21 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix/Spreadsheet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix/SpreadsheetHideRows.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/mm.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkTable.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkTableversion.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/version.h
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/TableMatrix.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/autosplit.ix
+%%SITE_ARCH%%/Tk/TableMatrix.pm
+%%SITE_ARCH%%/Tk/TableMatrix.pod
+%%SITE_ARCH%%/Tk/TableMatrix/Spreadsheet.pm
+%%SITE_ARCH%%/Tk/TableMatrix/SpreadsheetHideRows.pm
+%%SITE_ARCH%%/Tk/pTk/mm.h
+%%SITE_ARCH%%/Tk/pTk/tkTable.h
+%%SITE_ARCH%%/Tk/pTk/tkTableversion.h
+%%SITE_ARCH%%/Tk/pTk/version.h
+%%SITE_ARCH%%/auto/Tk/TableMatrix/TableMatrix.so
+%%SITE_ARCH%%/auto/Tk/TableMatrix/autosplit.ix
 %%PERL5_MAN3%%/Tk::TableMatrix.3.gz
 %%PERL5_MAN3%%/Tk::TableMatrix::Spreadsheet.3.gz
 %%PERL5_MAN3%%/Tk::TableMatrix::SpreadsheetHideRows.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%
diff --git a/x11-toolkits/p5-Tk-ToolBar/Makefile b/x11-toolkits/p5-Tk-ToolBar/Makefile
index 81bc63add315..e9c4804fe162 100644
--- a/x11-toolkits/p5-Tk-ToolBar/Makefile
+++ b/x11-toolkits/p5-Tk-ToolBar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-ToolBar
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-ToolBar/pkg-plist b/x11-toolkits/p5-Tk-ToolBar/pkg-plist
index 954eda8a3b74..dab00079339d 100644
--- a/x11-toolkits/p5-Tk-ToolBar/pkg-plist
+++ b/x11-toolkits/p5-Tk-ToolBar/pkg-plist
@@ -1,11 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ToolBar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ToolBar/tkIcons
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/toolbar.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ToolBar/.packlist
+%%SITE_ARCH%%/Tk/ToolBar.pm
+%%SITE_ARCH%%/Tk/ToolBar/tkIcons
+%%SITE_ARCH%%/Tk/demos/widtrib/toolbar.pl
 %%PERL5_MAN3%%/Tk::ToolBar.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ToolBar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Tk/ToolBar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
diff --git a/x11-toolkits/p5-Tk-WaitBox/Makefile b/x11-toolkits/p5-Tk-WaitBox/Makefile
index aa92a723c5fb..5e6a87eef30c 100644
--- a/x11-toolkits/p5-Tk-WaitBox/Makefile
+++ b/x11-toolkits/p5-Tk-WaitBox/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Tk-WaitBox
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5 tk
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-WaitBox/pkg-plist b/x11-toolkits/p5-Tk-WaitBox/pkg-plist
index f259572712a2..fec76cc284bc 100644
--- a/x11-toolkits/p5-Tk-WaitBox/pkg-plist
+++ b/x11-toolkits/p5-Tk-WaitBox/pkg-plist
@@ -1,5 +1,2 @@
 %%PERL5_MAN3%%/Tk::WaitBox.3.gz
 %%SITE_PERL%%/Tk/WaitBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/WaitBox/.packlist
-@dirrmtry %%SITE_PERL%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/WaitBox
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 94c43b96e24a..3d35d7e84e3e 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk
 PORTVERSION=	804.032
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -50,10 +50,10 @@ post-configure:
 
 post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/pTk/extralibs.ld
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Tk/Tk.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/Tk.so
 .for i in Canvas Compound Entry Event HList IO InputO JPEG Listbox Menubutton Mwm NBFrame PNG Pixmap Scale Scrollbar TList Text TixGrid WinPhoto X Xlib
 		${STRIP_CMD} \
-		    ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Tk/${i}/${i}.so
+		    ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/${i}/${i}.so
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk/pkg-plist b/x11-toolkits/p5-Tk/pkg-plist
index c4649fe208b6..b77d691c2c1f 100644
--- a/x11-toolkits/p5-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tk/pkg-plist
@@ -118,677 +118,630 @@ bin/widget
 %%PERL5_MAN3%%/Tk::tixWm.3.gz
 %%PERL5_MAN3%%/Tk::tkvars.3.gz
 %%PERL5_MAN3%%/Tk::widgets.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Tie/Watch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/804delta.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Adjuster.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Adjuster.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/After.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Animation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Animation.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Balloon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Balloon.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Bitmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Bitmap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/BrowseEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/BrowseEntry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Button.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Button.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Camel.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Canvas.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Canvas.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Checkbutton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Checkbutton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Clipboard.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Clipboard.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/CmdLine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/CmdLine.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorEdit.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorEditor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorEditor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorSelect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Compound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Compound.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ConfigSpecs.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Configure.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Credits
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DItem.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Derived.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Derived.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Dialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Dialog.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DialogBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DialogBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DirTree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DirTree.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Dirlist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Common.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/LocalDrop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Rect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunConst.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunConst.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunDrop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunSite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/XDNDDrop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/XDNDSite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DropSite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DropSite.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DummyEncode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/English.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Entry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Entry.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ErrorDialog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Event/IO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Eventloop.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/FBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/FBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/FileSelect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/FileSelect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/FloatEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Font.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Font.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Frame.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Frame.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/HList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/HList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/IO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/IO.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/IconList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/IconList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Image.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Image.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/InputO.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/InputO.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Internals.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ItemStyle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/JPEG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/LabEntry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/LabFrame.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/LabFrame.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/LabRadio.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Label.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Label.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Labelframe.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Labelframe.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Listbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Listbox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/MMtry.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/MMutil.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/MainWindow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/MainWindow.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/MakeDepend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menu/Item.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menu/Item.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menubar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menubutton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menubutton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Message.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Message.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/MsgBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/MsgBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Mwm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Mwm.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/NBFrame.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/NoteBook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/NoteBook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Optionmenu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Optionmenu.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/PNG.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Pane.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Panedwindow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Panedwindow.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Photo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Photo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Pixmap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Pixmap.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Popup.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Pretty.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ProgressBar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/README.Adjust
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ROText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ROText.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Radiobutton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Radiobutton.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Region.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Reindex.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ReindexedROText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ReindexedText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Scale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Scale.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Scrollbar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Scrollbar.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Scrolled.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Spinbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Spinbox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Stats.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Submethods.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Submethods.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TList.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Table.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Tcl-perl.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Text.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Text/Tag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TextEdit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TextList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TextUndo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TextUndo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Tiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Tiler.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TixGrid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TixGrid.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Tk.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Tk.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TkXSUB.def
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Toplevel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Toplevel.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Trace.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Tree.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Tree.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/UserGuide.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Widget.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Widget.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/WidgetDemo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/WinPhoto.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Wm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Wm.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/X.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/X.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/X11Font.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/X11Font.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Xcamel.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Xlib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Xrm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Xrm.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/act_folder.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/act_folder.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/after.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/anim.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/arrowdownwin.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/balArrow.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/bind.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/bindtags.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/callbacks.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/cbxarrow.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/chooseColor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/chooseDirectory.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/composite.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/LabEnLabRad.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/QuitPB.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/QuitPBa.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/c.icon
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/cursor.cur
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/cursor.mask
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/cursor.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/dir.icon
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/dir.mask
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/earth.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/earthris.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/face
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/flagdown
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/flagup
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/grey.25
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/grey.5
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/letters
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/mickey.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/ned.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/noletters
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/page.icon
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/page.mask
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/pattern
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images/teapot.ppm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/Ball.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/HList.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/HList2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/Plot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/WidgetDemo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/arrows.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/balloon.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/bind.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/bitmaps.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/bounce.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/browseentry.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/browseentry2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/button.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/check.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/choosedir.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/clrpick.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/colors.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/cscroll.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/ctext.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/dialog1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/dialog2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/dirtree.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/entry1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/entry2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/entry3.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/filebox.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/floor.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/form.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/form_mgr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/hello.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/hscale.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/icon.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/image1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/image2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/items.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/keysyms.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/labelframe.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/labels.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/labframe.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/mega.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/menbut.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/menus.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/menus2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/msgBox.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/notebook.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/paned1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/paned2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/photo1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/photo2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/plot.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/progress.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/puzzle.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/radio.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/ruler.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/sayings.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/search.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/showVars.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/slide.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/spin.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/states.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/style.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/texts.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/trace1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/trace2.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/transtile.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/twind.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/unicodeout.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/virtevents1.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib/vscale.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/Gedi.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/TEMPLATE.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/Tiler.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/all.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/cursor.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/lib/npuz/Xcamel.npuz
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/npuz.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/plop.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/event.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/exit.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/file.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/file.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/fileevent.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/focus.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/folder.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/folder.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/form.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/getOpenFile.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/grab.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/grid.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/icon.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/install.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/license.terms
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/mega.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/messageBox.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/openfile.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/openfolder.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/openfolder.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/option.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/options.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/overview.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Lang.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Lang.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Lang.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Lang_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Tcl-pTk
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Xlib.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Xlib.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Xlib.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/Xlib_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/compat/limits.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/compat/stdlib.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/compat/unistd.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/default.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/img.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/imgInt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/imgInt.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/imgInt.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/imgInt_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/ks_names.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/mkVFunc
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/moredefs.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/port.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tcl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclDecls.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclDecls.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclDecls_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclIntDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclIntPlatDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclMath.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclPlatDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tix.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tix.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tix.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixBitmaps.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixDef.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixForm.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixGrData.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixGrid.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixHList.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixImgXpm.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixImgXpm.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixImgXpm.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixImgXpm_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixInt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixInt.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixInt.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixInt_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixPort.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixTList.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixUnixInt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tixUnixPort.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tix_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tk.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tk.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tk.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tk3d.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkButton.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkCanvas.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkCanvases.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkColor.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkConfig.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkDecls.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkDecls.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkDecls_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkEvent.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkEvent.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkEvent.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkEvent_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkFileFilter.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkFont.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkImgPhoto.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkImgPhoto.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkImgPhoto.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkImgPhoto_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkInitScript.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkInt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkInt.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkInt.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntDecls.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntDecls.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntDecls_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntPlatDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntPlatDecls.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntPlatDecls.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntPlatDecls_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntXlibDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntXlibDecls.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntXlibDecls.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkIntXlibDecls_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkInt_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkMenu.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkMenubutton.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkOption.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkOption.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkOption.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkOption_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkPlatDecls.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkPlatDecls.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkPlatDecls.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkPlatDecls_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkPort.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkScale.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkScrollbar.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkSelect.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkText.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkUndo.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkUnixDefault.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkUnixInt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkUnixPort.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkVMacro.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkXrm.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tk_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pack.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/palette.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/place.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/prolog.ps
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/selection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/send.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/srcfile.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/textfile.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tixWm.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tkGlue.def
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tkGlue.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tkGlue.m
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tkGlue.t
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tkGlue_f.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tkvars.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/tranicon.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/vtab.def
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/widgets.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/widgets.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/win.xbm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/winfolder.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/wintext.xpm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/CancelRepeat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Canvas/Canvas.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Clipboard/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Clipboard/getSelected.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Compound/Compound.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/EnterFocus.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Entry/Entry.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Error.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Event/Event.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FirstMenu.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FocusChildren.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FocusOK.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/AddScrollbars.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/FindMenu.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/freeze_on_map.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/label.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/labelPack.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/labelVariable.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/packscrollbars.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/queuePack.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/sbset.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame/scrollbars.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HList/HList.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/IO/IO.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ImageNames.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ImageTypes.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/InputO/InputO.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG/JPEG.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/AutoScan.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/BeginExtend.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/BeginSelect.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/BeginToggle.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/ButtonRelease_1.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/CLEAR.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/Cancel.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/Cntrl_End.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/Cntrl_Home.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/Cntrl_backslash.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/DELETE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/DataExtend.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/EXISTS.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/EXTEND.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/ExtendUpDown.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/FETCH.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/FETCHSIZE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/Listbox.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/Motion.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/POP.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/PUSH.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/SHIFT.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/SPLICE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/STORE.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/SelectAll.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/SetList.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/TIEARRAY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/TIESCALAR.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/UNSHIFT.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/UpDown.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/clipboardPaste.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/deleteSelected.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/getSelected.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox/xyIndex.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Menubutton/Menubutton.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Mwm/Mwm.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/NBFrame/NBFrame.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/PNG/PNG.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Pixmap/Pixmap.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Receive.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/RepeatId.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/Activate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/ButtonDown.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/ButtonUp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/ControlPress.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/Drag.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/EndDrag.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/Enter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/Increment.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/Leave.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/Scale.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/ButtonDown.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/ButtonUp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/Drag.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/EndDrag.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/Enter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/Leave.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/Motion.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/ScrlByPages.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/ScrlByUnits.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/ScrlToPos.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/ScrlTopBottom.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/Scrollbar.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/Select.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/StartDrag.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Selection.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TList/TList.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Table/Create.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Table/Posn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Table/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Table/see.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Table/totalColumns.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Table/totalRows.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Text/Text.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Text/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TextEdit/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TextUndo/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TixGrid/TixGrid.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Tk.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel/FG_BindIn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel/FG_BindOut.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel/FG_Create.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel/FG_Destroy.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel/FG_In.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel/FG_Out.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TraverseToMenu.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/ASkludge.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/AltKeyInDialog.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/AmpWidget.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/FindAltKeyTarget.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/MasterMenu.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/RestoreFocusGrab.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/SetAmpText.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/SetFocusGrab.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/UnderlineAmpersand.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/bindDump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/clipboardKeysyms.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget/pathname.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/WinPhoto/WinPhoto.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Wm/AnchorAdjust.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Wm/FullScreen.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Wm/Popup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Wm/Post.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Wm/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Wm/iconposition.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/X/X.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/X/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Xlib/Xlib.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/break.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/focusFollowsMouse.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/focusNext.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/focusPrev.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/getEncoding.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/getNextFocus.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/getPrevFocus.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/interps.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/lsearch.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/tabFocus.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/updateWidgets.al
+%%SITE_ARCH%%/Tie/Watch.pm
+%%SITE_ARCH%%/Tk.pm
+%%SITE_ARCH%%/Tk.pod
+%%SITE_ARCH%%/Tk/804delta.pod
+%%SITE_ARCH%%/Tk/Adjuster.pm
+%%SITE_ARCH%%/Tk/Adjuster.pod
+%%SITE_ARCH%%/Tk/After.pm
+%%SITE_ARCH%%/Tk/Animation.pm
+%%SITE_ARCH%%/Tk/Animation.pod
+%%SITE_ARCH%%/Tk/Balloon.pm
+%%SITE_ARCH%%/Tk/Balloon.pod
+%%SITE_ARCH%%/Tk/Bitmap.pm
+%%SITE_ARCH%%/Tk/Bitmap.pod
+%%SITE_ARCH%%/Tk/BrowseEntry.pm
+%%SITE_ARCH%%/Tk/BrowseEntry.pod
+%%SITE_ARCH%%/Tk/Button.pm
+%%SITE_ARCH%%/Tk/Button.pod
+%%SITE_ARCH%%/Tk/Camel.xpm
+%%SITE_ARCH%%/Tk/Canvas.pm
+%%SITE_ARCH%%/Tk/Canvas.pod
+%%SITE_ARCH%%/Tk/Checkbutton.pm
+%%SITE_ARCH%%/Tk/Checkbutton.pod
+%%SITE_ARCH%%/Tk/Clipboard.pm
+%%SITE_ARCH%%/Tk/Clipboard.pod
+%%SITE_ARCH%%/Tk/CmdLine.pm
+%%SITE_ARCH%%/Tk/CmdLine.pod
+%%SITE_ARCH%%/Tk/ColorEdit.xpm
+%%SITE_ARCH%%/Tk/ColorEditor.pm
+%%SITE_ARCH%%/Tk/ColorEditor.pod
+%%SITE_ARCH%%/Tk/ColorDialog.pm
+%%SITE_ARCH%%/Tk/ColorSelect.pm
+%%SITE_ARCH%%/Tk/Compound.pm
+%%SITE_ARCH%%/Tk/Compound.pod
+%%SITE_ARCH%%/Tk/Config.pm
+%%SITE_ARCH%%/Tk/ConfigSpecs.pod
+%%SITE_ARCH%%/Tk/Configure.pm
+%%SITE_ARCH%%/Tk/Credits
+%%SITE_ARCH%%/Tk/DItem.pod
+%%SITE_ARCH%%/Tk/Derived.pm
+%%SITE_ARCH%%/Tk/Derived.pod
+%%SITE_ARCH%%/Tk/Dialog.pm
+%%SITE_ARCH%%/Tk/Dialog.pod
+%%SITE_ARCH%%/Tk/DialogBox.pm
+%%SITE_ARCH%%/Tk/DialogBox.pod
+%%SITE_ARCH%%/Tk/DirTree.pm
+%%SITE_ARCH%%/Tk/DirTree.pod
+%%SITE_ARCH%%/Tk/Dirlist.pm
+%%SITE_ARCH%%/Tk/DragDrop.pm
+%%SITE_ARCH%%/Tk/DragDrop/Common.pm
+%%SITE_ARCH%%/Tk/DragDrop/Common.pod
+%%SITE_ARCH%%/Tk/DragDrop/LocalDrop.pm
+%%SITE_ARCH%%/Tk/DragDrop/Rect.pm
+%%SITE_ARCH%%/Tk/DragDrop/SunConst.pm
+%%SITE_ARCH%%/Tk/DragDrop/SunConst.pod
+%%SITE_ARCH%%/Tk/DragDrop/SunDrop.pm
+%%SITE_ARCH%%/Tk/DragDrop/SunSite.pm
+%%SITE_ARCH%%/Tk/DragDrop/XDNDDrop.pm
+%%SITE_ARCH%%/Tk/DragDrop/XDNDSite.pm
+%%SITE_ARCH%%/Tk/DropSite.pm
+%%SITE_ARCH%%/Tk/DropSite.pod
+%%SITE_ARCH%%/Tk/DummyEncode.pm
+%%SITE_ARCH%%/Tk/English.pm
+%%SITE_ARCH%%/Tk/Entry.pm
+%%SITE_ARCH%%/Tk/Entry.pod
+%%SITE_ARCH%%/Tk/Error.pod
+%%SITE_ARCH%%/Tk/ErrorDialog.pm
+%%SITE_ARCH%%/Tk/Event.pm
+%%SITE_ARCH%%/Tk/Event/IO.pm
+%%SITE_ARCH%%/Tk/Eventloop.pod
+%%SITE_ARCH%%/Tk/FBox.pm
+%%SITE_ARCH%%/Tk/FBox.pod
+%%SITE_ARCH%%/Tk/FileSelect.pm
+%%SITE_ARCH%%/Tk/FileSelect.pod
+%%SITE_ARCH%%/Tk/FloatEntry.pm
+%%SITE_ARCH%%/Tk/Font.pm
+%%SITE_ARCH%%/Tk/Font.pod
+%%SITE_ARCH%%/Tk/Frame.pm
+%%SITE_ARCH%%/Tk/Frame.pod
+%%SITE_ARCH%%/Tk/HList.pm
+%%SITE_ARCH%%/Tk/HList.pod
+%%SITE_ARCH%%/Tk/IO.pm
+%%SITE_ARCH%%/Tk/IO.pod
+%%SITE_ARCH%%/Tk/IconList.pm
+%%SITE_ARCH%%/Tk/IconList.pod
+%%SITE_ARCH%%/Tk/Image.pm
+%%SITE_ARCH%%/Tk/Image.pod
+%%SITE_ARCH%%/Tk/InputO.pm
+%%SITE_ARCH%%/Tk/InputO.pod
+%%SITE_ARCH%%/Tk/Internals.pod
+%%SITE_ARCH%%/Tk/ItemStyle.pm
+%%SITE_ARCH%%/Tk/JPEG.pm
+%%SITE_ARCH%%/Tk/LabEntry.pm
+%%SITE_ARCH%%/Tk/LabFrame.pm
+%%SITE_ARCH%%/Tk/LabFrame.pod
+%%SITE_ARCH%%/Tk/LabRadio.pm
+%%SITE_ARCH%%/Tk/Label.pm
+%%SITE_ARCH%%/Tk/Label.pod
+%%SITE_ARCH%%/Tk/Labelframe.pm
+%%SITE_ARCH%%/Tk/Labelframe.pod
+%%SITE_ARCH%%/Tk/Listbox.pm
+%%SITE_ARCH%%/Tk/Listbox.pod
+%%SITE_ARCH%%/Tk/MMtry.pm
+%%SITE_ARCH%%/Tk/MMutil.pm
+%%SITE_ARCH%%/Tk/MainWindow.pm
+%%SITE_ARCH%%/Tk/MainWindow.pod
+%%SITE_ARCH%%/Tk/MakeDepend.pm
+%%SITE_ARCH%%/Tk/Menu.pm
+%%SITE_ARCH%%/Tk/Menu.pod
+%%SITE_ARCH%%/Tk/Menu/Item.pm
+%%SITE_ARCH%%/Tk/Menu/Item.pod
+%%SITE_ARCH%%/Tk/Menubar.pm
+%%SITE_ARCH%%/Tk/Menubutton.pm
+%%SITE_ARCH%%/Tk/Menubutton.pod
+%%SITE_ARCH%%/Tk/Message.pm
+%%SITE_ARCH%%/Tk/Message.pod
+%%SITE_ARCH%%/Tk/MsgBox.pm
+%%SITE_ARCH%%/Tk/MsgBox.pod
+%%SITE_ARCH%%/Tk/Mwm.pm
+%%SITE_ARCH%%/Tk/Mwm.pod
+%%SITE_ARCH%%/Tk/NBFrame.pm
+%%SITE_ARCH%%/Tk/NoteBook.pm
+%%SITE_ARCH%%/Tk/NoteBook.pod
+%%SITE_ARCH%%/Tk/Optionmenu.pm
+%%SITE_ARCH%%/Tk/Optionmenu.pod
+%%SITE_ARCH%%/Tk/PNG.pm
+%%SITE_ARCH%%/Tk/Pane.pm
+%%SITE_ARCH%%/Tk/Panedwindow.pm
+%%SITE_ARCH%%/Tk/Panedwindow.pod
+%%SITE_ARCH%%/Tk/Photo.pm
+%%SITE_ARCH%%/Tk/Photo.pod
+%%SITE_ARCH%%/Tk/Pixmap.pm
+%%SITE_ARCH%%/Tk/Pixmap.pod
+%%SITE_ARCH%%/Tk/Popup.pod
+%%SITE_ARCH%%/Tk/Pretty.pm
+%%SITE_ARCH%%/Tk/ProgressBar.pm
+%%SITE_ARCH%%/Tk/README.Adjust
+%%SITE_ARCH%%/Tk/ROText.pm
+%%SITE_ARCH%%/Tk/ROText.pod
+%%SITE_ARCH%%/Tk/Radiobutton.pm
+%%SITE_ARCH%%/Tk/Radiobutton.pod
+%%SITE_ARCH%%/Tk/Region.pm
+%%SITE_ARCH%%/Tk/Reindex.pm
+%%SITE_ARCH%%/Tk/ReindexedROText.pm
+%%SITE_ARCH%%/Tk/ReindexedText.pm
+%%SITE_ARCH%%/Tk/Scale.pm
+%%SITE_ARCH%%/Tk/Scale.pod
+%%SITE_ARCH%%/Tk/Scrollbar.pm
+%%SITE_ARCH%%/Tk/Scrollbar.pod
+%%SITE_ARCH%%/Tk/Scrolled.pod
+%%SITE_ARCH%%/Tk/Spinbox.pm
+%%SITE_ARCH%%/Tk/Spinbox.pod
+%%SITE_ARCH%%/Tk/Stats.pm
+%%SITE_ARCH%%/Tk/Submethods.pm
+%%SITE_ARCH%%/Tk/Submethods.pod
+%%SITE_ARCH%%/Tk/TList.pm
+%%SITE_ARCH%%/Tk/TList.pod
+%%SITE_ARCH%%/Tk/Table.pm
+%%SITE_ARCH%%/Tk/Table.pod
+%%SITE_ARCH%%/Tk/Tcl-perl.pod
+%%SITE_ARCH%%/Tk/Text.pm
+%%SITE_ARCH%%/Tk/Text.pod
+%%SITE_ARCH%%/Tk/Text/Tag.pm
+%%SITE_ARCH%%/Tk/TextEdit.pm
+%%SITE_ARCH%%/Tk/TextList.pm
+%%SITE_ARCH%%/Tk/TextUndo.pm
+%%SITE_ARCH%%/Tk/TextUndo.pod
+%%SITE_ARCH%%/Tk/Tiler.pm
+%%SITE_ARCH%%/Tk/Tiler.pod
+%%SITE_ARCH%%/Tk/TixGrid.pm
+%%SITE_ARCH%%/Tk/TixGrid.pod
+%%SITE_ARCH%%/Tk/Tk.xbm
+%%SITE_ARCH%%/Tk/Tk.xpm
+%%SITE_ARCH%%/Tk/TkXSUB.def
+%%SITE_ARCH%%/Tk/Toplevel.pm
+%%SITE_ARCH%%/Tk/Toplevel.pod
+%%SITE_ARCH%%/Tk/Trace.pm
+%%SITE_ARCH%%/Tk/Tree.pm
+%%SITE_ARCH%%/Tk/Tree.pod
+%%SITE_ARCH%%/Tk/UserGuide.pod
+%%SITE_ARCH%%/Tk/Widget.pm
+%%SITE_ARCH%%/Tk/Widget.pod
+%%SITE_ARCH%%/Tk/WidgetDemo.pod
+%%SITE_ARCH%%/Tk/WinPhoto.pm
+%%SITE_ARCH%%/Tk/Wm.pm
+%%SITE_ARCH%%/Tk/Wm.pod
+%%SITE_ARCH%%/Tk/X.pm
+%%SITE_ARCH%%/Tk/X.pod
+%%SITE_ARCH%%/Tk/X11Font.pm
+%%SITE_ARCH%%/Tk/X11Font.pod
+%%SITE_ARCH%%/Tk/Xcamel.gif
+%%SITE_ARCH%%/Tk/Xlib.pm
+%%SITE_ARCH%%/Tk/Xrm.pm
+%%SITE_ARCH%%/Tk/Xrm.pod
+%%SITE_ARCH%%/Tk/act_folder.xbm
+%%SITE_ARCH%%/Tk/act_folder.xpm
+%%SITE_ARCH%%/Tk/after.pod
+%%SITE_ARCH%%/Tk/anim.gif
+%%SITE_ARCH%%/Tk/arrowdownwin.xbm
+%%SITE_ARCH%%/Tk/balArrow.xbm
+%%SITE_ARCH%%/Tk/bind.pod
+%%SITE_ARCH%%/Tk/bindtags.pod
+%%SITE_ARCH%%/Tk/callbacks.pod
+%%SITE_ARCH%%/Tk/cbxarrow.xbm
+%%SITE_ARCH%%/Tk/chooseColor.pod
+%%SITE_ARCH%%/Tk/chooseDirectory.pod
+%%SITE_ARCH%%/Tk/composite.pod
+%%SITE_ARCH%%/Tk/demos/LabEnLabRad.pm
+%%SITE_ARCH%%/Tk/demos/images/QuitPB.xpm
+%%SITE_ARCH%%/Tk/demos/images/QuitPBa.xpm
+%%SITE_ARCH%%/Tk/demos/images/c.icon
+%%SITE_ARCH%%/Tk/demos/images/cursor.cur
+%%SITE_ARCH%%/Tk/demos/images/cursor.mask
+%%SITE_ARCH%%/Tk/demos/images/cursor.xbm
+%%SITE_ARCH%%/Tk/demos/images/dir.icon
+%%SITE_ARCH%%/Tk/demos/images/dir.mask
+%%SITE_ARCH%%/Tk/demos/images/earth.gif
+%%SITE_ARCH%%/Tk/demos/images/earthris.gif
+%%SITE_ARCH%%/Tk/demos/images/face
+%%SITE_ARCH%%/Tk/demos/images/flagdown
+%%SITE_ARCH%%/Tk/demos/images/flagup
+%%SITE_ARCH%%/Tk/demos/images/grey.25
+%%SITE_ARCH%%/Tk/demos/images/grey.5
+%%SITE_ARCH%%/Tk/demos/images/letters
+%%SITE_ARCH%%/Tk/demos/images/mickey.gif
+%%SITE_ARCH%%/Tk/demos/images/ned.xpm
+%%SITE_ARCH%%/Tk/demos/images/noletters
+%%SITE_ARCH%%/Tk/demos/images/page.icon
+%%SITE_ARCH%%/Tk/demos/images/page.mask
+%%SITE_ARCH%%/Tk/demos/images/pattern
+%%SITE_ARCH%%/Tk/demos/images/teapot.ppm
+%%SITE_ARCH%%/Tk/demos/widget_lib/Ball.pm
+%%SITE_ARCH%%/Tk/demos/widget_lib/HList.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/HList2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/Plot.pm
+%%SITE_ARCH%%/Tk/demos/widget_lib/WidgetDemo.pm
+%%SITE_ARCH%%/Tk/demos/widget_lib/arrows.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/balloon.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/bind.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/bitmaps.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/bounce.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/browseentry.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/browseentry2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/button.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/check.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/choosedir.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/clrpick.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/colors.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/cscroll.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/ctext.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/dialog1.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/dialog2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/dirtree.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/entry1.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/entry2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/entry3.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/filebox.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/floor.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/form.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/form_mgr.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/hello.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/hscale.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/icon.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/image1.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/image2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/items.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/keysyms.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/labelframe.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/labels.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/labframe.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/mega.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/menbut.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/menus.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/menus2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/msgBox.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/notebook.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/paned1.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/paned2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/photo1.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/photo2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/plot.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/progress.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/puzzle.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/radio.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/ruler.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/sayings.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/search.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/showVars.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/slide.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/spin.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/states.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/style.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/texts.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/trace1.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/trace2.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/transtile.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/twind.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/unicodeout.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/virtevents1.pl
+%%SITE_ARCH%%/Tk/demos/widget_lib/vscale.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/Gedi.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/TEMPLATE.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/Tiler.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/all.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/cursor.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/lib/npuz/Xcamel.npuz
+%%SITE_ARCH%%/Tk/demos/widtrib/npuz.pl
+%%SITE_ARCH%%/Tk/demos/widtrib/plop.pl
+%%SITE_ARCH%%/Tk/event.pod
+%%SITE_ARCH%%/Tk/exit.pod
+%%SITE_ARCH%%/Tk/file.xbm
+%%SITE_ARCH%%/Tk/file.xpm
+%%SITE_ARCH%%/Tk/fileevent.pod
+%%SITE_ARCH%%/Tk/focus.pod
+%%SITE_ARCH%%/Tk/folder.xbm
+%%SITE_ARCH%%/Tk/folder.xpm
+%%SITE_ARCH%%/Tk/form.pod
+%%SITE_ARCH%%/Tk/getOpenFile.pod
+%%SITE_ARCH%%/Tk/grab.pod
+%%SITE_ARCH%%/Tk/grid.pod
+%%SITE_ARCH%%/Tk/icon.gif
+%%SITE_ARCH%%/Tk/install.pm
+%%SITE_ARCH%%/Tk/license.terms
+%%SITE_ARCH%%/Tk/mega.pod
+%%SITE_ARCH%%/Tk/messageBox.pod
+%%SITE_ARCH%%/Tk/openfile.xbm
+%%SITE_ARCH%%/Tk/openfolder.xbm
+%%SITE_ARCH%%/Tk/openfolder.xpm
+%%SITE_ARCH%%/Tk/option.pod
+%%SITE_ARCH%%/Tk/options.pod
+%%SITE_ARCH%%/Tk/overview.pod
+%%SITE_ARCH%%/Tk/pTk.pod
+%%SITE_ARCH%%/Tk/pTk/Lang.h
+%%SITE_ARCH%%/Tk/pTk/Lang.m
+%%SITE_ARCH%%/Tk/pTk/Lang.t
+%%SITE_ARCH%%/Tk/pTk/Lang_f.h
+%%SITE_ARCH%%/Tk/pTk/Tcl-pTk
+%%SITE_ARCH%%/Tk/pTk/Xlib.h
+%%SITE_ARCH%%/Tk/pTk/Xlib.m
+%%SITE_ARCH%%/Tk/pTk/Xlib.t
+%%SITE_ARCH%%/Tk/pTk/Xlib_f.h
+%%SITE_ARCH%%/Tk/pTk/compat/limits.h
+%%SITE_ARCH%%/Tk/pTk/compat/stdlib.h
+%%SITE_ARCH%%/Tk/pTk/compat/unistd.h
+%%SITE_ARCH%%/Tk/pTk/default.h
+%%SITE_ARCH%%/Tk/pTk/img.h
+%%SITE_ARCH%%/Tk/pTk/imgInt.h
+%%SITE_ARCH%%/Tk/pTk/imgInt.m
+%%SITE_ARCH%%/Tk/pTk/imgInt.t
+%%SITE_ARCH%%/Tk/pTk/imgInt_f.h
+%%SITE_ARCH%%/Tk/pTk/ks_names.h
+%%SITE_ARCH%%/Tk/pTk/mkVFunc
+%%SITE_ARCH%%/Tk/pTk/moredefs.h
+%%SITE_ARCH%%/Tk/pTk/port.h
+%%SITE_ARCH%%/Tk/pTk/tcl.h
+%%SITE_ARCH%%/Tk/pTk/tclDecls.h
+%%SITE_ARCH%%/Tk/pTk/tclDecls.m
+%%SITE_ARCH%%/Tk/pTk/tclDecls.t
+%%SITE_ARCH%%/Tk/pTk/tclDecls_f.h
+%%SITE_ARCH%%/Tk/pTk/tclIntDecls.h
+%%SITE_ARCH%%/Tk/pTk/tclIntPlatDecls.h
+%%SITE_ARCH%%/Tk/pTk/tclMath.h
+%%SITE_ARCH%%/Tk/pTk/tclPlatDecls.h
+%%SITE_ARCH%%/Tk/pTk/tix.h
+%%SITE_ARCH%%/Tk/pTk/tix.m
+%%SITE_ARCH%%/Tk/pTk/tix.t
+%%SITE_ARCH%%/Tk/pTk/tixBitmaps.h
+%%SITE_ARCH%%/Tk/pTk/tixDef.h
+%%SITE_ARCH%%/Tk/pTk/tixForm.h
+%%SITE_ARCH%%/Tk/pTk/tixGrData.h
+%%SITE_ARCH%%/Tk/pTk/tixGrid.h
+%%SITE_ARCH%%/Tk/pTk/tixHList.h
+%%SITE_ARCH%%/Tk/pTk/tixImgXpm.h
+%%SITE_ARCH%%/Tk/pTk/tixImgXpm.m
+%%SITE_ARCH%%/Tk/pTk/tixImgXpm.t
+%%SITE_ARCH%%/Tk/pTk/tixImgXpm_f.h
+%%SITE_ARCH%%/Tk/pTk/tixInt.h
+%%SITE_ARCH%%/Tk/pTk/tixInt.m
+%%SITE_ARCH%%/Tk/pTk/tixInt.t
+%%SITE_ARCH%%/Tk/pTk/tixInt_f.h
+%%SITE_ARCH%%/Tk/pTk/tixPort.h
+%%SITE_ARCH%%/Tk/pTk/tixTList.h
+%%SITE_ARCH%%/Tk/pTk/tixUnixInt.h
+%%SITE_ARCH%%/Tk/pTk/tixUnixPort.h
+%%SITE_ARCH%%/Tk/pTk/tix_f.h
+%%SITE_ARCH%%/Tk/pTk/tk.h
+%%SITE_ARCH%%/Tk/pTk/tk.m
+%%SITE_ARCH%%/Tk/pTk/tk.t
+%%SITE_ARCH%%/Tk/pTk/tk3d.h
+%%SITE_ARCH%%/Tk/pTk/tkButton.h
+%%SITE_ARCH%%/Tk/pTk/tkCanvas.h
+%%SITE_ARCH%%/Tk/pTk/tkCanvases.h
+%%SITE_ARCH%%/Tk/pTk/tkColor.h
+%%SITE_ARCH%%/Tk/pTk/tkConfig.h
+%%SITE_ARCH%%/Tk/pTk/tkDecls.h
+%%SITE_ARCH%%/Tk/pTk/tkDecls.m
+%%SITE_ARCH%%/Tk/pTk/tkDecls.t
+%%SITE_ARCH%%/Tk/pTk/tkDecls_f.h
+%%SITE_ARCH%%/Tk/pTk/tkEvent.h
+%%SITE_ARCH%%/Tk/pTk/tkEvent.m
+%%SITE_ARCH%%/Tk/pTk/tkEvent.t
+%%SITE_ARCH%%/Tk/pTk/tkEvent_f.h
+%%SITE_ARCH%%/Tk/pTk/tkFileFilter.h
+%%SITE_ARCH%%/Tk/pTk/tkFont.h
+%%SITE_ARCH%%/Tk/pTk/tkImgPhoto.h
+%%SITE_ARCH%%/Tk/pTk/tkImgPhoto.m
+%%SITE_ARCH%%/Tk/pTk/tkImgPhoto.t
+%%SITE_ARCH%%/Tk/pTk/tkImgPhoto_f.h
+%%SITE_ARCH%%/Tk/pTk/tkInitScript.h
+%%SITE_ARCH%%/Tk/pTk/tkInt.h
+%%SITE_ARCH%%/Tk/pTk/tkInt.m
+%%SITE_ARCH%%/Tk/pTk/tkInt.t
+%%SITE_ARCH%%/Tk/pTk/tkIntDecls.h
+%%SITE_ARCH%%/Tk/pTk/tkIntDecls.m
+%%SITE_ARCH%%/Tk/pTk/tkIntDecls.t
+%%SITE_ARCH%%/Tk/pTk/tkIntDecls_f.h
+%%SITE_ARCH%%/Tk/pTk/tkIntPlatDecls.h
+%%SITE_ARCH%%/Tk/pTk/tkIntPlatDecls.m
+%%SITE_ARCH%%/Tk/pTk/tkIntPlatDecls.t
+%%SITE_ARCH%%/Tk/pTk/tkIntPlatDecls_f.h
+%%SITE_ARCH%%/Tk/pTk/tkIntXlibDecls.h
+%%SITE_ARCH%%/Tk/pTk/tkIntXlibDecls.m
+%%SITE_ARCH%%/Tk/pTk/tkIntXlibDecls.t
+%%SITE_ARCH%%/Tk/pTk/tkIntXlibDecls_f.h
+%%SITE_ARCH%%/Tk/pTk/tkInt_f.h
+%%SITE_ARCH%%/Tk/pTk/tkMenu.h
+%%SITE_ARCH%%/Tk/pTk/tkMenubutton.h
+%%SITE_ARCH%%/Tk/pTk/tkOption.h
+%%SITE_ARCH%%/Tk/pTk/tkOption.m
+%%SITE_ARCH%%/Tk/pTk/tkOption.t
+%%SITE_ARCH%%/Tk/pTk/tkOption_f.h
+%%SITE_ARCH%%/Tk/pTk/tkPlatDecls.h
+%%SITE_ARCH%%/Tk/pTk/tkPlatDecls.m
+%%SITE_ARCH%%/Tk/pTk/tkPlatDecls.t
+%%SITE_ARCH%%/Tk/pTk/tkPlatDecls_f.h
+%%SITE_ARCH%%/Tk/pTk/tkPort.h
+%%SITE_ARCH%%/Tk/pTk/tkScale.h
+%%SITE_ARCH%%/Tk/pTk/tkScrollbar.h
+%%SITE_ARCH%%/Tk/pTk/tkSelect.h
+%%SITE_ARCH%%/Tk/pTk/tkText.h
+%%SITE_ARCH%%/Tk/pTk/tkUndo.h
+%%SITE_ARCH%%/Tk/pTk/tkUnixDefault.h
+%%SITE_ARCH%%/Tk/pTk/tkUnixInt.h
+%%SITE_ARCH%%/Tk/pTk/tkUnixPort.h
+%%SITE_ARCH%%/Tk/pTk/tkVMacro.h
+%%SITE_ARCH%%/Tk/pTk/tkXrm.h
+%%SITE_ARCH%%/Tk/pTk/tk_f.h
+%%SITE_ARCH%%/Tk/pack.pod
+%%SITE_ARCH%%/Tk/palette.pod
+%%SITE_ARCH%%/Tk/place.pod
+%%SITE_ARCH%%/Tk/prolog.ps
+%%SITE_ARCH%%/Tk/selection.pod
+%%SITE_ARCH%%/Tk/send.pod
+%%SITE_ARCH%%/Tk/srcfile.xpm
+%%SITE_ARCH%%/Tk/textfile.xpm
+%%SITE_ARCH%%/Tk/tixWm.pod
+%%SITE_ARCH%%/Tk/tkGlue.def
+%%SITE_ARCH%%/Tk/tkGlue.h
+%%SITE_ARCH%%/Tk/tkGlue.m
+%%SITE_ARCH%%/Tk/tkGlue.t
+%%SITE_ARCH%%/Tk/tkGlue_f.h
+%%SITE_ARCH%%/Tk/tkvars.pod
+%%SITE_ARCH%%/Tk/tranicon.gif
+%%SITE_ARCH%%/Tk/typemap
+%%SITE_ARCH%%/Tk/vtab.def
+%%SITE_ARCH%%/Tk/widgets.pm
+%%SITE_ARCH%%/Tk/widgets.pod
+%%SITE_ARCH%%/Tk/win.xbm
+%%SITE_ARCH%%/Tk/winfolder.xpm
+%%SITE_ARCH%%/Tk/wintext.xpm
+%%SITE_ARCH%%/auto/Tk/CancelRepeat.al
+%%SITE_ARCH%%/auto/Tk/Canvas/Canvas.so
+%%SITE_ARCH%%/auto/Tk/Clipboard/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Clipboard/getSelected.al
+%%SITE_ARCH%%/auto/Tk/Compound/Compound.so
+%%SITE_ARCH%%/auto/Tk/EnterFocus.al
+%%SITE_ARCH%%/auto/Tk/Entry/Entry.so
+%%SITE_ARCH%%/auto/Tk/Error.al
+%%SITE_ARCH%%/auto/Tk/Event/Event.so
+%%SITE_ARCH%%/auto/Tk/FirstMenu.al
+%%SITE_ARCH%%/auto/Tk/FocusChildren.al
+%%SITE_ARCH%%/auto/Tk/FocusOK.al
+%%SITE_ARCH%%/auto/Tk/Frame/AddScrollbars.al
+%%SITE_ARCH%%/auto/Tk/Frame/FindMenu.al
+%%SITE_ARCH%%/auto/Tk/Frame/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Frame/freeze_on_map.al
+%%SITE_ARCH%%/auto/Tk/Frame/label.al
+%%SITE_ARCH%%/auto/Tk/Frame/labelPack.al
+%%SITE_ARCH%%/auto/Tk/Frame/labelVariable.al
+%%SITE_ARCH%%/auto/Tk/Frame/packscrollbars.al
+%%SITE_ARCH%%/auto/Tk/Frame/queuePack.al
+%%SITE_ARCH%%/auto/Tk/Frame/sbset.al
+%%SITE_ARCH%%/auto/Tk/Frame/scrollbars.al
+%%SITE_ARCH%%/auto/Tk/HList/HList.so
+%%SITE_ARCH%%/auto/Tk/IO/IO.so
+%%SITE_ARCH%%/auto/Tk/ImageNames.al
+%%SITE_ARCH%%/auto/Tk/ImageTypes.al
+%%SITE_ARCH%%/auto/Tk/InputO/InputO.so
+%%SITE_ARCH%%/auto/Tk/JPEG/JPEG.so
+%%SITE_ARCH%%/auto/Tk/Listbox/AutoScan.al
+%%SITE_ARCH%%/auto/Tk/Listbox/BeginExtend.al
+%%SITE_ARCH%%/auto/Tk/Listbox/BeginSelect.al
+%%SITE_ARCH%%/auto/Tk/Listbox/BeginToggle.al
+%%SITE_ARCH%%/auto/Tk/Listbox/ButtonRelease_1.al
+%%SITE_ARCH%%/auto/Tk/Listbox/CLEAR.al
+%%SITE_ARCH%%/auto/Tk/Listbox/Cancel.al
+%%SITE_ARCH%%/auto/Tk/Listbox/Cntrl_End.al
+%%SITE_ARCH%%/auto/Tk/Listbox/Cntrl_Home.al
+%%SITE_ARCH%%/auto/Tk/Listbox/Cntrl_backslash.al
+%%SITE_ARCH%%/auto/Tk/Listbox/DELETE.al
+%%SITE_ARCH%%/auto/Tk/Listbox/DataExtend.al
+%%SITE_ARCH%%/auto/Tk/Listbox/EXISTS.al
+%%SITE_ARCH%%/auto/Tk/Listbox/EXTEND.al
+%%SITE_ARCH%%/auto/Tk/Listbox/ExtendUpDown.al
+%%SITE_ARCH%%/auto/Tk/Listbox/FETCH.al
+%%SITE_ARCH%%/auto/Tk/Listbox/FETCHSIZE.al
+%%SITE_ARCH%%/auto/Tk/Listbox/Listbox.so
+%%SITE_ARCH%%/auto/Tk/Listbox/Motion.al
+%%SITE_ARCH%%/auto/Tk/Listbox/POP.al
+%%SITE_ARCH%%/auto/Tk/Listbox/PUSH.al
+%%SITE_ARCH%%/auto/Tk/Listbox/SHIFT.al
+%%SITE_ARCH%%/auto/Tk/Listbox/SPLICE.al
+%%SITE_ARCH%%/auto/Tk/Listbox/STORE.al
+%%SITE_ARCH%%/auto/Tk/Listbox/SelectAll.al
+%%SITE_ARCH%%/auto/Tk/Listbox/SetList.al
+%%SITE_ARCH%%/auto/Tk/Listbox/TIEARRAY.al
+%%SITE_ARCH%%/auto/Tk/Listbox/TIESCALAR.al
+%%SITE_ARCH%%/auto/Tk/Listbox/UNSHIFT.al
+%%SITE_ARCH%%/auto/Tk/Listbox/UpDown.al
+%%SITE_ARCH%%/auto/Tk/Listbox/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Listbox/clipboardPaste.al
+%%SITE_ARCH%%/auto/Tk/Listbox/deleteSelected.al
+%%SITE_ARCH%%/auto/Tk/Listbox/getSelected.al
+%%SITE_ARCH%%/auto/Tk/Listbox/xyIndex.al
+%%SITE_ARCH%%/auto/Tk/Menubutton/Menubutton.so
+%%SITE_ARCH%%/auto/Tk/Mwm/Mwm.so
+%%SITE_ARCH%%/auto/Tk/NBFrame/NBFrame.so
+%%SITE_ARCH%%/auto/Tk/PNG/PNG.so
+%%SITE_ARCH%%/auto/Tk/Pixmap/Pixmap.so
+%%SITE_ARCH%%/auto/Tk/Receive.al
+%%SITE_ARCH%%/auto/Tk/RepeatId.al
+%%SITE_ARCH%%/auto/Tk/Scale/Activate.al
+%%SITE_ARCH%%/auto/Tk/Scale/ButtonDown.al
+%%SITE_ARCH%%/auto/Tk/Scale/ButtonUp.al
+%%SITE_ARCH%%/auto/Tk/Scale/ControlPress.al
+%%SITE_ARCH%%/auto/Tk/Scale/Drag.al
+%%SITE_ARCH%%/auto/Tk/Scale/EndDrag.al
+%%SITE_ARCH%%/auto/Tk/Scale/Enter.al
+%%SITE_ARCH%%/auto/Tk/Scale/Increment.al
+%%SITE_ARCH%%/auto/Tk/Scale/Leave.al
+%%SITE_ARCH%%/auto/Tk/Scale/Scale.so
+%%SITE_ARCH%%/auto/Tk/Scale/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Scrollbar/ButtonDown.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/ButtonUp.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/Drag.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/EndDrag.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/Enter.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/Leave.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/Motion.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/ScrlByPages.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/ScrlByUnits.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/ScrlToPos.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/ScrlTopBottom.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/Scrollbar.so
+%%SITE_ARCH%%/auto/Tk/Scrollbar/Select.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/StartDrag.al
+%%SITE_ARCH%%/auto/Tk/Scrollbar/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Selection.al
+%%SITE_ARCH%%/auto/Tk/TList/TList.so
+%%SITE_ARCH%%/auto/Tk/Table/Create.al
+%%SITE_ARCH%%/auto/Tk/Table/Posn.al
+%%SITE_ARCH%%/auto/Tk/Table/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Table/see.al
+%%SITE_ARCH%%/auto/Tk/Table/totalColumns.al
+%%SITE_ARCH%%/auto/Tk/Table/totalRows.al
+%%SITE_ARCH%%/auto/Tk/Text/Text.so
+%%SITE_ARCH%%/auto/Tk/Text/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/TextEdit/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/TextUndo/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/TixGrid/TixGrid.so
+%%SITE_ARCH%%/auto/Tk/Tk.so
+%%SITE_ARCH%%/auto/Tk/Toplevel/FG_BindIn.al
+%%SITE_ARCH%%/auto/Tk/Toplevel/FG_BindOut.al
+%%SITE_ARCH%%/auto/Tk/Toplevel/FG_Create.al
+%%SITE_ARCH%%/auto/Tk/Toplevel/FG_Destroy.al
+%%SITE_ARCH%%/auto/Tk/Toplevel/FG_In.al
+%%SITE_ARCH%%/auto/Tk/Toplevel/FG_Out.al
+%%SITE_ARCH%%/auto/Tk/Toplevel/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/TraverseToMenu.al
+%%SITE_ARCH%%/auto/Tk/Widget/ASkludge.al
+%%SITE_ARCH%%/auto/Tk/Widget/AltKeyInDialog.al
+%%SITE_ARCH%%/auto/Tk/Widget/AmpWidget.al
+%%SITE_ARCH%%/auto/Tk/Widget/FindAltKeyTarget.al
+%%SITE_ARCH%%/auto/Tk/Widget/MasterMenu.al
+%%SITE_ARCH%%/auto/Tk/Widget/RestoreFocusGrab.al
+%%SITE_ARCH%%/auto/Tk/Widget/SetAmpText.al
+%%SITE_ARCH%%/auto/Tk/Widget/SetFocusGrab.al
+%%SITE_ARCH%%/auto/Tk/Widget/UnderlineAmpersand.al
+%%SITE_ARCH%%/auto/Tk/Widget/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Widget/bindDump.al
+%%SITE_ARCH%%/auto/Tk/Widget/clipboardKeysyms.al
+%%SITE_ARCH%%/auto/Tk/Widget/pathname.al
+%%SITE_ARCH%%/auto/Tk/WinPhoto/WinPhoto.so
+%%SITE_ARCH%%/auto/Tk/Wm/AnchorAdjust.al
+%%SITE_ARCH%%/auto/Tk/Wm/FullScreen.al
+%%SITE_ARCH%%/auto/Tk/Wm/Popup.al
+%%SITE_ARCH%%/auto/Tk/Wm/Post.al
+%%SITE_ARCH%%/auto/Tk/Wm/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Wm/iconposition.al
+%%SITE_ARCH%%/auto/Tk/X/X.so
+%%SITE_ARCH%%/auto/Tk/X/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/Xlib/Xlib.so
+%%SITE_ARCH%%/auto/Tk/autosplit.ix
+%%SITE_ARCH%%/auto/Tk/break.al
+%%SITE_ARCH%%/auto/Tk/focusFollowsMouse.al
+%%SITE_ARCH%%/auto/Tk/focusNext.al
+%%SITE_ARCH%%/auto/Tk/focusPrev.al
+%%SITE_ARCH%%/auto/Tk/getEncoding.al
+%%SITE_ARCH%%/auto/Tk/getNextFocus.al
+%%SITE_ARCH%%/auto/Tk/getPrevFocus.al
+%%SITE_ARCH%%/auto/Tk/interps.al
+%%SITE_ARCH%%/auto/Tk/lsearch.al
+%%SITE_ARCH%%/auto/Tk/tabFocus.al
+%%SITE_ARCH%%/auto/Tk/updateWidgets.al
 man/man1/ptked.1.gz
 man/man1/ptksh.1.gz
 man/man1/tkjpeg.1.gz
 man/man1/widget.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/pTk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Xlib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/X
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Wm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/WinPhoto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Widget
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Toplevel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TixGrid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TextUndo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TextEdit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Table
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TList
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scrollbar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Scale
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Pixmap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/PNG
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/NBFrame
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Mwm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Menubutton
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Listbox
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/InputO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/IO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HList
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Frame
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Event
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Entry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Compound
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Clipboard
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Canvas
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/compat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/lib/npuz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/lib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widget_lib
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/images
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Text
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Menu
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Event
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tie
diff --git a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
index f897349e0e11..330f7539cad2 100644
--- a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
+++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Wx-Perl-ProcessStream
 PORTVERSION=	0.32
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist b/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist
index 0f83988e3da6..02c4021e50ab 100644
--- a/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist
+++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist
@@ -1,7 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Perl/ProcessStream/.packlist
 %%SITE_PERL%%/Wx/Perl/ProcessStream.pm
 %%PERL5_MAN3%%/Wx::Perl::ProcessStream.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Perl/ProcessStream
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Perl
-@dirrmtry %%SITE_PERL%%/Wx/Perl
-@dirrmtry %%SITE_PERL%%/Wx
diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index ad9dfdb4a41b..ddf1fe3da4b8 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Wx
 PORTVERSION=	0.99.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Wx/pkg-plist b/x11-toolkits/p5-Wx/pkg-plist
index e919503cbb66..eaee0c7e2121 100644
--- a/x11-toolkits/p5-Wx/pkg-plist
+++ b/x11-toolkits/p5-Wx/pkg-plist
@@ -14,128 +14,97 @@ bin/wxperl_overload
 %%PERL5_MAN3%%/Wx::build::Options.3.gz
 %%PERL5_MAN3%%/Wx::build::Utils.3.gz
 man/man1/wxperl_overload.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/AUI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Api.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/App.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/ArtProvider.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Calendar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DND.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DataView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DateTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DocView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DropSource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/FS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Grid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Help.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Html.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/IPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Loader.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Locale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/MDI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Media.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Menu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Mini.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/NewClass.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Overload/Driver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Overload/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl/Carp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl/SplashFast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl/TextValidator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/PerlTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Print.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/PropertyGrid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/RadioBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Ribbon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/RichText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/STC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Thread.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/WebView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Wx_Exp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XRC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Enum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Overload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Virtual.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Any_OS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Any_wx_config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Hacks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/MacOSX_GCC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Win32_MSVC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Win32_MinGW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/Opt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/Options.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/chkconfig.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/compat.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/constants.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/e_cback.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/event.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/helpers.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/overload.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/setup.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/streams.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/v_cback.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/v_cback_def.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/wxapi.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/AUI/AUI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Calendar/Calendar.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DND/DND.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DataView/DataView.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DateTime/DateTime.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DocView/DocView.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/FS/FS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Grid/Grid.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Help/Help.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Html/Html.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/IPC/IPC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/MDI/MDI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Media/Media.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PerlTest/PerlTest.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Print/Print.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Ribbon/Ribbon.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/RichText/RichText.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/STC/STC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Socket/Socket.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/WebView/WebView.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Wx.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/XRC/XRC.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/WebView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Ribbon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PropertyGrid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/IPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DataView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/XRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/STC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/RichText
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Print
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PerlTest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Media
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/MDI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Html
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Help
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Grid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/FS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DocView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DateTime
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DND
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Calendar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/AUI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/build
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/Overload
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx
+%%SITE_ARCH%%/Wx.pm
+%%SITE_ARCH%%/Wx/AUI.pm
+%%SITE_ARCH%%/Wx/Api.pod
+%%SITE_ARCH%%/Wx/App.pm
+%%SITE_ARCH%%/Wx/ArtProvider.pm
+%%SITE_ARCH%%/Wx/Calendar.pm
+%%SITE_ARCH%%/Wx/DND.pm
+%%SITE_ARCH%%/Wx/DataView.pm
+%%SITE_ARCH%%/Wx/DateTime.pm
+%%SITE_ARCH%%/Wx/DocView.pm
+%%SITE_ARCH%%/Wx/DropSource.pm
+%%SITE_ARCH%%/Wx/Event.pm
+%%SITE_ARCH%%/Wx/FS.pm
+%%SITE_ARCH%%/Wx/Grid.pm
+%%SITE_ARCH%%/Wx/Help.pm
+%%SITE_ARCH%%/Wx/Html.pm
+%%SITE_ARCH%%/Wx/IPC.pm
+%%SITE_ARCH%%/Wx/Loader.pod
+%%SITE_ARCH%%/Wx/Locale.pm
+%%SITE_ARCH%%/Wx/MDI.pm
+%%SITE_ARCH%%/Wx/Media.pm
+%%SITE_ARCH%%/Wx/Menu.pm
+%%SITE_ARCH%%/Wx/Mini.pm
+%%SITE_ARCH%%/Wx/NewClass.pod
+%%SITE_ARCH%%/Wx/Overload/Driver.pm
+%%SITE_ARCH%%/Wx/Overload/Handle.pm
+%%SITE_ARCH%%/Wx/Perl/Carp.pm
+%%SITE_ARCH%%/Wx/Perl/SplashFast.pm
+%%SITE_ARCH%%/Wx/Perl/TextValidator.pm
+%%SITE_ARCH%%/Wx/PerlTest.pm
+%%SITE_ARCH%%/Wx/Print.pm
+%%SITE_ARCH%%/Wx/PropertyGrid.pm
+%%SITE_ARCH%%/Wx/RadioBox.pm
+%%SITE_ARCH%%/Wx/Ribbon.pm
+%%SITE_ARCH%%/Wx/RichText.pm
+%%SITE_ARCH%%/Wx/STC.pm
+%%SITE_ARCH%%/Wx/Socket.pm
+%%SITE_ARCH%%/Wx/Thread.pod
+%%SITE_ARCH%%/Wx/Timer.pm
+%%SITE_ARCH%%/Wx/WebView.pm
+%%SITE_ARCH%%/Wx/Wx_Exp.pm
+%%SITE_ARCH%%/Wx/XRC.pm
+%%SITE_ARCH%%/Wx/XSP/Enum.pm
+%%SITE_ARCH%%/Wx/XSP/Event.pm
+%%SITE_ARCH%%/Wx/XSP/Overload.pm
+%%SITE_ARCH%%/Wx/XSP/Virtual.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Any_OS.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Any_wx_config.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Core.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Hacks.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/MacOSX_GCC.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MSVC.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MinGW.pm
+%%SITE_ARCH%%/Wx/build/Opt.pm
+%%SITE_ARCH%%/Wx/build/Options.pm
+%%SITE_ARCH%%/Wx/build/Utils.pm
+%%SITE_ARCH%%/Wx/cpp/chkconfig.h
+%%SITE_ARCH%%/Wx/cpp/compat.h
+%%SITE_ARCH%%/Wx/cpp/constants.h
+%%SITE_ARCH%%/Wx/cpp/e_cback.h
+%%SITE_ARCH%%/Wx/cpp/event.h
+%%SITE_ARCH%%/Wx/cpp/helpers.h
+%%SITE_ARCH%%/Wx/cpp/overload.h
+%%SITE_ARCH%%/Wx/cpp/setup.h
+%%SITE_ARCH%%/Wx/cpp/streams.h
+%%SITE_ARCH%%/Wx/cpp/v_cback.h
+%%SITE_ARCH%%/Wx/cpp/v_cback_def.h
+%%SITE_ARCH%%/Wx/cpp/wxapi.h
+%%SITE_ARCH%%/Wx/typemap
+%%SITE_ARCH%%/auto/Wx/AUI/AUI.so
+%%SITE_ARCH%%/auto/Wx/Calendar/Calendar.so
+%%SITE_ARCH%%/auto/Wx/DND/DND.so
+%%SITE_ARCH%%/auto/Wx/DataView/DataView.so
+%%SITE_ARCH%%/auto/Wx/DateTime/DateTime.so
+%%SITE_ARCH%%/auto/Wx/DocView/DocView.so
+%%SITE_ARCH%%/auto/Wx/FS/FS.so
+%%SITE_ARCH%%/auto/Wx/Grid/Grid.so
+%%SITE_ARCH%%/auto/Wx/Help/Help.so
+%%SITE_ARCH%%/auto/Wx/Html/Html.so
+%%SITE_ARCH%%/auto/Wx/IPC/IPC.so
+%%SITE_ARCH%%/auto/Wx/MDI/MDI.so
+%%SITE_ARCH%%/auto/Wx/Media/Media.so
+%%SITE_ARCH%%/auto/Wx/PerlTest/PerlTest.so
+%%SITE_ARCH%%/auto/Wx/Print/Print.so
+%%SITE_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.so
+%%SITE_ARCH%%/auto/Wx/Ribbon/Ribbon.so
+%%SITE_ARCH%%/auto/Wx/RichText/RichText.so
+%%SITE_ARCH%%/auto/Wx/STC/STC.so
+%%SITE_ARCH%%/auto/Wx/Socket/Socket.so
+%%SITE_ARCH%%/auto/Wx/WebView/WebView.so
+%%SITE_ARCH%%/auto/Wx/Wx.so
+%%SITE_ARCH%%/auto/Wx/XRC/XRC.so
diff --git a/x11/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index 3ff8ed171d8d..15aa936178f5 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Clipboard
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KING
diff --git a/x11/p5-Clipboard/pkg-plist b/x11/p5-Clipboard/pkg-plist
index a775463ec7ac..6c947cc53e30 100644
--- a/x11/p5-Clipboard/pkg-plist
+++ b/x11/p5-Clipboard/pkg-plist
@@ -8,11 +8,8 @@ bin/clipjoin
 %%SITE_PERL%%/Clipboard/MacPasteboard.pm
 %%SITE_PERL%%/Clipboard/Win32.pm
 %%SITE_PERL%%/Clipboard/Xclip.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clipboard/.packlist
 man/man1/clipaccumulate.1.gz
 man/man1/clipbrowse.1.gz
 man/man1/clipedit.1.gz
 man/man1/clipfilter.1.gz
 man/man1/clipjoin.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clipboard
-@dirrmtry %%SITE_PERL%%/Clipboard
diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile
index 162d29cfa4ef..f7b135bf1ee7 100644
--- a/x11/p5-X11-GUITest/Makefile
+++ b/x11/p5-X11-GUITest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	X11-GUITest
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN \
 		SF/x11guitest/x11guitest/${PORTVERSION}
diff --git a/x11/p5-X11-GUITest/pkg-plist b/x11/p5-X11-GUITest/pkg-plist
index 01cb02eee475..3ab41b2009f3 100644
--- a/x11/p5-X11-GUITest/pkg-plist
+++ b/x11/p5-X11-GUITest/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/X11::GUITest.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/X11/GUITest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest/GUITest.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/X11
+%%SITE_ARCH%%/X11/GUITest.pm
+%%SITE_ARCH%%/auto/X11/GUITest/GUITest.so
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index 47f15e7984f4..e0e033f2db9b 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	X11-IdleTime
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11/p5-X11-IdleTime/pkg-plist b/x11/p5-X11-IdleTime/pkg-plist
index b4115f63d660..661e9979a824 100644
--- a/x11/p5-X11-IdleTime/pkg-plist
+++ b/x11/p5-X11-IdleTime/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/X11/IdleTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/IdleTime/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/IdleTime/IdleTime.so
+%%SITE_ARCH%%/X11/IdleTime.pm
+%%SITE_ARCH%%/auto/X11/IdleTime/IdleTime.so
 %%PERL5_MAN3%%/X11::IdleTime.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/IdleTime
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/X11
diff --git a/x11/p5-X11-Protocol/Makefile b/x11/p5-X11-Protocol/Makefile
index ee12127baae7..44403bc25ff1 100644
--- a/x11/p5-X11-Protocol/Makefile
+++ b/x11/p5-X11-Protocol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	X11-Protocol
 PORTVERSION=	0.56
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11/p5-X11-Protocol/pkg-plist b/x11/p5-X11-Protocol/pkg-plist
index 0557aaa70fe1..f5230893953e 100644
--- a/x11/p5-X11-Protocol/pkg-plist
+++ b/x11/p5-X11-Protocol/pkg-plist
@@ -31,10 +31,3 @@
 %%SITE_PERL%%/X11/Protocol/Ext/SHAPE.pm
 %%SITE_PERL%%/X11/Protocol/Ext/XC_MISC.pm
 %%SITE_PERL%%/X11/Protocol/Ext/XFree86_Misc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Protocol/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Protocol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
-@dirrmtry %%SITE_PERL%%/X11/Protocol/Ext
-@dirrmtry %%SITE_PERL%%/X11/Protocol/Connection
-@dirrmtry %%SITE_PERL%%/X11/Protocol
-@dirrmtry %%SITE_PERL%%/X11
diff --git a/x11/p5-X11-Resolution/Makefile b/x11/p5-X11-Resolution/Makefile
index cff62dba23ac..00297b98ad23 100644
--- a/x11/p5-X11-Resolution/Makefile
+++ b/x11/p5-X11-Resolution/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	X11-Resolution
 PORTVERSION=	0.0.0
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11/p5-X11-Resolution/pkg-plist b/x11/p5-X11-Resolution/pkg-plist
index 45a73a8f2a78..6c8f2c301797 100644
--- a/x11/p5-X11-Resolution/pkg-plist
+++ b/x11/p5-X11-Resolution/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/X11::Resolution.3.gz
 %%SITE_PERL%%/X11/Resolution.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Resolution/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Resolution
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
-@dirrmtry %%SITE_PERL%%/X11
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 221546d60cd0..3dc54da86567 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-conf
 PORTVERSION=	4.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfconf-${PORTVERSION}
@@ -57,8 +57,4 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MPERL}
-	@${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
-.endif
 .include <bsd.port.mk>
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index bbb8f70791f2..03f867c80525 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -73,18 +73,12 @@ share/dbus-1/services/org.xfce.Xfconf.service
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfconf.mo
 %%PERLBIND%%%%PERL5_MAN3%%/Xfce4::Xfconf.3.gz
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/.packlist
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/Files.pm
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf.pm
-%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf
-%%PERLBIND%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4
-%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install
-%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf
-%%PERLBIND%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4
+%%PERLBIND%%%%SITE_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
+%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/Files.pm
+%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h
+%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h
+%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap
+%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf.pm
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
 %%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES