summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/p5-Error/Makefile1
-rw-r--r--lang/p5-Error/pkg-plist6
-rw-r--r--lang/p5-Expect/Makefile5
-rw-r--r--lang/p5-Expect/pkg-plist8
-rw-r--r--lang/p5-Scalar-List-Utils/pkg-plist18
-rw-r--r--lang/p5-Switch/Makefile5
-rw-r--r--lang/p5-Switch/pkg-plist6
-rw-r--r--lang/p5-Tcl/Makefile1
-rw-r--r--lang/p5-Tcl/pkg-plist10
-rw-r--r--lang/p5-ePerl/Makefile1
-rw-r--r--lang/p5-ePerl/pkg-plist20
-rw-r--r--lang/perl5.10/pkg-plist12
-rw-r--r--lang/perl5.12/pkg-plist12
-rw-r--r--lang/perl5.14/pkg-plist12
-rw-r--r--lang/perl5.16/pkg-plist12
-rw-r--r--lang/perl5.6/pkg-plist10
-rw-r--r--lang/perl5.8/pkg-plist12
-rw-r--r--lang/perl5/pkg-plist10
-rw-r--r--lang/ruby-perl/pkg-plist10
19 files changed, 83 insertions, 88 deletions
diff --git a/lang/p5-Error/Makefile b/lang/p5-Error/Makefile
index 6226a316af26..51d3a8806e60 100644
--- a/lang/p5-Error/Makefile
+++ b/lang/p5-Error/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to provide Error/exception support for perl: Error
PERL_CONFIGURE= YES
MAN3= Error.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/lang/p5-Error/pkg-plist b/lang/p5-Error/pkg-plist
index 71a183710826..e8875e37ddc9 100644
--- a/lang/p5-Error/pkg-plist
+++ b/lang/p5-Error/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Error.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Error/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Error 2>/dev/null || true
+%%SITE_PERL%%/Error.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error 2>/dev/null || true
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index 814c268b3b52..ceb99eef7fb8 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Perl module inspired by the Tcl version of Expect
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO/Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Stty.pm:${PORTSDIR}/devel/p5-IO-Stty
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO/Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
+ ${SITE_PERL}/IO/Stty.pm:${PORTSDIR}/devel/p5-IO-Stty
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Expect.3
.include <bsd.port.mk>
diff --git a/lang/p5-Expect/pkg-plist b/lang/p5-Expect/pkg-plist
index 04c3ce025fb5..edc73e0e5fce 100644
--- a/lang/p5-Expect/pkg-plist
+++ b/lang/p5-Expect/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Expect.pod
-lib/perl5/site_perl/%%PERL_VER%%/Expect.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Expect/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Expect 2>/dev/null || true
+%%SITE_PERL%%/Expect.pod
+%%SITE_PERL%%/Expect.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect 2>/dev/null || true
diff --git a/lang/p5-Scalar-List-Utils/pkg-plist b/lang/p5-Scalar-List-Utils/pkg-plist
index a36c83f0f0ef..c202f3eda11f 100644
--- a/lang/p5-Scalar-List-Utils/pkg-plist
+++ b/lang/p5-Scalar-List-Utils/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util/Util.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util/Util.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Scalar/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/List/Util.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/List 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/Util.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/Util.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Scalar/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/List/Util.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Scalar 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/List 2>/dev/null || true
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index 9a7e05ccda23..574e70291891 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Switch - A switch statement for Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
+ ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Switch.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/lang/p5-Switch/pkg-plist b/lang/p5-Switch/pkg-plist
index 8fed5517e612..6dadc139d1ff 100644
--- a/lang/p5-Switch/pkg-plist
+++ b/lang/p5-Switch/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Switch/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Switch.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Switch 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch/.packlist
+%%SITE_PERL%%/Switch.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch 2>/dev/null || true
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index b6bf7952aa48..fd57d0277e8d 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+= POLLUTE=1
CONFIGURE_ENV+= PREFIX=${PREFIX}
WRKSRC= ${WRKDIR}/${PORTNAME}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tcl.3
.include <bsd.port.mk>
diff --git a/lang/p5-Tcl/pkg-plist b/lang/p5-Tcl/pkg-plist
index e75d422354b1..d06b92d73503 100644
--- a/lang/p5-Tcl/pkg-plist
+++ b/lang/p5-Tcl/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tcl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tcl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tcl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl
+%%SITE_PERL%%/%%PERL_ARCH%%/Tcl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tcl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tcl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl
diff --git a/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile
index ef56af3cece1..484a101f04e4 100644
--- a/lang/p5-ePerl/Makefile
+++ b/lang/p5-ePerl/Makefile
@@ -19,6 +19,5 @@ COMMENT= Perl Modules of ePerl package: Parse::ePerl, Apache::ePerl
PERL_CONFIGURE= yes
MAN3= Parse::ePerl.3 Apache::ePerl.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/lang/p5-ePerl/pkg-plist b/lang/p5-ePerl/pkg-plist
index 34c6f4866d60..8a338de6974f 100644
--- a/lang/p5-ePerl/pkg-plist
+++ b/lang/p5-ePerl/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ePerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Parse/ePerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Parse
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
+%%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/ePerl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Parse
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/lang/perl5.10/pkg-plist b/lang/perl5.10/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.10/pkg-plist
+++ b/lang/perl5.10/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.12/pkg-plist b/lang/perl5.12/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.12/pkg-plist
+++ b/lang/perl5.12/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.6/pkg-plist b/lang/perl5.6/pkg-plist
index 81a9ea1ce296..ec2a2459167c 100644
--- a/lang/perl5.6/pkg-plist
+++ b/lang/perl5.6/pkg-plist
@@ -898,11 +898,11 @@ lib/perl5/%%PERL_VER%%/validate.pl
lib/perl5/%%PERL_VER%%/vars.pm
lib/perl5/%%PERL_VER%%/warnings.pm
lib/perl5/%%PERL_VER%%/warnings/register.pm
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
diff --git a/lang/perl5.8/pkg-plist b/lang/perl5.8/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.8/pkg-plist
+++ b/lang/perl5.8/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5/pkg-plist b/lang/perl5/pkg-plist
index 81a9ea1ce296..ec2a2459167c 100644
--- a/lang/perl5/pkg-plist
+++ b/lang/perl5/pkg-plist
@@ -898,11 +898,11 @@ lib/perl5/%%PERL_VER%%/validate.pl
lib/perl5/%%PERL_VER%%/vars.pm
lib/perl5/%%PERL_VER%%/warnings.pm
lib/perl5/%%PERL_VER%%/warnings/register.pm
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
diff --git a/lang/ruby-perl/pkg-plist b/lang/ruby-perl/pkg-plist
index 30830750ff66..82abc52fb36f 100644
--- a/lang/ruby-perl/pkg-plist
+++ b/lang/ruby-perl/pkg-plist
@@ -9,8 +9,8 @@
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ruby.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/Ruby.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/Ruby.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby
+%%SITE_PERL%%/%%PERL_ARCH%%/Ruby.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby/Ruby.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby/Ruby.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby