aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2003-10-24 12:05:09 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2003-10-24 12:05:09 +0000
commitc634b4bb839753aec2ae1040e2c80a5282402cb8 (patch)
treed8b3fc97550f860aeb41c57751d2550e9ad6273e /www
parent386f40a6b587557ff9ef6bed9fccca2490a5d78d (diff)
downloadports-c634b4bb839753aec2ae1040e2c80a5282402cb8.tar.gz
ports-c634b4bb839753aec2ae1040e2c80a5282402cb8.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/bins/Makefile2
-rw-r--r--www/cgi-lib.pl/pkg-plist2
-rw-r--r--www/cybercalendar/Makefile8
-rw-r--r--www/html2wml/Makefile2
-rw-r--r--www/htmlobject/Makefile1
-rw-r--r--www/htmlobject/pkg-plist38
-rw-r--r--www/htmlpp/pkg-plist12
-rw-r--r--www/interchange/Makefile2
-rw-r--r--www/jdresolve/Makefile2
-rw-r--r--www/ljdeps/Makefile2
-rw-r--r--www/mod_perl/Makefile3
-rw-r--r--www/mod_perl/pkg-plist140
-rw-r--r--www/mod_perl2/Makefile1
-rw-r--r--www/p5-Apache-ASP/Makefile32
-rw-r--r--www/p5-Apache-AddHostPath/Makefile1
-rw-r--r--www/p5-Apache-AddHostPath/pkg-plist10
-rw-r--r--www/p5-Apache-Admin-Config/Makefile1
-rw-r--r--www/p5-Apache-Admin-Config/pkg-plist14
-rw-r--r--www/p5-Apache-AntiSpam/Makefile6
-rw-r--r--www/p5-Apache-AntiSpam/pkg-plist18
-rw-r--r--www/p5-Apache-Archive/Makefile3
-rw-r--r--www/p5-Apache-Archive/pkg-plist16
-rw-r--r--www/p5-Apache-AuthCookie/Makefile3
-rw-r--r--www/p5-Apache-AuthCookie/pkg-plist12
-rw-r--r--www/p5-Apache-AuthTicket/Makefile6
-rw-r--r--www/p5-Apache-AuthTicket/pkg-plist10
-rw-r--r--www/p5-Apache-AuthenCache/Makefile3
-rw-r--r--www/p5-Apache-AuthenCache/pkg-plist10
-rw-r--r--www/p5-Apache-AuthenURL/Makefile3
-rw-r--r--www/p5-Apache-AuthenURL/pkg-plist6
-rw-r--r--www/p5-Apache-AutoIndex/Makefile9
-rw-r--r--www/p5-Apache-AutoIndex/pkg-plist12
-rw-r--r--www/p5-Apache-Clean/Makefile1
-rw-r--r--www/p5-Apache-Clean2/Makefile1
-rw-r--r--www/p5-Apache-Compress/Makefile1
-rw-r--r--www/p5-Apache-ConfigFile/pkg-plist10
-rw-r--r--www/p5-Apache-DumpHeaders/Makefile3
-rw-r--r--www/p5-Apache-DumpHeaders/pkg-plist12
-rw-r--r--www/p5-Apache-Icon/Makefile3
-rw-r--r--www/p5-Apache-Icon/pkg-plist10
-rw-r--r--www/p5-Apache-Language/Makefile5
-rw-r--r--www/p5-Apache-Language/pkg-plist20
-rw-r--r--www/p5-Apache-MP3/Makefile3
-rw-r--r--www/p5-Apache-MP3/pkg-plist100
-rw-r--r--www/p5-Apache-NNTPGateway/Makefile7
-rw-r--r--www/p5-Apache-NNTPGateway/pkg-plist10
-rw-r--r--www/p5-Apache-PageKit/Makefile3
-rw-r--r--www/p5-Apache-PageKit/pkg-plist32
-rw-r--r--www/p5-Apache-Peek/Makefile5
-rw-r--r--www/p5-Apache-Peek/pkg-plist10
-rw-r--r--www/p5-Apache-Radius/Makefile4
-rw-r--r--www/p5-Apache-Radius/pkg-plist4
-rw-r--r--www/p5-Apache-Reload/Makefile1
-rw-r--r--www/p5-Apache-Reload/pkg-plist10
-rw-r--r--www/p5-Apache-SSI/Makefile2
-rw-r--r--www/p5-Apache-Session-PHP/Makefile7
-rw-r--r--www/p5-Apache-Session-PHP/pkg-plist10
-rw-r--r--www/p5-Apache-Session/Makefile2
-rw-r--r--www/p5-Apache-Session/pkg-plist70
-rw-r--r--www/p5-Apache-SubProcess/Makefile2
-rw-r--r--www/p5-Apache-SubProcess/pkg-plist14
-rw-r--r--www/p5-ApacheBench/pkg-plist24
-rw-r--r--www/p5-AxKit-XSP-Cookie/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Cookie/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-ESQL/Makefile2
-rw-r--r--www/p5-AxKit-XSP-ESQL/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Exception/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Exception/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-IfParam/Makefile2
-rw-r--r--www/p5-AxKit-XSP-IfParam/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Param/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Param/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-PerForm/Makefile2
-rw-r--r--www/p5-AxKit-XSP-PerForm/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Sendmail/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Sendmail/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Util/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Util/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-WebUtils/Makefile2
-rw-r--r--www/p5-AxKit-XSP-WebUtils/pkg-plist12
-rw-r--r--www/p5-AxKit/Makefile2
-rw-r--r--www/p5-AxKit/pkg-plist102
-rw-r--r--www/p5-Bundle-Slash/Makefile3
-rw-r--r--www/p5-Bundle-Slash/pkg-plist10
-rw-r--r--www/p5-Bundle-Sledge/Makefile3
-rw-r--r--www/p5-Bundle-Sledge/pkg-plist10
-rw-r--r--www/p5-CGI-Application/Makefile3
-rw-r--r--www/p5-CGI-Application/pkg-plist14
-rw-r--r--www/p5-CGI-ArgChecker/Makefile3
-rw-r--r--www/p5-CGI-ArgChecker/pkg-plist10
-rw-r--r--www/p5-CGI-Cache/Makefile3
-rw-r--r--www/p5-CGI-Cache/pkg-plist10
-rw-r--r--www/p5-CGI-FastTemplate/Makefile1
-rw-r--r--www/p5-CGI-FastTemplate/pkg-plist10
-rw-r--r--www/p5-CGI-Minimal/pkg-plist12
-rw-r--r--www/p5-CGI-Session/Makefile2
-rw-r--r--www/p5-CGI-Session/pkg-plist94
-rw-r--r--www/p5-CGI-SpeedyCGI/pkg-plist10
-rw-r--r--www/p5-CGI-Upload/Makefile5
-rw-r--r--www/p5-CGI-Upload/pkg-plist10
-rw-r--r--www/p5-CGI-modules/Makefile3
-rw-r--r--www/p5-CGI-modules/pkg-plist20
-rw-r--r--www/p5-CGI.pm/Makefile4
-rw-r--r--www/p5-FastCGI/Makefile1
-rw-r--r--www/p5-FastCGI/pkg-plist10
-rw-r--r--www/p5-GtkHTML/Makefile4
-rw-r--r--www/p5-GtkHTML/pkg-plist32
-rw-r--r--www/p5-HTML-CalendarMonthSimple/Makefile2
-rw-r--r--www/p5-HTML-CalendarMonthSimple/pkg-plist12
-rw-r--r--www/p5-HTML-Clean/pkg-plist16
-rw-r--r--www/p5-HTML-Element-Extended/Makefile2
-rw-r--r--www/p5-HTML-Element-Extended/pkg-plist14
-rw-r--r--www/p5-HTML-Embperl/Makefile6
-rw-r--r--www/p5-HTML-Embperl/pkg-plist46
-rw-r--r--www/p5-HTML-FromText/Makefile1
-rw-r--r--www/p5-HTML-FromText/pkg-plist10
-rw-r--r--www/p5-HTML-Navigation/Makefile3
-rw-r--r--www/p5-HTML-Navigation/pkg-plist10
-rw-r--r--www/p5-HTML-Pager/Makefile3
-rw-r--r--www/p5-HTML-Pager/pkg-plist6
-rw-r--r--www/p5-HTML-QuickCheck/Makefile1
-rw-r--r--www/p5-HTML-QuickCheck/pkg-plist10
-rw-r--r--www/p5-HTML-SimpleParse/Makefile1
-rw-r--r--www/p5-HTML-Stream/Makefile1
-rw-r--r--www/p5-HTML-Stream/pkg-plist10
-rw-r--r--www/p5-HTML-Summary/Makefile2
-rw-r--r--www/p5-HTML-Summary/pkg-plist22
-rw-r--r--www/p5-HTML-Table/pkg-plist10
-rw-r--r--www/p5-HTML-TableExtract/Makefile3
-rw-r--r--www/p5-HTML-TableExtract/pkg-plist6
-rw-r--r--www/p5-HTML-TableLayout/pkg-plist20
-rw-r--r--www/p5-HTML-Tagset/pkg-plist10
-rw-r--r--www/p5-HTML-Template-Associate/Makefile1
-rw-r--r--www/p5-HTML-Template-Expr/Makefile8
-rw-r--r--www/p5-HTML-Template-Expr/pkg-plist14
-rw-r--r--www/p5-HTML-Template/pkg-plist10
-rw-r--r--www/p5-HTML-Tree/Makefile2
-rw-r--r--www/p5-HTML-Tree/pkg-plist28
-rw-r--r--www/p5-HTML-Webmake/Makefile8
-rw-r--r--www/p5-HTML-Webmake/pkg-plist128
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/Makefile1
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/pkg-plist16
-rw-r--r--www/p5-HTML/pkg-plist6
-rw-r--r--www/p5-HTTP-BrowserDetect/pkg-plist10
-rw-r--r--www/p5-HTTP-DAV/Makefile4
-rw-r--r--www/p5-HTTP-DAV/pkg-plist24
-rw-r--r--www/p5-HTTP-GHTTP/Makefile1
-rw-r--r--www/p5-HTTP-GHTTP/pkg-plist14
-rw-r--r--www/p5-HTTP-MobileAgent/Makefile2
-rw-r--r--www/p5-HTTP-MobileAgent/pkg-plist24
-rw-r--r--www/p5-HTTPD-Log-Filter/Makefile4
-rw-r--r--www/p5-HTTPD-Log-Filter/pkg-plist14
-rw-r--r--www/p5-HTTPD-Tools/Makefile1
-rw-r--r--www/p5-HTTPD-Tools/pkg-plist40
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile1
-rw-r--r--www/p5-HTTPD-User-Manage/pkg-plist40
-rw-r--r--www/p5-MasonX-Request-WithApacheSession/pkg-plist2
-rw-r--r--www/p5-ParallelUA/Makefile6
-rw-r--r--www/p5-ParallelUA/pkg-plist36
-rw-r--r--www/p5-Sledge-Plugin-CacheContent/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-CacheContent/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-Download/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-Download/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-Dumper/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-Dumper/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-HTML2HDML/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-HTML2HDML/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-Log/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-Log/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-NoCache/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-NoCache/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-SaveUpload/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-SaveUpload/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-ScratchPad/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-ScratchPad/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-XSLT/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-XSLT/pkg-plist10
-rw-r--r--www/p5-Sledge-SessionManager-CookieStore/Makefile2
-rw-r--r--www/p5-Sledge-SessionManager-CookieStore/pkg-plist10
-rw-r--r--www/p5-Sledge-Template-Expr/Makefile2
-rw-r--r--www/p5-Sledge-Template-Expr/pkg-plist10
-rw-r--r--www/p5-Sledge/Makefile2
-rw-r--r--www/p5-Sledge/pkg-plist98
-rw-r--r--www/p5-Template-Plugin-Comma/Makefile1
-rw-r--r--www/p5-Template-Toolkit/Makefile2
-rw-r--r--www/p5-Template-Toolkit/pkg-plist204
-rw-r--r--www/p5-URI-Sequin/Makefile1
-rw-r--r--www/p5-URI-Sequin/pkg-plist20
-rw-r--r--www/p5-WWW-Automate/Makefile2
-rw-r--r--www/p5-WWW-Automate/pkg-plist10
-rw-r--r--www/p5-WWW-IMDb/Makefile3
-rw-r--r--www/p5-WWW-IMDb/pkg-plist14
-rw-r--r--www/p5-WWW-Robot/Makefile3
-rw-r--r--www/p5-WWW-Robot/pkg-plist10
-rw-r--r--www/p5-WWW-Search-Google/Makefile6
-rw-r--r--www/p5-WWW-Search-Google/pkg-plist14
-rw-r--r--www/p5-libservlet/Makefile3
-rw-r--r--www/p5-libservlet/pkg-plist88
-rw-r--r--www/reportmagic/Makefile8
-rw-r--r--www/rt2/Makefile2
-rw-r--r--www/rt3/Makefile2
-rw-r--r--www/rt32/Makefile2
-rw-r--r--www/rt34/Makefile2
-rw-r--r--www/rt36/Makefile2
-rw-r--r--www/smb2www/Makefile2
-rw-r--r--www/swish++/pkg-plist2
-rw-r--r--www/w3mir/Makefile2
-rw-r--r--www/w3mir/pkg-plist10
-rw-r--r--www/wwwstat/pkg-plist6
211 files changed, 1291 insertions, 1339 deletions
diff --git a/www/bins/Makefile b/www/bins/Makefile
index a29c716b10f5..8549cd5038ac 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -35,7 +35,7 @@ USE_REINPLACE= yes
NO_BUILD= yes
# perlbase
-PBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PBASE= ${SITE_PERL}
# additional scripts
BINS_SCRIPTS= bins_txt2xml
diff --git a/www/cgi-lib.pl/pkg-plist b/www/cgi-lib.pl/pkg-plist
index 834510c6fceb..ee56a48cfcf1 100644
--- a/www/cgi-lib.pl/pkg-plist
+++ b/www/cgi-lib.pl/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/cgi-lib.pl
+%%SITE_PERL%%/cgi-lib.pl
diff --git a/www/cybercalendar/Makefile b/www/cybercalendar/Makefile
index e6f4af4414fb..58a42726c9ce 100644
--- a/www/cybercalendar/Makefile
+++ b/www/cybercalendar/Makefile
@@ -13,10 +13,10 @@ DISTNAME= CyberCalendar_${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= CyberCalendar is a web based calendar program written in perl
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
+ ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
+ ${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite
WRKSRC= ${WRKDIR}/CyberCalendar
diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index 884e97759c8b..d8ac63480594 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
USE_PERL5= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN1= html2wml.1
diff --git a/www/htmlobject/Makefile b/www/htmlobject/Makefile
index 0154ee7b90ac..a8e2c99b7782 100644
--- a/www/htmlobject/Makefile
+++ b/www/htmlobject/Makefile
@@ -18,7 +18,6 @@ COMMENT= HTML Document Object
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTMLObject::Base.3 HTMLObject::FrameSet.3 HTMLObject::GetCookie.3 \
HTMLObject::Normal.3 HTMLObject::ReadCookie.3
diff --git a/www/htmlobject/pkg-plist b/www/htmlobject/pkg-plist
index 46e1dbb5c56f..deae218c0f06 100644
--- a/www/htmlobject/pkg-plist
+++ b/www/htmlobject/pkg-plist
@@ -1,19 +1,19 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/FrameSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/GetCookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/Normal.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/ReadCookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Base/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/FrameSet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/GetCookie/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Normal/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/ReadCookie/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTMLObject/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTMLObject
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Base
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/FrameSet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/GetCookie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Normal
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/ReadCookie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTMLObject
+%%SITE_PERL%%/HTMLObject/Base.pm
+%%SITE_PERL%%/HTMLObject/FrameSet.pm
+%%SITE_PERL%%/HTMLObject/GetCookie.pm
+%%SITE_PERL%%/HTMLObject/Normal.pm
+%%SITE_PERL%%/HTMLObject/ReadCookie.pm
+%%SITE_PERL%%/auto/HTMLObject/Base/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/FrameSet/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/GetCookie/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/Normal/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/ReadCookie/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTMLObject/.packlist
+@dirrm %%SITE_PERL%%/HTMLObject
+@dirrm %%SITE_PERL%%/auto/HTMLObject/Base
+@dirrm %%SITE_PERL%%/auto/HTMLObject/FrameSet
+@dirrm %%SITE_PERL%%/auto/HTMLObject/GetCookie
+@dirrm %%SITE_PERL%%/auto/HTMLObject/Normal
+@dirrm %%SITE_PERL%%/auto/HTMLObject/ReadCookie
+@dirrm %%SITE_PERL%%/auto/HTMLObject
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTMLObject
diff --git a/www/htmlpp/pkg-plist b/www/htmlpp/pkg-plist
index d95544535a15..5178cdf916ba 100644
--- a/www/htmlpp/pkg-plist
+++ b/www/htmlpp/pkg-plist
@@ -5,12 +5,12 @@ bin/guru.def
bin/macros.def
bin/prelude.def
bin/guru.fmt
-lib/perl5/site_perl/%%PERL_VER%%/htmlpp.d
-lib/perl5/site_perl/%%PERL_VER%%/findfile.pl
-lib/perl5/site_perl/%%PERL_VER%%/sflcvdp.pl
-lib/perl5/site_perl/%%PERL_VER%%/sfldate.pl
-lib/perl5/site_perl/%%PERL_VER%%/shellwd.pl
-lib/perl5/site_perl/%%PERL_VER%%/textdb.pl
+%%SITE_PERL%%/htmlpp.d
+%%SITE_PERL%%/findfile.pl
+%%SITE_PERL%%/sflcvdp.pl
+%%SITE_PERL%%/sfldate.pl
+%%SITE_PERL%%/shellwd.pl
+%%SITE_PERL%%/textdb.pl
share/doc/htmlpp/index.htm
share/doc/htmlpp/index1.htm
share/doc/htmlpp/index2.htm
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index b77f8afc35ce..33078abf6e09 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statemen
USE_PERL5= yes
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}
MAN1= configdump.1 config_prog.1 expire.1 localize.1 \
diff --git a/www/jdresolve/Makefile b/www/jdresolve/Makefile
index 76d131e35c61..86c7a1cefa83 100644
--- a/www/jdresolve/Makefile
+++ b/www/jdresolve/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.jdrowell.com/projects/jdresolve/
MAINTAINER= christophe@labouisse.org
COMMENT= A IP addresse to hostname program for httpd log files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
diff --git a/www/ljdeps/Makefile b/www/ljdeps/Makefile
index 72e2b6b03b2a..51f36a97da29 100644
--- a/www/ljdeps/Makefile
+++ b/www/ljdeps/Makefile
@@ -36,7 +36,7 @@ RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
${SITE_PERL}/Unicode/MapUTF8.pm:${PORTSDIR}/converters/p5-Unicode-MapUTF8
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
EXTRACT_ONLY= # Empty
NO_BUILD= yes
diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index 7f897c3851aa..65d0d7d4c163 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Embeds a Perl interpreter in the Apache server
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PERL5= YES
@@ -35,7 +35,6 @@ MAN3= Apache.3 Apache::Constants.3 Apache::ExtUtils.3 \
Apache::PerlSections.3 cgi_to_mod_perl.3 \
mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \
mod_perl_tuning.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERLSITEDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
APACHE_PORT?= ${PORTSDIR}/www/apache13
diff --git a/www/mod_perl/pkg-plist b/www/mod_perl/pkg-plist
index 289a934c887c..2b14814a3844 100644
--- a/www/mod_perl/pkg-plist
+++ b/www/mod_perl/pkg-plist
@@ -3,77 +3,77 @@ include/apache/modules/perl/mod_perl.h
include/apache/modules/perl/mod_perl_version.h
include/apache/modules/perl/mod_perl_xs.h
include/apache/modules/perl/perl_PL.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants/Exports.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ExtUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/FakeRequest.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Include.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Leak.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ModuleConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/MyConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Opcode.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Options.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlRun.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlRunXS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlSections.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RedirectLogFix.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Registry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryBB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryLoader.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryNG.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SIG.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/StatINC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Status.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Symbol.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Symdump.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/URI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/httpd_conf.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/src.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/testold.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/ap_config_auto.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/apache_inc.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_version.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_xs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/perl_PL.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/mod_perl.exp
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_cvs.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_hooks.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_hooks.pm.PL
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_method_handlers.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_traps.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_tuning.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Connection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants/Exports.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Debug.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/ExtUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/FakeRequest.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Include.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Leak.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Log.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/ModuleConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/MyConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Opcode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Options.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/PerlRun.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/PerlRunXS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/PerlSections.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RedirectLogFix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Registry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RegistryBB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RegistryLoader.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RegistryNG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Resource.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SIG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/StatINC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Status.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Symbol.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Symdump.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Table.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/URI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/httpd_conf.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/src.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/testold.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/ap_config_auto.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/apache_inc.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_version.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_xs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/perl_PL.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/mod_perl.exp
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_cvs.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_hooks.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_hooks.pm.PL
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_method_handlers.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_traps.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_tuning.pod
libexec/apache/libperl.so
@dirrm include/apache/modules/perl
@dirrm include/apache/modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@unexec rmdir %D/etc/apache 2> /dev/null || true
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 337877356ae5..7b9436e6008a 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -29,7 +29,6 @@ MAN3= Apache::TestRequest.3 Apache::TestSmoke.3 Apache::TestRun.3 \
Apache::Test.3 Apache::TestUtil.3 Apache::Build.3 \
Bundle::Apache2.3 ModPerl::Code.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
APACHE2_PORT?= ${PORTSDIR}/www/apache2
.include <bsd.port.pre.mk>
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 2fc9a45f09a7..385b6048f662 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -15,18 +15,18 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Active Server Pages for Apache with mod_perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Filter.pm:${PORTSDIR}/www/p5-Apache-Filter \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/SSI.pm:${PORTSDIR}/www/p5-Apache-SSI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MLDBM/Sync.pm:${PORTSDIR}/databases/p5-MLDBM-Sync \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Tie/Cache.pm:${PORTSDIR}/devel/p5-Tie-Cache \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/XSLT.pm:${PORTSDIR}/textproc/p5-XML-XSLT \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
+BUILD_DEPENDS= ${SITE_PERL}/Apache/Filter.pm:${PORTSDIR}/www/p5-Apache-Filter \
+ ${SITE_PERL}/Apache/SSI.pm:${PORTSDIR}/www/p5-Apache-SSI \
+ ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
+ ${SITE_PERL}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \
+ ${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
+ ${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/MLDBM/Sync.pm:${PORTSDIR}/databases/p5-MLDBM-Sync \
+ ${SITE_PERL}/Tie/Cache.pm:${PORTSDIR}/devel/p5-Tie-Cache \
+ ${SITE_PERL}/XML/XSLT.pm:${PORTSDIR}/textproc/p5-XML-XSLT \
+ ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -40,10 +40,10 @@ MAN3= Apache::ASP.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
.endif
.include <bsd.port.post.mk>
diff --git a/www/p5-Apache-AddHostPath/Makefile b/www/p5-Apache-AddHostPath/Makefile
index 880dfb16fc32..2608d732d959 100644
--- a/www/p5-Apache-AddHostPath/Makefile
+++ b/www/p5-Apache-AddHostPath/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl interface for transforming a requested URI based on host/port
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AddHostPath.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AddHostPath/pkg-plist b/www/p5-Apache-AddHostPath/pkg-plist
index 09dc462889fd..336c74ba47ff 100644
--- a/www/p5-Apache-AddHostPath/pkg-plist
+++ b/www/p5-Apache-AddHostPath/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AddHostPath.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AddHostPath/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AddHostPath
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AddHostPath.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-Admin-Config/Makefile b/www/p5-Apache-Admin-Config/Makefile
index 0ee841593ff2..fbb7b21a55d9 100644
--- a/www/p5-Apache-Admin-Config/Makefile
+++ b/www/p5-Apache-Admin-Config/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl module to manipulate Apache configuration files
PERL_CONFIGURE= yes
MAN3= Apache::Admin::Config.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e 's/(!\$$)/0 && $1/;' \
diff --git a/www/p5-Apache-Admin-Config/pkg-plist b/www/p5-Apache-Admin-Config/pkg-plist
index 2ae24874878d..de408c3e1b13 100644
--- a/www/p5-Apache-Admin-Config/pkg-plist
+++ b/www/p5-Apache-Admin-Config/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Admin/Config.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Admin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache/Admin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
+%%SITE_PERL%%/Apache/Admin/Config.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache/Admin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AntiSpam/Makefile b/www/p5-Apache-AntiSpam/Makefile
index 26b9bac225a1..bfea28fd5406 100644
--- a/www/p5-Apache-AntiSpam/Makefile
+++ b/www/p5-Apache-AntiSpam/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= AntiSpam filter for web pages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Email/Find.pm:${PORTSDIR}/mail/p5-Email-Find
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Email/Find.pm:${PORTSDIR}/mail/p5-Email-Find
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-AntiSpam/pkg-plist b/www/p5-Apache-AntiSpam/pkg-plist
index dbee9119a782..ab0f54471da8 100644
--- a/www/p5-Apache-AntiSpam/pkg-plist
+++ b/www/p5-Apache-AntiSpam/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam/HTMLEncode.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam/NoSpam.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam/Heuristic.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AntiSpam/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AntiSpam
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AntiSpam.pm
+%%SITE_PERL%%/Apache/AntiSpam/HTMLEncode.pm
+%%SITE_PERL%%/Apache/AntiSpam/NoSpam.pm
+%%SITE_PERL%%/Apache/AntiSpam/Heuristic.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Apache/AntiSpam
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-Archive/Makefile b/www/p5-Apache-Archive/Makefile
index a56070ece6da..5f38baeddb84 100644
--- a/www/p5-Apache-Archive/Makefile
+++ b/www/p5-Apache-Archive/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module that creates a menu to allow perusal of tarball contents
BUILD_DEPENDS= ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Archive.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Archive/pkg-plist b/www/p5-Apache-Archive/pkg-plist
index aa78aea3a7c1..5b50a615ac23 100644
--- a/www/p5-Apache-Archive/pkg-plist
+++ b/www/p5-Apache-Archive/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Archive.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Apache/Archive/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Archive/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Archive
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Apache/Archive
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/Archive.pm
+%%SITE_PERL%%/auto/Apache/Archive/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive
+@dirrm %%SITE_PERL%%/auto/Apache/Archive
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index 96a114d493b0..51248b9b27de 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module to provide custom forms for reauthentication
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
${LOCALBASE}/sbin/apxs:${APACHE_PORT}
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -29,7 +29,6 @@ CONFIGURE_ENV+= APACHE="${PREFIX}/sbin/apache" \
TESTGRP="${CURGRP}" \
TESTPORT="${TESTPORT}"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AuthCookie.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AuthCookie/pkg-plist b/www/p5-Apache-AuthCookie/pkg-plist
index 27577d6136b6..3cf0f8b88c9d 100644
--- a/www/p5-Apache-AuthCookie/pkg-plist
+++ b/www/p5-Apache-AuthCookie/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie/Util.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AuthCookie.pm
+%%SITE_PERL%%/Apache/AuthCookie/Util.pm
+@dirrm %%SITE_PERL%%/Apache/AuthCookie
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 1abc278d3012..8144ef4243d3 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl modules that implement a cookie-based authentication system
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/AuthCookie.pm:${PORTSDIR}/www/p5-Apache-AuthCookie
+BUILD_DEPENDS= ${SITE_PERL}/Apache/AuthCookie.pm:${PORTSDIR}/www/p5-Apache-AuthCookie
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -25,8 +25,8 @@ MAN3= Apache::AuthTicket.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
.endif
.if ${PERL_LEVEL} < 500600
diff --git a/www/p5-Apache-AuthTicket/pkg-plist b/www/p5-Apache-AuthTicket/pkg-plist
index 6ebc5c7b2d8d..6abe3abb4a32 100644
--- a/www/p5-Apache-AuthTicket/pkg-plist
+++ b/www/p5-Apache-AuthTicket/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthTicket.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthTicket/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthTicket
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AuthTicket.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthenCache/Makefile b/www/p5-Apache-AuthenCache/Makefile
index 5e035bcfabe8..3dc85b3c9273 100644
--- a/www/p5-Apache-AuthenCache/Makefile
+++ b/www/p5-Apache-AuthenCache/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash \
${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AuthenCache.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AuthenCache/pkg-plist b/www/p5-Apache-AuthenCache/pkg-plist
index c84aea468239..5d53fbeff37f 100644
--- a/www/p5-Apache-AuthenCache/pkg-plist
+++ b/www/p5-Apache-AuthenCache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthenCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenCache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenCache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AuthenCache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthenURL/Makefile b/www/p5-Apache-AuthenURL/Makefile
index ff606f1129de..5ebfb28e29a9 100644
--- a/www/p5-Apache-AuthenURL/Makefile
+++ b/www/p5-Apache-AuthenURL/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/Apache/AuthenCache.pm:${PORTSDIR}/www/p5-Apache-AuthenCache
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AuthenURL.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AuthenURL/pkg-plist b/www/p5-Apache-AuthenURL/pkg-plist
index 2a6ff2484440..db766e177081 100644
--- a/www/p5-Apache-AuthenURL/pkg-plist
+++ b/www/p5-Apache-AuthenURL/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthenURL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenURL/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenURL
+%%SITE_PERL%%/Apache/AuthenURL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenURL/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenURL
diff --git a/www/p5-Apache-AutoIndex/Makefile b/www/p5-Apache-AutoIndex/Makefile
index d4a309948355..c5df5dd054c1 100644
--- a/www/p5-Apache-AutoIndex/Makefile
+++ b/www/p5-Apache-AutoIndex/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module that can completely replace mod_dir and mod_autoindex
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Language.pm:${PORTSDIR}/www/p5-Apache-Language \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
+ ${SITE_PERL}/${PERL_ARCH}/Apache/Language.pm:${PORTSDIR}/www/p5-Apache-Language \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AutoIndex.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AutoIndex/pkg-plist b/www/p5-Apache-AutoIndex/pkg-plist
index dac00cee7726..6b3750c44c8d 100644
--- a/www/p5-Apache-AutoIndex/pkg-plist
+++ b/www/p5-Apache-AutoIndex/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AutoIndex.dic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AutoIndex.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AutoIndex.dic
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AutoIndex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex
diff --git a/www/p5-Apache-Clean/Makefile b/www/p5-Apache-Clean/Makefile
index f19ff9930a76..267746edb89a 100644
--- a/www/p5-Apache-Clean/Makefile
+++ b/www/p5-Apache-Clean/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Clean.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index f19ff9930a76..267746edb89a 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Clean.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-Compress/Makefile b/www/p5-Apache-Compress/Makefile
index c5641f4745ea..13fe061e5576 100644
--- a/www/p5-Apache-Compress/Makefile
+++ b/www/p5-Apache-Compress/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Compress.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-ConfigFile/pkg-plist b/www/p5-Apache-ConfigFile/pkg-plist
index 14f3936c6dd4..bdd04740a326 100644
--- a/www/p5-Apache-ConfigFile/pkg-plist
+++ b/www/p5-Apache-ConfigFile/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ConfigFile.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
+%%SITE_PERL%%/Apache/ConfigFile.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-DumpHeaders/Makefile b/www/p5-Apache-DumpHeaders/Makefile
index 1e864187560c..0fc38b2285b8 100644
--- a/www/p5-Apache-DumpHeaders/Makefile
+++ b/www/p5-Apache-DumpHeaders/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Watches HTTP transactions under mod_perl, looking at the headers
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
PERL_CONFIGURE= yes
MAN3= Apache::DumpHeaders.3 Apache::ProxyPassThru.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-Apache-DumpHeaders/pkg-plist b/www/p5-Apache-DumpHeaders/pkg-plist
index 2a0aee1b1544..330bdeb2352d 100644
--- a/www/p5-Apache-DumpHeaders/pkg-plist
+++ b/www/p5-Apache-DumpHeaders/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/DumpHeaders.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ProxyPassThru.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/DumpHeaders.pm
+%%SITE_PERL%%/Apache/ProxyPassThru.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-Icon/Makefile b/www/p5-Apache-Icon/Makefile
index 0705c226b62e..95d4dfbe9e0a 100644
--- a/www/p5-Apache-Icon/Makefile
+++ b/www/p5-Apache-Icon/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module that provides an interface for looking up icon images
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Icon.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Icon/pkg-plist b/www/p5-Apache-Icon/pkg-plist
index 19be675b066d..4b576f953b9a 100644
--- a/www/p5-Apache-Icon/pkg-plist
+++ b/www/p5-Apache-Icon/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Icon.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Icon.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon
diff --git a/www/p5-Apache-Language/Makefile b/www/p5-Apache-Language/Makefile
index 9fdd24d65b60..2069e1c9af46 100644
--- a/www/p5-Apache-Language/Makefile
+++ b/www/p5-Apache-Language/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module that provides language-aware object hashes
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Language.3 Apache::Language::Constants.3 \
Apache::Language::DBI.3 Apache::Language::PlainFile.3
diff --git a/www/p5-Apache-Language/pkg-plist b/www/p5-Apache-Language/pkg-plist
index 9e575bf12fa0..bca2e9e3f865 100644
--- a/www/p5-Apache-Language/pkg-plist
+++ b/www/p5-Apache-Language/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language/PlainFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language/Language.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language/Language.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language/PlainFile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language/Language.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language/Language.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 445158e6166f..c43620b7ffb3 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -22,10 +22,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Audio/Wav.pm:${PORTSDIR}/audio/p5-Audio-Wav \
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::MP3.3 \
Apache::MP3::L10N.3 \
Apache::MP3::Playlist.3 \
diff --git a/www/p5-Apache-MP3/pkg-plist b/www/p5-Apache-MP3/pkg-plist
index ec15c577fa6e..522977529696 100644
--- a/www/p5-Apache-MP3/pkg-plist
+++ b/www/p5-Apache-MP3/pkg-plist
@@ -1,49 +1,49 @@
@comment $FreeBSD$
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/Aliases.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/RightToLeft.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ca.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/cs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/de.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/en.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/es.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/fa.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/fi.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/fr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ga.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/he.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/hr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/is.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/it.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ja.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ko.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ms.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nb.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nb_no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nl_be.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nl_nl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nn.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nn_no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/no_no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/pl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ru.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sh.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sk.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/tr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/uk.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/x_marklar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/zh_cn.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/zh_tw.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/Playlist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/Resample.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/Sorted.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/MP3/.packlist
+%%SITE_PERL%%/Apache/MP3.pm
+%%SITE_PERL%%/Apache/MP3/L10N.pm
+%%SITE_PERL%%/Apache/MP3/L10N/Aliases.pm
+%%SITE_PERL%%/Apache/MP3/L10N/RightToLeft.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ar.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ca.pm
+%%SITE_PERL%%/Apache/MP3/L10N/cs.pm
+%%SITE_PERL%%/Apache/MP3/L10N/de.pm
+%%SITE_PERL%%/Apache/MP3/L10N/en.pm
+%%SITE_PERL%%/Apache/MP3/L10N/es.pm
+%%SITE_PERL%%/Apache/MP3/L10N/fa.pm
+%%SITE_PERL%%/Apache/MP3/L10N/fi.pm
+%%SITE_PERL%%/Apache/MP3/L10N/fr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ga.pm
+%%SITE_PERL%%/Apache/MP3/L10N/he.pm
+%%SITE_PERL%%/Apache/MP3/L10N/hr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/is.pm
+%%SITE_PERL%%/Apache/MP3/L10N/it.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ja.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ko.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ms.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nb.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nb_no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nl_be.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nl_nl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nn.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nn_no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/no_no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/pl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ru.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sh.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sk.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/tr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/uk.pm
+%%SITE_PERL%%/Apache/MP3/L10N/x_marklar.pm
+%%SITE_PERL%%/Apache/MP3/L10N/zh_cn.pm
+%%SITE_PERL%%/Apache/MP3/L10N/zh_tw.pm
+%%SITE_PERL%%/Apache/MP3/Playlist.pm
+%%SITE_PERL%%/Apache/MP3/Resample.pm
+%%SITE_PERL%%/Apache/MP3/Sorted.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3/.packlist
share/Apache-MP3/apache_mp3.css
share/Apache-MP3/apache_mp3_fig1.gif
share/Apache-MP3/apache_mp3_help.gif
@@ -54,9 +54,9 @@ share/Apache-MP3/functions.js
share/Apache-MP3/playlist.gif
share/Apache-MP3/right_arrow.gif
share/Apache-MP3/sound.gif
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/MP3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Apache/MP3/L10N
+@dirrm %%SITE_PERL%%/Apache/MP3
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
@dirrm share/Apache-MP3
diff --git a/www/p5-Apache-NNTPGateway/Makefile b/www/p5-Apache-NNTPGateway/Makefile
index a4e01ace6c2a..4e459206a4b8 100644
--- a/www/p5-Apache-NNTPGateway/Makefile
+++ b/www/p5-Apache-NNTPGateway/Makefile
@@ -15,16 +15,15 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= A NNTP interface for mod_perl enabled Apache web server
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/NNTPGateway-${PORTVERSION}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::NNTPGateway.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-NNTPGateway/pkg-plist b/www/p5-Apache-NNTPGateway/pkg-plist
index f82cde879818..5fd095ccb30d 100644
--- a/www/p5-Apache-NNTPGateway/pkg-plist
+++ b/www/p5-Apache-NNTPGateway/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/NNTPGateway.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway/.packlist
+%%SITE_PERL%%/Apache/NNTPGateway.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-PageKit/Makefile b/www/p5-Apache-PageKit/Makefile
index 22d7b0c6c599..77dd551e7043 100644
--- a/www/p5-Apache-PageKit/Makefile
+++ b/www/p5-Apache-PageKit/Makefile
@@ -36,7 +36,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME}
PERL_CONFIGURE= yes
@@ -44,7 +44,6 @@ MAN3= Apache::ErrorReport.3 \
Apache::PageKit.3 \
Apache::PageKit::Model.3 \
Apache::PageKit::Session.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/www/p5-Apache-PageKit/pkg-plist b/www/p5-Apache-PageKit/pkg-plist
index be280d74a929..25a600cd17df 100644
--- a/www/p5-Apache-PageKit/pkg-plist
+++ b/www/p5-Apache-PageKit/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Content.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Param.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Edit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/setup_eg.pl
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ErrorReport.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
+%%SITE_PERL%%/Apache/PageKit/View.pm
+%%SITE_PERL%%/Apache/PageKit/Content.pm
+%%SITE_PERL%%/Apache/PageKit/Model.pm
+%%SITE_PERL%%/Apache/PageKit/Param.pm
+%%SITE_PERL%%/Apache/PageKit/Session.pm
+%%SITE_PERL%%/Apache/PageKit/Config.pm
+%%SITE_PERL%%/Apache/PageKit/Edit.pm
+%%SITE_PERL%%/Apache/setup_eg.pl
+%%SITE_PERL%%/Apache/PageKit.pm
+%%SITE_PERL%%/Apache/ErrorReport.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
%%PORTDOCS%%share/doc/Apache-PageKit/README
%%PORTDOCS%%share/doc/Apache-PageKit/features.xml
%%PORTDOCS%%share/doc/Apache-PageKit/manual.xml
@@ -80,8 +80,8 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Content
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Config
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/PageKit
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache/PageKit 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/www/p5-Apache-Peek/Makefile b/www/p5-Apache-Peek/Makefile
index 4fadea16b6d3..426d1be01add 100644
--- a/www/p5-Apache-Peek/Makefile
+++ b/www/p5-Apache-Peek/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= leo@florida.sarang.net
COMMENT= A perl5 data debugging tool for the XS programmer
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/B/Graph.pm:${PORTSDIR}/devel/p5-B-Graph
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/B/Graph.pm:${PORTSDIR}/devel/p5-B-Graph
PERL_CONFIGURE= YES
MAN3= Apache::Peek.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/www/p5-Apache-Peek/pkg-plist b/www/p5-Apache-Peek/pkg-plist
index 67f839a68cd0..310b29dd793b 100644
--- a/www/p5-Apache-Peek/pkg-plist
+++ b/www/p5-Apache-Peek/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Peek.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Peek.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek
diff --git a/www/p5-Apache-Radius/Makefile b/www/p5-Apache-Radius/Makefile
index a21a2ccc6888..7b733318c132 100644
--- a/www/p5-Apache-Radius/Makefile
+++ b/www/p5-Apache-Radius/Makefile
@@ -16,8 +16,8 @@ DISTNAME= Apache-AuthenRadius-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A perl5 module for providing RADIUS authentication in Apache+mod_perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-Radius/pkg-plist b/www/p5-Apache-Radius/pkg-plist
index e7236a0ae889..1a75ccc6fb03 100644
--- a/www/p5-Apache-Radius/pkg-plist
+++ b/www/p5-Apache-Radius/pkg-plist
@@ -1,2 +1,2 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthenRadius.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius/.packlist
+%%SITE_PERL%%/Apache/AuthenRadius.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius/.packlist
diff --git a/www/p5-Apache-Reload/Makefile b/www/p5-Apache-Reload/Makefile
index ded031f67f9d..df74a886c233 100644
--- a/www/p5-Apache-Reload/Makefile
+++ b/www/p5-Apache-Reload/Makefile
@@ -17,7 +17,6 @@ COMMENT= Reload changed modules
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Reload.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Reload/pkg-plist b/www/p5-Apache-Reload/pkg-plist
index 4adcec1b7886..ed834e651972 100644
--- a/www/p5-Apache-Reload/pkg-plist
+++ b/www/p5-Apache-Reload/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Reload/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Reload.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Reload
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload/.packlist
+%%SITE_PERL%%/Apache/Reload.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index ea62411d7237..76cefd457076 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Apache::SSI - Implement Server Side Includes in Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse
+BUILD_DEPENDS= ${SITE_PERL}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-Session-PHP/Makefile b/www/p5-Apache-Session-PHP/Makefile
index 6f3c7252ff33..b0c0c4c15541 100644
--- a/www/p5-Apache-Session-PHP/Makefile
+++ b/www/p5-Apache-Session-PHP/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
COMMENT= Glue Apache::Session with PHP::Session
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PHP/Session.pm:${PORTSDIR}/www/p5-PHP-Session \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS= ${SITE_PERL}/PHP/Session.pm:${PORTSDIR}/www/p5-PHP-Session \
+ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
+ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Apache::Session::PHP.3 Apache::Session::Serialize::PHP.3 Apache::Session::Store::PHP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Session-PHP/pkg-plist b/www/p5-Apache-Session-PHP/pkg-plist
index c0f27ddcd218..aa9899fe5144 100644
--- a/www/p5-Apache-Session-PHP/pkg-plist
+++ b/www/p5-Apache-Session-PHP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/PHP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/PHP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/PHP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
+%%SITE_PERL%%/Apache/Session/PHP.pm
+%%SITE_PERL%%/Apache/Session/Serialize/PHP.pm
+%%SITE_PERL%%/Apache/Session/Store/PHP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index 617e8fa43f20..3a9805746574 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -51,7 +51,7 @@ MAN3= Apache::Session.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif
.include <bsd.port.post.mk>
diff --git a/www/p5-Apache-Session/pkg-plist b/www/p5-Apache-Session/pkg-plist
index d930a0e6e679..9191ba40da02 100644
--- a/www/p5-Apache-Session/pkg-plist
+++ b/www/p5-Apache-Session/pkg-plist
@@ -1,35 +1,35 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Flex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Oracle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Postgres.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate/ModUniqueId.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate/ModUsertrack.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/File.pm.orig
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/Semaphore.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/Base64.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/Storable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/UUEncode.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/File.pm.orig
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/Oracle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/Postgres.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session
+%%SITE_PERL%%/Apache/Session.pm
+%%SITE_PERL%%/Apache/Session/DB_File.pm
+%%SITE_PERL%%/Apache/Session/File.pm
+%%SITE_PERL%%/Apache/Session/Flex.pm
+%%SITE_PERL%%/Apache/Session/MySQL.pm
+%%SITE_PERL%%/Apache/Session/Oracle.pm
+%%SITE_PERL%%/Apache/Session/Postgres.pm
+%%SITE_PERL%%/Apache/Session/Sybase.pm
+%%SITE_PERL%%/Apache/Session/Generate/MD5.pm
+%%SITE_PERL%%/Apache/Session/Generate/ModUniqueId.pm
+%%SITE_PERL%%/Apache/Session/Generate/ModUsertrack.pm
+%%SITE_PERL%%/Apache/Session/Lock/File.pm
+%%SITE_PERL%%/Apache/Session/Lock/File.pm.orig
+%%SITE_PERL%%/Apache/Session/Lock/MySQL.pm
+%%SITE_PERL%%/Apache/Session/Lock/Null.pm
+%%SITE_PERL%%/Apache/Session/Lock/Semaphore.pm
+%%SITE_PERL%%/Apache/Session/Serialize/Base64.pm
+%%SITE_PERL%%/Apache/Session/Serialize/Storable.pm
+%%SITE_PERL%%/Apache/Session/Serialize/Sybase.pm
+%%SITE_PERL%%/Apache/Session/Serialize/UUEncode.pm
+%%SITE_PERL%%/Apache/Session/Store/DBI.pm
+%%SITE_PERL%%/Apache/Session/Store/DB_File.pm
+%%SITE_PERL%%/Apache/Session/Store/File.pm
+%%SITE_PERL%%/Apache/Session/Store/File.pm.orig
+%%SITE_PERL%%/Apache/Session/Store/MySQL.pm
+%%SITE_PERL%%/Apache/Session/Store/Oracle.pm
+%%SITE_PERL%%/Apache/Session/Store/Postgres.pm
+%%SITE_PERL%%/Apache/Session/Store/Sybase.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
+@dirrm %%SITE_PERL%%/Apache/Session/Store
+@dirrm %%SITE_PERL%%/Apache/Session/Serialize
+@dirrm %%SITE_PERL%%/Apache/Session/Lock
+@dirrm %%SITE_PERL%%/Apache/Session/Generate
+@dirrm %%SITE_PERL%%/Apache/Session
diff --git a/www/p5-Apache-SubProcess/Makefile b/www/p5-Apache-SubProcess/Makefile
index 8f865ad2b6b3..1d4b45581bc6 100644
--- a/www/p5-Apache-SubProcess/Makefile
+++ b/www/p5-Apache-SubProcess/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= larse@isi.edu
COMMENT= Forking and executing subprocesses from mod_perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-SubProcess/pkg-plist b/www/p5-Apache-SubProcess/pkg-plist
index f2718c0db3d9..03f356e980bd 100644
--- a/www/p5-Apache-SubProcess/pkg-plist
+++ b/www/p5-Apache-SubProcess/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SubProcess.pm
-@unexec %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess 2>/dev/null || true
-@unexec %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SubProcess.pm
+@unexec %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess 2>/dev/null || true
+@unexec %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
diff --git a/www/p5-ApacheBench/pkg-plist b/www/p5-ApacheBench/pkg-plist
index 52eb3e6d031b..08cd40f033fc 100644
--- a/www/p5-ApacheBench/pkg-plist
+++ b/www/p5-ApacheBench/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Regression.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Run.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Regression.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Run.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Cookie/Makefile b/www/p5-AxKit-XSP-Cookie/Makefile
index cf845212ee43..2fe166a3d4cf 100644
--- a/www/p5-AxKit-XSP-Cookie/Makefile
+++ b/www/p5-AxKit-XSP-Cookie/Makefile
@@ -17,7 +17,7 @@ COMMENT= An XSP library for setting and getting HTTP cookies
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Cookie.3
diff --git a/www/p5-AxKit-XSP-Cookie/pkg-plist b/www/p5-AxKit-XSP-Cookie/pkg-plist
index 29451e987420..0a56fc181685 100644
--- a/www/p5-AxKit-XSP-Cookie/pkg-plist
+++ b/www/p5-AxKit-XSP-Cookie/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-ESQL/Makefile b/www/p5-AxKit-XSP-ESQL/Makefile
index c58a3a043bb4..9d84512b2086 100644
--- a/www/p5-AxKit-XSP-ESQL/Makefile
+++ b/www/p5-AxKit-XSP-ESQL/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/AxKit/XSP/Util.pm:${PORTSDIR}/www/p5-AxKit-XSP-Util
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::ESQL.3
diff --git a/www/p5-AxKit-XSP-ESQL/pkg-plist b/www/p5-AxKit-XSP-ESQL/pkg-plist
index f3bc1d747972..1f406480c1f8 100644
--- a/www/p5-AxKit-XSP-ESQL/pkg-plist
+++ b/www/p5-AxKit-XSP-ESQL/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/ESQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/ESQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Exception/Makefile b/www/p5-AxKit-XSP-Exception/Makefile
index 663c56b39bdf..1434d7b919ee 100644
--- a/www/p5-AxKit-XSP-Exception/Makefile
+++ b/www/p5-AxKit-XSP-Exception/Makefile
@@ -17,7 +17,7 @@ COMMENT= Exceptions taglib for eXtensible Server Pages plugin for AxKit
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Exception.3
diff --git a/www/p5-AxKit-XSP-Exception/pkg-plist b/www/p5-AxKit-XSP-Exception/pkg-plist
index 7d9bb4ad727c..c5719ed7fea0 100644
--- a/www/p5-AxKit-XSP-Exception/pkg-plist
+++ b/www/p5-AxKit-XSP-Exception/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-IfParam/Makefile b/www/p5-AxKit-XSP-IfParam/Makefile
index 6540dbdf02ab..fb020ee719f3 100644
--- a/www/p5-AxKit-XSP-IfParam/Makefile
+++ b/www/p5-AxKit-XSP-IfParam/Makefile
@@ -17,7 +17,7 @@ COMMENT= Equivalent of XSP Param taglib, but conditional plugin for AxKit
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::IfParam.3
diff --git a/www/p5-AxKit-XSP-IfParam/pkg-plist b/www/p5-AxKit-XSP-IfParam/pkg-plist
index 11092a3bc364..7a2a491b2e6a 100644
--- a/www/p5-AxKit-XSP-IfParam/pkg-plist
+++ b/www/p5-AxKit-XSP-IfParam/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/IfParam.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/IfParam.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Param/Makefile b/www/p5-AxKit-XSP-Param/Makefile
index ea00acfc50f8..bd5c1b3d6394 100644
--- a/www/p5-AxKit-XSP-Param/Makefile
+++ b/www/p5-AxKit-XSP-Param/Makefile
@@ -17,7 +17,7 @@ COMMENT= A namespace wrapper for accessing HTTP request paramaters
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Param.3
diff --git a/www/p5-AxKit-XSP-Param/pkg-plist b/www/p5-AxKit-XSP-Param/pkg-plist
index 05ea6fd3ddd1..fb338161421e 100644
--- a/www/p5-AxKit-XSP-Param/pkg-plist
+++ b/www/p5-AxKit-XSP-Param/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Param.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Param.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-PerForm/Makefile b/www/p5-AxKit-XSP-PerForm/Makefile
index 8a4486a08543..a15732479534 100644
--- a/www/p5-AxKit-XSP-PerForm/Makefile
+++ b/www/p5-AxKit-XSP-PerForm/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/AxKit/XSP/WebUtils.pm:${PORTSDIR}/www/p5-AxKit-XSP-WebUtils
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::PerForm.3
diff --git a/www/p5-AxKit-XSP-PerForm/pkg-plist b/www/p5-AxKit-XSP-PerForm/pkg-plist
index c78914a38084..a7f9cdaa4b6c 100644
--- a/www/p5-AxKit-XSP-PerForm/pkg-plist
+++ b/www/p5-AxKit-XSP-PerForm/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/PerForm.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/PerForm.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Sendmail/Makefile b/www/p5-AxKit-XSP-Sendmail/Makefile
index 2b7c42f627a1..bfd0053a6d78 100644
--- a/www/p5-AxKit-XSP-Sendmail/Makefile
+++ b/www/p5-AxKit-XSP-Sendmail/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Sendmail.3
diff --git a/www/p5-AxKit-XSP-Sendmail/pkg-plist b/www/p5-AxKit-XSP-Sendmail/pkg-plist
index cad6a9736c76..9be0d56f8575 100644
--- a/www/p5-AxKit-XSP-Sendmail/pkg-plist
+++ b/www/p5-AxKit-XSP-Sendmail/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Sendmail.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Sendmail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Util/Makefile b/www/p5-AxKit-XSP-Util/Makefile
index 695000ece144..dfe953cef84e 100644
--- a/www/p5-AxKit-XSP-Util/Makefile
+++ b/www/p5-AxKit-XSP-Util/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/${PERL_ARCH}/Time/Piece.pm:${PORTSDIR}/devel/p5-Time-Piece
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Util.3
diff --git a/www/p5-AxKit-XSP-Util/pkg-plist b/www/p5-AxKit-XSP-Util/pkg-plist
index 363bd92b2009..f017e0569600 100644
--- a/www/p5-AxKit-XSP-Util/pkg-plist
+++ b/www/p5-AxKit-XSP-Util/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-WebUtils/Makefile b/www/p5-AxKit-XSP-WebUtils/Makefile
index 775e0c4bb91c..5511d0f46a1f 100644
--- a/www/p5-AxKit-XSP-WebUtils/Makefile
+++ b/www/p5-AxKit-XSP-WebUtils/Makefile
@@ -18,7 +18,7 @@ COMMENT= Plugin for AxKit that provide utilities for building XSP web apps
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::WebUtils.3
diff --git a/www/p5-AxKit-XSP-WebUtils/pkg-plist b/www/p5-AxKit-XSP-WebUtils/pkg-plist
index cfb9e5f0a192..66a6e3038074 100644
--- a/www/p5-AxKit-XSP-WebUtils/pkg-plist
+++ b/www/p5-AxKit-XSP-WebUtils/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/WebUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/WebUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit/Makefile b/www/p5-AxKit/Makefile
index 869541f90c33..86ff8a988498 100644
--- a/www/p5-AxKit/Makefile
+++ b/www/p5-AxKit/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS= \
${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
# XXX Glitch in this release...
WRKSRC= ${WRKDIR}/${PORTNAME}-1.61
diff --git a/www/p5-AxKit/pkg-plist b/www/p5-AxKit/pkg-plist
index ab58c1828d57..efa1774f8b1c 100644
--- a/www/p5-AxKit/pkg-plist
+++ b/www/p5-AxKit/pkg-plist
@@ -1,44 +1,44 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.xs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/ConfigReader.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/AxPoint.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/HtmlDoc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/LibXSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/PassiveTeX.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/SAXMachines.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/Sablot.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsNITF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsRDF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XPathScript.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/SimpleTaglib.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/TaglibHelper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Makefile.PL
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser/WAPCheck.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Fragment.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Passthru.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/QueryStringCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/FileWrite.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Scalar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/FileSuffix.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/PathInfo.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/QueryString.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/AxKit.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/AxKit.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/AxKit.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.xs
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/ConfigReader.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/AxPoint.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/HtmlDoc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/LibXSLT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/PassiveTeX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/Query.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/SAXMachines.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/Sablot.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsNITF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsRDF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XPathScript.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/SimpleTaglib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/TaglibHelper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Makefile.PL
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser/WAPCheck.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Fragment.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Passthru.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/QueryStringCache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/FileWrite.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Filter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Scalar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/FileSuffix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/PathInfo.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/QueryString.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/UserAgent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/AxKit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.so
share/examples/AxKit/axkit.org/docs/associating_stylesheets.xml
share/examples/AxKit/axkit.org/docs/index.xml
share/examples/AxKit/axkit.org/docs/introduction.dkb
@@ -110,16 +110,16 @@ share/examples/AxKit/docbook_print.xps
share/examples/AxKit/docbook_screen.xps
share/examples/AxKit/docbook_tags.xps
share/examples/AxKit/index.xml
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit
@dirrm share/examples/AxKit/axkit.org/docs/xsp
@dirrm share/examples/AxKit/axkit.org/docs/presentations/tpc2001
@dirrm share/examples/AxKit/axkit.org/docs/presentations
diff --git a/www/p5-Bundle-Slash/Makefile b/www/p5-Bundle-Slash/Makefile
index c9b79c445293..0bae22528d90 100644
--- a/www/p5-Bundle-Slash/Makefile
+++ b/www/p5-Bundle-Slash/Makefile
@@ -46,12 +46,11 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-D
${SITE_PERL}/DBIx/Password.pm:${PORTSDIR}/databases/p5-DBIx-Password
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Bundle::Slash.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/www/p5-Bundle-Slash/pkg-plist b/www/p5-Bundle-Slash/pkg-plist
index 1bc1903feba3..82bda6482a5e 100644
--- a/www/p5-Bundle-Slash/pkg-plist
+++ b/www/p5-Bundle-Slash/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/Slash.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Slash/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Slash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
+%%SITE_PERL%%/Bundle/Slash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
diff --git a/www/p5-Bundle-Sledge/Makefile b/www/p5-Bundle-Sledge/Makefile
index 39e7fd687cdb..59963beeb10a 100644
--- a/www/p5-Bundle-Sledge/Makefile
+++ b/www/p5-Bundle-Sledge/Makefile
@@ -45,12 +45,11 @@ PM_DEPENDS+= ${SITE_PERL}/Data/Properties.pm:${PORTSDIR}/devel/p5-Data-Propertie
PM_DEPENDS+= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
PM_DEPENDS+= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Bundle::Sledge.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/www/p5-Bundle-Sledge/pkg-plist b/www/p5-Bundle-Sledge/pkg-plist
index 4ac92a387cdd..820f5f823258 100644
--- a/www/p5-Bundle-Sledge/pkg-plist
+++ b/www/p5-Bundle-Sledge/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/Sledge.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Sledge/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Sledge 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
+%%SITE_PERL%%/Bundle/Sledge.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 12cb00ede78f..db15bb061122 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= CGI::Application.3 CGI::Application::Mailform.3
.include <bsd.port.mk>
diff --git a/www/p5-CGI-Application/pkg-plist b/www/p5-CGI-Application/pkg-plist
index 54fdd2a0343c..559dc1fac363 100644
--- a/www/p5-CGI-Application/pkg-plist
+++ b/www/p5-CGI-Application/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Application.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Application/Mailform.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Application
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Application
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/Application.pm
+%%SITE_PERL%%/CGI/Application/Mailform.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/CGI/Application
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index ecd000f3f363..b392fecf4afa 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module implementing a cgi interface to String::Checker
BUILD_DEPENDS= ${SITE_PERL}/String/Checker.pm:${PORTSDIR}/devel/p5-String-Checker
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= CGI::ArgChecker.3
.include <bsd.port.mk>
diff --git a/www/p5-CGI-ArgChecker/pkg-plist b/www/p5-CGI-ArgChecker/pkg-plist
index b29cc79c1f68..767facd633ca 100644
--- a/www/p5-CGI-ArgChecker/pkg-plist
+++ b/www/p5-CGI-ArgChecker/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/ArgChecker.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/ArgChecker.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile
index 778c332d8953..788f85969bce 100644
--- a/www/p5-CGI-Cache/Makefile
+++ b/www/p5-CGI-Cache/Makefile
@@ -27,10 +27,9 @@ BUILD_DEPENDS+= ${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Sp
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL?= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= CGI::Cache.3
.include <bsd.port.post.mk>
diff --git a/www/p5-CGI-Cache/pkg-plist b/www/p5-CGI-Cache/pkg-plist
index ebd3e2a0697d..395eaca1328f 100644
--- a/www/p5-CGI-Cache/pkg-plist
+++ b/www/p5-CGI-Cache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Cache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 1ce8c00c8604..7ed3d66d1ba7 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module for manage templates and parses templates
PERL_CONFIGURE= yes
MAN3= CGI::FastTemplate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-CGI-FastTemplate/pkg-plist b/www/p5-CGI-FastTemplate/pkg-plist
index 32ac44477343..ea8c2e2f26fc 100644
--- a/www/p5-CGI-FastTemplate/pkg-plist
+++ b/www/p5-CGI-FastTemplate/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/FastTemplate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/FastTemplate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-Minimal/pkg-plist b/www/p5-CGI-Minimal/pkg-plist
index 45ca7bba894c..b23541379d53 100644
--- a/www/p5-CGI-Minimal/pkg-plist
+++ b/www/p5-CGI-Minimal/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Minimal.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Minimal.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Minimal
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist
+%%SITE_PERL%%/CGI/Minimal.pm
+%%SITE_PERL%%/CGI/Minimal.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrm %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index 616d996267f7..6a0d92773ab7 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -36,7 +36,7 @@ MAN3= CGI::Session::DB_File.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
diff --git a/www/p5-CGI-Session/pkg-plist b/www/p5-CGI-Session/pkg-plist
index 0f0abf5a4256..ab2478d76d05 100644
--- a/www/p5-CGI-Session/pkg-plist
+++ b/www/p5-CGI-Session/pkg-plist
@@ -1,47 +1,47 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/BluePrint.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/PostgreSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Tutorial.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/CookBook.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize/FreezeThaw.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize/Storable.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID/Incr.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID/SHA1.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Example.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/remote_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/errstr.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/expire.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/_time_alias.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/name.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/header.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/sync_param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/close.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/expires.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/ctime.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/atime.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/param_hashref.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/save_param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/load_param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/clear.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/error.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/delete.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/is_new.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/version.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/dump.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/CGI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/Session/BluePrint.pm
+%%SITE_PERL%%/CGI/Session/PostgreSQL.pm
+%%SITE_PERL%%/CGI/Session/Tutorial.pm
+%%SITE_PERL%%/CGI/Session/CookBook.pm
+%%SITE_PERL%%/CGI/Session/Serialize/FreezeThaw.pm
+%%SITE_PERL%%/CGI/Session/Serialize/Default.pm
+%%SITE_PERL%%/CGI/Session/Serialize/Storable.pm
+@dirrm %%SITE_PERL%%/CGI/Session/Serialize
+%%SITE_PERL%%/CGI/Session/ID/Incr.pm
+%%SITE_PERL%%/CGI/Session/ID/MD5.pm
+%%SITE_PERL%%/CGI/Session/ID/SHA1.pm
+@dirrm %%SITE_PERL%%/CGI/Session/ID
+%%SITE_PERL%%/CGI/Session/DB_File.pm
+%%SITE_PERL%%/CGI/Session/Example.pm
+%%SITE_PERL%%/CGI/Session/MySQL.pm
+%%SITE_PERL%%/CGI/Session/File.pm
+%%SITE_PERL%%/CGI/Session.pm
+%%SITE_PERL%%/auto/CGI/Session/remote_addr.al
+%%SITE_PERL%%/auto/CGI/Session/errstr.al
+%%SITE_PERL%%/auto/CGI/Session/expire.al
+%%SITE_PERL%%/auto/CGI/Session/_time_alias.al
+%%SITE_PERL%%/auto/CGI/Session/name.al
+%%SITE_PERL%%/auto/CGI/Session/header.al
+%%SITE_PERL%%/auto/CGI/Session/sync_param.al
+%%SITE_PERL%%/auto/CGI/Session/close.al
+%%SITE_PERL%%/auto/CGI/Session/expires.al
+%%SITE_PERL%%/auto/CGI/Session/ctime.al
+%%SITE_PERL%%/auto/CGI/Session/atime.al
+%%SITE_PERL%%/auto/CGI/Session/param_hashref.al
+%%SITE_PERL%%/auto/CGI/Session/save_param.al
+%%SITE_PERL%%/auto/CGI/Session/load_param.al
+%%SITE_PERL%%/auto/CGI/Session/clear.al
+%%SITE_PERL%%/auto/CGI/Session/error.al
+%%SITE_PERL%%/auto/CGI/Session/delete.al
+%%SITE_PERL%%/auto/CGI/Session/is_new.al
+%%SITE_PERL%%/auto/CGI/Session/version.al
+%%SITE_PERL%%/auto/CGI/Session/dump.al
+%%SITE_PERL%%/auto/CGI/Session/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist
+@dirrm %%SITE_PERL%%/CGI/Session
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/CGI/Session
+@unexec rmdir %D/%%SITE_PERL%%/auto/CGI/Session 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/mach/auto/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-SpeedyCGI/pkg-plist b/www/p5-CGI-SpeedyCGI/pkg-plist
index 1ecddc1b1222..8d801eec2dfb 100644
--- a/www/p5-CGI-SpeedyCGI/pkg-plist
+++ b/www/p5-CGI-SpeedyCGI/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CGI/SpeedyCGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
+%%SITE_PERL%%/CGI/SpeedyCGI.pm
bin/speedy
bin/speedy_backend
bin/speedy_suid
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-Upload/Makefile b/www/p5-CGI-Upload/Makefile
index 64bcefe24f02..baeab954c0a8 100644
--- a/www/p5-CGI-Upload/Makefile
+++ b/www/p5-CGI-Upload/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports-freebsd@FreeBSDsecurity.com
COMMENT= CGI class for handling browser file uploads
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/BrowserDetect.pm:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
+BUILD_DEPENDS= ${SITE_PERL}/HTTP/BrowserDetect.pm:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
+ ${SITE_PERL}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
PERL_CONFIGURE= yes
MAN3= CGI::Upload.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-CGI-Upload/pkg-plist b/www/p5-CGI-Upload/pkg-plist
index c819cef38beb..c803b8e5128d 100644
--- a/www/p5-CGI-Upload/pkg-plist
+++ b/www/p5-CGI-Upload/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Upload.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Upload
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
+%%SITE_PERL%%/CGI/Upload.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 7df0a8ca1a47..088a72167643 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Modules for perl5, for use in writing CGI scripts
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
PERL_CONFIGURE= yes
MAN3= CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
CGI::MiniSvr.3 CGI::Request.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
@${RM} ${WRKSRC}/CGI/*.orig
diff --git a/www/p5-CGI-modules/pkg-plist b/www/p5-CGI-modules/pkg-plist
index 822174c9c235..949636b3fa66 100644
--- a/www/p5-CGI-modules/pkg-plist
+++ b/www/p5-CGI-modules/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/BasePlus.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Carp.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Form.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/MiniSvr.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Request.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI
+%%SITE_PERL%%/CGI/Base.pm
+%%SITE_PERL%%/CGI/BasePlus.pm
+%%SITE_PERL%%/CGI/Carp.pm
+%%SITE_PERL%%/CGI/Form.pm
+%%SITE_PERL%%/CGI/MiniSvr.pm
+%%SITE_PERL%%/CGI/Request.pm
+%%SITE_PERL%%/CGI/test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrm %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index 8738a1d1cf14..bc6d2cb97d0a 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -26,8 +26,8 @@ MAN3= CGI.3 CGI::Apache.3 CGI::Carp.3 CGI::Cookie.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
.endif
.include <bsd.port.post.mk>
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index bc1a8a7b14fb..7c02319a66f4 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= fcgi.0:${PORTSDIR}/www/fcgi
PERL_CONFIGURE= yes
CONFIGURE_ARGS+= --use-installed=${LOCALBASE}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= FCGI.3
.include <bsd.port.mk>
diff --git a/www/p5-FastCGI/pkg-plist b/www/p5-FastCGI/pkg-plist
index 4c1360cc6da0..493244a5fffc 100644
--- a/www/p5-FastCGI/pkg-plist
+++ b/www/p5-FastCGI/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FCGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI/FCGI.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI/FCGI.bs
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI
+%%SITE_PERL%%/%%PERL_ARCH%%/FCGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/FCGI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/FCGI.bs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
diff --git a/www/p5-GtkHTML/Makefile b/www/p5-GtkHTML/Makefile
index 94ec7663e81c..f7de913d3d4b 100644
--- a/www/p5-GtkHTML/Makefile
+++ b/www/p5-GtkHTML/Makefile
@@ -17,8 +17,8 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Gtk HTML module of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
+ ${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= gnomeprefix gtkhtml
diff --git a/www/p5-GtkHTML/pkg-plist b/www/p5-GtkHTML/pkg-plist
index ccd114247624..7b6d6232977e 100644
--- a/www/p5-GtkHTML/pkg-plist
+++ b/www/p5-GtkHTML/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/PerlGtkHTMLInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/PerlGtkHTMLInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Simple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
diff --git a/www/p5-HTML-CalendarMonthSimple/Makefile b/www/p5-HTML-CalendarMonthSimple/Makefile
index 165dd45faa01..57c869a6942c 100644
--- a/www/p5-HTML-CalendarMonthSimple/Makefile
+++ b/www/p5-HTML-CalendarMonthSimple/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= HTML::CalendarMonthSimple - Perl Module for Generating HTML Calendars
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-CalendarMonthSimple/pkg-plist b/www/p5-HTML-CalendarMonthSimple/pkg-plist
index f528846c8880..e2e10efe7ca1 100644
--- a/www/p5-HTML-CalendarMonthSimple/pkg-plist
+++ b/www/p5-HTML-CalendarMonthSimple/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/CalendarMonthSimple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/CalendarMonthSimple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Clean/pkg-plist b/www/p5-HTML-Clean/pkg-plist
index d159c6df1c52..e31ee7128e86 100644
--- a/www/p5-HTML-Clean/pkg-plist
+++ b/www/p5-HTML-Clean/pkg-plist
@@ -1,10 +1,10 @@
bin/htmlclean
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Clean.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Clean
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTML/Clean/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTML/Clean
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Clean.pm
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/auto/HTML/Clean/autosplit.ix
+@dirrm %%SITE_PERL%%/auto/HTML/Clean
+@unexec rmdir %D/%%SITE_PERL%%/auto/HTML 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
diff --git a/www/p5-HTML-Element-Extended/Makefile b/www/p5-HTML-Element-Extended/Makefile
index 39aee007db12..3585f4b0ae3f 100644
--- a/www/p5-HTML-Element-Extended/Makefile
+++ b/www/p5-HTML-Element-Extended/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wollman@FreeBSD.org
COMMENT= An extended interface to HTML::Tree's HTML::Element class
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS= ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Element-Extended/pkg-plist b/www/p5-HTML-Element-Extended/pkg-plist
index e48663877f64..b0e1579763cf 100644
--- a/www/p5-HTML-Element-Extended/pkg-plist
+++ b/www/p5-HTML-Element-Extended/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementGlob.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementRaw.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementSuper.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Element-Extended/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Element-Extended
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/ElementGlob.pm
+%%SITE_PERL%%/HTML/ElementRaw.pm
+%%SITE_PERL%%/HTML/ElementSuper.pm
+%%SITE_PERL%%/HTML/ElementTable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 730d43e31fdf..7652d81d776d 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -16,9 +16,9 @@ MAINTAINER= kapr@crosswinds.net
COMMENT= A module to allow embedded perl in HTML documents
.if !defined(WITHOUT_APACHE)
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
.endif
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Embperl/pkg-plist b/www/p5-HTML-Embperl/pkg-plist
index 2a0403d858ba..e5ed0fd0569c 100644
--- a/www/p5-HTML-Embperl/pkg-plist
+++ b/www/p5-HTML-Embperl/pkg-plist
@@ -1,24 +1,24 @@
bin/embpexec.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Faq.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Features.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/FeaturesD.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Intro.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/IntroD.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Mail.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Module.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/TipsAndTricks.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/embpcgi.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/epocgi.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/EmbperlD.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/EmbperlObject.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/IntroEmbperlObject.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Faq.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Features.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/FeaturesD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Intro.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/IntroD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Mail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Module.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Session.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/TipsAndTricks.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/embpcgi.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/epocgi.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/EmbperlD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/EmbperlObject.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/IntroEmbperlObject.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile
index 5d31d1949ad6..770fd9f20d90 100644
--- a/www/p5-HTML-FromText/Makefile
+++ b/www/p5-HTML-FromText/Makefile
@@ -18,6 +18,5 @@ COMMENT= Mark up text as HTML
PERL_CONFIGURE= yes
MAN3= HTML::FromText.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTML-FromText/pkg-plist b/www/p5-HTML-FromText/pkg-plist
index 8a004a100859..320aed257482 100644
--- a/www/p5-HTML-FromText/pkg-plist
+++ b/www/p5-HTML-FromText/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FromText.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/FromText/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/FromText 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/FromText.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Navigation/Makefile b/www/p5-HTML-Navigation/Makefile
index 96748c168622..8b1b0859ed8e 100644
--- a/www/p5-HTML-Navigation/Makefile
+++ b/www/p5-HTML-Navigation/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/CGI/Base.pm:${PORTSDIR}/www/p5-CGI-modules \
${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Navigation.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Navigation/pkg-plist b/www/p5-HTML-Navigation/pkg-plist
index c4dbb0c60e0a..b66c9151f1aa 100644
--- a/www/p5-HTML-Navigation/pkg-plist
+++ b/www/p5-HTML-Navigation/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Navigation.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Navigation/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Navigation
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Navigation.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Navigation/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Navigation
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index 2915e28ec65e..83a3de3d18c1 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module for handling CGI HTML paging of arbitrary data
BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Pager.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Pager/pkg-plist b/www/p5-HTML-Pager/pkg-plist
index 3bac259f1145..fa21cd92f3dc 100644
--- a/www/p5-HTML-Pager/pkg-plist
+++ b/www/p5-HTML-Pager/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Pager.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Pager/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Pager
+%%SITE_PERL%%/HTML/Pager.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Pager/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Pager
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index f5d30ae3c080..2eb747ad276c 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -18,6 +18,5 @@ COMMENT= A simple and fast HTML syntax checking package for perl 4 and perl 5
PERL_CONFIGURE= yes
MAN3= HTML::QuickCheck.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTML-QuickCheck/pkg-plist b/www/p5-HTML-QuickCheck/pkg-plist
index 90c625da34c6..abef439bded9 100644
--- a/www/p5-HTML-QuickCheck/pkg-plist
+++ b/www/p5-HTML-QuickCheck/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/QuickCheck.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/QuickCheck/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/QuickCheck
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/QuickCheck.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index b4e4114fda41..4ee3ca3bfe3d 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -17,7 +17,6 @@ COMMENT= HTML::SimpleParse - a bare-bones HTML parser
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::SimpleParse.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 1db61c5ac306..eb895b0d3008 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 HTML output stream class, and some markup utilities
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Stream.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Stream/pkg-plist b/www/p5-HTML-Stream/pkg-plist
index c8f4f4f1d95e..aaffda928919 100644
--- a/www/p5-HTML-Stream/pkg-plist
+++ b/www/p5-HTML-Stream/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Stream.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Stream/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Stream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Stream.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index bf3aa24b92ad..25516148f56e 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Produces summaries from the textual content of web pages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS= ${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Summary/pkg-plist b/www/p5-HTML-Summary/pkg-plist
index 89d8227ba5fe..43a4c01c56d8 100644
--- a/www/p5-HTML-Summary/pkg-plist
+++ b/www/p5-HTML-Summary/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Summary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Sentence.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/JA/Jcode.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/JA/Jtruncate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Summary/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Summary
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua/JA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Summary.pm
+%%SITE_PERL%%/Text/Sentence.pm
+%%SITE_PERL%%/Lingua/JA/Jcode.pm
+%%SITE_PERL%%/Lingua/JA/Jtruncate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary
+@dirrm %%SITE_PERL%%/Lingua/JA
+@dirrm %%SITE_PERL%%/Lingua
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Table/pkg-plist b/www/p5-HTML-Table/pkg-plist
index 6a90ccda5c94..c9313f4af599 100644
--- a/www/p5-HTML-Table/pkg-plist
+++ b/www/p5-HTML-Table/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Table/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Table
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Table.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index d323ca6f74da..c1aab4a842b2 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Extract text contained in tables within an HTML document
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= HTML::TableExtract.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTML-TableExtract/pkg-plist b/www/p5-HTML-TableExtract/pkg-plist
index bbd330f6b124..478c8f3c75c1 100644
--- a/www/p5-HTML-TableExtract/pkg-plist
+++ b/www/p5-HTML-TableExtract/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableExtract.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-TableExtract/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-TableExtract
+%%SITE_PERL%%/HTML/TableExtract.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-TableExtract/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-TableExtract
diff --git a/www/p5-HTML-TableLayout/pkg-plist b/www/p5-HTML-TableLayout/pkg-plist
index 2a0b20b29a6d..cb24d8d16e06 100644
--- a/www/p5-HTML-TableLayout/pkg-plist
+++ b/www/p5-HTML-TableLayout/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/TLCore.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/Form.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/TableLayout/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/TableLayout
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/TableLayout/TLCore.pm
+%%SITE_PERL%%/HTML/TableLayout/Symbols.pm
+%%SITE_PERL%%/HTML/TableLayout/Component.pm
+%%SITE_PERL%%/HTML/TableLayout/Form.pm
+%%SITE_PERL%%/HTML/TableLayout.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout/.packlist
+@dirrm %%SITE_PERL%%/HTML/TableLayout
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Tagset/pkg-plist b/www/p5-HTML-Tagset/pkg-plist
index f5c34fc1d66e..1da36d193566 100644
--- a/www/p5-HTML-Tagset/pkg-plist
+++ b/www/p5-HTML-Tagset/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tagset.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Tagset/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Tagset
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Tagset.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Template-Associate/Makefile b/www/p5-HTML-Template-Associate/Makefile
index 95f55b8a5960..94ea52ec087b 100644
--- a/www/p5-HTML-Template-Associate/Makefile
+++ b/www/p5-HTML-Template-Associate/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Template::Associate.3 \
HTML::Template::Associate::FormValidator.3
diff --git a/www/p5-HTML-Template-Expr/Makefile b/www/p5-HTML-Template-Expr/Makefile
index 69b5a2b5c557..48afcc604453 100644
--- a/www/p5-HTML-Template-Expr/Makefile
+++ b/www/p5-HTML-Template-Expr/Makefile
@@ -15,11 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Perl module to use HTML Templates which allows expressions
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
+BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
${RUN_DEPENDS}
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+RUN_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
+ ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
+ ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Template-Expr/pkg-plist b/www/p5-HTML-Template-Expr/pkg-plist
index 37bbdac100f6..e95da97a3f45 100644
--- a/www/p5-HTML-Template-Expr/pkg-plist
+++ b/www/p5-HTML-Template-Expr/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Template/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template/Expr/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template/Expr 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Template/Expr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Template/pkg-plist b/www/p5-HTML-Template/pkg-plist
index 498fa08e680f..0d7c0878a683 100644
--- a/www/p5-HTML-Template/pkg-plist
+++ b/www/p5-HTML-Template/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Template.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 442f35ad4dbe..aa945ba946f7 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= A collection of modules to manupulate HTML syntax trees
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Tree/pkg-plist b/www/p5-HTML-Tree/pkg-plist
index bc9fbcfc8186..bd7ab6577d15 100644
--- a/www/p5-HTML-Tree/pkg-plist
+++ b/www/p5-HTML-Tree/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/AsSubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Parse.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TreeBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Element/traverse.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree/AboutObjects.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree/AboutTrees.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree/Scanning.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Tree/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Tree
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Element
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/AsSubs.pm
+%%SITE_PERL%%/HTML/Element.pm
+%%SITE_PERL%%/HTML/Parse.pm
+%%SITE_PERL%%/HTML/TreeBuilder.pm
+%%SITE_PERL%%/HTML/Element/traverse.pm
+%%SITE_PERL%%/HTML/Tree.pm
+%%SITE_PERL%%/HTML/Tree/AboutObjects.pod
+%%SITE_PERL%%/HTML/Tree/AboutTrees.pod
+%%SITE_PERL%%/HTML/Tree/Scanning.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Tree/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Tree
+@dirrm %%SITE_PERL%%/HTML/Element
+@dirrm %%SITE_PERL%%/HTML/Tree
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Webmake/Makefile b/www/p5-HTML-Webmake/Makefile
index 08b20aa819ce..2cb388148c1a 100644
--- a/www/p5-HTML-Webmake/Makefile
+++ b/www/p5-HTML-Webmake/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jkoshy@FreeBSD.org
COMMENT= A simple perl based website content management system
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/EtText.pm:${PORTSDIR}/textproc/p5-Text-EtText \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Text/EtText.pm:${PORTSDIR}/textproc/p5-Text-EtText \
+ ${SITE_PERL}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Webmake/pkg-plist b/www/p5-HTML-Webmake/pkg-plist
index 7b09356d4d3d..a7f977acc5a5 100644
--- a/www/p5-HTML-Webmake/pkg-plist
+++ b/www/p5-HTML-Webmake/pkg-plist
@@ -1,66 +1,66 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/editbuttons.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/safe_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/thumbnail_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/rssbox.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/DownloadTag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/sitetree.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/wwwtable_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/csvtable_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/dump_vars.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/download_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/SiteTree.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/navtree.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/xsl.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/lang_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/CSVTableTag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/NavTree.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/ThumbnailTag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/SubstCtx.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGIGlue.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Metadata.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlCodeLibrary.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Main.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSourceBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSource.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MSHTMLtoHTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlCode.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/HTMLCleaner.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/CGIBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Del.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/RWMetaTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Dir.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/EditFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Edit.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/CVS.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/EditBlock.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Site.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/FindWmkf.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Out.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Content.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MediaContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MetadataContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Media.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/NormalContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/WMLinkGlossary.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/SiteCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/FormatConvert.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/UserTags.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Contents.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/WmkFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MetaTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/SiteMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSources/DirOfFiles.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSources/SVFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/WebMake/.packlist
+%%SITE_PERL%%/HTML/WebMake/PerlLib/editbuttons.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/safe_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/thumbnail_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/rssbox.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/DownloadTag.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/sitetree.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/wwwtable_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/csvtable_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/dump_vars.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/download_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/SiteTree.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/navtree.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/xsl.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/lang_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/CSVTableTag.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/NavTree.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/ThumbnailTag.pm
+%%SITE_PERL%%/HTML/WebMake/SubstCtx.pm
+%%SITE_PERL%%/HTML/WebMake/CGIGlue.pm
+%%SITE_PERL%%/HTML/WebMake/Metadata.pm
+%%SITE_PERL%%/HTML/WebMake/PerlCodeLibrary.pm
+%%SITE_PERL%%/HTML/WebMake/Main.pm
+%%SITE_PERL%%/HTML/WebMake/DataSourceBase.pm
+%%SITE_PERL%%/HTML/WebMake/DataSource.pm
+%%SITE_PERL%%/HTML/WebMake/MSHTMLtoHTML.pm
+%%SITE_PERL%%/HTML/WebMake/PerlCode.pm
+%%SITE_PERL%%/HTML/WebMake/HTMLCleaner.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/CGIBase.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Del.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/RWMetaTable.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Dir.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/EditFile.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Edit.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/CVS.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/EditBlock.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Site.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/FindWmkf.pm
+%%SITE_PERL%%/HTML/WebMake/Out.pm
+%%SITE_PERL%%/HTML/WebMake/Content.pm
+%%SITE_PERL%%/HTML/WebMake/MediaContent.pm
+%%SITE_PERL%%/HTML/WebMake/MetadataContent.pm
+%%SITE_PERL%%/HTML/WebMake/Media.pm
+%%SITE_PERL%%/HTML/WebMake/File.pm
+%%SITE_PERL%%/HTML/WebMake/NormalContent.pm
+%%SITE_PERL%%/HTML/WebMake/WMLinkGlossary.pm
+%%SITE_PERL%%/HTML/WebMake/SiteCache.pm
+%%SITE_PERL%%/HTML/WebMake/FormatConvert.pm
+%%SITE_PERL%%/HTML/WebMake/UserTags.pm
+%%SITE_PERL%%/HTML/WebMake/Contents.pm
+%%SITE_PERL%%/HTML/WebMake/WmkFile.pm
+%%SITE_PERL%%/HTML/WebMake/MetaTable.pm
+%%SITE_PERL%%/HTML/WebMake/SiteMap.pm
+%%SITE_PERL%%/HTML/WebMake/DataSources/DirOfFiles.pm
+%%SITE_PERL%%/HTML/WebMake/DataSources/SVFile.pm
+%%SITE_PERL%%/HTML/WebMake/Util.pm
+%%SITE_PERL%%/HTML/WebMake.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WebMake/.packlist
bin/webmake_cvs_import
bin/webmake
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSources
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/WebMake
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2> /dev/null || true
+@dirrm %%SITE_PERL%%/HTML/WebMake/CGI
+@dirrm %%SITE_PERL%%/HTML/WebMake/DataSources
+@dirrm %%SITE_PERL%%/HTML/WebMake/PerlLib
+@dirrm %%SITE_PERL%%/HTML/WebMake
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WebMake
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2> /dev/null || true
diff --git a/www/p5-HTML-Widgets-SelectLayers/Makefile b/www/p5-HTML-Widgets-SelectLayers/Makefile
index 0bea2cd267cb..51cf38dc1f1c 100644
--- a/www/p5-HTML-Widgets-SelectLayers/Makefile
+++ b/www/p5-HTML-Widgets-SelectLayers/Makefile
@@ -17,7 +17,6 @@ COMMENT= Implements an HTML widget with multiple layers
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Widgets::SelectLayers.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Widgets-SelectLayers/pkg-plist b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
index 7ff88bfbca19..c5294704d0f8 100644
--- a/www/p5-HTML-Widgets-SelectLayers/pkg-plist
+++ b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Widgets/SelectLayers.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Widgets/homepage.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Widgets 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML/Widgets 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Widgets/SelectLayers.pm
+%%SITE_PERL%%/HTML/Widgets/homepage.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML/Widgets 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML/pkg-plist b/www/p5-HTML/pkg-plist
index daf1ba65f323..390a88d58588 100644
--- a/www/p5-HTML/pkg-plist
+++ b/www/p5-HTML/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/html_base.pod
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Base.pm
+%%SITE_PERL%%/html_base.pod
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTTP-BrowserDetect/pkg-plist b/www/p5-HTTP-BrowserDetect/pkg-plist
index dd73e79cf036..38cb7cc4e558 100644
--- a/www/p5-HTTP-BrowserDetect/pkg-plist
+++ b/www/p5-HTTP-BrowserDetect/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/BrowserDetect.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect/.packlist
+%%SITE_PERL%%/HTTP/BrowserDetect.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect
+@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 78a19f1e64b9..b7f4ce213d33 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Perl interface to the gnome ghttp library
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTTP-DAV/pkg-plist b/www/p5-HTTP-DAV/pkg-plist
index 57fdb3c08ead..342914b2abc9 100644
--- a/www/p5-HTTP-DAV/pkg-plist
+++ b/www/p5-HTTP-DAV/pkg-plist
@@ -1,13 +1,13 @@
bin/dave
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/DAV/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Comms.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Lock.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/ResourceList.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Response.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Utils.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/DAV
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV/.packlist
+%%SITE_PERL%%/HTTP/DAV.pm
+%%SITE_PERL%%/HTTP/DAV/Comms.pm
+%%SITE_PERL%%/HTTP/DAV/Lock.pm
+%%SITE_PERL%%/HTTP/DAV/Resource.pm
+%%SITE_PERL%%/HTTP/DAV/ResourceList.pm
+%%SITE_PERL%%/HTTP/DAV/Response.pm
+%%SITE_PERL%%/HTTP/DAV/Utils.pm
+@dirrm %%SITE_PERL%%/HTTP/DAV
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV
+@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
diff --git a/www/p5-HTTP-GHTTP/Makefile b/www/p5-HTTP-GHTTP/Makefile
index 0937acb34e73..b959eef7db1b 100644
--- a/www/p5-HTTP-GHTTP/Makefile
+++ b/www/p5-HTTP-GHTTP/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp
PERL_CONFIGURE= yes
CONFIGURE_ARGS= LIBS="-L${LOCALBASE}/lib -lghttp" INC="-I${LOCALBASE}/include"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTTP::GHTTP.3
.include <bsd.port.mk>
diff --git a/www/p5-HTTP-GHTTP/pkg-plist b/www/p5-HTTP-GHTTP/pkg-plist
index 9132b55e0f7d..1631ac674433 100644
--- a/www/p5-HTTP-GHTTP/pkg-plist
+++ b/www/p5-HTTP-GHTTP/pkg-plist
@@ -1,8 +1,8 @@
bin/g-request
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTP/GHTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTP/GHTTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
diff --git a/www/p5-HTTP-MobileAgent/Makefile b/www/p5-HTTP-MobileAgent/Makefile
index 0958e812c8ed..67294b7f4849 100644
--- a/www/p5-HTTP-MobileAgent/Makefile
+++ b/www/p5-HTTP-MobileAgent/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/HTTP/Headers.pm:${PORTSDIR}/www/p5-libwww
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTTP-MobileAgent/pkg-plist b/www/p5-HTTP-MobileAgent/pkg-plist
index 5c6f4361ebfa..18882e565d8f 100644
--- a/www/p5-HTTP-MobileAgent/pkg-plist
+++ b/www/p5-HTTP-MobileAgent/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/AirHPhone.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/Display.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/DoCoMo.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/DoCoMoDisplayMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/EZweb.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/JPhone.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/NonMobile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/Request.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent
+%%SITE_PERL%%/HTTP/MobileAgent.pm
+%%SITE_PERL%%/HTTP/MobileAgent/AirHPhone.pm
+%%SITE_PERL%%/HTTP/MobileAgent/Display.pm
+%%SITE_PERL%%/HTTP/MobileAgent/DoCoMo.pm
+%%SITE_PERL%%/HTTP/MobileAgent/DoCoMoDisplayMap.pm
+%%SITE_PERL%%/HTTP/MobileAgent/EZweb.pm
+%%SITE_PERL%%/HTTP/MobileAgent/JPhone.pm
+%%SITE_PERL%%/HTTP/MobileAgent/NonMobile.pm
+%%SITE_PERL%%/HTTP/MobileAgent/Request.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent
+@dirrm %%SITE_PERL%%/HTTP/MobileAgent
diff --git a/www/p5-HTTPD-Log-Filter/Makefile b/www/p5-HTTPD-Log-Filter/Makefile
index 0c72f9d4a9a7..d8ba8bb15334 100644
--- a/www/p5-HTTPD-Log-Filter/Makefile
+++ b/www/p5-HTTPD-Log-Filter/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl module to filter entries out of an httpd log
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
+BUILD_DEPENDS= ${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
+RUN_DEPENDS= ${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
PERL_CONFIGURE= yes
MAN1= exclude_robots.1
diff --git a/www/p5-HTTPD-Log-Filter/pkg-plist b/www/p5-HTTPD-Log-Filter/pkg-plist
index fa264d176cc2..22421ec66487 100644
--- a/www/p5-HTTPD-Log-Filter/pkg-plist
+++ b/www/p5-HTTPD-Log-Filter/pkg-plist
@@ -1,8 +1,8 @@
bin/exclude_robots
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Log/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Log 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Log 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/HTTPD/Log/Filter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD/Log 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index 046df57f1aa4..f4cdc3d5008b 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module for a HTTP server authentication class
PERL_CONFIGURE= yes
MAN3= HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTTPD-Tools/pkg-plist b/www/p5-HTTPD-Tools/pkg-plist
index 0dc8c087be18..7975c095ef3a 100644
--- a/www/p5-HTTPD-Tools/pkg-plist
+++ b/www/p5-HTTPD-Tools/pkg-plist
@@ -1,20 +1,20 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/AdminBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Authen.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM/apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/SQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/HTTPD/AdminBase.pm
+%%SITE_PERL%%/HTTPD/Authen.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM/apache.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text/cern.pm
+%%SITE_PERL%%/HTTPD/UserAdmin.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/SQL.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text/cern.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/DBM
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 046df57f1aa4..f4cdc3d5008b 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module for a HTTP server authentication class
PERL_CONFIGURE= yes
MAN3= HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTTPD-User-Manage/pkg-plist b/www/p5-HTTPD-User-Manage/pkg-plist
index 0dc8c087be18..7975c095ef3a 100644
--- a/www/p5-HTTPD-User-Manage/pkg-plist
+++ b/www/p5-HTTPD-User-Manage/pkg-plist
@@ -1,20 +1,20 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/AdminBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Authen.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM/apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/SQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/HTTPD/AdminBase.pm
+%%SITE_PERL%%/HTTPD/Authen.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM/apache.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text/cern.pm
+%%SITE_PERL%%/HTTPD/UserAdmin.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/SQL.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text/cern.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/DBM
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
diff --git a/www/p5-MasonX-Request-WithApacheSession/pkg-plist b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
index e0ad7cf46cab..0d7ddafb783e 100644
--- a/www/p5-MasonX-Request-WithApacheSession/pkg-plist
+++ b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
@@ -5,4 +5,4 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX
@dirrm %%SITE_PERL%%/MasonX/Request
@dirrm %%SITE_PERL%%/MasonX
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MasonX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 3891dad3b39c..017cee345a10 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -17,9 +17,9 @@ DISTNAME= ParallelUserAgent-${PORTVERSION}
MAINTAINER= ache@FreeBSD.org
COMMENT= Perl5 Parallel LWP User Agent for WWW access
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-ParallelUA/pkg-plist b/www/p5-ParallelUA/pkg-plist
index bc4930413dd2..d122d0cc841f 100644
--- a/www/p5-ParallelUA/pkg-plist
+++ b/www/p5-ParallelUA/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/ParallelUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/file.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/ftp.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/http.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/https.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/RobotUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/ParallelUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/RobotPUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LWP/Parallel/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LWP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LWP/Parallel
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LWP
+%%SITE_PERL%%/Bundle/ParallelUA.pm
+%%SITE_PERL%%/LWP/Parallel.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/file.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/ftp.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/http.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/https.pm
+%%SITE_PERL%%/LWP/Parallel/RobotUA.pm
+%%SITE_PERL%%/LWP/Parallel/UserAgent.pm
+%%SITE_PERL%%/LWP/ParallelUA.pm
+%%SITE_PERL%%/LWP/RobotPUA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel/.packlist
+@dirrm %%SITE_PERL%%/LWP/Parallel/Protocol
+@dirrm %%SITE_PERL%%/LWP/Parallel
+@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
diff --git a/www/p5-Sledge-Plugin-CacheContent/Makefile b/www/p5-Sledge-Plugin-CacheContent/Makefile
index b2bbff1048d2..98c9bba26f8c 100644
--- a/www/p5-Sledge-Plugin-CacheContent/Makefile
+++ b/www/p5-Sledge-Plugin-CacheContent/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-CacheContent/pkg-plist b/www/p5-Sledge-Plugin-CacheContent/pkg-plist
index 6451b49a9ec7..922c52e92033 100644
--- a/www/p5-Sledge-Plugin-CacheContent/pkg-plist
+++ b/www/p5-Sledge-Plugin-CacheContent/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/CacheContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/CacheContent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-Download/Makefile b/www/p5-Sledge-Plugin-Download/Makefile
index b7b382566682..836bb04f1c71 100644
--- a/www/p5-Sledge-Plugin-Download/Makefile
+++ b/www/p5-Sledge-Plugin-Download/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-Download/pkg-plist b/www/p5-Sledge-Plugin-Download/pkg-plist
index 34030d926160..038c9a8203a2 100644
--- a/www/p5-Sledge-Plugin-Download/pkg-plist
+++ b/www/p5-Sledge-Plugin-Download/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/Download.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/Download.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-Dumper/Makefile b/www/p5-Sledge-Plugin-Dumper/Makefile
index 5c3da5e3604d..aa79cbb282a7 100644
--- a/www/p5-Sledge-Plugin-Dumper/Makefile
+++ b/www/p5-Sledge-Plugin-Dumper/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-Dumper/pkg-plist b/www/p5-Sledge-Plugin-Dumper/pkg-plist
index 6f7ac77c6fdb..a6bb543299ca 100644
--- a/www/p5-Sledge-Plugin-Dumper/pkg-plist
+++ b/www/p5-Sledge-Plugin-Dumper/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/Dumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/Dumper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-HTML2HDML/Makefile b/www/p5-Sledge-Plugin-HTML2HDML/Makefile
index eb5670e2ce13..c7445ad863ff 100644
--- a/www/p5-Sledge-Plugin-HTML2HDML/Makefile
+++ b/www/p5-Sledge-Plugin-HTML2HDML/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PM_DEPENDS} \
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/HTTP/MobileAgent.pm:${PORTSDIR}/www/p5-HTTP-MobileAgent
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
index 2ab41e77d45e..84e0ccc50f31 100644
--- a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
+++ b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/HTML2HDML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/HTML2HDML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-Log/Makefile b/www/p5-Sledge-Plugin-Log/Makefile
index a680e858e780..36cdeef4a544 100644
--- a/www/p5-Sledge-Plugin-Log/Makefile
+++ b/www/p5-Sledge-Plugin-Log/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/Log/Dispatch/Config.pm:${PORTSDIR}/devel/p5-Log-Dispatch-Config
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-Log/pkg-plist b/www/p5-Sledge-Plugin-Log/pkg-plist
index 3a9159fe1e13..dabfc3739f93 100644
--- a/www/p5-Sledge-Plugin-Log/pkg-plist
+++ b/www/p5-Sledge-Plugin-Log/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/Log.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-NoCache/Makefile b/www/p5-Sledge-Plugin-NoCache/Makefile
index 35473af9a5da..9321194a1a26 100644
--- a/www/p5-Sledge-Plugin-NoCache/Makefile
+++ b/www/p5-Sledge-Plugin-NoCache/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-NoCache/pkg-plist b/www/p5-Sledge-Plugin-NoCache/pkg-plist
index de726c596da5..fa4a5d85fb8a 100644
--- a/www/p5-Sledge-Plugin-NoCache/pkg-plist
+++ b/www/p5-Sledge-Plugin-NoCache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/NoCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/NoCache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-SaveUpload/Makefile b/www/p5-Sledge-Plugin-SaveUpload/Makefile
index 740f2f470a16..fe097dd60dce 100644
--- a/www/p5-Sledge-Plugin-SaveUpload/Makefile
+++ b/www/p5-Sledge-Plugin-SaveUpload/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
index 81de994830eb..7ebb314b2957 100644
--- a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
+++ b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/SaveUpload.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/SaveUpload.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-ScratchPad/Makefile b/www/p5-Sledge-Plugin-ScratchPad/Makefile
index 25be14493ce7..a7a0d9c8c4ed 100644
--- a/www/p5-Sledge-Plugin-ScratchPad/Makefile
+++ b/www/p5-Sledge-Plugin-ScratchPad/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
index cc860276c7b0..dc0fd60a2002 100644
--- a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
+++ b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/ScratchPad.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/ScratchPad.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile b/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
index 8742d861e04d..875443e06ac4 100644
--- a/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
+++ b/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
index 6c6448e39971..a3e59ed4fd6e 100644
--- a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
+++ b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/SessionAutoCleanup.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/SessionAutoCleanup.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-XSLT/Makefile b/www/p5-Sledge-Plugin-XSLT/Makefile
index 2c74f74ed548..43d6957b23bc 100644
--- a/www/p5-Sledge-Plugin-XSLT/Makefile
+++ b/www/p5-Sledge-Plugin-XSLT/Makefile
@@ -22,7 +22,7 @@ PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-XSLT/pkg-plist b/www/p5-Sledge-Plugin-XSLT/pkg-plist
index ad303e9b7f22..9c72b38b119f 100644
--- a/www/p5-Sledge-Plugin-XSLT/pkg-plist
+++ b/www/p5-Sledge-Plugin-XSLT/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/XSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/XSLT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-SessionManager-CookieStore/Makefile b/www/p5-Sledge-SessionManager-CookieStore/Makefile
index 355d6001a399..b89dabfa9e74 100644
--- a/www/p5-Sledge-SessionManager-CookieStore/Makefile
+++ b/www/p5-Sledge-SessionManager-CookieStore/Makefile
@@ -23,7 +23,7 @@ PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5
PM_DEPENDS+= ${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC
PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
index 5f1d64a34309..659fec08334b 100644
--- a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
+++ b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/CookieStore.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/SessionManager 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager 2>/dev/null || true
+%%SITE_PERL%%/Sledge/SessionManager/CookieStore.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/SessionManager 2>/dev/null || true
diff --git a/www/p5-Sledge-Template-Expr/Makefile b/www/p5-Sledge-Template-Expr/Makefile
index 88e5027ca5d7..6f19717df7eb 100644
--- a/www/p5-Sledge-Template-Expr/Makefile
+++ b/www/p5-Sledge-Template-Expr/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/HTML/Template/Expr.pm:${PORTSDIR}/www/p5-HTML-Template-Expr
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Template-Expr/pkg-plist b/www/p5-Sledge-Template-Expr/pkg-plist
index c025181d689f..db87ea04f737 100644
--- a/www/p5-Sledge-Template-Expr/pkg-plist
+++ b/www/p5-Sledge-Template-Expr/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Template 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Template/Expr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Template 2>/dev/null || true
diff --git a/www/p5-Sledge/Makefile b/www/p5-Sledge/Makefile
index 67cb9e2b3c0f..7550d6a7c86d 100644
--- a/www/p5-Sledge/Makefile
+++ b/www/p5-Sledge/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Bundle/Sledge.pm:${PORTSDIR}/www/p5-Bundle-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge/pkg-plist b/www/p5-Sledge/pkg-plist
index a3d4d4a1c825..4b512a3422b5 100644
--- a/www/p5-Sledge/pkg-plist
+++ b/www/p5-Sledge/pkg-plist
@@ -1,50 +1,50 @@
bin/sledge-setup
-lib/perl5/site_perl/%%PERL_VER%%/Sledge.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Authorizer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Authorizer/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset/Shift_JIS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/FAQ.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/Hooks.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/Install.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/Tutorial.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Exceptions.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/FillInForm.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Install.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Install/Stub.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/Compat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Registrar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request/Upload.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/SQLite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/Rewrite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/StickyQuery.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template/TT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Authorizer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge
+%%SITE_PERL%%/Sledge.pm
+%%SITE_PERL%%/Sledge/Authorizer.pm
+%%SITE_PERL%%/Sledge/Authorizer/Null.pm
+%%SITE_PERL%%/Sledge/Charset.pm
+%%SITE_PERL%%/Sledge/Charset/Default.pm
+%%SITE_PERL%%/Sledge/Charset/Null.pm
+%%SITE_PERL%%/Sledge/Charset/Shift_JIS.pm
+%%SITE_PERL%%/Sledge/Config.pm
+%%SITE_PERL%%/Sledge/Constants.pm
+%%SITE_PERL%%/Sledge/Doc/FAQ.pod
+%%SITE_PERL%%/Sledge/Doc/Hooks.pod
+%%SITE_PERL%%/Sledge/Doc/Install.pod
+%%SITE_PERL%%/Sledge/Doc/Tutorial.pod
+%%SITE_PERL%%/Sledge/Exception.pm
+%%SITE_PERL%%/Sledge/Exceptions.pm
+%%SITE_PERL%%/Sledge/FillInForm.pm
+%%SITE_PERL%%/Sledge/Install.pm
+%%SITE_PERL%%/Sledge/Install/Stub.pm
+%%SITE_PERL%%/Sledge/Pages/Apache.pm
+%%SITE_PERL%%/Sledge/Pages/Base.pm
+%%SITE_PERL%%/Sledge/Pages/CGI.pm
+%%SITE_PERL%%/Sledge/Pages/Compat.pm
+%%SITE_PERL%%/Sledge/Registrar.pm
+%%SITE_PERL%%/Sledge/Request/CGI.pm
+%%SITE_PERL%%/Sledge/Request/Table.pm
+%%SITE_PERL%%/Sledge/Request/Upload.pm
+%%SITE_PERL%%/Sledge/Session.pm
+%%SITE_PERL%%/Sledge/Session/DBI.pm
+%%SITE_PERL%%/Sledge/Session/MySQL.pm
+%%SITE_PERL%%/Sledge/Session/Pg.pm
+%%SITE_PERL%%/Sledge/Session/SQLite.pm
+%%SITE_PERL%%/Sledge/SessionManager.pm
+%%SITE_PERL%%/Sledge/SessionManager/Cookie.pm
+%%SITE_PERL%%/Sledge/SessionManager/Rewrite.pm
+%%SITE_PERL%%/Sledge/SessionManager/StickyQuery.pm
+%%SITE_PERL%%/Sledge/Template.pm
+%%SITE_PERL%%/Sledge/Template/TT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge
+@dirrm %%SITE_PERL%%/Sledge/Template
+@dirrm %%SITE_PERL%%/Sledge/SessionManager
+@dirrm %%SITE_PERL%%/Sledge/Session
+@dirrm %%SITE_PERL%%/Sledge/Request
+@dirrm %%SITE_PERL%%/Sledge/Pages
+@dirrm %%SITE_PERL%%/Sledge/Install
+@dirrm %%SITE_PERL%%/Sledge/Doc
+@dirrm %%SITE_PERL%%/Sledge/Charset
+@dirrm %%SITE_PERL%%/Sledge/Authorizer
+@dirrm %%SITE_PERL%%/Sledge
diff --git a/www/p5-Template-Plugin-Comma/Makefile b/www/p5-Template-Plugin-Comma/Makefile
index fcff11c70ab3..f1a8c39e0f0c 100644
--- a/www/p5-Template-Plugin-Comma/Makefile
+++ b/www/p5-Template-Plugin-Comma/Makefile
@@ -21,6 +21,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Template::Plugin::Comma.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index ddbac095e1a9..7a02d583e62d 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MASTER_SITE_BACKUP+= http://www.template-toolkit.org/download/
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index 210e3ef501d2..aa12466dc233 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -1,92 +1,92 @@
bin/tpage
bin/ttree
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Context.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Directive.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Document.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/FAQ.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Filters.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Grammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Iterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library/HTML.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library/PostScript.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library/Splash.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Config.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Credits.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Directives.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Filters.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Internals.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Intro.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Plugins.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Refs.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Syntax.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/VMethods.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Variables.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Views.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Modules.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Namespace/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Autoformat.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Datafile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Directory.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Dumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Format.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/area.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/linespoints.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/mixed.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/points.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Image.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Polygon.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Align.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Wrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Iterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Pod.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/URL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Wrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/DOM.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/RSS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/Style.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/XPath.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugins.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Provider.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Service.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash/Context.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash/XS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tools/tpage.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tools/ttree.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial/Datafile.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial/Web.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Template.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Base.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Config.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Context.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Directive.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Document.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/FAQ.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Filters.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Grammar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Iterator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Library/HTML.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Library/PostScript.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Library/Splash.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Config.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Credits.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Directives.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Filters.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Internals.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Intro.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Plugins.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Refs.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Syntax.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/VMethods.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Variables.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Views.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Modules.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Autoformat.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/CGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Datafile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Date.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Directory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Dumper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Filter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Format.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/area.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars3d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines3d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/linespoints.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/mixed.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie3d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/points.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Image.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Polygon.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Align.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Wrap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/HTML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Iterator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Pod.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/String.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Table.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/URL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/View.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Wrap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/DOM.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/RSS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/Simple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/Style.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/XPath.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugins.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Provider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Service.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/Context.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/XS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/tpage.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/ttree.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial/Datafile.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial/Web.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/View.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
share/tt2/docs/README
share/tt2/docs/html/FAQ/FAQ.html
share/tt2/docs/html/FAQ/index.html
@@ -1364,21 +1364,21 @@ share/tt2/templates/splash/tabset
share/tt2/templates/splash/text
share/tt2/templates/splash/ttdotorg
share/tt2/templates/splash/ttpower
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash/XS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tools
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Namespace
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Library
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template
@dirrm share/tt2/docs/html/Tools
@dirrm share/tt2/docs/html/Tutorial
@dirrm share/tt2/docs/html/Library
diff --git a/www/p5-URI-Sequin/Makefile b/www/p5-URI-Sequin/Makefile
index fec65cbc3179..780346b25f01 100644
--- a/www/p5-URI-Sequin/Makefile
+++ b/www/p5-URI-Sequin/Makefile
@@ -18,7 +18,6 @@ COMMENT= Extract information from the URLs of Search-Engines
PERL_CONFIGURE= yes
MAN3= URI::Sequin.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.ifndef (NOPORTDOCS)
post-install:
diff --git a/www/p5-URI-Sequin/pkg-plist b/www/p5-URI-Sequin/pkg-plist
index f5c9464d12be..dbfc90a04ba0 100644
--- a/www/p5-URI-Sequin/pkg-plist
+++ b/www/p5-URI-Sequin/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Sequin/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin.pm
-%%PORTDOCS%%lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples/example.pl
-%%PORTDOCS%%lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples/ref1.log
-%%PORTDOCS%%lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples/ref2.log
-%%PORTDOCS%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples
-%%PORTDOCS%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Sequin
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/URI 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin/.packlist
+%%SITE_PERL%%/URI/Sequin.pm
+%%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/example.pl
+%%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/ref1.log
+%%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/ref2.log
+%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin/examples
+%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
diff --git a/www/p5-WWW-Automate/Makefile b/www/p5-WWW-Automate/Makefile
index 03a98358fdb5..8602309fe47a 100644
--- a/www/p5-WWW-Automate/Makefile
+++ b/www/p5-WWW-Automate/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= WWW::Automate.3
diff --git a/www/p5-WWW-Automate/pkg-plist b/www/p5-WWW-Automate/pkg-plist
index 7c9e801e3852..9246757bb73f 100644
--- a/www/p5-WWW-Automate/pkg-plist
+++ b/www/p5-WWW-Automate/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Automate/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Automate.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Automate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Automate/.packlist
+%%SITE_PERL%%/WWW/Automate.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Automate
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
diff --git a/www/p5-WWW-IMDb/Makefile b/www/p5-WWW-IMDb/Makefile
index 12a738a27587..a136611f24a9 100644
--- a/www/p5-WWW-IMDb/Makefile
+++ b/www/p5-WWW-IMDb/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= IMDb.3
.include <bsd.port.mk>
diff --git a/www/p5-WWW-IMDb/pkg-plist b/www/p5-WWW-IMDb/pkg-plist
index bd349d038bee..907b1dee6cb1 100644
--- a/www/p5-WWW-IMDb/pkg-plist
+++ b/www/p5-WWW-IMDb/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/IMDb/Title.pm
-lib/perl5/site_perl/%%PERL_VER%%/IMDb/Generique.pm
-lib/perl5/site_perl/%%PERL_VER%%/IMDb/People.pm
-lib/perl5/site_perl/%%PERL_VER%%/IMDb.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMDb/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMDb
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IMDb
+%%SITE_PERL%%/IMDb/Title.pm
+%%SITE_PERL%%/IMDb/Generique.pm
+%%SITE_PERL%%/IMDb/People.pm
+%%SITE_PERL%%/IMDb.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDb/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDb
+@dirrm %%SITE_PERL%%/IMDb
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index 6fa3272adad9..a6cf752d7fec 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
${SITE_PERL}/HTTP/Status.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= WWW::Robot.3
.include <bsd.port.mk>
diff --git a/www/p5-WWW-Robot/pkg-plist b/www/p5-WWW-Robot/pkg-plist
index 7ac63322a5ce..8830191ca0ed 100644
--- a/www/p5-WWW-Robot/pkg-plist
+++ b/www/p5-WWW-Robot/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Robot.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Robot/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Robot
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>/dev/null || true
+%%SITE_PERL%%/WWW/Robot.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
diff --git a/www/p5-WWW-Search-Google/Makefile b/www/p5-WWW-Search-Google/Makefile
index b3df700e7a5d..c2ba343a001c 100644
--- a/www/p5-WWW-Search-Google/Makefile
+++ b/www/p5-WWW-Search-Google/Makefile
@@ -16,9 +16,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Perl WWW::Search class for searching Google
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/WWW/Search.pm:${PORTSDIR}/www/p5-WWW-Search \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Google.pm:${PORTSDIR}/net/p5-Net-Google
+BUILD_DEPENDS= ${SITE_PERL}/WWW/Search.pm:${PORTSDIR}/www/p5-WWW-Search \
+ ${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
+ ${SITE_PERL}/Net/Google.pm:${PORTSDIR}/net/p5-Net-Google
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-WWW-Search-Google/pkg-plist b/www/p5-WWW-Search-Google/pkg-plist
index b621dcdfe6aa..d06f7bc143a5 100644
--- a/www/p5-WWW-Search-Google/pkg-plist
+++ b/www/p5-WWW-Search-Google/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Google.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search/Google/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search/Google
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search 2>&1 || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW 2>&1 || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW/Search 2>&1 || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>&1 || true
+%%SITE_PERL%%/WWW/Search/Google.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>&1 || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>&1 || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>&1 || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>&1 || true
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index aad31f28b30c..9d4770c33f0a 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Servlet API for Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS= ${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Servlet.3 \
Servlet::Http::Cookie.3 \
Servlet::Http::HttpServlet.3 \
diff --git a/www/p5-libservlet/pkg-plist b/www/p5-libservlet/pkg-plist
index 10cee5fc0cd1..6b53771c815d 100644
--- a/www/p5-libservlet/pkg-plist
+++ b/www/p5-libservlet/pkg-plist
@@ -1,44 +1,44 @@
-lib/perl5/site_perl/%%PERL_VER%%/Servlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSession.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletRequestWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletResponse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionAttributesListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletResponseWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletRequest.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionBindingEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionActivationListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionBindingListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util/Principal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/FilterChain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/FilterConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/GenericServlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/RequestDispatcher.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Servlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContext.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextAttributeEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextAttributeListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletException.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletInputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletOutputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletRequest.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletRequestWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletResponse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletResponseWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/SingleThreadModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/UnavailableException.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Servlet
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libservlet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libservlet
+%%SITE_PERL%%/Servlet.pm
+%%SITE_PERL%%/Servlet/Http/HttpSession.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletRequestWrapper.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletResponse.pm
+%%SITE_PERL%%/Servlet/Http/HttpServlet.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionEvent.pm
+%%SITE_PERL%%/Servlet/Http/Cookie.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionAttributesListener.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionListener.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletResponseWrapper.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletRequest.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionBindingEvent.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionActivationListener.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionBindingListener.pm
+%%SITE_PERL%%/Servlet/Util/Event.pm
+%%SITE_PERL%%/Servlet/Util/Exception.pm
+%%SITE_PERL%%/Servlet/Util/Principal.pm
+%%SITE_PERL%%/Servlet/Config.pm
+%%SITE_PERL%%/Servlet/Filter.pm
+%%SITE_PERL%%/Servlet/FilterChain.pm
+%%SITE_PERL%%/Servlet/FilterConfig.pm
+%%SITE_PERL%%/Servlet/GenericServlet.pm
+%%SITE_PERL%%/Servlet/RequestDispatcher.pm
+%%SITE_PERL%%/Servlet/Servlet.pm
+%%SITE_PERL%%/Servlet/ServletConfig.pm
+%%SITE_PERL%%/Servlet/ServletContext.pm
+%%SITE_PERL%%/Servlet/ServletContextAttributeEvent.pm
+%%SITE_PERL%%/Servlet/ServletContextAttributeListener.pm
+%%SITE_PERL%%/Servlet/ServletContextEvent.pm
+%%SITE_PERL%%/Servlet/ServletContextListener.pm
+%%SITE_PERL%%/Servlet/ServletException.pm
+%%SITE_PERL%%/Servlet/ServletInputStream.pm
+%%SITE_PERL%%/Servlet/ServletOutputStream.pm
+%%SITE_PERL%%/Servlet/ServletRequest.pm
+%%SITE_PERL%%/Servlet/ServletRequestWrapper.pm
+%%SITE_PERL%%/Servlet/ServletResponse.pm
+%%SITE_PERL%%/Servlet/ServletResponseWrapper.pm
+%%SITE_PERL%%/Servlet/SingleThreadModel.pm
+%%SITE_PERL%%/Servlet/UnavailableException.pm
+@dirrm %%SITE_PERL%%/Servlet/Http
+@dirrm %%SITE_PERL%%/Servlet/Util
+@dirrm %%SITE_PERL%%/Servlet
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libservlet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libservlet
diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile
index ab5780d45e5a..9ca9ea8c0e07 100644
--- a/www/reportmagic/Makefile
+++ b/www/reportmagic/Makefile
@@ -18,10 +18,10 @@ MAINTAINER= jeremy@external.org
COMMENT= A web site statistics post-processor for Analog
RUN_DEPENDS= analog:${PORTSDIR}/www/analog \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+ ${SITE_PERL}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
+ ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
WRKSRC= ${WRKDIR}/${DISTNAME}
NO_BUILD= YES
diff --git a/www/rt2/Makefile b/www/rt2/Makefile
index 91f58655ec8c..2d47b2a620a8 100644
--- a/www/rt2/Makefile
+++ b/www/rt2/Makefile
@@ -56,7 +56,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-serv
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
USE_REINPLACE= yes
USE_PERL5= yes
diff --git a/www/rt3/Makefile b/www/rt3/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt3/Makefile
+++ b/www/rt3/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/rt32/Makefile b/www/rt32/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt32/Makefile
+++ b/www/rt32/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/rt34/Makefile b/www/rt34/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt34/Makefile
+++ b/www/rt34/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/smb2www/Makefile b/www/smb2www/Makefile
index bccec7fa4fd3..8b800bcae840 100644
--- a/www/smb2www/Makefile
+++ b/www/smb2www/Makefile
@@ -22,7 +22,7 @@ COMMENT= Windows Network client that is accessible through a web browser
RUN_DEPENDS= httpd:${PORTSDIR}/www/apache13 \
smbclient:${PORTSDIR}/net/samba \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
IS_INTERACTIVE= yes
NO_BUILD= yes
diff --git a/www/swish++/pkg-plist b/www/swish++/pkg-plist
index 964f62e86873..e5bfa7b94b8a 100644
--- a/www/swish++/pkg-plist
+++ b/www/swish++/pkg-plist
@@ -7,4 +7,4 @@ bin/searchmonitor
bin/splitmail
etc/swish++.conf
etc/rc.d/swish++.sh
-lib/perl5/site_perl/%%PERL_VER%%/WWW.pm
+%%SITE_PERL%%/WWW.pm
diff --git a/www/w3mir/Makefile b/www/w3mir/Makefile
index 6c5ebed77bc0..7f8bac1aa7f5 100644
--- a/www/w3mir/Makefile
+++ b/www/w3mir/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://langfeldt.net/w3mir/
MAINTAINER= ache@freebsd.org
COMMENT= All-purpose HTTP copying and mirroring tool
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
USE_PERL5= yes
diff --git a/www/w3mir/pkg-plist b/www/w3mir/pkg-plist
index aa9222e3382c..9d0ba142ddab 100644
--- a/www/w3mir/pkg-plist
+++ b/www/w3mir/pkg-plist
@@ -1,13 +1,13 @@
bin/w3mfix
bin/w3mir
-lib/perl5/site_perl/%%PERL_VER%%/htmlop.pm
-lib/perl5/site_perl/%%PERL_VER%%/w3http.pm
-lib/perl5/site_perl/%%PERL_VER%%/w3pdfuri.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/w3mir/.packlist
+%%SITE_PERL%%/htmlop.pm
+%%SITE_PERL%%/w3http.pm
+%%SITE_PERL%%/w3pdfuri.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/w3mir/.packlist
share/doc/w3mir/Artistic
share/doc/w3mir/README
share/doc/w3mir/example.cfg
share/doc/w3mir/multiscope.cfg
share/doc/w3mir/w3mir-HOWTO.html
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/w3mir
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/w3mir
@dirrm share/doc/w3mir
diff --git a/www/wwwstat/pkg-plist b/www/wwwstat/pkg-plist
index c16d074b5371..e5178924d5c5 100644
--- a/www/wwwstat/pkg-plist
+++ b/www/wwwstat/pkg-plist
@@ -3,6 +3,6 @@ bin/oldlog2new
bin/splitlog
bin/wwwerrs
bin/wwwstat
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/domains.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/splitlog.rc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/wwwstat.rc
+%%SITE_PERL%%/%%PERL_ARCH%%/domains.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/splitlog.rc
+%%SITE_PERL%%/%%PERL_ARCH%%/wwwstat.rc