Change the way Perl modules are installed, update the default Perl to 5.18.

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.

PR:		194969
Differential Revision:	https://reviews.freebsd.org/D1019
Exp-run by:	antoine
Reviewed by:	perl@
Approved by:	portmgr

65 files changed, 57 insertions, 59 deletions

diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 45c5d96dfb2..e3f04b66a49 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 327abd86314..54e3288fc45 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 dcaf9c0cbc8..e9bed4ace74 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 54207b16186..a60b9c122d1 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 c5d57c5cb94..006bd510712 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 242514ef17f..f62de3f4c06 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 31a2fd47aee..85c04813afd 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 cb490433d78..241295487af 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 9ca69f3a9dd..ad3b1735781 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 4f46b6b8fa6..c2885a99e58 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 200dd765ab5..0c2e36909c9 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 b418a8a5eb8..50e50b5aa20 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 8eedcb242e0..6030d4d9174 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 b497ba0c456..0a635ea1f34 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 8525048aa3c..5fcbca58f20 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 7a7b74b2067..909c136f8f1 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 7dfb06e5764..56b0372e9a9 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 49f8ef10cc8..bf635c2eb65 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 6cdce651522..958ba3ec965 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 3073c11788c..c8f736be287 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 f62840d4e5e..22fba5d9295 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 8db11d97878..725b1a25f24 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 02fb9ada6cd..4d41223a3eb 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 810eab93b54..db0370ecddf 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 52b9c30dd3b..b9f65ae2199 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 d474298b58b..8bec2b7b5df 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 f545c081547..1b4285c3757 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 967c3940127..cb989e9bdfe 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 8e02bc41299..f8b0432ce7e 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 eecc519ed93..8190e019e4c 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 502134aa21b..b8c82fc93e7 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 e1d83d36f39..be42f8bbdc3 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 6e93673edde..bc1b6aefdc5 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 4c0f6a40dc6..f228f13fcd2 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 f02663d5c52..21542c2d4de 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 1988dcf4c0d..c8e36f7bb29 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 d4ba1dae30a..747bd3845f4 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 1d977f3ca5e..64c69e51a93 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 b3aed3601f5..ea1c55deb9c 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 90889f9e6ea..be0641514e7 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 982cb50db01..46810e26a64 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 f01ee609b53..1b0b8864da2 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 6f7d0871dc3..512bba7cbae 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 5e08f12cb13..c1fe4324dc2 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 626c516d22c..9b0c4f04070 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 ef245ff9db9..703ad7ab581 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 cd08b79132a..b4c2775f1ad 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 bc1382aa167..a005b417bdb 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 0c97557d91c..5a06d9a3ac7 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 63f6df4df97..1283dd24150 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 570f964b13d..e83ae39607d 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 443c57c8c87..311e0e08adc 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 cbb222db706..144b5cc5a92 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 d5275e75808..1a4d9a7089f 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 7c325807bd5..35d5b334a4d 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 cdb9a3221ab..6ec95d32026 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 a70231c4f99..8edd240ffc4 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 7d109fa6c7c..a54a35a581c 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 dac4e9c524a..14a43d2bd8e 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 ef02f432912..e01c76fccd3 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 d76e8ca2886..f7c9aecddbe 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 fa175edbac4..b230da13969 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 412b739785b..cc347fcaea3 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 5756708e0a0..cd9f8438485 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 0b15f306200..ec74a915b1d 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