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

62 files changed, 206 insertions, 170 deletions

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