aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/ascii2pdf/Makefile2
-rw-r--r--textproc/gutenbook/Makefile2
-rw-r--r--textproc/gutenbook/pkg-plist14
-rw-r--r--textproc/makepatch/pkg-plist4
-rw-r--r--textproc/p5-Apache-ParseLog/Makefile1
-rw-r--r--textproc/p5-Apache-ParseLog/pkg-plist10
-rw-r--r--textproc/p5-CSS-SAC/Makefile4
-rw-r--r--textproc/p5-CSS-SAC/pkg-plist60
-rw-r--r--textproc/p5-Data-FormValidator/Makefile1
-rw-r--r--textproc/p5-Data-FormValidator/pkg-plist10
-rw-r--r--textproc/p5-DelimMatch/Makefile1
-rw-r--r--textproc/p5-DelimMatch/pkg-plist16
-rw-r--r--textproc/p5-FreeBSD-Ports/pkg-plist14
-rw-r--r--textproc/p5-HTML-Format/Makefile5
-rw-r--r--textproc/p5-HTML-Format/pkg-plist14
-rw-r--r--textproc/p5-LJ-SpellCheck/Makefile1
-rw-r--r--textproc/p5-LJ-SpellCheck/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Conjunction/Makefile1
-rw-r--r--textproc/p5-Lingua-Conjunction/pkg-plist10
-rw-r--r--textproc/p5-Lingua-EN-AddressParse/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-AddressParse/pkg-plist16
-rw-r--r--textproc/p5-Lingua-EN-Gender/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Gender/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Inflect/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Inflect/pkg-plist24
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-NameCase/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-NameCase/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-NameParse/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-NameParse/pkg-plist16
-rw-r--r--textproc/p5-Lingua-EN-Nickname/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Nickname/pkg-plist16
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist18
-rw-r--r--textproc/p5-Lingua-EN-Numbers/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Numbers/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Sentence/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Sentence/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Squeeze/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Squeeze/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Summarize/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Summarize/pkg-plist18
-rw-r--r--textproc/p5-Lingua-EN-Syllable/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Syllable/pkg-plist14
-rw-r--r--textproc/p5-Lingua-Ident/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Ispell/pkg-plist8
-rw-r--r--textproc/p5-Lingua-Preferred/Makefile3
-rw-r--r--textproc/p5-Lingua-Preferred/pkg-plist16
-rw-r--r--textproc/p5-MARC/Makefile1
-rw-r--r--textproc/p5-MARC/pkg-plist6
-rw-r--r--textproc/p5-NetAddr-IP-Find/Makefile2
-rw-r--r--textproc/p5-NetAddr-IP-Find/pkg-plist14
-rw-r--r--textproc/p5-Number-Format/Makefile1
-rw-r--r--textproc/p5-Number-Format/pkg-plist10
-rw-r--r--textproc/p5-Orchard-Perl/Makefile2
-rw-r--r--textproc/p5-Orchard-Perl/pkg-plist20
-rw-r--r--textproc/p5-PDF-API2/Makefile2
-rw-r--r--textproc/p5-PDF-API3/Makefile2
-rw-r--r--textproc/p5-PDF-Create/Makefile1
-rw-r--r--textproc/p5-PDF-Create/pkg-plist18
-rw-r--r--textproc/p5-Parse-Syslog/Makefile1
-rw-r--r--textproc/p5-Parse-Syslog/pkg-plist10
-rw-r--r--textproc/p5-Pod-Constants/Makefile2
-rw-r--r--textproc/p5-Pod-Constants/pkg-plist10
-rw-r--r--textproc/p5-Pod-POM/pkg-plist30
-rw-r--r--textproc/p5-RADIUS-UserFile/Makefile3
-rw-r--r--textproc/p5-RADIUS-UserFile/pkg-plist10
-rw-r--r--textproc/p5-RDF-Core/Makefile4
-rw-r--r--textproc/p5-RDF-Core/pkg-plist66
-rw-r--r--textproc/p5-RDFStore/Makefile8
-rw-r--r--textproc/p5-RDFStore/pkg-plist90
-rw-r--r--textproc/p5-Search-Saryer/Makefile1
-rw-r--r--textproc/p5-Search-Saryer/pkg-plist14
-rw-r--r--textproc/p5-Sort-ArbBiLex/Makefile1
-rw-r--r--textproc/p5-Sort-ArbBiLex/pkg-plist10
-rw-r--r--textproc/p5-Sort-Fields/Makefile1
-rw-r--r--textproc/p5-Sort-Fields/pkg-plist10
-rw-r--r--textproc/p5-Sort-PolySort/Makefile1
-rw-r--r--textproc/p5-Sort-PolySort/pkg-plist10
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/Makefile1
-rw-r--r--textproc/p5-String-Scanf/Makefile1
-rw-r--r--textproc/p5-String-Scanf/pkg-plist10
-rw-r--r--textproc/p5-String-ShellQuote/Makefile1
-rw-r--r--textproc/p5-String-ShellQuote/pkg-plist10
-rw-r--r--textproc/p5-String-Strip/Makefile1
-rw-r--r--textproc/p5-String-Strip/pkg-plist16
-rw-r--r--textproc/p5-TeX-Hyphen/Makefile1
-rw-r--r--textproc/p5-TeX-Hyphen/pkg-plist16
-rw-r--r--textproc/p5-Text-Bind/Makefile1
-rw-r--r--textproc/p5-Text-Bind/pkg-plist10
-rw-r--r--textproc/p5-Text-CSV/Makefile1
-rw-r--r--textproc/p5-Text-CSV/pkg-plist24
-rw-r--r--textproc/p5-Text-CSV_XS/Makefile1
-rw-r--r--textproc/p5-Text-CSV_XS/pkg-plist14
-rw-r--r--textproc/p5-Text-Diff/Makefile3
-rw-r--r--textproc/p5-Text-Diff/pkg-plist14
-rw-r--r--textproc/p5-Text-DoubleMetaphone/Makefile1
-rw-r--r--textproc/p5-Text-DoubleMetaphone/pkg-plist16
-rw-r--r--textproc/p5-Text-EtText/pkg-plist22
-rw-r--r--textproc/p5-Text-FillIn/Makefile1
-rw-r--r--textproc/p5-Text-FillIn/pkg-plist10
-rw-r--r--textproc/p5-Text-Filter-Chain/Makefile3
-rw-r--r--textproc/p5-Text-Filter-Chain/pkg-plist8
-rw-r--r--textproc/p5-Text-Filter/Makefile1
-rw-r--r--textproc/p5-Text-Filter/pkg-plist10
-rw-r--r--textproc/p5-Text-FixedLength-Extra/Makefile3
-rw-r--r--textproc/p5-Text-FixedLength-Extra/pkg-plist8
-rw-r--r--textproc/p5-Text-FixedLength/Makefile1
-rw-r--r--textproc/p5-Text-FixedLength/pkg-plist10
-rw-r--r--textproc/p5-Text-Flowchart/Makefile1
-rw-r--r--textproc/p5-Text-Flowchart/pkg-plist10
-rw-r--r--textproc/p5-Text-Format/Makefile1
-rw-r--r--textproc/p5-Text-Format/pkg-plist10
-rw-r--r--textproc/p5-Text-FormatTable/Makefile1
-rw-r--r--textproc/p5-Text-FormatTable/pkg-plist12
-rw-r--r--textproc/p5-Text-Graphics/Makefile3
-rw-r--r--textproc/p5-Text-Graphics/pkg-plist8
-rw-r--r--textproc/p5-Text-Metaphone/Makefile1
-rw-r--r--textproc/p5-Text-Metaphone/pkg-plist14
-rw-r--r--textproc/p5-Text-Query/Makefile1
-rw-r--r--textproc/p5-Text-Query/pkg-plist36
-rw-r--r--textproc/p5-Text-Repository/Makefile1
-rw-r--r--textproc/p5-Text-Repository/pkg-plist10
-rw-r--r--textproc/p5-Text-Shellwords/Makefile1
-rw-r--r--textproc/p5-Text-Shellwords/pkg-plist6
-rw-r--r--textproc/p5-Text-SimpleTemplate/Makefile1
-rw-r--r--textproc/p5-Text-SimpleTemplate/pkg-plist10
-rw-r--r--textproc/p5-Text-Tabs+Wrap/Makefile1
-rw-r--r--textproc/p5-Text-Tabs+Wrap/pkg-plist10
-rw-r--r--textproc/p5-Text-Template/Makefile1
-rw-r--r--textproc/p5-Text-Template/pkg-plist14
-rw-r--r--textproc/p5-Text-Tmpl/Makefile1
-rw-r--r--textproc/p5-Text-Tmpl/pkg-plist22
-rw-r--r--textproc/p5-Text-Wrapper/Makefile1
-rw-r--r--textproc/p5-Text-Wrapper/pkg-plist10
-rw-r--r--textproc/p5-Tk-XMLViewer/Makefile4
-rw-r--r--textproc/p5-Tree-Nary/Makefile1
-rw-r--r--textproc/p5-Tree-Nary/pkg-plist10
-rw-r--r--textproc/p5-URI-Find/Makefile2
-rw-r--r--textproc/p5-URI-Find/pkg-plist14
-rw-r--r--textproc/p5-WDDX/Makefile5
-rw-r--r--textproc/p5-WDDX/pkg-plist28
-rw-r--r--textproc/p5-XML-Catalog/Makefile1
-rw-r--r--textproc/p5-XML-Catalog/pkg-plist10
-rw-r--r--textproc/p5-XML-DOM/Makefile3
-rw-r--r--textproc/p5-XML-DOM/pkg-plist62
-rw-r--r--textproc/p5-XML-DT/Makefile3
-rw-r--r--textproc/p5-XML-DT/pkg-plist100
-rw-r--r--textproc/p5-XML-Directory/Makefile3
-rw-r--r--textproc/p5-XML-Directory/pkg-plist22
-rw-r--r--textproc/p5-XML-Dumper/Makefile3
-rw-r--r--textproc/p5-XML-Dumper/pkg-plist8
-rw-r--r--textproc/p5-XML-Encoding/Makefile3
-rw-r--r--textproc/p5-XML-Encoding/pkg-plist10
-rw-r--r--textproc/p5-XML-Filter-Base/Makefile1
-rw-r--r--textproc/p5-XML-Filter-Base/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-DetectWS/Makefile3
-rw-r--r--textproc/p5-XML-Filter-DetectWS/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-GenericChunk/Makefile1
-rw-r--r--textproc/p5-XML-Filter-Reindent/Makefile3
-rw-r--r--textproc/p5-XML-Filter-Reindent/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-SAXT/Makefile1
-rw-r--r--textproc/p5-XML-Filter-SAXT/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-XInclude/Makefile3
-rw-r--r--textproc/p5-XML-Filter-XInclude/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-XSLT/Makefile7
-rw-r--r--textproc/p5-XML-Filter-XSLT/pkg-plist18
-rw-r--r--textproc/p5-XML-GDOME/Makefile1
-rw-r--r--textproc/p5-XML-Generator-PerlData/Makefile1
-rw-r--r--textproc/p5-XML-Grove/Makefile3
-rw-r--r--textproc/p5-XML-Grove/pkg-plist34
-rw-r--r--textproc/p5-XML-Handler-YAWriter/Makefile2
-rw-r--r--textproc/p5-XML-Handler-YAWriter/pkg-plist14
-rw-r--r--textproc/p5-XML-LibRSVG/Makefile1
-rw-r--r--textproc/p5-XML-LibRSVG/pkg-plist14
-rw-r--r--textproc/p5-XML-LibXML-Common/pkg-plist18
-rw-r--r--textproc/p5-XML-LibXSLT/Makefile3
-rw-r--r--textproc/p5-XML-LibXSLT/pkg-plist16
-rw-r--r--textproc/p5-XML-Node/Makefile3
-rw-r--r--textproc/p5-XML-Node/pkg-plist14
-rw-r--r--textproc/p5-XML-RSS/Makefile1
-rw-r--r--textproc/p5-XML-RegExp/Makefile1
-rw-r--r--textproc/p5-XML-RegExp/pkg-plist10
-rw-r--r--textproc/p5-XML-SAX-Base/Makefile1
-rw-r--r--textproc/p5-XML-SAX-Base/pkg-plist16
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/Makefile4
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/pkg-plist14
-rw-r--r--textproc/p5-XML-Schematron/Makefile3
-rw-r--r--textproc/p5-XML-Schematron/pkg-plist18
-rw-r--r--textproc/p5-XML-Simple/Makefile3
-rw-r--r--textproc/p5-XML-Stream/Makefile5
-rw-r--r--textproc/p5-XML-Stream/pkg-plist24
-rw-r--r--textproc/p5-XML-TreeBuilder/Makefile5
-rw-r--r--textproc/p5-XML-TreeBuilder/pkg-plist10
-rw-r--r--textproc/p5-XML-Twig/Makefile5
-rw-r--r--textproc/p5-XML-Twig/pkg-plist8
-rw-r--r--textproc/p5-XML-XPath/Makefile3
-rw-r--r--textproc/p5-XML-XPath/pkg-plist54
-rw-r--r--textproc/p5-XML-XQL/Makefile3
-rw-r--r--textproc/p5-XML-XQL/pkg-plist26
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/Makefile2
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/pkg-plist18
-rw-r--r--textproc/p5-dTemplate/Makefile1
-rw-r--r--textproc/p5-dTemplate/pkg-plist6
-rw-r--r--textproc/p5-libxml/Makefile3
-rw-r--r--textproc/p5-libxml/pkg-plist42
-rw-r--r--textproc/p5-xmltv/pkg-plist44
-rw-r--r--textproc/ruby-xmlparser/Makefile2
-rw-r--r--textproc/sarep/Makefile2
-rw-r--r--textproc/sdf/pkg-plist378
-rw-r--r--textproc/texi2db/Makefile2
-rw-r--r--textproc/xslint/Makefile2
213 files changed, 1180 insertions, 1270 deletions
diff --git a/textproc/ascii2pdf/Makefile b/textproc/ascii2pdf/Makefile
index 9114492a4178..0260695a6634 100644
--- a/textproc/ascii2pdf/Makefile
+++ b/textproc/ascii2pdf/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-0.9.1
MAINTAINER= petef@FreeBSD.org
COMMENT= A perl script to convert text files to PDF files
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PDF/Create.pm:${PORTSDIR}/textproc/p5-PDF-Create
+RUN_DEPENDS= ${SITE_PERL}/PDF/Create.pm:${PORTSDIR}/textproc/p5-PDF-Create
NO_BUILD= yes
diff --git a/textproc/gutenbook/Makefile b/textproc/gutenbook/Makefile
index 44d64c0277d3..5efa8fd9aa91 100644
--- a/textproc/gutenbook/Makefile
+++ b/textproc/gutenbook/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
${site_perl}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
${site_perl}/URI/URL.pm:${PORTSDIR}/net/p5-URI
-site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+site_perl= ${SITE_PERL}
USE_GNOME= gtk12
NO_BUILD= yes
diff --git a/textproc/gutenbook/pkg-plist b/textproc/gutenbook/pkg-plist
index 5e4b75fccd63..51c8c0841ac5 100644
--- a/textproc/gutenbook/pkg-plist
+++ b/textproc/gutenbook/pkg-plist
@@ -1,11 +1,11 @@
bin/gutenbook
-lib/perl5/site_perl/%%PERL_VER%%/PGB.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/Etext.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/Index.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/Network.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/PropList.pm
+%%SITE_PERL%%/PGB.pm
+%%SITE_PERL%%/PGB/Etext.pm
+%%SITE_PERL%%/PGB/File.pm
+%%SITE_PERL%%/PGB/Index.pm
+%%SITE_PERL%%/PGB/Network.pm
+%%SITE_PERL%%/PGB/PropList.pm
share/doc/gutenbook/MANUAL
share/doc/gutenbook/gutenbook.spec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PGB
+@dirrm %%SITE_PERL%%/PGB
@dirrm share/doc/gutenbook
diff --git a/textproc/makepatch/pkg-plist b/textproc/makepatch/pkg-plist
index 6253252daab7..e79c2a2e4948 100644
--- a/textproc/makepatch/pkg-plist
+++ b/textproc/makepatch/pkg-plist
@@ -1,4 +1,4 @@
bin/applypatch
bin/makepatch
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/makepatch/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/makepatch
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/makepatch/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/makepatch
diff --git a/textproc/p5-Apache-ParseLog/Makefile b/textproc/p5-Apache-ParseLog/Makefile
index 4f009f8059fe..bd39e13c77e3 100644
--- a/textproc/p5-Apache-ParseLog/Makefile
+++ b/textproc/p5-Apache-ParseLog/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Apache::ParseLog.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Apache-ParseLog/pkg-plist b/textproc/p5-Apache-ParseLog/pkg-plist
index 7ac4c313e734..95769851c9de 100644
--- a/textproc/p5-Apache-ParseLog/pkg-plist
+++ b/textproc/p5-Apache-ParseLog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ParseLog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ParseLog/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ParseLog 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 2>/dev/null || true
+%%SITE_PERL%%/Apache/ParseLog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog 2>/dev/null || true
+@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/textproc/p5-CSS-SAC/Makefile b/textproc/p5-CSS-SAC/Makefile
index 81f1e592bacb..92c40fd164fe 100644
--- a/textproc/p5-CSS-SAC/Makefile
+++ b/textproc/p5-CSS-SAC/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= SAC CSS (Simple API for CSS) parser
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ArrayObjects.pm:${PORTSDIR}/devel/p5-Class-ArrayObjects
+BUILD_DEPENDS= ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
+ ${SITE_PERL}/Class/ArrayObjects.pm:${PORTSDIR}/devel/p5-Class-ArrayObjects
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-CSS-SAC/pkg-plist b/textproc/p5-CSS-SAC/pkg-plist
index fe372fff15c1..ab0f1dad7c6f 100644
--- a/textproc/p5-CSS-SAC/pkg-plist
+++ b/textproc/p5-CSS-SAC/pkg-plist
@@ -1,30 +1,30 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CSS/SAC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Attribute.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Combinator.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Content.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Lang.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Negative.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Positional.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/ConditionFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/LexicalUnit.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/CharacterData.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Conditional.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Descendant.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Negative.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/ProcessingInstruction.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Sibling.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/SelectorFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/SelectorList.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/TestWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Writer.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CSS/SAC
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CSS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC/.packlist
+%%SITE_PERL%%/CSS/SAC.pm
+%%SITE_PERL%%/CSS/SAC/Condition.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Attribute.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Combinator.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Content.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Lang.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Negative.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Positional.pm
+%%SITE_PERL%%/CSS/SAC/ConditionFactory.pm
+%%SITE_PERL%%/CSS/SAC/LexicalUnit.pm
+%%SITE_PERL%%/CSS/SAC/Selector.pm
+%%SITE_PERL%%/CSS/SAC/Selector/CharacterData.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Conditional.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Descendant.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Element.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Negative.pm
+%%SITE_PERL%%/CSS/SAC/Selector/ProcessingInstruction.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Sibling.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Simple.pm
+%%SITE_PERL%%/CSS/SAC/SelectorFactory.pm
+%%SITE_PERL%%/CSS/SAC/SelectorList.pm
+%%SITE_PERL%%/CSS/SAC/TestWriter.pm
+%%SITE_PERL%%/CSS/SAC/Writer.pm
+@dirrm %%SITE_PERL%%/CSS/SAC/Condition
+@dirrm %%SITE_PERL%%/CSS/SAC/Selector
+@dirrm %%SITE_PERL%%/CSS/SAC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC
+@unexec rmdir %D/%%SITE_PERL%%/CSS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index 30e1d5977be5..bfb9c75b6f9d 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -18,6 +18,5 @@ COMMENT= Validates user input (usually from an HTML form) based
PERL_CONFIGURE= yes
MAN3= Data::FormValidator.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Data-FormValidator/pkg-plist b/textproc/p5-Data-FormValidator/pkg-plist
index eb888bff9d88..67c7f801511f 100644
--- a/textproc/p5-Data-FormValidator/pkg-plist
+++ b/textproc/p5-Data-FormValidator/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/FormValidator/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/FormValidator.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/FormValidator
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/FormValidator/.packlist
+%%SITE_PERL%%/Data/FormValidator.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/FormValidator
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
diff --git a/textproc/p5-DelimMatch/Makefile b/textproc/p5-DelimMatch/Makefile
index efb0737443eb..e1ab7f7317a6 100644
--- a/textproc/p5-DelimMatch/Makefile
+++ b/textproc/p5-DelimMatch/Makefile
@@ -17,6 +17,5 @@ COMMENT= Perl extension to find regexp delimited strings with proper nesting
PERL_CONFIGURE= yes
MAN3= Text::DelimMatch.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-DelimMatch/pkg-plist b/textproc/p5-DelimMatch/pkg-plist
index 0492f61925e1..03e14a538488 100644
--- a/textproc/p5-DelimMatch/pkg-plist
+++ b/textproc/p5-DelimMatch/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/DelimMatch/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/DelimMatch.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Text/DelimMatch
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/auto/Text/DelimMatch/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
+%%SITE_PERL%%/Text/DelimMatch.pm
+@dirrm %%SITE_PERL%%/auto/Text/DelimMatch
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch
+@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-FreeBSD-Ports/pkg-plist b/textproc/p5-FreeBSD-Ports/pkg-plist
index 9e63253110c6..a6ecd11c12cf 100644
--- a/textproc/p5-FreeBSD-Ports/pkg-plist
+++ b/textproc/p5-FreeBSD-Ports/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports/Port.pm
-lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/FreeBSD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD
+%%SITE_PERL%%/FreeBSD/Ports/Port.pm
+%%SITE_PERL%%/FreeBSD/Ports.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
+@dirrm %%SITE_PERL%%/FreeBSD/Ports
+@dirrm %%SITE_PERL%%/FreeBSD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index 70aa8f5dc5a1..97fcf183f49a 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
COMMENT= A module to format HTML to text or PS
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Font/AFM.pm:${PORTSDIR}/x11-fonts/p5-Font-AFM
+BUILD_DEPENDS= ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
+ ${SITE_PERL}/Font/AFM.pm:${PORTSDIR}/x11-fonts/p5-Font-AFM
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= HTML::Formatter.3 HTML::FormatPS.3 HTML::FormatRTF.3 HTML::FormatText.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Format/pkg-plist b/textproc/p5-HTML-Format/pkg-plist
index c1efd13e78d7..840824ec9183 100644
--- a/textproc/p5-HTML-Format/pkg-plist
+++ b/textproc/p5-HTML-Format/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FormatPS.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FormatRTF.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FormatText.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Formatter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Format/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Format
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/FormatPS.pm
+%%SITE_PERL%%/HTML/FormatRTF.pm
+%%SITE_PERL%%/HTML/FormatText.pm
+%%SITE_PERL%%/HTML/Formatter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/textproc/p5-LJ-SpellCheck/Makefile b/textproc/p5-LJ-SpellCheck/Makefile
index e39be6db0982..ef78401055d7 100644
--- a/textproc/p5-LJ-SpellCheck/Makefile
+++ b/textproc/p5-LJ-SpellCheck/Makefile
@@ -20,6 +20,5 @@ RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
PERL_CONFIGURE= yes
MAN3= LJ::SpellCheck.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-LJ-SpellCheck/pkg-plist b/textproc/p5-LJ-SpellCheck/pkg-plist
index dd94c10c55fd..2707ab5b9d8c 100644
--- a/textproc/p5-LJ-SpellCheck/pkg-plist
+++ b/textproc/p5-LJ-SpellCheck/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/LJ/SpellCheck.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/SpellCheck/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/SpellCheck
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LJ 2>/dev/null || true
+%%SITE_PERL%%/LJ/SpellCheck.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true
diff --git a/textproc/p5-Lingua-Conjunction/Makefile b/textproc/p5-Lingua-Conjunction/Makefile
index 9242cbf0b8c8..567a5798f270 100644
--- a/textproc/p5-Lingua-Conjunction/Makefile
+++ b/textproc/p5-Lingua-Conjunction/Makefile
@@ -18,6 +18,5 @@ COMMENT= Convert Perl lists into linguistic conjunctions
PERL_CONFIGURE= yes
MAN3= Lingua::Conjunction.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-Conjunction/pkg-plist b/textproc/p5-Lingua-Conjunction/pkg-plist
index ce9019f839e9..e33c2c526586 100644
--- a/textproc/p5-Lingua-Conjunction/pkg-plist
+++ b/textproc/p5-Lingua-Conjunction/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Conjunction.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Conjunction/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Conjunction
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/Conjunction.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-AddressParse/Makefile b/textproc/p5-Lingua-EN-AddressParse/Makefile
index b0525a1cf1b7..8502e53a6875 100644
--- a/textproc/p5-Lingua-EN-AddressParse/Makefile
+++ b/textproc/p5-Lingua-EN-AddressParse/Makefile
@@ -20,11 +20,10 @@ BUILD_DEPENDS= ${SITE_PERL}/Lingua/EN/NameParse.pm:${PORTSDIR}/textproc/p5-Lingu
${SITE_PERL}/Locale/SubCountry.pm:${PORTSDIR}/misc/p5-Locale-SubCountry
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::AddressGrammar.3 \
Lingua::EN::AddressParse.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-AddressParse/pkg-plist b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
index 77a8128b9660..ee4050cbedef 100644
--- a/textproc/p5-Lingua-EN-AddressParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/AddressGrammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/AddressParse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/AddressGrammar.pm
+%%SITE_PERL%%/Lingua/EN/AddressParse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Gender/Makefile b/textproc/p5-Lingua-EN-Gender/Makefile
index 8a1077a632c2..6bafaaba3fd5 100644
--- a/textproc/p5-Lingua-EN-Gender/Makefile
+++ b/textproc/p5-Lingua-EN-Gender/Makefile
@@ -18,6 +18,5 @@ COMMENT= Inflect pronouns for gender
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Gender.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Gender/pkg-plist b/textproc/p5-Lingua-EN-Gender/pkg-plist
index a6e1217ef626..e6e16cea201b 100644
--- a/textproc/p5-Lingua-EN-Gender/pkg-plist
+++ b/textproc/p5-Lingua-EN-Gender/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Gender.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Gender.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Inflect/Makefile b/textproc/p5-Lingua-EN-Inflect/Makefile
index 7e38889091af..f201b84f79a1 100644
--- a/textproc/p5-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect/Makefile
@@ -18,6 +18,5 @@ COMMENT= Convert singular words to their plural form
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Inflect.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Inflect/pkg-plist b/textproc/p5-Lingua-EN-Inflect/pkg-plist
index 7eb692eb5a71..b397e1ebc7ab 100644
--- a/textproc/p5-Lingua-EN-Inflect/pkg-plist
+++ b/textproc/p5-Lingua-EN-Inflect/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Inflect.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_NO.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_NUM.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_PL.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_eq.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_inflect.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Inflect.pm
+%%SITE_PERL%%/Lingua/EN/demo_NO.pl
+%%SITE_PERL%%/Lingua/EN/demo_NUM.pl
+%%SITE_PERL%%/Lingua/EN/demo_PL.pl
+%%SITE_PERL%%/Lingua/EN/demo_eq.pl
+%%SITE_PERL%%/Lingua/EN/demo_inflect.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-MatchNames/Makefile b/textproc/p5-Lingua-EN-MatchNames/Makefile
index 890b88a65a4f..0c6b8da7130d 100644
--- a/textproc/p5-Lingua-EN-MatchNames/Makefile
+++ b/textproc/p5-Lingua-EN-MatchNames/Makefile
@@ -21,10 +21,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Lingua/EN/NameParse.pm:${PORTSDIR}/textproc/p5-Lingu
${SITE_PERL}/${PERL_ARCH}/Text/Metaphone.pm:${PORTSDIR}/textproc/p5-Text-Metaphone
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::MatchNames.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-MatchNames/pkg-plist b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
index 328e816d86e6..bf1f57546ad7 100644
--- a/textproc/p5-Lingua-EN-MatchNames/pkg-plist
+++ b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/MatchNames.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/MatchNames.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-NameCase/Makefile b/textproc/p5-Lingua-EN-NameCase/Makefile
index 4ea9a33cc4b2..e1c5af01768a 100644
--- a/textproc/p5-Lingua-EN-NameCase/Makefile
+++ b/textproc/p5-Lingua-EN-NameCase/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to fix the case of people's names
PERL_CONFIGURE= yes
MAN3= Lingua::EN::NameCase.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-NameCase/pkg-plist b/textproc/p5-Lingua-EN-NameCase/pkg-plist
index 54614a9e2065..411f8b0a5870 100644
--- a/textproc/p5-Lingua-EN-NameCase/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameCase/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/NameCase.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/NameCase.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-NameParse/Makefile b/textproc/p5-Lingua-EN-NameParse/Makefile
index fda3cd54d472..c262487769f8 100644
--- a/textproc/p5-Lingua-EN-NameParse/Makefile
+++ b/textproc/p5-Lingua-EN-NameParse/Makefile
@@ -18,11 +18,10 @@ COMMENT= Perl routines for manipulating a person's name
BUILD_DEPENDS= ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::NameGrammar.3 \
Lingua::EN::NameParse.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-NameParse/pkg-plist b/textproc/p5-Lingua-EN-NameParse/pkg-plist
index af4463564abc..aeac9708f2ae 100644
--- a/textproc/p5-Lingua-EN-NameParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameParse/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/NameGrammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/NameParse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/NameGrammar.pm
+%%SITE_PERL%%/Lingua/EN/NameParse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Lingua/EN
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Nickname/Makefile b/textproc/p5-Lingua-EN-Nickname/Makefile
index 61f1161bba96..11ead49f7f42 100644
--- a/textproc/p5-Lingua-EN-Nickname/Makefile
+++ b/textproc/p5-Lingua-EN-Nickname/Makefile
@@ -18,6 +18,5 @@ COMMENT= Genealogical nickname matching (Liz=Beth)
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Nickname.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Nickname/pkg-plist b/textproc/p5-Lingua-EN-Nickname/pkg-plist
index 984986de941f..ace6d667c365 100644
--- a/textproc/p5-Lingua-EN-Nickname/pkg-plist
+++ b/textproc/p5-Lingua-EN-Nickname/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Nickname.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/nickhash.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Nickname.pm
+%%SITE_PERL%%/Lingua/EN/nickhash.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Lingua/EN
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
index f26ccff3376f..63ec42a0cc9d 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
@@ -18,6 +18,5 @@ COMMENT= Go from cardinal number (3) to ordinal ("3rd")
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Numbers::Ordinate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
index 580f23e4ea5c..dd1824999427 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Numbers/Ordinate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Numbers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Numbers/Ordinate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Numbers 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Numbers/Makefile b/textproc/p5-Lingua-EN-Numbers/Makefile
index 85c3afe37e1e..9c8909c31a40 100644
--- a/textproc/p5-Lingua-EN-Numbers/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers/Makefile
@@ -18,6 +18,5 @@ COMMENT= Converts numeric values into their English string equivalents
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Numbers.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Numbers/pkg-plist b/textproc/p5-Lingua-EN-Numbers/pkg-plist
index 4b118ca69056..c3ca9338a694 100644
--- a/textproc/p5-Lingua-EN-Numbers/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Numbers.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Numbers.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Sentence/Makefile b/textproc/p5-Lingua-EN-Sentence/Makefile
index 52c953b90d29..c42d5ee38345 100644
--- a/textproc/p5-Lingua-EN-Sentence/Makefile
+++ b/textproc/p5-Lingua-EN-Sentence/Makefile
@@ -17,7 +17,6 @@ COMMENT= Module for splitting text into sentences
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Sentence.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-extract:
@${RM} -f ${WRKSRC}/lib/Lingua/EN/Sentence.pm~
diff --git a/textproc/p5-Lingua-EN-Sentence/pkg-plist b/textproc/p5-Lingua-EN-Sentence/pkg-plist
index ee49f991cdf1..86455eb85b62 100644
--- a/textproc/p5-Lingua-EN-Sentence/pkg-plist
+++ b/textproc/p5-Lingua-EN-Sentence/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Sentence.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Sentence.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Squeeze/Makefile b/textproc/p5-Lingua-EN-Squeeze/Makefile
index ed91f9b22c1e..cbf5125707fd 100644
--- a/textproc/p5-Lingua-EN-Squeeze/Makefile
+++ b/textproc/p5-Lingua-EN-Squeeze/Makefile
@@ -19,6 +19,5 @@ COMMENT= Shorten text to minimum syllables by using hash table
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Squeeze.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Squeeze/pkg-plist b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
index 03efe63657d6..3d631d057207 100644
--- a/textproc/p5-Lingua-EN-Squeeze/pkg-plist
+++ b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Squeeze.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Squeeze.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Summarize/Makefile b/textproc/p5-Lingua-EN-Summarize/Makefile
index 2a7617dde72e..40feda6f348b 100644
--- a/textproc/p5-Lingua-EN-Summarize/Makefile
+++ b/textproc/p5-Lingua-EN-Summarize/Makefile
@@ -18,11 +18,10 @@ COMMENT= A simple tool for summarizing bodies of English text
BUILD_DEPENDS= ${SITE_PERL}/HTML/Summary.pm:${PORTSDIR}/www/p5-HTML-Summary
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Filters.3 \
Lingua::EN::Summarize.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Summarize/pkg-plist b/textproc/p5-Lingua-EN-Summarize/pkg-plist
index 580cc9599207..dcff42a5271e 100644
--- a/textproc/p5-Lingua-EN-Summarize/pkg-plist
+++ b/textproc/p5-Lingua-EN-Summarize/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Summarize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Summarize/Filters.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Summarize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Summarize.pm
+%%SITE_PERL%%/Lingua/EN/Summarize/Filters.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Summarize 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Syllable/Makefile b/textproc/p5-Lingua-EN-Syllable/Makefile
index 91b14f4e9799..2dcf86cc5329 100644
--- a/textproc/p5-Lingua-EN-Syllable/Makefile
+++ b/textproc/p5-Lingua-EN-Syllable/Makefile
@@ -18,6 +18,5 @@ COMMENT= Routine for estimating syllable count in words
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Syllable.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Syllable/pkg-plist b/textproc/p5-Lingua-EN-Syllable/pkg-plist
index ae5e1b959dba..6e3fb503a2f7 100644
--- a/textproc/p5-Lingua-EN-Syllable/pkg-plist
+++ b/textproc/p5-Lingua-EN-Syllable/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Syllable.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Syllable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-Ident/pkg-plist b/textproc/p5-Lingua-Ident/pkg-plist
index 8e802a98649e..380848cbc407 100644
--- a/textproc/p5-Lingua-Ident/pkg-plist
+++ b/textproc/p5-Lingua-Ident/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Ident.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Ident/.packlist
+%%SITE_PERL%%/Lingua/Ident.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident/.packlist
bin/trainlid
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Ident 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-Ispell/pkg-plist b/textproc/p5-Lingua-Ispell/pkg-plist
index 1882e4a7e0ca..b8d17e603177 100644
--- a/textproc/p5-Lingua-Ispell/pkg-plist
+++ b/textproc/p5-Lingua-Ispell/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Ispell/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Ispell.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Lingua/Ispell
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ispell/.packlist
+%%SITE_PERL%%/Lingua/Ispell.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Ispell
+@dirrm %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Preferred/Makefile b/textproc/p5-Lingua-Preferred/Makefile
index b28417911a68..ea46387726b8 100644
--- a/textproc/p5-Lingua-Preferred/Makefile
+++ b/textproc/p5-Lingua-Preferred/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= svenasse@polaris.ca
COMMENT= Perl extension to choose a language
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Log/TraceMessages.pm:${PORTSDIR}/devel/p5-Log-TraceMessages
+RUN_DEPENDS= ${SITE_PERL}/Log/TraceMessages.pm:${PORTSDIR}/devel/p5-Log-TraceMessages
PERL_CONFIGURE= yes
MAN3= Lingua::Preferred.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-Preferred/pkg-plist b/textproc/p5-Lingua-Preferred/pkg-plist
index 37f6d0733f00..392f69888d2a 100644
--- a/textproc/p5-Lingua-Preferred/pkg-plist
+++ b/textproc/p5-Lingua-Preferred/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Preferred.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Preferred/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Lingua/Preferred/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Lingua/Preferred
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Lingua 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Preferred
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/Preferred.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred/.packlist
+%%SITE_PERL%%/auto/Lingua/Preferred/autosplit.ix
+@dirrm %%SITE_PERL%%/auto/Lingua/Preferred
+@unexec rmdir %D/%%SITE_PERL%%/auto/Lingua 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-MARC/Makefile b/textproc/p5-MARC/Makefile
index cd0267f8f3ea..ddf53d23477e 100644
--- a/textproc/p5-MARC/Makefile
+++ b/textproc/p5-MARC/Makefile
@@ -18,6 +18,5 @@ COMMENT= A module for manipulating bibliographic records in the USMARC format
PERL_CONFIGURE= yes
MAN3= MARC.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-MARC/pkg-plist b/textproc/p5-MARC/pkg-plist
index 388c280c4acb..b0c5d440c89e 100644
--- a/textproc/p5-MARC/pkg-plist
+++ b/textproc/p5-MARC/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MARC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/MARC.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MARC
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/.packlist
+%%SITE_PERL%%/MARC.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC
diff --git a/textproc/p5-NetAddr-IP-Find/Makefile b/textproc/p5-NetAddr-IP-Find/Makefile
index 8784b220fef1..91a7cca4638f 100644
--- a/textproc/p5-NetAddr-IP-Find/Makefile
+++ b/textproc/p5-NetAddr-IP-Find/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
COMMENT= Iterates over all IP addresses in a text similar to Email::Find
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
+RUN_DEPENDS= ${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
PERL_CONFIGURE= yes
INSTALL_TARGET= pure_install
diff --git a/textproc/p5-NetAddr-IP-Find/pkg-plist b/textproc/p5-NetAddr-IP-Find/pkg-plist
index fde4508d2bce..09e01e051d9b 100644
--- a/textproc/p5-NetAddr-IP-Find/pkg-plist
+++ b/textproc/p5-NetAddr-IP-Find/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP/Find.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/NetAddr 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr 2>/dev/null || true
+%%SITE_PERL%%/NetAddr/IP/Find.pm
+@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/NetAddr 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr 2>/dev/null || true
diff --git a/textproc/p5-Number-Format/Makefile b/textproc/p5-Number-Format/Makefile
index 25b11962d83e..c766ad103b0c 100644
--- a/textproc/p5-Number-Format/Makefile
+++ b/textproc/p5-Number-Format/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for formatting numbers
PERL_CONFIGURE= yes
MAN3= Number::Format.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Number-Format/pkg-plist b/textproc/p5-Number-Format/pkg-plist
index c8a967674e32..75772136a33d 100644
--- a/textproc/p5-Number-Format/pkg-plist
+++ b/textproc/p5-Number-Format/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Number/Format/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Number/Format.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Number/Format
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Number 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format/.packlist
+%%SITE_PERL%%/Number/Format.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Number 2>/dev/null || true
diff --git a/textproc/p5-Orchard-Perl/Makefile b/textproc/p5-Orchard-Perl/Makefile
index 388664be27fe..c2cb7ccc991d 100644
--- a/textproc/p5-Orchard-Perl/Makefile
+++ b/textproc/p5-Orchard-Perl/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= Perl interface to Orchard-C
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
LIB_DEPENDS= orchard.0:${PORTSDIR}/textproc/orchard-c
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Orchard-Perl/pkg-plist b/textproc/p5-Orchard-Perl/pkg-plist
index ec1ae7f35424..ad6659d16e83 100644
--- a/textproc/p5-Orchard-Perl/pkg-plist
+++ b/textproc/p5-Orchard-Perl/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/Class/Orchard/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/Orchard/TreeBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/SAXDriver/XMLParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Orchard.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Orchard-Perl/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Orchard-Perl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SAXDriver 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Orchard
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
+%%SITE_PERL%%/Class/Orchard/Node.pm
+%%SITE_PERL%%/Class/Orchard/TreeBuilder.pm
+%%SITE_PERL%%/SAXDriver/XMLParser.pm
+%%SITE_PERL%%/XML/Orchard.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Orchard-Perl/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Orchard-Perl
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/SAXDriver 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Class/Orchard
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 33e737adaa51..cbb06e8d066d 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PERL_SITELIBDIR}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/arch
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
FILES= API2.pm API2/IOString.pm API2/UniMap.pm \
API2/PDF/FileAPI.pm API2/TTF/Font.pm
diff --git a/textproc/p5-PDF-API3/Makefile b/textproc/p5-PDF-API3/Makefile
index 33e737adaa51..cbb06e8d066d 100644
--- a/textproc/p5-PDF-API3/Makefile
+++ b/textproc/p5-PDF-API3/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PERL_SITELIBDIR}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/arch
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
FILES= API2.pm API2/IOString.pm API2/UniMap.pm \
API2/PDF/FileAPI.pm API2/TTF/Font.pm
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index 8853a3b2d32c..96132307a271 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -17,6 +17,5 @@ COMMENT= A perl script to convert text files to PDF files
PERL_CONFIGURE= yes
MAN3= PDF::Create.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-PDF-Create/pkg-plist b/textproc/p5-PDF-Create/pkg-plist
index 337a44f67cd8..a5a1dd6f531b 100644
--- a/textproc/p5-PDF-Create/pkg-plist
+++ b/textproc/p5-PDF-Create/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/Create/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/PDF/Create/Page.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/Create/Outline.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/sample.pl
-lib/perl5/site_perl/%%PERL_VER%%/PDF/Create.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/Create
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/Create
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PDF 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create/.packlist
+%%SITE_PERL%%/PDF/Create/Page.pm
+%%SITE_PERL%%/PDF/Create/Outline.pm
+%%SITE_PERL%%/PDF/sample.pl
+%%SITE_PERL%%/PDF/Create.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create
+@dirrm %%SITE_PERL%%/PDF/Create
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true
diff --git a/textproc/p5-Parse-Syslog/Makefile b/textproc/p5-Parse-Syslog/Makefile
index 9348e52766d6..ca53e50a2167 100644
--- a/textproc/p5-Parse-Syslog/Makefile
+++ b/textproc/p5-Parse-Syslog/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 routines that present a simple interface to parse syslog files
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Parse::Syslog.3
.include <bsd.port.mk>
diff --git a/textproc/p5-Parse-Syslog/pkg-plist b/textproc/p5-Parse-Syslog/pkg-plist
index 35a768f8afa6..074c9048d381 100644
--- a/textproc/p5-Parse-Syslog/pkg-plist
+++ b/textproc/p5-Parse-Syslog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Parse/Syslog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/Syslog/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/Syslog
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Parse 2>/dev/null || true
+%%SITE_PERL%%/Parse/Syslog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
diff --git a/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile
index 01ad0ac9f9cf..11349801f60b 100644
--- a/textproc/p5-Pod-Constants/Makefile
+++ b/textproc/p5-Pod-Constants/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Include constants from POD
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Pod-Constants/pkg-plist b/textproc/p5-Pod-Constants/pkg-plist
index 3d0908340b34..b2fd4e9fa53f 100644
--- a/textproc/p5-Pod-Constants/pkg-plist
+++ b/textproc/p5-Pod-Constants/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/Constants/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Constants.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/Constants
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants/.packlist
+%%SITE_PERL%%/Pod/Constants.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants
+@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
diff --git a/textproc/p5-Pod-POM/pkg-plist b/textproc/p5-Pod-POM/pkg-plist
index 212401393921..6176a8df90b7 100644
--- a/textproc/p5-Pod-POM/pkg-plist
+++ b/textproc/p5-Pod-POM/pkg-plist
@@ -1,17 +1,17 @@
bin/pom2
bin/podlint
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/POM/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Nodes.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View/Pod.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View/Text.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod/POM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/POM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/.packlist
+%%SITE_PERL%%/Pod/POM.pm
+%%SITE_PERL%%/Pod/POM/Constants.pm
+%%SITE_PERL%%/Pod/POM/Node.pm
+%%SITE_PERL%%/Pod/POM/Nodes.pm
+%%SITE_PERL%%/Pod/POM/Test.pm
+%%SITE_PERL%%/Pod/POM/View.pm
+%%SITE_PERL%%/Pod/POM/View/HTML.pm
+%%SITE_PERL%%/Pod/POM/View/Pod.pm
+%%SITE_PERL%%/Pod/POM/View/Text.pm
+@dirrm %%SITE_PERL%%/Pod/POM/View
+@dirrm %%SITE_PERL%%/Pod/POM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM
+@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
diff --git a/textproc/p5-RADIUS-UserFile/Makefile b/textproc/p5-RADIUS-UserFile/Makefile
index 2d635ff80880..7a20340a1365 100644
--- a/textproc/p5-RADIUS-UserFile/Makefile
+++ b/textproc/p5-RADIUS-UserFile/Makefile
@@ -18,11 +18,10 @@ COMMENT= Perl extension for manipulating a RADIUS users file
BUILD_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= RADIUS::UserFile.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-RADIUS-UserFile/pkg-plist b/textproc/p5-RADIUS-UserFile/pkg-plist
index 80ca56cf88b5..db40ae1d6961 100644
--- a/textproc/p5-RADIUS-UserFile/pkg-plist
+++ b/textproc/p5-RADIUS-UserFile/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/RADIUS/UserFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RADIUS/UserFile/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RADIUS/UserFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RADIUS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/RADIUS 2>/dev/null || true
+%%SITE_PERL%%/RADIUS/UserFile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/RADIUS 2>/dev/null || true
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index be75b16b7bbc..f5bf623f652a 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= An object oriented Perl modules for handling tasks related to RDF
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-RDF-Core/pkg-plist b/textproc/p5-RDF-Core/pkg-plist
index 0baab0f2f738..d59d5eb972dc 100644
--- a/textproc/p5-RDF-Core/pkg-plist
+++ b/textproc/p5-RDF-Core/pkg-plist
@@ -1,29 +1,29 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF/Core/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator/Memory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator/Postgres.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Evaluator.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model/Serializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/ModelSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/NodeFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Schema.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Serializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/Memory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/Postgres.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core/.packlist
+%%SITE_PERL%%/RDF/Core.pm
+%%SITE_PERL%%/RDF/Core/Constants.pm
+%%SITE_PERL%%/RDF/Core/Enumerator.pm
+%%SITE_PERL%%/RDF/Core/Enumerator/DB_File.pm
+%%SITE_PERL%%/RDF/Core/Enumerator/Memory.pm
+%%SITE_PERL%%/RDF/Core/Enumerator/Postgres.pm
+%%SITE_PERL%%/RDF/Core/Evaluator.pm
+%%SITE_PERL%%/RDF/Core/Function.pm
+%%SITE_PERL%%/RDF/Core/Literal.pm
+%%SITE_PERL%%/RDF/Core/Model.pm
+%%SITE_PERL%%/RDF/Core/Model/Parser.pm
+%%SITE_PERL%%/RDF/Core/Model/Serializer.pm
+%%SITE_PERL%%/RDF/Core/ModelSet.pm
+%%SITE_PERL%%/RDF/Core/Node.pm
+%%SITE_PERL%%/RDF/Core/NodeFactory.pm
+%%SITE_PERL%%/RDF/Core/Parser.pm
+%%SITE_PERL%%/RDF/Core/Query.pm
+%%SITE_PERL%%/RDF/Core/Resource.pm
+%%SITE_PERL%%/RDF/Core/Schema.pm
+%%SITE_PERL%%/RDF/Core/Serializer.pm
+%%SITE_PERL%%/RDF/Core/Statement.pm
+%%SITE_PERL%%/RDF/Core/Storage.pm
+%%SITE_PERL%%/RDF/Core/Storage/DB_File.pm
+%%SITE_PERL%%/RDF/Core/Storage/Memory.pm
+%%SITE_PERL%%/RDF/Core/Storage/Postgres.pm
%%PORTDOCS%%%%DOCSDIR%%/RDF/Core/Enumerator/DB_File.pm.html
%%PORTDOCS%%%%DOCSDIR%%/RDF/Core/Enumerator/Memory.pm.html
%%PORTDOCS%%%%DOCSDIR%%/RDF/Core/Enumerator/Postgres.pm.html
@@ -56,10 +56,10 @@ lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/Postgres.pm
%%PORTDOCS%%@dirrm %%DOCSDIR%%/RDF/Core
%%PORTDOCS%%@dirrm %%DOCSDIR%%/RDF
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/RDF 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF/Core
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
+@dirrm %%SITE_PERL%%/RDF/Core/Enumerator
+@dirrm %%SITE_PERL%%/RDF/Core/Model
+@dirrm %%SITE_PERL%%/RDF/Core/Storage
+@dirrm %%SITE_PERL%%/RDF/Core
+@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index cfe572276071..64260093352d 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Perl API for RDF Storage
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Digest.pm:${PORTSDIR}/security/p5-Digest \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-RDFStore/pkg-plist b/textproc/p5-RDFStore/pkg-plist
index a75f7fac5afc..f161d2c7611e 100644
--- a/textproc/p5-RDFStore/pkg-plist
+++ b/textproc/p5-RDFStore/pkg-plist
@@ -1,45 +1,45 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDFStore/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/MagicTie.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/NodeFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/OpenHealth.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/SiRPAC.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/Styles/MagicTie.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/RDFNode.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/SchemaModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/SetModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Abstract.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Digestable.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/SHA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/NodeFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/RDFNode.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/SetModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/VirtualModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Vocabulary/Generator.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/VirtualModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/DAML.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/DC.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/DCQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/RDF.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/RDFS.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/Styles
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Vocabulary
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDFStore
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/.packlist
+%%SITE_PERL%%/Data/MagicTie.pm
+%%SITE_PERL%%/RDFStore.pm
+%%SITE_PERL%%/RDFStore/Literal.pm
+%%SITE_PERL%%/RDFStore/Model.pm
+%%SITE_PERL%%/RDFStore/NodeFactory.pm
+%%SITE_PERL%%/RDFStore/Parser/OpenHealth.pm
+%%SITE_PERL%%/RDFStore/Parser/SiRPAC.pm
+%%SITE_PERL%%/RDFStore/Parser/Styles/MagicTie.pm
+%%SITE_PERL%%/RDFStore/RDFNode.pm
+%%SITE_PERL%%/RDFStore/Resource.pm
+%%SITE_PERL%%/RDFStore/SchemaModel.pm
+%%SITE_PERL%%/RDFStore/SetModel.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Abstract.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Digestable.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Generic.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/MD5.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/SHA1.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Util.pm
+%%SITE_PERL%%/RDFStore/Stanford/Literal.pm
+%%SITE_PERL%%/RDFStore/Stanford/Model.pm
+%%SITE_PERL%%/RDFStore/Stanford/NodeFactory.pm
+%%SITE_PERL%%/RDFStore/Stanford/RDFNode.pm
+%%SITE_PERL%%/RDFStore/Stanford/Resource.pm
+%%SITE_PERL%%/RDFStore/Stanford/SetModel.pm
+%%SITE_PERL%%/RDFStore/Stanford/Statement.pm
+%%SITE_PERL%%/RDFStore/Stanford/VirtualModel.pm
+%%SITE_PERL%%/RDFStore/Stanford/Vocabulary/Generator.pm
+%%SITE_PERL%%/RDFStore/Statement.pm
+%%SITE_PERL%%/RDFStore/VirtualModel.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/DAML.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/DC.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/DCQ.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/RDF.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/RDFS.pm
+@dirrm %%SITE_PERL%%/RDFStore/Parser/Styles
+@dirrm %%SITE_PERL%%/RDFStore/Parser
+@dirrm %%SITE_PERL%%/RDFStore/Stanford/Digest
+@dirrm %%SITE_PERL%%/RDFStore/Stanford/Vocabulary
+@dirrm %%SITE_PERL%%/RDFStore/Stanford
+@dirrm %%SITE_PERL%%/RDFStore/Vocabulary
+@dirrm %%SITE_PERL%%/RDFStore
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile
index 8986d7f70694..c529af4c4a48 100644
--- a/textproc/p5-Search-Saryer/Makefile
+++ b/textproc/p5-Search-Saryer/Makefile
@@ -21,6 +21,5 @@ PERL_CONFIGURE= yes
MAN3= Search::Saryer.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Search-Saryer/pkg-plist b/textproc/p5-Search-Saryer/pkg-plist
index ec769ceb739d..97b2244a408e 100644
--- a/textproc/p5-Search-Saryer/pkg-plist
+++ b/textproc/p5-Search-Saryer/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Search/Saryer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Search/Saryer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Search 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
diff --git a/textproc/p5-Sort-ArbBiLex/Makefile b/textproc/p5-Sort-ArbBiLex/Makefile
index 5c423e7488fb..655cb9054a78 100644
--- a/textproc/p5-Sort-ArbBiLex/Makefile
+++ b/textproc/p5-Sort-ArbBiLex/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to make sort functions for arbitrary sort orders
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Sort::ArbBiLex.3
.include <bsd.port.mk>
diff --git a/textproc/p5-Sort-ArbBiLex/pkg-plist b/textproc/p5-Sort-ArbBiLex/pkg-plist
index 586ed3251688..e41b834b39fb 100644
--- a/textproc/p5-Sort-ArbBiLex/pkg-plist
+++ b/textproc/p5-Sort-ArbBiLex/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sort/ArbBiLex.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sort 2>/dev/null || true
+%%SITE_PERL%%/Sort/ArbBiLex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
diff --git a/textproc/p5-Sort-Fields/Makefile b/textproc/p5-Sort-Fields/Makefile
index c74933bd4f83..e2ecd11e7612 100644
--- a/textproc/p5-Sort-Fields/Makefile
+++ b/textproc/p5-Sort-Fields/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to sort lines containing delimited fields
PERL_CONFIGURE= yes
MAN3= Sort::Fields.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Sort-Fields/pkg-plist b/textproc/p5-Sort-Fields/pkg-plist
index 65611509b27f..09c561b1fc78 100644
--- a/textproc/p5-Sort-Fields/pkg-plist
+++ b/textproc/p5-Sort-Fields/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Fields/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Sort/Fields.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Fields
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sort 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields/.packlist
+%%SITE_PERL%%/Sort/Fields.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
diff --git a/textproc/p5-Sort-PolySort/Makefile b/textproc/p5-Sort-PolySort/Makefile
index b399d00e596c..1e0cabb9b9e0 100644
--- a/textproc/p5-Sort-PolySort/Makefile
+++ b/textproc/p5-Sort-PolySort/Makefile
@@ -18,7 +18,6 @@ COMMENT= General rules-based sorting of lists
PERL_CONFIGURE= yes
MAN3= Sort::PolySort.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e '/^\$$Sort::PolySort::VERSION =/ && chomp' \
diff --git a/textproc/p5-Sort-PolySort/pkg-plist b/textproc/p5-Sort-PolySort/pkg-plist
index 39aaf77427db..87da142e1b1c 100644
--- a/textproc/p5-Sort-PolySort/pkg-plist
+++ b/textproc/p5-Sort-PolySort/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/PolySort/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Sort/PolySort.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/PolySort
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sort 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/PolySort/.packlist
+%%SITE_PERL%%/Sort/PolySort.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/PolySort
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 387a5edbeca9..4fe797101e4e 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -24,7 +24,6 @@ PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
MAN3= Spreadsheet::ParseExcel.3 \
Spreadsheet::ParseExcel::SaveParser.3 \
Spreadsheet::ParseExcel::Utility.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
diff --git a/textproc/p5-String-Scanf/Makefile b/textproc/p5-String-Scanf/Makefile
index 4f60fc8fe3ba..95e1ea79c649 100644
--- a/textproc/p5-String-Scanf/Makefile
+++ b/textproc/p5-String-Scanf/Makefile
@@ -18,6 +18,5 @@ COMMENT= Emulates the sscanf() of the C stdio library
PERL_CONFIGURE= yes
MAN3= String::Scanf.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-String-Scanf/pkg-plist b/textproc/p5-String-Scanf/pkg-plist
index b20d3ce3216d..603efc4b5c2d 100644
--- a/textproc/p5-String-Scanf/pkg-plist
+++ b/textproc/p5-String-Scanf/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Scanf/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/String/Scanf.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Scanf
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/String 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf/.packlist
+%%SITE_PERL%%/String/Scanf.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index bea2db08836e..c96aae00aa14 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module for quote strings for passing through the shell
PERL_CONFIGURE= yes
MAN3= String::ShellQuote.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-String-ShellQuote/pkg-plist b/textproc/p5-String-ShellQuote/pkg-plist
index 73e216715272..42b07f38e6a1 100644
--- a/textproc/p5-String-ShellQuote/pkg-plist
+++ b/textproc/p5-String-ShellQuote/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/String/ShellQuote.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/ShellQuote
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/String 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist
+%%SITE_PERL%%/String/ShellQuote.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
diff --git a/textproc/p5-String-Strip/Makefile b/textproc/p5-String-Strip/Makefile
index 662ae4f2778d..2adc1811d259 100644
--- a/textproc/p5-String-Strip/Makefile
+++ b/textproc/p5-String-Strip/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for fast, commonly used, string operations
PERL_CONFIGURE= yes
MAN3= String::Strip.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-String-Strip/pkg-plist b/textproc/p5-String-Strip/pkg-plist
index 580b7b42bd94..9fb91550c52e 100644
--- a/textproc/p5-String-Strip/pkg-plist
+++ b/textproc/p5-String-Strip/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/Strip.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/Strip.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/Strip.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/Strip.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/Strip.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/String/Strip.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true
diff --git a/textproc/p5-TeX-Hyphen/Makefile b/textproc/p5-TeX-Hyphen/Makefile
index 01292ecc9541..8ef4c1a006be 100644
--- a/textproc/p5-TeX-Hyphen/Makefile
+++ b/textproc/p5-TeX-Hyphen/Makefile
@@ -17,7 +17,6 @@ COMMENT= Hyphenate words using TeX's patterns
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= TeX::Hyphen.3 TeX::Hyphen::czech.3 TeX::Hyphen::german.3
.include <bsd.port.mk>
diff --git a/textproc/p5-TeX-Hyphen/pkg-plist b/textproc/p5-TeX-Hyphen/pkg-plist
index f44e3c1a161e..6d6cfca3fde7 100644
--- a/textproc/p5-TeX-Hyphen/pkg-plist
+++ b/textproc/p5-TeX-Hyphen/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen.pm
-lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen/czech.pm
-lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen/german.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TeX/Hyphen/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TeX/Hyphen
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/TeX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TeX 2>/dev/null || true
+%%SITE_PERL%%/TeX/Hyphen.pm
+%%SITE_PERL%%/TeX/Hyphen/czech.pm
+%%SITE_PERL%%/TeX/Hyphen/german.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen
+@dirrm %%SITE_PERL%%/TeX/Hyphen
+@unexec rmdir %D/%%SITE_PERL%%/TeX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX 2>/dev/null || true
diff --git a/textproc/p5-Text-Bind/Makefile b/textproc/p5-Text-Bind/Makefile
index 4d4bc1d8c569..67b14f711e0c 100644
--- a/textproc/p5-Text-Bind/Makefile
+++ b/textproc/p5-Text-Bind/Makefile
@@ -18,6 +18,5 @@ COMMENT= Bind Perl structures to text files
PERL_CONFIGURE= yes
MAN3= Text::Bind.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Bind/pkg-plist b/textproc/p5-Text-Bind/pkg-plist
index 0ccbc5eb698f..d528cb84fbfa 100644
--- a/textproc/p5-Text-Bind/pkg-plist
+++ b/textproc/p5-Text-Bind/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Bind.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Bind
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist
+%%SITE_PERL%%/Text/Bind.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-CSV/Makefile b/textproc/p5-Text-CSV/Makefile
index 1143e9e07f4d..5a67154e4bee 100644
--- a/textproc/p5-Text-CSV/Makefile
+++ b/textproc/p5-Text-CSV/Makefile
@@ -18,6 +18,5 @@ COMMENT= Composition and decomposition of comma-separated values
PERL_CONFIGURE= yes
MAN3= Text::CSV.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV/pkg-plist b/textproc/p5-Text-CSV/pkg-plist
index 34ad51bb5880..adb60f3c722c 100644
--- a/textproc/p5-Text-CSV/pkg-plist
+++ b/textproc/p5-Text-CSV/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/version.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/new.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/status.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/error_input.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/string.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/fields.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/combine.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/parse.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/_bite.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/CSV.pm
+%%SITE_PERL%%/auto/Text/CSV/version.al
+%%SITE_PERL%%/auto/Text/CSV/new.al
+%%SITE_PERL%%/auto/Text/CSV/status.al
+%%SITE_PERL%%/auto/Text/CSV/error_input.al
+%%SITE_PERL%%/auto/Text/CSV/string.al
+%%SITE_PERL%%/auto/Text/CSV/fields.al
+%%SITE_PERL%%/auto/Text/CSV/combine.al
+%%SITE_PERL%%/auto/Text/CSV/parse.al
+%%SITE_PERL%%/auto/Text/CSV/_bite.al
+%%SITE_PERL%%/auto/Text/CSV/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/.packlist
+%%SITE_PERL%%/Text/CSV.pm
@dirrm lib/perl5/site_perl/5.6.0/mach/auto/Text/CSV
@dirrm lib/perl5/site_perl/5.6.0/mach/auto/Text
@dirrm lib/perl5/site_perl/5.6.0/auto/Text/CSV
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 236f52097bac..c0f7b6553fcb 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -18,6 +18,5 @@ COMMENT= Composition and decomposition of comma-separated values
PERL_CONFIGURE= yes
MAN3= Text::CSV_XS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV_XS/pkg-plist b/textproc/p5-Text-CSV_XS/pkg-plist
index e1ab5bf6ef92..cdfd7385a9ca 100644
--- a/textproc/p5-Text-CSV_XS/pkg-plist
+++ b/textproc/p5-Text-CSV_XS/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/CSV_XS.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/CSV_XS.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index 4f750a3f4f65..4dd4c6d8ff8e 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Text::Diff - Perform diffs on files and record sets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS= ${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Text::Diff.3 Text::Diff::Table.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Diff/pkg-plist b/textproc/p5-Text-Diff/pkg-plist
index 09cf96e27f0b..d59ca682fb75 100644
--- a/textproc/p5-Text-Diff/pkg-plist
+++ b/textproc/p5-Text-Diff/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Diff/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Diff/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Diff.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Diff
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/Diff
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff/.packlist
+%%SITE_PERL%%/Text/Diff/Table.pm
+%%SITE_PERL%%/Text/Diff.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Text/Diff
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-DoubleMetaphone/Makefile b/textproc/p5-Text-DoubleMetaphone/Makefile
index 05c1a568b69d..e4aba3c72309 100644
--- a/textproc/p5-Text-DoubleMetaphone/Makefile
+++ b/textproc/p5-Text-DoubleMetaphone/Makefile
@@ -18,6 +18,5 @@ COMMENT= Phonetic encoding of words
PERL_CONFIGURE= yes
MAN3= Text::DoubleMetaphone.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-DoubleMetaphone/pkg-plist b/textproc/p5-Text-DoubleMetaphone/pkg-plist
index 675a1088944f..d2ec9b13893d 100644
--- a/textproc/p5-Text-DoubleMetaphone/pkg-plist
+++ b/textproc/p5-Text-DoubleMetaphone/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/DoubleMetaphone.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/DoubleMetaphone.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-EtText/pkg-plist b/textproc/p5-Text-EtText/pkg-plist
index 2fd36f3f0185..242e02a0f3e1 100644
--- a/textproc/p5-Text-EtText/pkg-plist
+++ b/textproc/p5-Text-EtText/pkg-plist
@@ -1,13 +1,13 @@
bin/ethtml2text
bin/ettext2html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/EtText/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/Lists.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/DefaultGlossary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/LinkGlossary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/HTML2EtText.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/EtText2HTML.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/EtText
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/EtText
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2> /dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText/.packlist
+%%SITE_PERL%%/Text/EtText.pm
+%%SITE_PERL%%/Text/EtText/Lists.pm
+%%SITE_PERL%%/Text/EtText/DefaultGlossary.pm
+%%SITE_PERL%%/Text/EtText/LinkGlossary.pm
+%%SITE_PERL%%/Text/EtText/HTML2EtText.pm
+%%SITE_PERL%%/Text/EtText/EtText2HTML.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text/EtText
+@unexec rmdir %D/%%SITE_PERL%%/Text 2> /dev/null || true
diff --git a/textproc/p5-Text-FillIn/Makefile b/textproc/p5-Text-FillIn/Makefile
index 2d9f238bf5d9..c020e296fcf3 100644
--- a/textproc/p5-Text-FillIn/Makefile
+++ b/textproc/p5-Text-FillIn/Makefile
@@ -18,6 +18,5 @@ COMMENT= A class implementing a fill-in template
PERL_CONFIGURE= yes
MAN3= Text::FillIn.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-FillIn/pkg-plist b/textproc/p5-Text-FillIn/pkg-plist
index c611f7d45b0f..211fa5669e6f 100644
--- a/textproc/p5-Text-FillIn/pkg-plist
+++ b/textproc/p5-Text-FillIn/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FillIn/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FillIn.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FillIn
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn/.packlist
+%%SITE_PERL%%/Text/FillIn.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index 71e1c33391fd..f525a5d26743 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Chains multiple Text::Filter objects and runs them in sequence
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Filter.pm:${PORTSDIR}/textproc/p5-Text-Filter
+BUILD_DEPENDS= ${SITE_PERL}/Text/Filter.pm:${PORTSDIR}/textproc/p5-Text-Filter
PERL_CONFIGURE= yes
MAN3= Text::Filter::Chain.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Filter-Chain/pkg-plist b/textproc/p5-Text-Filter-Chain/pkg-plist
index 67510eb1fb3f..0a2e61f99637 100644
--- a/textproc/p5-Text-Filter-Chain/pkg-plist
+++ b/textproc/p5-Text-Filter-Chain/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter/Chain/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Filter/Chain.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter/Chain
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/Filter 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain/.packlist
+%%SITE_PERL%%/Text/Filter/Chain.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain
+@unexec rmdir %D/%%SITE_PERL%%/Text/Filter 2>/dev/null || true
diff --git a/textproc/p5-Text-Filter/Makefile b/textproc/p5-Text-Filter/Makefile
index a8a7e80eda92..8abe0be0d888 100644
--- a/textproc/p5-Text-Filter/Makefile
+++ b/textproc/p5-Text-Filter/Makefile
@@ -18,6 +18,5 @@ COMMENT= Base class for objects that can read and write text lines
PERL_CONFIGURE= yes
MAN3= Text::Filter.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Filter/pkg-plist b/textproc/p5-Text-Filter/pkg-plist
index dc5e9aff99e3..bebd509d24d2 100644
--- a/textproc/p5-Text-Filter/pkg-plist
+++ b/textproc/p5-Text-Filter/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Filter.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/.packlist
+%%SITE_PERL%%/Text/Filter.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index b7c532d0f768..7c5102be0fca 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Various niceties for p5-Text-FixedLength lovers
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/FixedLength.pm:${PORTSDIR}/textproc/p5-Text-FixedLength
+BUILD_DEPENDS= ${SITE_PERL}/Text/FixedLength.pm:${PORTSDIR}/textproc/p5-Text-FixedLength
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Text::FixedLength::Extra.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1);$$1/;' \
diff --git a/textproc/p5-Text-FixedLength-Extra/pkg-plist b/textproc/p5-Text-FixedLength-Extra/pkg-plist
index 0b9386335efa..a6fe8de83e28 100644
--- a/textproc/p5-Text-FixedLength-Extra/pkg-plist
+++ b/textproc/p5-Text-FixedLength-Extra/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FixedLength/Extra.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/FixedLength 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra/.packlist
+%%SITE_PERL%%/Text/FixedLength/Extra.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra
+@unexec rmdir %D/%%SITE_PERL%%/Text/FixedLength 2>/dev/null || true
diff --git a/textproc/p5-Text-FixedLength/Makefile b/textproc/p5-Text-FixedLength/Makefile
index 466baac70f59..9de4a4bdf01e 100644
--- a/textproc/p5-Text-FixedLength/Makefile
+++ b/textproc/p5-Text-FixedLength/Makefile
@@ -18,6 +18,5 @@ COMMENT= Parse and create fixed length field records
PERL_CONFIGURE= yes
MAN3= Text::FixedLength.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-FixedLength/pkg-plist b/textproc/p5-Text-FixedLength/pkg-plist
index 9ade71aff306..247a041f1050 100644
--- a/textproc/p5-Text-FixedLength/pkg-plist
+++ b/textproc/p5-Text-FixedLength/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FixedLength.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/.packlist
+%%SITE_PERL%%/Text/FixedLength.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Flowchart/Makefile b/textproc/p5-Text-Flowchart/Makefile
index 06d0cdf93114..0f88c65a4b80 100644
--- a/textproc/p5-Text-Flowchart/Makefile
+++ b/textproc/p5-Text-Flowchart/Makefile
@@ -18,6 +18,5 @@ COMMENT= ASCII Flowchart maker
PERL_CONFIGURE= yes
MAN3= Text::Flowchart.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Flowchart/pkg-plist b/textproc/p5-Text-Flowchart/pkg-plist
index 8cebf2b071c5..59f6ddccf34e 100644
--- a/textproc/p5-Text-Flowchart/pkg-plist
+++ b/textproc/p5-Text-Flowchart/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Flowchart/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Flowchart.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Flowchart
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart/.packlist
+%%SITE_PERL%%/Text/Flowchart.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index db938a1068e6..b482c8511f27 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -19,6 +19,5 @@ COMMENT= Various subroutines to format text
PERL_CONFIGURE= yes
MAN3= Text::Format.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Format/pkg-plist b/textproc/p5-Text-Format/pkg-plist
index c3961cbc9ef5..f7dfaa4c6207 100644
--- a/textproc/p5-Text-Format/pkg-plist
+++ b/textproc/p5-Text-Format/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Format/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Format.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Format
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format/.packlist
+%%SITE_PERL%%/Text/Format.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-FormatTable/Makefile b/textproc/p5-Text-FormatTable/Makefile
index 466e25ee858e..d2ceac7870d6 100644
--- a/textproc/p5-Text-FormatTable/Makefile
+++ b/textproc/p5-Text-FormatTable/Makefile
@@ -18,6 +18,5 @@ COMMENT= Renders simple tables as text
PERL_CONFIGURE= yes
MAN3= Text::FormatTable.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-FormatTable/pkg-plist b/textproc/p5-Text-FormatTable/pkg-plist
index a98e3a3805c8..815052f34e75 100644
--- a/textproc/p5-Text-FormatTable/pkg-plist
+++ b/textproc/p5-Text-FormatTable/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FormatTable/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FormatTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/example.pl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FormatTable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable/.packlist
+%%SITE_PERL%%/Text/FormatTable.pm
+%%SITE_PERL%%/Text/example.pl
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index 9df57d09932e..0638c0348c54 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= A text graphics rendering toolkit
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper
+BUILD_DEPENDS= ${SITE_PERL}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Text::Graphics.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
@${RM} ${WRKSRC}/lib/Text/Graphics.pm.orig
diff --git a/textproc/p5-Text-Graphics/pkg-plist b/textproc/p5-Text-Graphics/pkg-plist
index a747319850cc..e6daf9f81182 100644
--- a/textproc/p5-Text-Graphics/pkg-plist
+++ b/textproc/p5-Text-Graphics/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Graphics/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Graphics.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Graphics
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics/.packlist
+%%SITE_PERL%%/Text/Graphics.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Metaphone/Makefile b/textproc/p5-Text-Metaphone/Makefile
index ab60819c72eb..9b82d75d6aa5 100644
--- a/textproc/p5-Text-Metaphone/Makefile
+++ b/textproc/p5-Text-Metaphone/Makefile
@@ -18,6 +18,5 @@ COMMENT= A modern soundex: phonetic encoding of words
PERL_CONFIGURE= yes
MAN3= Text::Metaphone.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Metaphone/pkg-plist b/textproc/p5-Text-Metaphone/pkg-plist
index 87e808c0d99a..0c37d8351f80 100644
--- a/textproc/p5-Text-Metaphone/pkg-plist
+++ b/textproc/p5-Text-Metaphone/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/Metaphone.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/Metaphone.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Query/Makefile b/textproc/p5-Text-Query/Makefile
index 199f96711fb5..95c0f1e6b606 100644
--- a/textproc/p5-Text-Query/Makefile
+++ b/textproc/p5-Text-Query/Makefile
@@ -24,7 +24,6 @@ MAN3= Text::Query.3 Text::Query::Build.3 \
Text::Query::ParseSimple.3 Text::Query::Solve.3 \
Text::Query::SolveAdvancedString.3 \
Text::Query::SolveSimpleString.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e 's/factor\(\$$self\)/\&factor(\$$self)/' \
diff --git a/textproc/p5-Text-Query/pkg-plist b/textproc/p5-Text-Query/pkg-plist
index d35fe9eb1347..915a490f642f 100644
--- a/textproc/p5-Text-Query/pkg-plist
+++ b/textproc/p5-Text-Query/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Query/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Advanced.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Build.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Parse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildAdvancedString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildSimpleString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/SolveAdvancedString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Solve.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/ParseAdvanced.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/SolveSimpleString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Optimize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/ParseSimple.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Query
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/Query
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query/.packlist
+%%SITE_PERL%%/Text/Query.pm
+%%SITE_PERL%%/Text/Query/Advanced.pm
+%%SITE_PERL%%/Text/Query/Build.pm
+%%SITE_PERL%%/Text/Query/Parse.pm
+%%SITE_PERL%%/Text/Query/BuildAdvancedString.pm
+%%SITE_PERL%%/Text/Query/BuildSimpleString.pm
+%%SITE_PERL%%/Text/Query/SolveAdvancedString.pm
+%%SITE_PERL%%/Text/Query/Solve.pm
+%%SITE_PERL%%/Text/Query/ParseAdvanced.pm
+%%SITE_PERL%%/Text/Query/SolveSimpleString.pm
+%%SITE_PERL%%/Text/Query/Optimize.pm
+%%SITE_PERL%%/Text/Query/Simple.pm
+%%SITE_PERL%%/Text/Query/ParseSimple.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query
+@dirrm %%SITE_PERL%%/Text/Query
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Repository/Makefile b/textproc/p5-Text-Repository/Makefile
index 6dec212650b7..7a9d4393c53b 100644
--- a/textproc/p5-Text-Repository/Makefile
+++ b/textproc/p5-Text-Repository/Makefile
@@ -18,6 +18,5 @@ COMMENT= A simple way to manage text without mixing it with Perl
PERL_CONFIGURE= yes
MAN3= Text::Repository.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Repository/pkg-plist b/textproc/p5-Text-Repository/pkg-plist
index 52b3a5de22ac..b2c6d838e139 100644
--- a/textproc/p5-Text-Repository/pkg-plist
+++ b/textproc/p5-Text-Repository/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Repository/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Repository.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Repository 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository/.packlist
+%%SITE_PERL%%/Text/Repository.pm
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Shellwords/Makefile b/textproc/p5-Text-Shellwords/Makefile
index eb6587cababa..cd759da455cf 100644
--- a/textproc/p5-Text-Shellwords/Makefile
+++ b/textproc/p5-Text-Shellwords/Makefile
@@ -18,6 +18,5 @@ COMMENT= This is a thin wrapper around the shellwords.pl package
PERL_CONFIGURE= yes
MAN3= Text::Shellwords.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Shellwords/pkg-plist b/textproc/p5-Text-Shellwords/pkg-plist
index 9ad156872ac6..b5473d50070f 100644
--- a/textproc/p5-Text-Shellwords/pkg-plist
+++ b/textproc/p5-Text-Shellwords/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Text/Shellwords.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Shellwords/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Shellwords > /dev/null || true
+%%SITE_PERL%%/Text/Shellwords.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords > /dev/null || true
diff --git a/textproc/p5-Text-SimpleTemplate/Makefile b/textproc/p5-Text-SimpleTemplate/Makefile
index eb4456bafbc0..4c40d35a097d 100644
--- a/textproc/p5-Text-SimpleTemplate/Makefile
+++ b/textproc/p5-Text-SimpleTemplate/Makefile
@@ -18,6 +18,5 @@ COMMENT= Yet another Perl module for template processing
PERL_CONFIGURE= yes
MAN3= Text::SimpleTemplate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-SimpleTemplate/pkg-plist b/textproc/p5-Text-SimpleTemplate/pkg-plist
index 1f3d3fa5efde..9c482e006df9 100644
--- a/textproc/p5-Text-SimpleTemplate/pkg-plist
+++ b/textproc/p5-Text-SimpleTemplate/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/SimpleTemplate.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate/.packlist
+%%SITE_PERL%%/Text/SimpleTemplate.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Tabs+Wrap/Makefile b/textproc/p5-Text-Tabs+Wrap/Makefile
index e180decea27b..968679cd1201 100644
--- a/textproc/p5-Text-Tabs+Wrap/Makefile
+++ b/textproc/p5-Text-Tabs+Wrap/Makefile
@@ -18,6 +18,5 @@ COMMENT= Line wrapping to form simple paragraphs
PERL_CONFIGURE= YES
MAN3= Text::Wrap.3 Text::Tabs.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Tabs+Wrap/pkg-plist b/textproc/p5-Text-Tabs+Wrap/pkg-plist
index 5c4effac55d8..3538972597c0 100644
--- a/textproc/p5-Text-Tabs+Wrap/pkg-plist
+++ b/textproc/p5-Text-Tabs+Wrap/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Wrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Tabs.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/.packlist
+%%SITE_PERL%%/Text/Wrap.pm
+%%SITE_PERL%%/Text/Tabs.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 34b2e3c98666..7816b6d8aed2 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -18,7 +18,6 @@ COMMENT= Expand template text with embedded Perl
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Text::Template.3 Text::Template::Preprocess.3
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Template/pkg-plist b/textproc/p5-Text-Template/pkg-plist
index ddf4a3516aac..b8dcff442e26 100644
--- a/textproc/p5-Text-Template/pkg-plist
+++ b/textproc/p5-Text-Template/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Text/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Template/Preprocess.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Template/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Template
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/Template
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/Text/Template.pm
+%%SITE_PERL%%/Text/Template/Preprocess.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Text/Template
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Tmpl/Makefile b/textproc/p5-Text-Tmpl/Makefile
index 18b67e4c6159..90c3184ff6df 100644
--- a/textproc/p5-Text-Tmpl/Makefile
+++ b/textproc/p5-Text-Tmpl/Makefile
@@ -18,7 +18,6 @@ COMMENT= Templating system perl library
PERL_CONFIGURE= yes
MAN3= template_syntax.3 Text::Tmpl.3 template_extend.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e '/OPTIMIZE|libtmpl.pod/ and $$_=""' \
diff --git a/textproc/p5-Text-Tmpl/pkg-plist b/textproc/p5-Text-Tmpl/pkg-plist
index b5e5dfe0a172..9094eac83d63 100644
--- a/textproc/p5-Text-Tmpl/pkg-plist
+++ b/textproc/p5-Text-Tmpl/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/template_syntax.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/libtmpl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/template_extend.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/Tmpl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/template_syntax.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/libtmpl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/template_extend.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/Tmpl.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index a6a1f0ab32ca..9b0d9e8b2ae8 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -18,6 +18,5 @@ COMMENT= Simple word wrapping routine
PERL_CONFIGURE= yes
MAN3= Text::Wrapper.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Wrapper/pkg-plist b/textproc/p5-Text-Wrapper/pkg-plist
index a6c8643e2ef1..3a7e09e44eb4 100644
--- a/textproc/p5-Text-Wrapper/pkg-plist
+++ b/textproc/p5-Text-Wrapper/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Wrapper.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Wrapper
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist
+%%SITE_PERL%%/Text/Wrapper.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index 7fe0201aecb6..38d06aa79757 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Tk::XMLViewer - Tk widget to display XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Tree-Nary/Makefile b/textproc/p5-Tree-Nary/Makefile
index 772d68dcd245..3006268a3d14 100644
--- a/textproc/p5-Tree-Nary/Makefile
+++ b/textproc/p5-Tree-Nary/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl implementation of N-ary search trees
PERL_CONFIGURE= yes
MAN3= Tree::Nary.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Tree-Nary/pkg-plist b/textproc/p5-Tree-Nary/pkg-plist
index fff56a5e9e1f..97994796f75c 100644
--- a/textproc/p5-Tree-Nary/pkg-plist
+++ b/textproc/p5-Tree-Nary/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree/Nary/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tree/Nary.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree/Nary
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tree 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary/.packlist
+%%SITE_PERL%%/Tree/Nary.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index bf986e95c652..58c145632795 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
COMMENT= Perl module to find URIs in arbitrary text
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-URI-Find/pkg-plist b/textproc/p5-URI-Find/pkg-plist
index 02e00aca6b45..c2d831fef15c 100644
--- a/textproc/p5-URI-Find/pkg-plist
+++ b/textproc/p5-URI-Find/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/URI/Find.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/Find/Schemeless.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Find/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Find
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/Find
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/URI 2>/dev/null || true
+%%SITE_PERL%%/URI/Find.pm
+%%SITE_PERL%%/URI/Find/Schemeless.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/URI/Find
+@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile
index b1a135aa0201..f1b2758fdbd8 100644
--- a/textproc/p5-WDDX/Makefile
+++ b/textproc/p5-WDDX/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= eric@talesfromthereal.com
COMMENT= Perl module to parse WDDX Packets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
PERL_CONFIGURE= yes
ALL_TARGET= all test
MAN3= WDDX.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/textproc/p5-WDDX/pkg-plist b/textproc/p5-WDDX/pkg-plist
index f030dd7d9e32..94cc6097abb1 100644
--- a/textproc/p5-WDDX/pkg-plist
+++ b/textproc/p5-WDDX/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WDDX/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/WDDX.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Array.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Binary.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Boolean.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Datetime.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Number.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Recordset.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Struct.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WDDX/.packlist
+%%SITE_PERL%%/WDDX.pm
+%%SITE_PERL%%/WDDX/Array.pm
+%%SITE_PERL%%/WDDX/Binary.pm
+%%SITE_PERL%%/WDDX/Boolean.pm
+%%SITE_PERL%%/WDDX/Datetime.pm
+%%SITE_PERL%%/WDDX/Null.pm
+%%SITE_PERL%%/WDDX/Number.pm
+%%SITE_PERL%%/WDDX/Parser.pm
+%%SITE_PERL%%/WDDX/Recordset.pm
+%%SITE_PERL%%/WDDX/String.pm
+%%SITE_PERL%%/WDDX/Struct.pm
%%PORTDOCS%%share/doc/WDDX/Changes
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WDDX
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WDDX
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WDDX
+@dirrm %%SITE_PERL%%/WDDX
%%PORTDOCS%%@dirrm share/doc/WDDX
diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile
index e53c374142dd..e1a5cbd0f271 100644
--- a/textproc/p5-XML-Catalog/Makefile
+++ b/textproc/p5-XML-Catalog/Makefile
@@ -26,7 +26,6 @@ SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl
PERL_CONFIGURE= yes
MAN3= XML::Catalog.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e 's/\r//' ${WRKSRC}/Catalog.pm
diff --git a/textproc/p5-XML-Catalog/pkg-plist b/textproc/p5-XML-Catalog/pkg-plist
index 33ce207b7d02..3dcc2a3063e7 100644
--- a/textproc/p5-XML-Catalog/pkg-plist
+++ b/textproc/p5-XML-Catalog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/Catalog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Catalog/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Catalog
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/Catalog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 0f303d61598f..2255b041bbb6 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -35,9 +35,8 @@ MAN3= XML::DOM.3 XML::DOM::AttDef.3 XML::DOM::AttlistDecl.3 \
XML::DOM::Parser.3 XML::DOM::PerlSAX.3 \
XML::DOM::ProcessingInstruction.3 XML::DOM::Text.3 \
XML::DOM::XMLDecl.3 XML::Handler::BuildDOM.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-PBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PBASE= ${SITE_PERL}
.include <bsd.port.pre.mk>
diff --git a/textproc/p5-XML-DOM/pkg-plist b/textproc/p5-XML-DOM/pkg-plist
index 3f2b7fd8b1a0..443d4f1010e9 100644
--- a/textproc/p5-XML-DOM/pkg-plist
+++ b/textproc/p5-XML-DOM/pkg-plist
@@ -1,31 +1,31 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-DOM/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/AttDef.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/AttlistDecl.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Attr.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/CDATASection.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/CharacterData.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Comment.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DOMException.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DOMImplementation.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Document.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DocumentFragment.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DocumentType.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Element.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/ElementDecl.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Entity.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/EntityReference.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NamedNodeMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NamedNodeMap.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Node.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NodeList.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NodeList.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Notation.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Parser.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/ProcessingInstruction.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Text.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/XMLDecl.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/BuildDOM.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DOM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-DOM
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-DOM/.packlist
+%%SITE_PERL%%/XML/DOM.pm
+%%SITE_PERL%%/XML/DOM/AttDef.pod
+%%SITE_PERL%%/XML/DOM/AttlistDecl.pod
+%%SITE_PERL%%/XML/DOM/Attr.pod
+%%SITE_PERL%%/XML/DOM/CDATASection.pod
+%%SITE_PERL%%/XML/DOM/CharacterData.pod
+%%SITE_PERL%%/XML/DOM/Comment.pod
+%%SITE_PERL%%/XML/DOM/DOMException.pm
+%%SITE_PERL%%/XML/DOM/DOMImplementation.pod
+%%SITE_PERL%%/XML/DOM/Document.pod
+%%SITE_PERL%%/XML/DOM/DocumentFragment.pod
+%%SITE_PERL%%/XML/DOM/DocumentType.pod
+%%SITE_PERL%%/XML/DOM/Element.pod
+%%SITE_PERL%%/XML/DOM/ElementDecl.pod
+%%SITE_PERL%%/XML/DOM/Entity.pod
+%%SITE_PERL%%/XML/DOM/EntityReference.pod
+%%SITE_PERL%%/XML/DOM/NamedNodeMap.pm
+%%SITE_PERL%%/XML/DOM/NamedNodeMap.pod
+%%SITE_PERL%%/XML/DOM/Node.pod
+%%SITE_PERL%%/XML/DOM/NodeList.pm
+%%SITE_PERL%%/XML/DOM/NodeList.pod
+%%SITE_PERL%%/XML/DOM/Notation.pod
+%%SITE_PERL%%/XML/DOM/Parser.pod
+%%SITE_PERL%%/XML/DOM/PerlSAX.pm
+%%SITE_PERL%%/XML/DOM/ProcessingInstruction.pod
+%%SITE_PERL%%/XML/DOM/Text.pod
+%%SITE_PERL%%/XML/DOM/XMLDecl.pod
+%%SITE_PERL%%/XML/Handler/BuildDOM.pm
+@dirrm %%SITE_PERL%%/XML/DOM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-DOM
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 8a86df6dec18..4095a5c03cac 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module for down translation of XML to strings
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::DT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
@${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/XML/DT/examples
diff --git a/textproc/p5-XML-DT/pkg-plist b/textproc/p5-XML-DT/pkg-plist
index fef3fd7eee3b..be416475c54d 100644
--- a/textproc/p5-XML-DT/pkg-plist
+++ b/textproc/p5-XML-DT/pkg-plist
@@ -1,51 +1,51 @@
bin/mkdtskel
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/DT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex1.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex2.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex2.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex3.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex3.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex4.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex4.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex5.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex5.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex6.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex6.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex7.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex7.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex8.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex8.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/10nov.sgm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/README
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/arq.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/arq.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.2.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.2.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.3.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.3.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.1.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.5.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.5.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex2.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex3.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex5.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex6.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex7.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/gcapaper2tex.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/jj.dtd
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/lat1.html
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/makefile
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/makenewexample
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/pub.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/publico.dtd
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/DT
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT/.packlist
+%%SITE_PERL%%/XML/DT.pm
+%%SITE_PERL%%/XML/DT/examples/XPath/ex1.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex1.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex2.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex2.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex3.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex3.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex4.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex4.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex5.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex5.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex6.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex6.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex7.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex7.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex8.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex8.xml
+%%SITE_PERL%%/XML/DT/examples/10nov.sgm
+%%SITE_PERL%%/XML/DT/examples/README
+%%SITE_PERL%%/XML/DT/examples/arq.pl
+%%SITE_PERL%%/XML/DT/examples/arq.xml
+%%SITE_PERL%%/XML/DT/examples/ex.xml
+%%SITE_PERL%%/XML/DT/examples/ex1.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.1.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.2.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.2.xml
+%%SITE_PERL%%/XML/DT/examples/ex10.3.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.3.xml
+%%SITE_PERL%%/XML/DT/examples/ex11.1.pl
+%%SITE_PERL%%/XML/DT/examples/ex11.1.xml
+%%SITE_PERL%%/XML/DT/examples/ex11.5.pl
+%%SITE_PERL%%/XML/DT/examples/ex11.5.xml
+%%SITE_PERL%%/XML/DT/examples/ex2.pl
+%%SITE_PERL%%/XML/DT/examples/ex3.xml
+%%SITE_PERL%%/XML/DT/examples/ex5.pl
+%%SITE_PERL%%/XML/DT/examples/ex6.pl
+%%SITE_PERL%%/XML/DT/examples/ex7.pl
+%%SITE_PERL%%/XML/DT/examples/gcapaper2tex.pl
+%%SITE_PERL%%/XML/DT/examples/jj.dtd
+%%SITE_PERL%%/XML/DT/examples/lat1.html
+%%SITE_PERL%%/XML/DT/examples/makefile
+%%SITE_PERL%%/XML/DT/examples/makenewexample
+%%SITE_PERL%%/XML/DT/examples/pub.pl
+%%SITE_PERL%%/XML/DT/examples/publico.dtd
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT
+@dirrm %%SITE_PERL%%/XML/DT/examples/XPath
+@dirrm %%SITE_PERL%%/XML/DT/examples
+@dirrm %%SITE_PERL%%/XML/DT
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index 1ee88c0b8164..bebe61e08b61 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= Returns a content of directory as XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RDF/Notation3.pm:${PORTSDIR}/textproc/p5-RDF-Notation3
+BUILD_DEPENDS= ${SITE_PERL}/RDF/Notation3.pm:${PORTSDIR}/textproc/p5-RDF-Notation3
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -24,7 +24,6 @@ MAN3= XML::Directory.3 XML::Directory::Apache.3 \
XML::Directory::Exception.3 XML::Directory::SAX.3 \
XML::Directory::String.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@find ${WRKSRC} -name "*.pm" | xargs ${PERL} -pi -e \
diff --git a/textproc/p5-XML-Directory/pkg-plist b/textproc/p5-XML-Directory/pkg-plist
index 211983800e95..84cfd60c7813 100644
--- a/textproc/p5-XML-Directory/pkg-plist
+++ b/textproc/p5-XML-Directory/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Directory/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/SAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/String.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Directory
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Directory
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory/.packlist
+%%SITE_PERL%%/XML/Directory.pm
+%%SITE_PERL%%/XML/Directory.pod
+%%SITE_PERL%%/XML/Directory/Apache.pm
+%%SITE_PERL%%/XML/Directory/Exception.pm
+%%SITE_PERL%%/XML/Directory/SAX.pm
+%%SITE_PERL%%/XML/Directory/String.pm
+@dirrm %%SITE_PERL%%/XML/Directory
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index b07b05543fe8..3293580f01a7 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module for dumping Perl objects from/to XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Dumper.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Dumper/pkg-plist b/textproc/p5-XML-Dumper/pkg-plist
index 22e21500e0d5..10f520c1a76e 100644
--- a/textproc/p5-XML-Dumper/pkg-plist
+++ b/textproc/p5-XML-Dumper/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Dumper/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Dumper.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Dumper
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper/.packlist
+%%SITE_PERL%%/XML/Dumper.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Encoding/Makefile b/textproc/p5-XML-Encoding/Makefile
index 234abd334e6c..21d0772d813c 100644
--- a/textproc/p5-XML-Encoding/Makefile
+++ b/textproc/p5-XML-Encoding/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= A perl module for parsing XML encoding maps
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Encoding.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Encoding/pkg-plist b/textproc/p5-XML-Encoding/pkg-plist
index 3cfccfa1a47b..cea86c5de505 100644
--- a/textproc/p5-XML-Encoding/pkg-plist
+++ b/textproc/p5-XML-Encoding/pkg-plist
@@ -1,7 +1,7 @@
bin/compile_encoding
bin/make_encmap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Encoding/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Encoding.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Encoding
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding/.packlist
+%%SITE_PERL%%/XML/Encoding.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-Base/Makefile b/textproc/p5-XML-Filter-Base/Makefile
index 391d4f19a89c..3e953e47c4ac 100644
--- a/textproc/p5-XML-Filter-Base/Makefile
+++ b/textproc/p5-XML-Filter-Base/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= XML::Filter::Base.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-Base/pkg-plist b/textproc/p5-XML-Filter-Base/pkg-plist
index 267c3fcb3072..106822be1760 100644
--- a/textproc/p5-XML-Filter-Base/pkg-plist
+++ b/textproc/p5-XML-Filter-Base/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Base/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/Base.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Base
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Base/.packlist
+%%SITE_PERL%%/XML/Filter/Base.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Base
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index d82ab003d177..b3cb69d56761 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= A PerlSAX filter that detects ignorable whitespace
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Filter/SAXT.pm:${PORTSDIR}/textproc/p5-XML-Filter-SAXT
+RUN_DEPENDS= ${SITE_PERL}/XML/Filter/SAXT.pm:${PORTSDIR}/textproc/p5-XML-Filter-SAXT
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::DetectWS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-DetectWS/pkg-plist b/textproc/p5-XML-Filter-DetectWS/pkg-plist
index 85ed6c74a370..6f5380d016c2 100644
--- a/textproc/p5-XML-Filter-DetectWS/pkg-plist
+++ b/textproc/p5-XML-Filter-DetectWS/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/DetectWS.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS/.packlist
+%%SITE_PERL%%/XML/Filter/DetectWS.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-GenericChunk/Makefile b/textproc/p5-XML-Filter-GenericChunk/Makefile
index 1c4f7c7f67d3..344efe85ab33 100644
--- a/textproc/p5-XML-Filter-GenericChunk/Makefile
+++ b/textproc/p5-XML-Filter-GenericChunk/Makefile
@@ -25,7 +25,6 @@ PERL_CONFIGURE= yes
MAN3= XML::Filter::CharacterChunk.3 \
XML::Filter::GenericChunk.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e '$$_="" if /use warnings/;' \
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index a22ec7637ce7..ecaa7a37be11 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Reformats whitespace for pretty printing XML
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Filter/DetectWS.pm:${PORTSDIR}/textproc/p5-XML-Filter-DetectWS
+RUN_DEPENDS= ${SITE_PERL}/XML/Filter/DetectWS.pm:${PORTSDIR}/textproc/p5-XML-Filter-DetectWS
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::Reindent.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-Reindent/pkg-plist b/textproc/p5-XML-Filter-Reindent/pkg-plist
index 5104bb7aa45e..f70f6504f983 100644
--- a/textproc/p5-XML-Filter-Reindent/pkg-plist
+++ b/textproc/p5-XML-Filter-Reindent/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/Reindent.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent/.packlist
+%%SITE_PERL%%/XML/Filter/Reindent.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-SAXT/Makefile b/textproc/p5-XML-Filter-SAXT/Makefile
index 2fde7217c2c8..13579c227de5 100644
--- a/textproc/p5-XML-Filter-SAXT/Makefile
+++ b/textproc/p5-XML-Filter-SAXT/Makefile
@@ -18,6 +18,5 @@ COMMENT= Replicates SAX events to several SAX event handlers
PERL_CONFIGURE= yes
MAN3= XML::Filter::SAXT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-SAXT/pkg-plist b/textproc/p5-XML-Filter-SAXT/pkg-plist
index d85a30b3f069..629338a8642e 100644
--- a/textproc/p5-XML-Filter-SAXT/pkg-plist
+++ b/textproc/p5-XML-Filter-SAXT/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/SAXT.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT/.packlist
+%%SITE_PERL%%/XML/Filter/SAXT.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-XInclude/Makefile b/textproc/p5-XML-Filter-XInclude/Makefile
index 07069916c761..a554758d598e 100644
--- a/textproc/p5-XML-Filter-XInclude/Makefile
+++ b/textproc/p5-XML-Filter-XInclude/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= XInclude as a SAX Filter
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
+RUN_DEPENDS= ${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::XInclude.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-XInclude/pkg-plist b/textproc/p5-XML-Filter-XInclude/pkg-plist
index afd4341d188c..130b64b321de 100644
--- a/textproc/p5-XML-Filter-XInclude/pkg-plist
+++ b/textproc/p5-XML-Filter-XInclude/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XInclude.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude/.packlist
+%%SITE_PERL%%/XML/Filter/XInclude.pm
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-XSLT/Makefile b/textproc/p5-XML-Filter-XSLT/Makefile
index 67bc3d2cf6e5..9dd9abb95ab5 100644
--- a/textproc/p5-XML-Filter-XSLT/Makefile
+++ b/textproc/p5-XML-Filter-XSLT/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= XSLT as a SAX Filter
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
+RUN_DEPENDS= ${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
+ ${SITE_PERL}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
+ ${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::XSLT.3 XML::Filter::XSLT::LibXSLT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-XSLT/pkg-plist b/textproc/p5-XML-Filter-XSLT/pkg-plist
index 583d51008bcc..92648bc62c91 100644
--- a/textproc/p5-XML-Filter-XSLT/pkg-plist
+++ b/textproc/p5-XML-Filter-XSLT/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XSLT/LibXSLT.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT/.packlist
+%%SITE_PERL%%/XML/Filter/XSLT.pm
+%%SITE_PERL%%/XML/Filter/XSLT/LibXSLT.pm
+@dirrm %%SITE_PERL%%/XML/Filter/XSLT
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index 51b93179c61f..f65b1e1a5516 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -47,6 +47,5 @@ MAN3= XML::GDOME.3 \
XML::GDOME::XPath::Result.3 \
XML::GDOME::ProcessingInstruction.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Generator-PerlData/Makefile b/textproc/p5-XML-Generator-PerlData/Makefile
index e5b3bc68fd4f..491f78888f11 100644
--- a/textproc/p5-XML-Generator-PerlData/Makefile
+++ b/textproc/p5-XML-Generator-PerlData/Makefile
@@ -23,6 +23,5 @@ PERL_CONFIGURE= yes
MAN3= XML::Generator::PerlData.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index 10e33cfea590..24ad3e8ffcd0 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
${SITE_PERL}/Data/Grove.pm:${PORTSDIR}/textproc/p5-libxml
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= XML::DOM-ecmascript.3 \
@@ -35,6 +35,5 @@ MAN3= XML::DOM-ecmascript.3 \
XML::Grove::Sub.3 \
XML::Grove::Subst.3 \
XML::Grove::XPointer.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Grove/pkg-plist b/textproc/p5-XML-Grove/pkg-plist
index 1858cc2ddf62..43887eb0b053 100644
--- a/textproc/p5-XML-Grove/pkg-plist
+++ b/textproc/p5-XML-Grove/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM-ecmascript.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/AsCanonXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/AsString.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Builder.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Factory.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/IDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Path.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Sub.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Subst.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/XPointer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Grove/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Grove
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Grove
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/DOM-ecmascript.pod
+%%SITE_PERL%%/XML/Grove.pm
+%%SITE_PERL%%/XML/Grove/AsCanonXML.pm
+%%SITE_PERL%%/XML/Grove/AsString.pm
+%%SITE_PERL%%/XML/Grove/Builder.pm
+%%SITE_PERL%%/XML/Grove/Factory.pm
+%%SITE_PERL%%/XML/Grove/IDs.pm
+%%SITE_PERL%%/XML/Grove/Path.pm
+%%SITE_PERL%%/XML/Grove/PerlSAX.pm
+%%SITE_PERL%%/XML/Grove/Sub.pm
+%%SITE_PERL%%/XML/Grove/Subst.pm
+%%SITE_PERL%%/XML/Grove/XPointer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/XML/Grove
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index dd63e9b48104..062f62e164f4 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Yet another Perl SAX XML Writer
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
+BUILD_DEPENDS= ${SITE_PERL}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-Handler-YAWriter/pkg-plist b/textproc/p5-XML-Handler-YAWriter/pkg-plist
index b25026d0feac..f34eba0011d9 100644
--- a/textproc/p5-XML-Handler-YAWriter/pkg-plist
+++ b/textproc/p5-XML-Handler-YAWriter/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter/.packlist
bin/xmlpretty
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/YAWriter.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/Handler/YAWriter.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter
+@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-LibRSVG/Makefile b/textproc/p5-XML-LibRSVG/Makefile
index 5d61e9c6a15a..36b1e3b0f942 100644
--- a/textproc/p5-XML-LibRSVG/Makefile
+++ b/textproc/p5-XML-LibRSVG/Makefile
@@ -27,6 +27,5 @@ CONFIGURE_ENV= INC='-I${LOCALBASE}/include' LIBS='-L${LOCALBASE}/lib'
USE_GNOME= gdkpixbuf
MAN3= XML::LibRSVG.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-LibRSVG/pkg-plist b/textproc/p5-XML-LibRSVG/pkg-plist
index 55dbb9821ba9..86578b451ad4 100644
--- a/textproc/p5-XML-LibRSVG/pkg-plist
+++ b/textproc/p5-XML-LibRSVG/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibRSVG.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibRSVG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-LibXML-Common/pkg-plist b/textproc/p5-XML-LibXML-Common/pkg-plist
index dc9026a4c5fe..43553b9bf828 100644
--- a/textproc/p5-XML-LibXML-Common/pkg-plist
+++ b/textproc/p5-XML-LibXML-Common/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.so
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index d514170cf171..5817970774e3 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -22,10 +22,9 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
PERL_CONFIGURE= yes
CONFIGURE_ARGS= INC='-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2'
-PERL_ABASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+PERL_ABASE= ${SITE_PERL}/${PERL_ARCH}
MAN3= XML::LibXSLT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-LibXSLT/pkg-plist b/textproc/p5-XML-LibXSLT/pkg-plist
index cc3aeea08de7..22f090040a21 100644
--- a/textproc/p5-XML-LibXSLT/pkg-plist
+++ b/textproc/p5-XML-LibXSLT/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibXSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/benchmark.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXSLT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/benchmark.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index d152abe8fa42..cefdd8114615 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wjv@FreeBSD.org
COMMENT= Perl5 module to extend and simplify XML::Parser
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::Node.3
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Node/pkg-plist b/textproc/p5-XML-Node/pkg-plist
index 91faf8db3d44..6f52ccd88f8b 100644
--- a/textproc/p5-XML-Node/pkg-plist
+++ b/textproc/p5-XML-Node/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/parse-foo.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/parse-orders.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/parse-testsuite.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%//auto/XML/Node/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Node
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/Node.pm
+%%SITE_PERL%%/XML/parse-foo.pl
+%%SITE_PERL%%/XML/parse-orders.pl
+%%SITE_PERL%%/XML/parse-testsuite.pl
+%%SITE_PERL%%/%%PERL_ARCH%%//auto/XML/Node/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Node
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index 7da2245f7034..faf6242445ef 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -22,6 +22,5 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textpro
PERL_CONFIGURE= yes
MAN3= XML::RSS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index afeb2deae0fd..463c12fac8f0 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -17,7 +17,6 @@ COMMENT= Regular expressions for XML tokens
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::RegExp.3
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-RegExp/pkg-plist b/textproc/p5-XML-RegExp/pkg-plist
index 670b15d0f15e..66c16735198d 100644
--- a/textproc/p5-XML-RegExp/pkg-plist
+++ b/textproc/p5-XML-RegExp/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/RegExp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/RegExp.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/RegExp
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp/.packlist
+%%SITE_PERL%%/XML/RegExp.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-SAX-Base/Makefile b/textproc/p5-XML-SAX-Base/Makefile
index f201b4c01584..6c62b2a6d69b 100644
--- a/textproc/p5-XML-SAX-Base/Makefile
+++ b/textproc/p5-XML-SAX-Base/Makefile
@@ -20,6 +20,5 @@ PERL_CONFIGURE= yes
MAN3= XML::SAX::Exception.3 \
XML::SAX::Base.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-SAX-Base/pkg-plist b/textproc/p5-XML-SAX-Base/pkg-plist
index f001db4efdb4..0302d26ce61a 100644
--- a/textproc/p5-XML-SAX-Base/pkg-plist
+++ b/textproc/p5-XML-SAX-Base/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Base/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Exception.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Base 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Base/.packlist
+%%SITE_PERL%%/XML/SAX/Base.pm
+%%SITE_PERL%%/XML/SAX/Exception.pm
+@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Base 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/Makefile b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
index 5219877158ee..a5244fab3063 100644
--- a/textproc/p5-XML-SAXDriver-Sablotron/Makefile
+++ b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Perl SAX driver for the Sablotron XSLT
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX/Base.pm:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron \
+ ${SITE_PERL}/XML/SAX/Base.pm:${PORTSDIR}/textproc/p5-XML-SAX
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
index fe58c878b371..6cc0140de83a 100644
--- a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
+++ b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAXDriver/Sablotron.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/SAXDriver 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAXDriver 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron/.packlist
+%%SITE_PERL%%/XML/SAXDriver/Sablotron.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron
+@unexec rmdir %D/%%SITE_PERL%%/XML/SAXDriver 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Schematron/Makefile b/textproc/p5-XML-Schematron/Makefile
index 68ed5be01923..4fb379129820 100644
--- a/textproc/p5-XML-Schematron/Makefile
+++ b/textproc/p5-XML-Schematron/Makefile
@@ -18,13 +18,12 @@ COMMENT= Perl implementation of the Schematron
BUILD_DEPENDS= ${SITE_PERL}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= XML::Schematron::Sablotron.3 \
XML::Schematron::XPath.3 \
XML::Schematron::LibXSLT.3 \
XML::Schematron.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Schematron/pkg-plist b/textproc/p5-XML-Schematron/pkg-plist
index b22c209e82dd..119153e0c2db 100644
--- a/textproc/p5-XML-Schematron/pkg-plist
+++ b/textproc/p5-XML-Schematron/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Schematron/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron/LibXSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron/Sablotron.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron/XPath.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Schematron 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron/.packlist
+%%SITE_PERL%%/XML/Schematron.pm
+%%SITE_PERL%%/XML/Schematron/LibXSLT.pm
+%%SITE_PERL%%/XML/Schematron/Sablotron.pm
+%%SITE_PERL%%/XML/Schematron/XPath.pm
+@unexec rmdir %D/%%SITE_PERL%%/XML/Schematron 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 409c14075ac3..c0c1806f873c 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= andrew@ugh.net.au
COMMENT= Trivial API for reading and writing XML (esp config files)
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
MAN3= XML::Simple.3 XML::Simple::FAQ.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index bfb551cb52f7..dbf3ab4c21b8 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= XML::Stream provides you with access to XML Stream
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::Stream.3 XML::Stream::Hash.3 XML::Stream::Namespace.3 \
XML::Stream::Parser.3 XML::Stream::Parser::DTD.3 \
XML::Stream::Tree.3 XML::Stream::Node.3
diff --git a/textproc/p5-XML-Stream/pkg-plist b/textproc/p5-XML-Stream/pkg-plist
index b88351f9609b..3ce803352dfa 100644
--- a/textproc/p5-XML-Stream/pkg-plist
+++ b/textproc/p5-XML-Stream/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Stream/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Namespace.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Parser/DTD.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Tree.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Stream
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Parser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Stream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Stream/.packlist
+%%SITE_PERL%%/XML/Stream.pm
+%%SITE_PERL%%/XML/Stream/Hash.pm
+%%SITE_PERL%%/XML/Stream/Namespace.pm
+%%SITE_PERL%%/XML/Stream/Node.pm
+%%SITE_PERL%%/XML/Stream/Parser.pm
+%%SITE_PERL%%/XML/Stream/Parser/DTD.pm
+%%SITE_PERL%%/XML/Stream/Tree.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Stream
+@dirrm %%SITE_PERL%%/XML/Stream/Parser
+@dirrm %%SITE_PERL%%/XML/Stream
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index 312f96cc3f1d..d0e9a2a7ffc3 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl module to make XML document trees
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::TreeBuilder.3 XML::Element.3
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-TreeBuilder/pkg-plist b/textproc/p5-XML-TreeBuilder/pkg-plist
index e928c3c3a9c4..91d97f64549f 100644
--- a/textproc/p5-XML-TreeBuilder/pkg-plist
+++ b/textproc/p5-XML-TreeBuilder/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/TreeBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-TreeBuilder/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-TreeBuilder
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/TreeBuilder.pm
+%%SITE_PERL%%/XML/Element.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index 0edd44f0cde9..3533f9fa0510 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -17,12 +17,11 @@ COMMENT= Process huge XML documents by chunks via a tree interface
# On Perl < 5.8.0, XML::Twig has a further optional dependency on WeakRef.
# However, WeakRef needs Perl 5.005_55.
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
PERL_CONFIGURE= YES
MAN3= XML::Twig.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Twig/pkg-plist b/textproc/p5-XML-Twig/pkg-plist
index a8928a63e1b7..3ed98146dbda 100644
--- a/textproc/p5-XML-Twig/pkg-plist
+++ b/textproc/p5-XML-Twig/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Twig/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Twig.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Twig
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig/.packlist
+%%SITE_PERL%%/XML/Twig.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 3dce55061dd1..3ba604c608b8 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Modules for parsing and evaluating XPath statements
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -28,6 +28,5 @@ MAN3= XML::XPath.3 XML::XPath::Boolean.3 XML::XPath::Builder.3 \
XML::XPath::NodeSet.3 XML::XPath::Number.3 \
XML::XPath::PerlSAX.3 XML::XPath::XMLParser.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-XPath/pkg-plist b/textproc/p5-XML-XPath/pkg-plist
index 2ed7efdc42b3..5b9376390dc3 100644
--- a/textproc/p5-XML-XPath/pkg-plist
+++ b/textproc/p5-XML-XPath/pkg-plist
@@ -1,28 +1,28 @@
bin/xpath
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XPath/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Namespace.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Comment.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Attribute.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/PI.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Root.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Variable.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/LocationPath.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Builder.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Number.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/NodeSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Step.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/XMLParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Boolean.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XPath 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/XPath 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath/.packlist
+%%SITE_PERL%%/XML/XPath/Node/Namespace.pm
+%%SITE_PERL%%/XML/XPath/Node/Comment.pm
+%%SITE_PERL%%/XML/XPath/Node/Attribute.pm
+%%SITE_PERL%%/XML/XPath/Node/PI.pm
+%%SITE_PERL%%/XML/XPath/Node/Text.pm
+%%SITE_PERL%%/XML/XPath/Node/Element.pm
+%%SITE_PERL%%/XML/XPath/Root.pm
+%%SITE_PERL%%/XML/XPath/Variable.pm
+%%SITE_PERL%%/XML/XPath/Node.pm
+%%SITE_PERL%%/XML/XPath/LocationPath.pm
+%%SITE_PERL%%/XML/XPath/Function.pm
+%%SITE_PERL%%/XML/XPath/Builder.pm
+%%SITE_PERL%%/XML/XPath/Number.pm
+%%SITE_PERL%%/XML/XPath/Literal.pm
+%%SITE_PERL%%/XML/XPath/Parser.pm
+%%SITE_PERL%%/XML/XPath/NodeSet.pm
+%%SITE_PERL%%/XML/XPath/Step.pm
+%%SITE_PERL%%/XML/XPath/XMLParser.pm
+%%SITE_PERL%%/XML/XPath/Expr.pm
+%%SITE_PERL%%/XML/XPath/PerlSAX.pm
+%%SITE_PERL%%/XML/XPath/Boolean.pm
+%%SITE_PERL%%/XML/XPath.pm
+@dirrm %%SITE_PERL%%/XML/XPath/Node
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/XPath 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 76118faf3fe5..296455019cab 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -23,10 +23,9 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::XQL.3 XML::XQL::DOM.3 XML::XQL::Date.3 \
XML::XQL::Query.3 XML::XQL::Tutorial.3
-PBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PBASE= ${SITE_PERL}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-XQL/pkg-plist b/textproc/p5-XML-XQL/pkg-plist
index 4121b6bb025e..1f640c9f45a7 100644
--- a/textproc/p5-XML-XQL/pkg-plist
+++ b/textproc/p5-XML-XQL/pkg-plist
@@ -1,14 +1,14 @@
bin/xql.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XQL/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/DOM.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/DirXQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Plus.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Query.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Strict.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Tutorial.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XQL
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/XQL
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XQL/.packlist
+%%SITE_PERL%%/XML/XQL.pm
+%%SITE_PERL%%/XML/XQL/DOM.pm
+%%SITE_PERL%%/XML/XQL/Date.pm
+%%SITE_PERL%%/XML/XQL/Debug.pm
+%%SITE_PERL%%/XML/XQL/DirXQL.pm
+%%SITE_PERL%%/XML/XQL/Parser.pm
+%%SITE_PERL%%/XML/XQL/Plus.pm
+%%SITE_PERL%%/XML/XQL/Query.pod
+%%SITE_PERL%%/XML/XQL/Strict.pm
+%%SITE_PERL%%/XML/XQL/Tutorial.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XQL
+@dirrm %%SITE_PERL%%/XML/XQL
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index aa39e4a81d37..de92f4d9168e 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lev@FreeBSD.org
COMMENT= Simple implementation of XUpdate format based on and XML::LibXML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-XUpdate-LibXML/pkg-plist b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
index 335b88c77bf4..85568936a176 100644
--- a/textproc/p5-XML-XUpdate-LibXML/pkg-plist
+++ b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
@@ -1,10 +1,10 @@
bin/xupdate
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XUpdate/LibXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Normalize/LibXML.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XUpdate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/XUpdate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML/.packlist
+%%SITE_PERL%%/XML/XUpdate/LibXML.pm
+%%SITE_PERL%%/XML/Normalize/LibXML.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/XUpdate 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/Normalize 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-dTemplate/Makefile b/textproc/p5-dTemplate/Makefile
index 5dbf9022f63a..ee03dd6e38fd 100644
--- a/textproc/p5-dTemplate/Makefile
+++ b/textproc/p5-dTemplate/Makefile
@@ -17,6 +17,5 @@ COMMENT= A powerful template handling logic with advanced features
PERL_CONFIGURE= yes
MAN3= dTemplate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-dTemplate/pkg-plist b/textproc/p5-dTemplate/pkg-plist
index 10064d334ebb..a525be2b21aa 100644
--- a/textproc/p5-dTemplate/pkg-plist
+++ b/textproc/p5-dTemplate/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/dTemplate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/dTemplate/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/dTemplate 2>/dev/null || true
+%%SITE_PERL%%/dTemplate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate 2>/dev/null || true
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index a4a18f7249f4..fb73afc31937 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -16,7 +16,7 @@ DISTNAME= libxml-perl-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
COMMENT= Collection of Perl5 modules for working with XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
@@ -29,6 +29,5 @@ MAN3= Data::Grove.3 Data::Grove::Parent.3 Data::Grove::Visitor.3 \
XML::PatAct::MatchName.3 XML::PatAct::PatternTempl.3 \
XML::PatAct::ToObjects.3 XML::Perl2SAX.3 XML::SAX2Perl.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-libxml/pkg-plist b/textproc/p5-libxml/pkg-plist
index 2761d96a48e9..c8dee7dc6852 100644
--- a/textproc/p5-libxml/pkg-plist
+++ b/textproc/p5-libxml/pkg-plist
@@ -1,21 +1,21 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libxml-perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/Grove.pm
-lib/perl5/site_perl/%%PERL_VER%%/Data/Grove/Parent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Data/Grove/Visitor.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/ESISParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/CanonXMLWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/Sample.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/Subs.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/XMLWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Parser/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/ActionTempl.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/Amsterdam.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/MatchName.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/PatternTempl.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/ToObjects.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Perl2SAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX2Perl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Data/Grove
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libxml-perl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl/.packlist
+%%SITE_PERL%%/Data/Grove.pm
+%%SITE_PERL%%/Data/Grove/Parent.pm
+%%SITE_PERL%%/Data/Grove/Visitor.pm
+%%SITE_PERL%%/XML/ESISParser.pm
+%%SITE_PERL%%/XML/Handler/CanonXMLWriter.pm
+%%SITE_PERL%%/XML/Handler/Sample.pm
+%%SITE_PERL%%/XML/Handler/Subs.pm
+%%SITE_PERL%%/XML/Handler/XMLWriter.pm
+%%SITE_PERL%%/XML/Parser/PerlSAX.pm
+%%SITE_PERL%%/XML/PatAct/ActionTempl.pm
+%%SITE_PERL%%/XML/PatAct/Amsterdam.pm
+%%SITE_PERL%%/XML/PatAct/MatchName.pm
+%%SITE_PERL%%/XML/PatAct/PatternTempl.pm
+%%SITE_PERL%%/XML/PatAct/ToObjects.pm
+%%SITE_PERL%%/XML/Perl2SAX.pm
+%%SITE_PERL%%/XML/SAX2Perl.pm
+@dirrm %%SITE_PERL%%/Data/Grove
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index b1d13be7a621..6553cd335077 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -21,26 +21,26 @@ bin/tv_sort
bin/tv_split
bin/tv_to_latex
bin/tv_to_text
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Ask.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/AskTerm.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/AskTk.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Clumps.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Config_file.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Europe_TZ.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Get_nice.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Grab_XML.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Grep.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Gunzip.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/IMDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Memoize.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Mode.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Summarize.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/TZ.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Usage.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Version.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/ZapListings.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
+%%SITE_PERL%%/XMLTV.pm
+%%SITE_PERL%%/XMLTV/Ask.pm
+%%SITE_PERL%%/XMLTV/AskTerm.pm
+%%SITE_PERL%%/XMLTV/AskTk.pm
+%%SITE_PERL%%/XMLTV/Clumps.pm
+%%SITE_PERL%%/XMLTV/Config_file.pm
+%%SITE_PERL%%/XMLTV/Europe_TZ.pm
+%%SITE_PERL%%/XMLTV/Get_nice.pm
+%%SITE_PERL%%/XMLTV/Grab_XML.pm
+%%SITE_PERL%%/XMLTV/Grep.pm
+%%SITE_PERL%%/XMLTV/Gunzip.pm
+%%SITE_PERL%%/XMLTV/IMDB.pm
+%%SITE_PERL%%/XMLTV/Memoize.pm
+%%SITE_PERL%%/XMLTV/Mode.pm
+%%SITE_PERL%%/XMLTV/Summarize.pm
+%%SITE_PERL%%/XMLTV/TZ.pm
+%%SITE_PERL%%/XMLTV/Usage.pm
+%%SITE_PERL%%/XMLTV/Version.pm
+%%SITE_PERL%%/XMLTV/ZapListings.pm
share/doc/xmltv-%%VERSION%%/COPYING
share/doc/xmltv-%%VERSION%%/QuickStart
share/doc/xmltv-%%VERSION%%/README
@@ -102,5 +102,5 @@ share/xmltv/tv_grab_uk_rt/channel_ids
@dirrm share/xmltv/tv_grab_it
@dirrm share/xmltv
@dirrm share/doc/xmltv-%%VERSION%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XMLTV
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XMLTV
+@dirrm %%SITE_PERL%%/XMLTV
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index 52d6a98ec556..6bcbcfb6afc3 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
-PERL_ARCHLIB= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+PERL_ARCHLIB= ${SITE_PERL}/${PERL_ARCH}
WRKSRC= ${WRKDIR}/${PORTNAME}
CONFIGURE_ARGS= --with-perl-enc-map=${PERL_ARCHLIB}/XML/Parser/Encodings
diff --git a/textproc/sarep/Makefile b/textproc/sarep/Makefile
index 5ad93d2fcadf..e5fdcd1880c1 100644
--- a/textproc/sarep/Makefile
+++ b/textproc/sarep/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=
MAINTAINER= ache@FreeBSD.org
COMMENT= Command-line search and replace tool; written in Perl; handles regexps
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS
EXTRACT_CMD= $(SED)
EXTRACT_BEFORE_ARGS= 's=^\#!/usr/bin/perl =\#!${PERL} =' <
diff --git a/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist
index f53dab4ba6ab..6a8f15e0459e 100644
--- a/textproc/sdf/pkg-plist
+++ b/textproc/sdf/pkg-plist
@@ -9,181 +9,181 @@ bin/sdfbatch
bin/sdfcli
bin/sdfget
bin/sdngen
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDF/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Diff.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Sdf.pm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/apiperl.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/app.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/app.sdf
-lib/perl5/site_perl/%%PERL_VER%%/sdf/calc.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/dict.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/filters.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/find.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/arrow.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/arrow.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/back.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/back.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bar1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bar1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bg_ball.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bg_ball.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bk_diam.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bk_diam.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/camera1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/camera1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/constrt1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/constrt1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/dir.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/doc.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exclam.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exclam.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exit1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exit1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/folders.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/folders.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ftp1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ftp1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/greenbal.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/greenbal.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/hot_dot.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/hot_dot.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/htx.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/images.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info2.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info2.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/key.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/key.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/m0omo7eu.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/m0omo7eu.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail2.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail2.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mailto.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mailto.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mf6.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new2.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new2.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new3.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new3.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/news1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/news1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/next.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/next.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/pdf.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/postscript.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/pow.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/pow.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/printer.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ps.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/qsd.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ques1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ques1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/rd_ball.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/rd_ball.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdf.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdfbig.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdfbig.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdflogo.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdflogo.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sqbull.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/square_b.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/square_b.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/text.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/triangle.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/txt.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/cz_cz.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/de_de.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_au.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_ca.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_uk.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_us.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/ru_ru.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/fancy.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/manual.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap/infomap.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/overhead/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/overhead/overhead.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/admin.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/covers.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/document.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/fax.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/listing.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/manual.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/memo.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/mif.sdt.keep
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/minutes.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/newslttr.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/paper.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/rtf.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/simple.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl/catalog.sdf
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl/oracamel.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl/perl.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf.ini
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf/document.reg
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf/sdf.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdfbatch.ini
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/A4.fm4
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/A4.fm5
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/all.sdg
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/bugtrack.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/default.sdg
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/defines.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/delphi.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/hlp.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/homepage.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/html.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/langdefs.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/latex.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/macros.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/misc.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/module.sdp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/objects.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/pod.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/rtf.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/sdf_dir.sdr
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/sdgmacs.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/settings.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/sgml.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/simple.sdp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/stdlib.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/testcase.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/txt.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/usecases.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/macros.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/misc.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/name.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/parse.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/podmacs.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/post_htx.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/post_mf6.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/sdfget.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/specials.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/subs.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/table.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tests.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/toexpand.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tohtml.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tolatex.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tomif.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/topod.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/toraw.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tosgml.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/totxt.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/values.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF/.packlist
+%%SITE_PERL%%/Pod/Diff.pm
+%%SITE_PERL%%/Pod/Sdf.pm
+%%SITE_PERL%%/sdf/apiperl.pl
+%%SITE_PERL%%/sdf/app.pl
+%%SITE_PERL%%/sdf/app.sdf
+%%SITE_PERL%%/sdf/calc.pl
+%%SITE_PERL%%/sdf/dict.pl
+%%SITE_PERL%%/sdf/filters.pl
+%%SITE_PERL%%/sdf/find.pl
+%%SITE_PERL%%/sdf/home/images/arrow.bmp
+%%SITE_PERL%%/sdf/home/images/arrow.gif
+%%SITE_PERL%%/sdf/home/images/back.bmp
+%%SITE_PERL%%/sdf/home/images/back.gif
+%%SITE_PERL%%/sdf/home/images/bar1.bmp
+%%SITE_PERL%%/sdf/home/images/bar1.gif
+%%SITE_PERL%%/sdf/home/images/bg_ball.bmp
+%%SITE_PERL%%/sdf/home/images/bg_ball.gif
+%%SITE_PERL%%/sdf/home/images/bk_diam.bmp
+%%SITE_PERL%%/sdf/home/images/bk_diam.gif
+%%SITE_PERL%%/sdf/home/images/camera1.bmp
+%%SITE_PERL%%/sdf/home/images/camera1.gif
+%%SITE_PERL%%/sdf/home/images/constrt1.bmp
+%%SITE_PERL%%/sdf/home/images/constrt1.gif
+%%SITE_PERL%%/sdf/home/images/dir.gif
+%%SITE_PERL%%/sdf/home/images/doc.gif
+%%SITE_PERL%%/sdf/home/images/exclam.bmp
+%%SITE_PERL%%/sdf/home/images/exclam.gif
+%%SITE_PERL%%/sdf/home/images/exit1.bmp
+%%SITE_PERL%%/sdf/home/images/exit1.gif
+%%SITE_PERL%%/sdf/home/images/folders.bmp
+%%SITE_PERL%%/sdf/home/images/folders.gif
+%%SITE_PERL%%/sdf/home/images/ftp1.bmp
+%%SITE_PERL%%/sdf/home/images/ftp1.gif
+%%SITE_PERL%%/sdf/home/images/greenbal.bmp
+%%SITE_PERL%%/sdf/home/images/greenbal.gif
+%%SITE_PERL%%/sdf/home/images/hot_dot.bmp
+%%SITE_PERL%%/sdf/home/images/hot_dot.gif
+%%SITE_PERL%%/sdf/home/images/htx.gif
+%%SITE_PERL%%/sdf/home/images/images.sdm
+%%SITE_PERL%%/sdf/home/images/info1.bmp
+%%SITE_PERL%%/sdf/home/images/info1.gif
+%%SITE_PERL%%/sdf/home/images/info2.bmp
+%%SITE_PERL%%/sdf/home/images/info2.gif
+%%SITE_PERL%%/sdf/home/images/key.bmp
+%%SITE_PERL%%/sdf/home/images/key.gif
+%%SITE_PERL%%/sdf/home/images/m0omo7eu.bmp
+%%SITE_PERL%%/sdf/home/images/m0omo7eu.gif
+%%SITE_PERL%%/sdf/home/images/mail1.bmp
+%%SITE_PERL%%/sdf/home/images/mail1.gif
+%%SITE_PERL%%/sdf/home/images/mail2.bmp
+%%SITE_PERL%%/sdf/home/images/mail2.gif
+%%SITE_PERL%%/sdf/home/images/mailto.bmp
+%%SITE_PERL%%/sdf/home/images/mailto.gif
+%%SITE_PERL%%/sdf/home/images/mf6.gif
+%%SITE_PERL%%/sdf/home/images/new1.bmp
+%%SITE_PERL%%/sdf/home/images/new1.gif
+%%SITE_PERL%%/sdf/home/images/new2.bmp
+%%SITE_PERL%%/sdf/home/images/new2.gif
+%%SITE_PERL%%/sdf/home/images/new3.bmp
+%%SITE_PERL%%/sdf/home/images/new3.gif
+%%SITE_PERL%%/sdf/home/images/news1.bmp
+%%SITE_PERL%%/sdf/home/images/news1.gif
+%%SITE_PERL%%/sdf/home/images/next.bmp
+%%SITE_PERL%%/sdf/home/images/next.gif
+%%SITE_PERL%%/sdf/home/images/pdf.gif
+%%SITE_PERL%%/sdf/home/images/postscript.gif
+%%SITE_PERL%%/sdf/home/images/pow.bmp
+%%SITE_PERL%%/sdf/home/images/pow.gif
+%%SITE_PERL%%/sdf/home/images/printer.gif
+%%SITE_PERL%%/sdf/home/images/ps.gif
+%%SITE_PERL%%/sdf/home/images/qsd.gif
+%%SITE_PERL%%/sdf/home/images/ques1.bmp
+%%SITE_PERL%%/sdf/home/images/ques1.gif
+%%SITE_PERL%%/sdf/home/images/rd_ball.bmp
+%%SITE_PERL%%/sdf/home/images/rd_ball.gif
+%%SITE_PERL%%/sdf/home/images/sdf.gif
+%%SITE_PERL%%/sdf/home/images/sdfbig.bmp
+%%SITE_PERL%%/sdf/home/images/sdfbig.gif
+%%SITE_PERL%%/sdf/home/images/sdflogo.bmp
+%%SITE_PERL%%/sdf/home/images/sdflogo.gif
+%%SITE_PERL%%/sdf/home/images/sqbull.gif
+%%SITE_PERL%%/sdf/home/images/square_b.bmp
+%%SITE_PERL%%/sdf/home/images/square_b.gif
+%%SITE_PERL%%/sdf/home/images/text.gif
+%%SITE_PERL%%/sdf/home/images/triangle.gif
+%%SITE_PERL%%/sdf/home/images/txt.gif
+%%SITE_PERL%%/sdf/home/locale/cz_cz.sdl
+%%SITE_PERL%%/sdf/home/locale/de_de.sdl
+%%SITE_PERL%%/sdf/home/locale/en_au.sdl
+%%SITE_PERL%%/sdf/home/locale/en_ca.sdl
+%%SITE_PERL%%/sdf/home/locale/en_uk.sdl
+%%SITE_PERL%%/sdf/home/locale/en_us.sdl
+%%SITE_PERL%%/sdf/home/locale/ru_ru.sdl
+%%SITE_PERL%%/sdf/home/look/fancy/fancy.sdm
+%%SITE_PERL%%/sdf/home/look/fancy/manual.sds
+%%SITE_PERL%%/sdf/home/look/fancy/mif.sdn
+%%SITE_PERL%%/sdf/home/look/fancy/pages.sdm
+%%SITE_PERL%%/sdf/home/look/infomap/infomap.sdm
+%%SITE_PERL%%/sdf/home/look/infomap/mif.sdn
+%%SITE_PERL%%/sdf/home/look/infomap/pages.sdm
+%%SITE_PERL%%/sdf/home/look/overhead/mif.sdn
+%%SITE_PERL%%/sdf/home/look/overhead/overhead.sdm
+%%SITE_PERL%%/sdf/home/look/simple/admin.sds
+%%SITE_PERL%%/sdf/home/look/simple/covers.sdm
+%%SITE_PERL%%/sdf/home/look/simple/document.sds
+%%SITE_PERL%%/sdf/home/look/simple/fax.sds
+%%SITE_PERL%%/sdf/home/look/simple/listing.sds
+%%SITE_PERL%%/sdf/home/look/simple/manual.sds
+%%SITE_PERL%%/sdf/home/look/simple/memo.sds
+%%SITE_PERL%%/sdf/home/look/simple/mif.sdn
+%%SITE_PERL%%/sdf/home/look/simple/mif.sdt.keep
+%%SITE_PERL%%/sdf/home/look/simple/minutes.sds
+%%SITE_PERL%%/sdf/home/look/simple/newslttr.sds
+%%SITE_PERL%%/sdf/home/look/simple/pages.sdm
+%%SITE_PERL%%/sdf/home/look/simple/paper.sds
+%%SITE_PERL%%/sdf/home/look/simple/rtf.sdn
+%%SITE_PERL%%/sdf/home/look/simple/simple.sdm
+%%SITE_PERL%%/sdf/home/perl/catalog.sdf
+%%SITE_PERL%%/sdf/home/perl/oracamel.gif
+%%SITE_PERL%%/sdf/home/perl/perl.sdm
+%%SITE_PERL%%/sdf/home/sdf.ini
+%%SITE_PERL%%/sdf/home/sdf/document.reg
+%%SITE_PERL%%/sdf/home/sdf/sdf.sdm
+%%SITE_PERL%%/sdf/home/sdfbatch.ini
+%%SITE_PERL%%/sdf/home/stdlib/A4.fm4
+%%SITE_PERL%%/sdf/home/stdlib/A4.fm5
+%%SITE_PERL%%/sdf/home/stdlib/all.sdg
+%%SITE_PERL%%/sdf/home/stdlib/bugtrack.sdm
+%%SITE_PERL%%/sdf/home/stdlib/default.sdg
+%%SITE_PERL%%/sdf/home/stdlib/defines.sdm
+%%SITE_PERL%%/sdf/home/stdlib/delphi.sdm
+%%SITE_PERL%%/sdf/home/stdlib/hlp.sdn
+%%SITE_PERL%%/sdf/home/stdlib/homepage.sdm
+%%SITE_PERL%%/sdf/home/stdlib/html.sdn
+%%SITE_PERL%%/sdf/home/stdlib/langdefs.sdm
+%%SITE_PERL%%/sdf/home/stdlib/latex.sdn
+%%SITE_PERL%%/sdf/home/stdlib/macros.sdm
+%%SITE_PERL%%/sdf/home/stdlib/mif.sdn
+%%SITE_PERL%%/sdf/home/stdlib/misc.sdm
+%%SITE_PERL%%/sdf/home/stdlib/module.sdp
+%%SITE_PERL%%/sdf/home/stdlib/objects.sdm
+%%SITE_PERL%%/sdf/home/stdlib/pages.sdm
+%%SITE_PERL%%/sdf/home/stdlib/pod.sdn
+%%SITE_PERL%%/sdf/home/stdlib/rtf.sdn
+%%SITE_PERL%%/sdf/home/stdlib/sdf_dir.sdr
+%%SITE_PERL%%/sdf/home/stdlib/sdgmacs.sdm
+%%SITE_PERL%%/sdf/home/stdlib/settings.sdm
+%%SITE_PERL%%/sdf/home/stdlib/sgml.sdn
+%%SITE_PERL%%/sdf/home/stdlib/simple.sdp
+%%SITE_PERL%%/sdf/home/stdlib/stdlib.sdm
+%%SITE_PERL%%/sdf/home/stdlib/testcase.sdm
+%%SITE_PERL%%/sdf/home/stdlib/txt.sdn
+%%SITE_PERL%%/sdf/home/stdlib/usecases.sdm
+%%SITE_PERL%%/sdf/macros.pl
+%%SITE_PERL%%/sdf/misc.pl
+%%SITE_PERL%%/sdf/name.pl
+%%SITE_PERL%%/sdf/parse.pl
+%%SITE_PERL%%/sdf/podmacs.pl
+%%SITE_PERL%%/sdf/post_htx.pl
+%%SITE_PERL%%/sdf/post_mf6.pl
+%%SITE_PERL%%/sdf/sdfget.pl
+%%SITE_PERL%%/sdf/specials.pl
+%%SITE_PERL%%/sdf/subs.pl
+%%SITE_PERL%%/sdf/table.pl
+%%SITE_PERL%%/sdf/tests.pl
+%%SITE_PERL%%/sdf/toexpand.pl
+%%SITE_PERL%%/sdf/tohtml.pl
+%%SITE_PERL%%/sdf/tolatex.pl
+%%SITE_PERL%%/sdf/tomif.pl
+%%SITE_PERL%%/sdf/topod.pl
+%%SITE_PERL%%/sdf/toraw.pl
+%%SITE_PERL%%/sdf/tosgml.pl
+%%SITE_PERL%%/sdf/totxt.pl
+%%SITE_PERL%%/sdf/values.pl
share/doc/sdf/build
share/doc/sdf/catalog.html
share/doc/sdf/catalog.sdf
@@ -639,17 +639,17 @@ share/doc/sdf/website
@dirrm share/doc/sdf/genhtml
@dirrm share/doc/sdf/faq
@dirrm share/doc/sdf
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/overhead
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
+@dirrm %%SITE_PERL%%/sdf/home/stdlib
+@dirrm %%SITE_PERL%%/sdf/home/sdf
+@dirrm %%SITE_PERL%%/sdf/home/perl
+@dirrm %%SITE_PERL%%/sdf/home/look/simple
+@dirrm %%SITE_PERL%%/sdf/home/look/overhead
+@dirrm %%SITE_PERL%%/sdf/home/look/infomap
+@dirrm %%SITE_PERL%%/sdf/home/look/fancy
+@dirrm %%SITE_PERL%%/sdf/home/look
+@dirrm %%SITE_PERL%%/sdf/home/locale
+@dirrm %%SITE_PERL%%/sdf/home/images
+@dirrm %%SITE_PERL%%/sdf/home
+@dirrm %%SITE_PERL%%/sdf
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
diff --git a/textproc/texi2db/Makefile b/textproc/texi2db/Makefile
index bb922d01be0c..7be1acd35fb5 100644
--- a/textproc/texi2db/Makefile
+++ b/textproc/texi2db/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.tldp.org/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts a Texinfo file into DocBook XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/xslint/Makefile b/textproc/xslint/Makefile
index 354d34249cb3..134b3ef32b8c 100644
--- a/textproc/xslint/Makefile
+++ b/textproc/xslint/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= XSL(T) stylesheet checker
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
+RUN_DEPENDS= ${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
USE_PERL5= yes
USE_ZIP= yes