aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2003-10-24 12:05:09 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2003-10-24 12:05:09 +0000
commitc634b4bb839753aec2ae1040e2c80a5282402cb8 (patch)
treed8b3fc97550f860aeb41c57751d2550e9ad6273e /mail
parent386f40a6b587557ff9ef6bed9fccca2490a5d78d (diff)
downloadports-c634b4bb839753aec2ae1040e2c80a5282402cb8.tar.gz
ports-c634b4bb839753aec2ae1040e2c80a5282402cb8.zip
Notes
Diffstat (limited to 'mail')
-rw-r--r--mail/bayespam/Makefile2
-rw-r--r--mail/bayespam/pkg-plist4
-rw-r--r--mail/cmail/pkg-plist28
-rw-r--r--mail/cyrus-imapd/pkg-plist46
-rw-r--r--mail/cyrus-imapd2/Makefile6
-rw-r--r--mail/cyrus-imapd2/pkg-plist36
-rw-r--r--mail/cyrus-imapd22/Makefile6
-rw-r--r--mail/cyrus-imapd22/pkg-plist36
-rw-r--r--mail/cyrus-imapd23/Makefile6
-rw-r--r--mail/cyrus-imapd23/pkg-plist36
-rw-r--r--mail/cyrus-imapd24/Makefile6
-rw-r--r--mail/cyrus-imapd24/pkg-plist36
-rw-r--r--mail/demime/Makefile10
-rw-r--r--mail/gotmail/Makefile4
-rw-r--r--mail/grepmail/Makefile4
-rw-r--r--mail/grepmail/pkg-plist4
-rw-r--r--mail/mail2procmailrc/Makefile6
-rw-r--r--mail/majordomo/Makefile4
-rw-r--r--mail/mbx2mbox/Makefile2
-rw-r--r--mail/mbx2mbox/pkg-plist4
-rw-r--r--mail/mimedefang/Makefile2
-rw-r--r--mail/p5-Email-Find/Makefile2
-rw-r--r--mail/p5-Email-Find/pkg-plist10
-rw-r--r--mail/p5-Email-Valid-Loose/Makefile1
-rw-r--r--mail/p5-Email-Valid/Makefile1
-rw-r--r--mail/p5-IMAP-Admin/Makefile1
-rw-r--r--mail/p5-IMAP-Admin/pkg-plist10
-rw-r--r--mail/p5-MIME-Tools/Makefile7
-rw-r--r--mail/p5-MIME-Tools/pkg-plist54
-rw-r--r--mail/p5-Mail-Audit/Makefile3
-rw-r--r--mail/p5-Mail-Audit/pkg-plist26
-rw-r--r--mail/p5-Mail-Box1/Makefile3
-rw-r--r--mail/p5-Mail-Box1/pkg-plist52
-rw-r--r--mail/p5-Mail-Ezmlm/Makefile1
-rw-r--r--mail/p5-Mail-Ezmlm/pkg-plist6
-rw-r--r--mail/p5-Mail-FilterXML/Makefile3
-rw-r--r--mail/p5-Mail-FilterXML/pkg-plist8
-rw-r--r--mail/p5-Mail-Folder/Makefile15
-rw-r--r--mail/p5-Mail-Folder/pkg-plist14
-rw-r--r--mail/p5-Mail-Freshmeat/Makefile3
-rw-r--r--mail/p5-Mail-Freshmeat/pkg-plist14
-rw-r--r--mail/p5-Mail-MailStats/Makefile3
-rw-r--r--mail/p5-Mail-MailStats/pkg-plist18
-rw-r--r--mail/p5-Mail-QuoteWrap/Makefile3
-rw-r--r--mail/p5-Mail-QuoteWrap/pkg-plist10
-rw-r--r--mail/p5-Mail-RBL/Makefile1
-rw-r--r--mail/p5-Mail-RBL/pkg-plist10
-rw-r--r--mail/p5-Mail-RFC822-Address/Makefile1
-rw-r--r--mail/p5-Mail-RFC822-Address/pkg-plist10
-rw-r--r--mail/p5-Mail-Spool/Makefile2
-rw-r--r--mail/p5-Mail-Spool/pkg-plist12
-rw-r--r--mail/p5-Mail-Tools/pkg-plist78
-rw-r--r--mail/p5-Mail-Verify/Makefile3
-rw-r--r--mail/p5-Mail-Verify/pkg-plist10
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile6
-rw-r--r--mail/p5-Net-SMTP-Server/pkg-plist36
-rw-r--r--mail/p5-POE-Component-Client-POP3/Makefile3
-rw-r--r--mail/p5-POE-Component-Client-POP3/pkg-plist18
-rw-r--r--mail/p5-Sendmail-Milter/pkg-plist18
-rw-r--r--mail/p5-vpopmail/Makefile1
-rw-r--r--mail/p5-vpopmail/pkg-plist10
-rw-r--r--mail/pflogsumm/Makefile2
-rw-r--r--mail/pronto/Makefile24
-rw-r--r--mail/ricochet/Makefile10
-rw-r--r--mail/rmoldmail/Makefile2
-rw-r--r--mail/tlb/Makefile6
66 files changed, 401 insertions, 418 deletions
diff --git a/mail/bayespam/Makefile b/mail/bayespam/Makefile
index 4187f3fe893e..a852b7743e0f 100644
--- a/mail/bayespam/Makefile
+++ b/mail/bayespam/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.garyarnold.com/projects/
MAINTAINER= lioux@FreeBSD.org
COMMENT= qmail spam filter written in Perl using Bayesian classification
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
+RUN_DEPENDS= ${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
USE_PERL5= yes
USE_REINPLACE= yes
diff --git a/mail/bayespam/pkg-plist b/mail/bayespam/pkg-plist
index 413d0522855a..ee78e836b847 100644
--- a/mail/bayespam/pkg-plist
+++ b/mail/bayespam/pkg-plist
@@ -1,7 +1,7 @@
bin/bayes_process_email.pl
bin/bayes_spam_check.pl
bin/bayestest.pl
-lib/perl5/site_perl/%%PERL_VER%%/Bayespam/Process.pm
+%%SITE_PERL%%/Bayespam/Process.pm
%%PORTDOCS%%share/doc/bayespam/AUTHORS
%%PORTDOCS%%share/doc/bayespam/COPYING
%%PORTDOCS%%share/doc/bayespam/Changelog
@@ -10,4 +10,4 @@ lib/perl5/site_perl/%%PERL_VER%%/Bayespam/Process.pm
%%PORTDOCS%%share/doc/bayespam/TODO
%%PORTDOCS%%share/doc/bayespam/qmail.sample
%%PORTDOCS%%@dirrm share/doc/bayespam
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bayespam
+@dirrm %%SITE_PERL%%/Bayespam
diff --git a/mail/cmail/pkg-plist b/mail/cmail/pkg-plist
index 7cfa9da4ea48..64a21d534077 100644
--- a/mail/cmail/pkg-plist
+++ b/mail/cmail/pkg-plist
@@ -4,17 +4,17 @@ bin/cmail
%%PORTDOCS%%@dirrm share/doc/cmail
share/examples/cmail/cmail.rc
@dirrm share/examples/cmail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/file.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/pop3.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/maildir.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/mbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/imap.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/color.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/plain.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail/In
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail/Out
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/cmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/cmail
+%%SITE_PERL%%/CMail/In/Base.pm
+%%SITE_PERL%%/CMail/In/file.pm
+%%SITE_PERL%%/CMail/In/pop3.pm
+%%SITE_PERL%%/CMail/In/maildir.pm
+%%SITE_PERL%%/CMail/In/mbox.pm
+%%SITE_PERL%%/CMail/In/imap.pm
+%%SITE_PERL%%/CMail/Out/Base.pm
+%%SITE_PERL%%/CMail/Out/color.pm
+%%SITE_PERL%%/CMail/Out/plain.pm
+@dirrm %%SITE_PERL%%/CMail/In
+@dirrm %%SITE_PERL%%/CMail/Out
+@dirrm %%SITE_PERL%%/CMail
diff --git a/mail/cyrus-imapd/pkg-plist b/mail/cyrus-imapd/pkg-plist
index 0be945641dc4..5cf28fd7971f 100644
--- a/mail/cyrus-imapd/pkg-plist
+++ b/mail/cyrus-imapd/pkg-plist
@@ -59,29 +59,29 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 6d1199956909..9d2a994ce2c1 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -111,10 +111,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -143,7 +143,7 @@ post-patch:
${WRKSRC}/tools/mkimap
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
index ddde37ab1d7e..2c080ed13049 100644
--- a/mail/cyrus-imapd2/pkg-plist
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -77,24 +77,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 381332b97bcb..9ae82e1bdbef 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -133,10 +133,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -168,7 +168,7 @@ post-patch:
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index d60cce6f568f..430c67e0260c 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -85,24 +85,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 381332b97bcb..9ae82e1bdbef 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -133,10 +133,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -168,7 +168,7 @@ post-patch:
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index d60cce6f568f..430c67e0260c 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -85,24 +85,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 381332b97bcb..9ae82e1bdbef 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -133,10 +133,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -168,7 +168,7 @@ post-patch:
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index d60cce6f568f..430c67e0260c 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -85,24 +85,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index e39296fcc233..824a8406bea3 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -15,11 +15,11 @@ DISTFILES= ${PORTNAME}.${PORTVERSION}:demime demime_junkmail.cf:junkmail
MAINTAINER= petef@FreeBSD.org
COMMENT= A tool to scrub mime from mailing lists
-RUN_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}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/FormatText.pm:${PORTSDIR}/textproc/p5-HTML-Format \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+ ${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/HTML/FormatText.pm:${PORTSDIR}/textproc/p5-HTML-Format \
+ ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
+ ${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
NO_BUILD= yes
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index 4784783b68f4..d31edc4a24fc 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= erwin@FreeBSD.org
COMMENT= A script to fetch mail from a Hotmail or MSN mailbox
RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/libnet.cfg:${PORTSDIR}/net/p5-Net
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/Net/libnet.cfg:${PORTSDIR}/net/p5-Net
MAN1= ${PORTNAME}.1
NO_BUILD= yes
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 3823e5751ef6..d41f496e8cbf 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
COMMENT= Search mailboxes for a given regexp and display matching emails
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS= ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS= ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
PERL_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/mail/grepmail/pkg-plist b/mail/grepmail/pkg-plist
index 281cbfa14ff6..d4a1e3e833a2 100644
--- a/mail/grepmail/pkg-plist
+++ b/mail/grepmail/pkg-plist
@@ -1,3 +1,3 @@
bin/grepmail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/grepmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/grepmail
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail
diff --git a/mail/mail2procmailrc/Makefile b/mail/mail2procmailrc/Makefile
index 44eaa9a23721..1439be27f181 100644
--- a/mail/mail2procmailrc/Makefile
+++ b/mail/mail2procmailrc/Makefile
@@ -15,9 +15,9 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= mail to procmailrc generator
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Curses/Widgets.pm:${PORTSDIR}/devel/p5-Curses-Widgets \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
+ ${SITE_PERL}/Curses/Widgets.pm:${PORTSDIR}/devel/p5-Curses-Widgets \
+ ${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools
USE_PERL5= yes
NO_BUILD= yes
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 31d55b72fe88..8e00796467ca 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -17,9 +17,9 @@ MAINTAINER= anders@FreeBSD.org
COMMENT= A mailing list manager
.if defined(WITH_SHA1_COOKIES)
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
.else
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
.endif
USE_PERL5= yes
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 15e66f3e0345..563c42de4a7e 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= MS Outlook Express .mbx to mbox file converter
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
+BUILD_DEPENDS= ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/mail/mbx2mbox/pkg-plist b/mail/mbx2mbox/pkg-plist
index 4d5a1c1f7df3..3c86ea46896f 100644
--- a/mail/mbx2mbox/pkg-plist
+++ b/mail/mbx2mbox/pkg-plist
@@ -1,3 +1,3 @@
bin/mbx2mbox
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mbx2mbox/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mbx2mbox
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 623945a45cc5..b4ec7aab867f 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= \
USE_PERL5= yes
USE_REINPLACE= yes
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
GNU_CONFIGURE= yes
MAILUSER?= mailnull
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 4724d8aeb853..15c1e5ce1a47 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Find RFC 822 email addresses in plain text
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
+BUILD_DEPENDS= ${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/mail/p5-Email-Find/pkg-plist b/mail/p5-Email-Find/pkg-plist
index 589207986f1c..777a675f573c 100644
--- a/mail/p5-Email-Find/pkg-plist
+++ b/mail/p5-Email-Find/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Email/Find.pm
-lib/perl5/site_perl/%%PERL_VER%%/Email/Find/addrspec.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Email/Find/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Email/Find
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Email/Find
+%%SITE_PERL%%/Email/Find.pm
+%%SITE_PERL%%/Email/Find/addrspec.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find/.packlist
+@dirrm %%SITE_PERL%%/Email/Find
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index d010a5de6c21..2e9950224338 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -21,6 +21,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Email::Valid::Loose.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index 9b3bfff60021..bbd6dd8f36b1 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -22,6 +22,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Email::Valid.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index 771032e54841..bbc92d433314 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module for basic IMAP server administration
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= IMAP::Admin.3
post-install:
diff --git a/mail/p5-IMAP-Admin/pkg-plist b/mail/p5-IMAP-Admin/pkg-plist
index 4dd734fc2d3b..09bfac3bace7 100644
--- a/mail/p5-IMAP-Admin/pkg-plist
+++ b/mail/p5-IMAP-Admin/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMAP/Admin/.packlist
+%%SITE_PERL%%/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin/.packlist
share/examples/p5-IMAP-Admin/create.pl
share/examples/p5-IMAP-Admin/delete.pl
@dirrm share/examples/p5-IMAP-Admin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMAP/Admin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
+@dirrm %%SITE_PERL%%/IMAP
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 19ac4f2b90e4..f9777a3f8d6f 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -16,14 +16,13 @@ DISTNAME= MIME-tools-${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= A set of perl5 modules for MIME
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS= ${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
WRKSRC= ${WRKDIR}/MIME-tools-5.411
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= MIME::Body.3 \
MIME::Decoder.3 \
MIME::Decoder::Base64.3 \
@@ -49,7 +48,7 @@ MAN3= MIME::Body.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
.endif
post-patch:
diff --git a/mail/p5-MIME-Tools/pkg-plist b/mail/p5-MIME-Tools/pkg-plist
index 120906b55a6d..5722ecd9136b 100644
--- a/mail/p5-MIME-Tools/pkg-plist
+++ b/mail/p5-MIME-Tools/pkg-plist
@@ -1,27 +1,27 @@
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Body.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Entity.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/QuotedPrint.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/Base64.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/Binary.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/Gzip64.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/NBit.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/UU.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ConTraEnc.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ContDisp.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ContType.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ParamVal.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Head.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser/Filer.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser/Reader.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser/Results.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Tools.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/WordDecoder.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Words.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME-tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME-tools
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MIME/Field
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MIME 2>/dev/null || true
+%%SITE_PERL%%/MIME/Body.pm
+%%SITE_PERL%%/MIME/Entity.pm
+%%SITE_PERL%%/MIME/Decoder.pm
+%%SITE_PERL%%/MIME/Decoder/QuotedPrint.pm
+%%SITE_PERL%%/MIME/Decoder/Base64.pm
+%%SITE_PERL%%/MIME/Decoder/Binary.pm
+%%SITE_PERL%%/MIME/Decoder/Gzip64.pm
+%%SITE_PERL%%/MIME/Decoder/NBit.pm
+%%SITE_PERL%%/MIME/Decoder/UU.pm
+%%SITE_PERL%%/MIME/Field/ConTraEnc.pm
+%%SITE_PERL%%/MIME/Field/ContDisp.pm
+%%SITE_PERL%%/MIME/Field/ContType.pm
+%%SITE_PERL%%/MIME/Field/ParamVal.pm
+%%SITE_PERL%%/MIME/Head.pm
+%%SITE_PERL%%/MIME/Parser.pm
+%%SITE_PERL%%/MIME/Parser/Filer.pm
+%%SITE_PERL%%/MIME/Parser/Reader.pm
+%%SITE_PERL%%/MIME/Parser/Results.pm
+%%SITE_PERL%%/MIME/Tools.pm
+%%SITE_PERL%%/MIME/WordDecoder.pm
+%%SITE_PERL%%/MIME/Words.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME-tools/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME-tools
+@dirrm %%SITE_PERL%%/MIME/Field
+@dirrm %%SITE_PERL%%/MIME/Decoder
+@dirrm %%SITE_PERL%%/MIME/Parser
+@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 571cb32d46ca..5decd3847e90 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -23,10 +23,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Net/Config.pm:${PORTSDIR}/net/p5-Net \
${SITE_PERL}/${PERL_ARCH}/Razor2/Client/Agent.pm:${PORTSDIR}/mail/razor-agents
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::Audit.3 \
Mail::Audit::KillDups.3 \
Mail::Audit::List.3 \
diff --git a/mail/p5-Mail-Audit/pkg-plist b/mail/p5-Mail-Audit/pkg-plist
index c973337c8596..5f3836ff4bf9 100644
--- a/mail/p5-Mail-Audit/pkg-plist
+++ b/mail/p5-Mail-Audit/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/KillDups.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/List.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/MAPS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/MailInternet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/MimeEntity.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/PGP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/Razor.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Audit/.packlist
+%%SITE_PERL%%/Mail/Audit.pm
+%%SITE_PERL%%/Mail/Audit/KillDups.pm
+%%SITE_PERL%%/Mail/Audit/List.pm
+%%SITE_PERL%%/Mail/Audit/MAPS.pm
+%%SITE_PERL%%/Mail/Audit/MailInternet.pm
+%%SITE_PERL%%/Mail/Audit/MimeEntity.pm
+%%SITE_PERL%%/Mail/Audit/PGP.pm
+%%SITE_PERL%%/Mail/Audit/Razor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/.packlist
%%PORTDOCS%%share/doc/p5-Mail-Audit/Changes
%%PORTDOCS%%share/doc/p5-Mail-Audit/FAQ
%%PORTDOCS%%share/doc/p5-Mail-Audit/README
@@ -14,7 +14,7 @@ share/examples/p5-Mail-Audit/popread
share/examples/p5-Mail-Audit/proc2ma
@dirrm share/examples/p5-Mail-Audit
%%PORTDOCS%%@dirrm share/doc/p5-Mail-Audit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Audit
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/Audit
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-Box1/Makefile b/mail/p5-Mail-Box1/Makefile
index 89b1a5ca620c..ee8cd1b01df1 100644
--- a/mail/p5-Mail-Box1/Makefile
+++ b/mail/p5-Mail-Box1/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= ${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::Box.3 \
Mail::Box::Index.3 \
Mail::Box::Locker.3 \
diff --git a/mail/p5-Mail-Box1/pkg-plist b/mail/p5-Mail-Box1/pkg-plist
index 3f30987b987c..a9fb9b401ae7 100644
--- a/mail/p5-Mail-Box1/pkg-plist
+++ b/mail/p5-Mail-Box1/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Index.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/DotLock.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/NFS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Manager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Threads.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie/ARRAY.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie/HASH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Box
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Box.pm
+%%SITE_PERL%%/Mail/Box/Index.pm
+%%SITE_PERL%%/Mail/Box/Locker.pm
+%%SITE_PERL%%/Mail/Box/Locker/DotLock.pm
+%%SITE_PERL%%/Mail/Box/Locker/File.pm
+%%SITE_PERL%%/Mail/Box/Locker/NFS.pm
+%%SITE_PERL%%/Mail/Box/MH.pm
+%%SITE_PERL%%/Mail/Box/MH/Message.pm
+%%SITE_PERL%%/Mail/Box/Manager.pm
+%%SITE_PERL%%/Mail/Box/Mbox.pm
+%%SITE_PERL%%/Mail/Box/Mbox/Message.pm
+%%SITE_PERL%%/Mail/Box/Message.pm
+%%SITE_PERL%%/Mail/Box/Threads.pm
+%%SITE_PERL%%/Mail/Box/Tie.pm
+%%SITE_PERL%%/Mail/Box/Tie/ARRAY.pm
+%%SITE_PERL%%/Mail/Box/Tie/HASH.pm
+%%SITE_PERL%%/Mail/Message.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/Box/Locker
+@dirrm %%SITE_PERL%%/Mail/Box/Mbox
+@dirrm %%SITE_PERL%%/Mail/Box/MH
+@dirrm %%SITE_PERL%%/Mail/Box/Tie
+@dirrm %%SITE_PERL%%/Mail/Box
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index fd175e0c46a0..0145c56b7c39 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -25,7 +25,6 @@ EZMLM_DIR?= ${LOCALBASE}
USE_PERL5= YES
MAN3= Mail::Ezmlm.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
# For this version, since it is a bugfix
WRKSRC= ${WRKDIR}/Ezmlm-0.03
diff --git a/mail/p5-Mail-Ezmlm/pkg-plist b/mail/p5-Mail-Ezmlm/pkg-plist
index 64eea9c5d158..4318a9d7fcfd 100644
--- a/mail/p5-Mail-Ezmlm/pkg-plist
+++ b/mail/p5-Mail-Ezmlm/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Ezmlm.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Ezmlm/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Ezmlm
+%%SITE_PERL%%/Mail/Ezmlm.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index a57daf9fc600..c8b2441ac9bc 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Mail/Audit.pm:${PORTSDIR}/mail/p5-Mail-Audit \
${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::FilterXML.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-FilterXML/pkg-plist b/mail/p5-Mail-FilterXML/pkg-plist
index 710dd16eaa03..be856d318e47 100644
--- a/mail/p5-Mail-FilterXML/pkg-plist
+++ b/mail/p5-Mail-FilterXML/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/mailfilter.pl
-lib/perl5/site_perl/%%PERL_VER%%/Mail/FilterXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/FilterXML/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/FilterXML
+%%SITE_PERL%%/Mail/mailfilter.pl
+%%SITE_PERL%%/Mail/FilterXML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 42f363226564..8d8d582580f6 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -16,18 +16,17 @@ DISTNAME= MailFolder-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl module for a folder-independant interface to email folders
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Head.pm:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync
+RUN_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
+ ${SITE_PERL}/MIME/Head.pm:${PORTSDIR}/mail/p5-MIME-Tools
PERL_CONFIGURE= YES
MAN3= Mail::Folder.3 Mail::Folder::Emaul.3 Mail::Folder::Mbox.3 \
Mail::Folder::NNTP.3 Mail::Folder::Maildir.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Folder/pkg-plist b/mail/p5-Mail-Folder/pkg-plist
index 5fd4400df364..0205c6f82c86 100644
--- a/mail/p5-Mail-Folder/pkg-plist
+++ b/mail/p5-Mail-Folder/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/Emaul.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/Maildir.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/Mbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/NNTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder
+%%SITE_PERL%%/Mail/Folder.pm
+%%SITE_PERL%%/Mail/Folder/Emaul.pm
+%%SITE_PERL%%/Mail/Folder/Maildir.pm
+%%SITE_PERL%%/Mail/Folder/Mbox.pm
+%%SITE_PERL%%/Mail/Folder/NNTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
+@dirrm %%SITE_PERL%%/Mail/Folder
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index c95e0822a2cb..acb62597f4f2 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module to parse daily newsletters from freshmeat.net
BUILD_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Freshmeat.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Freshmeat/pkg-plist b/mail/p5-Mail-Freshmeat/pkg-plist
index 6bc030c0cfdf..c95a97212fc6 100644
--- a/mail/p5-Mail-Freshmeat/pkg-plist
+++ b/mail/p5-Mail-Freshmeat/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat/Article.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat/Entry.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat/Utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Freshmeat.pm
+%%SITE_PERL%%/Mail/Freshmeat/Article.pm
+%%SITE_PERL%%/Mail/Freshmeat/Entry.pm
+%%SITE_PERL%%/Mail/Freshmeat/Utils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist
+@dirrm %%SITE_PERL%%/Mail/Freshmeat
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index d0934990563c..f37c538e1ef7 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module to detect newer messages in procmail-generated mailboxes
BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::Stats::Record.3 Mail::Stats.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 5ef06671a955..6631fc615c67 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -1,10 +1,10 @@
bin/countmail
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Record.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Stats
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Stats.pm
+%%SITE_PERL%%/Mail/Stats/Config.pm
+%%SITE_PERL%%/Mail/Stats/Parser.pm
+%%SITE_PERL%%/Mail/Stats/Record.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats
+@dirrm %%SITE_PERL%%/Mail/Stats
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-QuoteWrap/Makefile b/mail/p5-Mail-QuoteWrap/Makefile
index ec1fe7108831..dad16ebbb547 100644
--- a/mail/p5-Mail-QuoteWrap/Makefile
+++ b/mail/p5-Mail-QuoteWrap/Makefile
@@ -17,11 +17,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= mharo@FreeBSD.org
COMMENT= Provides wrapping functionality for quoted Email and Usenet messages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Format.pm:${PORTSDIR}/textproc/p5-Text-Format
+BUILD_DEPENDS= ${SITE_PERL}/Text/Format.pm:${PORTSDIR}/textproc/p5-Text-Format
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::QuoteWrap.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-QuoteWrap/pkg-plist b/mail/p5-Mail-QuoteWrap/pkg-plist
index 92a055039a40..feb3473995ba 100644
--- a/mail/p5-Mail-QuoteWrap/pkg-plist
+++ b/mail/p5-Mail-QuoteWrap/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/QuoteWrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/QuoteWrap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index 7775b955b845..6281791d21fc 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl extension to access RBL-style host verification services
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::RBL.3
FILES= Makefile.PL test.pl RBL.pm
diff --git a/mail/p5-Mail-RBL/pkg-plist b/mail/p5-Mail-RBL/pkg-plist
index c6fbb6e5b3a8..2ccbd7513252 100644
--- a/mail/p5-Mail-RBL/pkg-plist
+++ b/mail/p5-Mail-RBL/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/RBL.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RBL
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/RBL.pm
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-RFC822-Address/Makefile b/mail/p5-Mail-RFC822-Address/Makefile
index b79c9e6677f9..0cb493b9c08e 100644
--- a/mail/p5-Mail-RFC822-Address/Makefile
+++ b/mail/p5-Mail-RFC822-Address/Makefile
@@ -19,7 +19,6 @@ PERL_CONFIGURE= yes
INSTALL_TARGET= pure_site_install
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::RFC822::Address.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-RFC822-Address/pkg-plist b/mail/p5-Mail-RFC822-Address/pkg-plist
index 2f3138b4efd6..388f128629dd 100644
--- a/mail/p5-Mail-RFC822-Address/pkg-plist
+++ b/mail/p5-Mail-RFC822-Address/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/RFC822/Address.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/RFC822
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RFC822
+%%SITE_PERL%%/Mail/RFC822/Address.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address/.packlist
+@dirrm %%SITE_PERL%%/Mail/RFC822
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 2afacabf6f9a..5ea00b7646b9 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${SITE_PERL}/File/NFSLock.pm:${PORTSDIR}/devel/p5-File-NFSLock \
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::Spool.3 Mail::Spool::Handle.3 Mail::Spool::Node.3
diff --git a/mail/p5-Mail-Spool/pkg-plist b/mail/p5-Mail-Spool/pkg-plist
index 61a2d6dc2a10..87d022981d17 100644
--- a/mail/p5-Mail-Spool/pkg-plist
+++ b/mail/p5-Mail-Spool/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool/Handle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Spool/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Spool
+%%SITE_PERL%%/Mail/Spool.pm
+%%SITE_PERL%%/Mail/Spool/Handle.pm
+%%SITE_PERL%%/Mail/Spool/Node.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool/.packlist
+@dirrm %%SITE_PERL%%/Mail/Spool
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index 01589bb17ec8..30ab4dbdb400 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -1,39 +1,39 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Address.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Cap.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Field.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Field/AddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Field/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Header.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Internet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/qmail.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/rfc822.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/sendmail.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/smtp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/test.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Send.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/_prephdr.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/add_signature.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/escape_from.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/nntppost.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/reply.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/send.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/sign.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/smtpsend.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/unescape_from.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/mailaddress.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/maildomain.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/read_mbox.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Field
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Address.pm
+%%SITE_PERL%%/Mail/Cap.pm
+%%SITE_PERL%%/Mail/Field.pm
+%%SITE_PERL%%/Mail/Field/AddrList.pm
+%%SITE_PERL%%/Mail/Field/Date.pm
+%%SITE_PERL%%/Mail/Filter.pm
+%%SITE_PERL%%/Mail/Header.pm
+%%SITE_PERL%%/Mail/Internet.pm
+%%SITE_PERL%%/Mail/Mailer.pm
+%%SITE_PERL%%/Mail/Mailer/qmail.pm
+%%SITE_PERL%%/Mail/Mailer/rfc822.pm
+%%SITE_PERL%%/Mail/Mailer/sendmail.pm
+%%SITE_PERL%%/Mail/Mailer/smtp.pm
+%%SITE_PERL%%/Mail/Mailer/test.pm
+%%SITE_PERL%%/Mail/Send.pm
+%%SITE_PERL%%/Mail/Util.pm
+%%SITE_PERL%%/auto/Mail/Internet/_prephdr.al
+%%SITE_PERL%%/auto/Mail/Internet/add_signature.al
+%%SITE_PERL%%/auto/Mail/Internet/autosplit.ix
+%%SITE_PERL%%/auto/Mail/Internet/escape_from.al
+%%SITE_PERL%%/auto/Mail/Internet/nntppost.al
+%%SITE_PERL%%/auto/Mail/Internet/reply.al
+%%SITE_PERL%%/auto/Mail/Internet/send.al
+%%SITE_PERL%%/auto/Mail/Internet/sign.al
+%%SITE_PERL%%/auto/Mail/Internet/smtpsend.al
+%%SITE_PERL%%/auto/Mail/Internet/unescape_from.al
+%%SITE_PERL%%/auto/Mail/Util/autosplit.ix
+%%SITE_PERL%%/auto/Mail/Util/mailaddress.al
+%%SITE_PERL%%/auto/Mail/Util/maildomain.al
+%%SITE_PERL%%/auto/Mail/Util/read_mbox.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/Mail/Util
+@dirrm %%SITE_PERL%%/auto/Mail/Internet
+@dirrm %%SITE_PERL%%/auto/Mail
+@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/Mailer
+@dirrm %%SITE_PERL%%/Mail/Field
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index e5ae57dd382e..f09b987ae568 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module to verify email addresses
BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::Verify.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Verify/pkg-plist b/mail/p5-Mail-Verify/pkg-plist
index 93316c1916b0..e092fe55d7c5 100644
--- a/mail/p5-Mail-Verify/pkg-plist
+++ b/mail/p5-Mail-Verify/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Verify.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Verify
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Verify.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index a7fcc3808c1f..376fed3f3a58 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -16,7 +16,7 @@ DISTNAME= SMTP-Server-${PORTVERSION}
MAINTAINER= erwin@FreeBSD.org
COMMENT= A native Perl SMTP Server
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS= ${BUILD_DEPENDS}
MASTER_SITE_BACKUP+= http://www.macgyver.org/software/perl/
@@ -30,8 +30,8 @@ MAN3= Net::SMTP::Server.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
.endif
.include <bsd.port.post.mk>
diff --git a/mail/p5-Net-SMTP-Server/pkg-plist b/mail/p5-Net-SMTP-Server/pkg-plist
index a0b294ed30d3..267f6efa5ba2 100644
--- a/mail/p5-Net-SMTP-Server/pkg-plist
+++ b/mail/p5-Net-SMTP-Server/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server/Relay.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Client/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Relay/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Client
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Relay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMTP/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/SMTP/Server.pm
+%%SITE_PERL%%/Net/SMTP/Server/Client.pm
+%%SITE_PERL%%/Net/SMTP/Server/Relay.pm
+%%SITE_PERL%%/auto/Net/SMTP/Server/Client/autosplit.ix
+%%SITE_PERL%%/auto/Net/SMTP/Server/Relay/autosplit.ix
+%%SITE_PERL%%/auto/Net/SMTP/Server/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist
+@dirrm %%SITE_PERL%%/Net/SMTP/Server
+@unexec rmdir %D/%%SITE_PERL%%/Net/SMTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Client
+@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Relay
+@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/SMTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index 30c1e7e23624..674ac5fce79a 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Impliment a POP3 client POE component
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= POE::Component::Client::POP3.3
post-install:
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-plist b/mail/p5-POE-Component-Client-POP3/pkg-plist
index eed6aad99217..5dd93f06af76 100644
--- a/mail/p5-POE-Component-Client-POP3/pkg-plist
+++ b/mail/p5-POE-Component-Client-POP3/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client/POP3.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
+%%SITE_PERL%%/POE/Component/Client/POP3.pm
%%PORTDOCS%%%%EXAMPLESDIR%%/test.perl
%%PORTDOCS%%%%EXAMPLESDIR%%/term.perl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/mail/p5-Sendmail-Milter/pkg-plist b/mail/p5-Sendmail-Milter/pkg-plist
index f4ee907a779f..9e50dcab9ae2 100644
--- a/mail/p5-Sendmail-Milter/pkg-plist
+++ b/mail/p5-Sendmail-Milter/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sendmail/Milter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sendmail/sample.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sendmail
+%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/Milter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/sample.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Sendmail
diff --git a/mail/p5-vpopmail/Makefile b/mail/p5-vpopmail/Makefile
index 125e2294cd4f..772a0b517844 100644
--- a/mail/p5-vpopmail/Makefile
+++ b/mail/p5-vpopmail/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= vpopmail.3
.include <bsd.port.mk>
diff --git a/mail/p5-vpopmail/pkg-plist b/mail/p5-vpopmail/pkg-plist
index 8b7e287a27cc..5c26ac126a40 100644
--- a/mail/p5-vpopmail/pkg-plist
+++ b/mail/p5-vpopmail/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/vpopmail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail
+%%SITE_PERL%%/%%PERL_ARCH%%/vpopmail.pm
diff --git a/mail/pflogsumm/Makefile b/mail/pflogsumm/Makefile
index 3331e0bce35d..d4647af76df1 100644
--- a/mail/pflogsumm/Makefile
+++ b/mail/pflogsumm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://jimsun.LinxNet.com/downloads/ \
MAINTAINER= erwin@FreeBSD.org
COMMENT= Postfix Log Entry Summarizer
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
NO_BUILD= yes
USE_PERL5= yes
diff --git a/mail/pronto/Makefile b/mail/pronto/Makefile
index 6dfd96692984..ca0f6a4206a6 100644
--- a/mail/pronto/Makefile
+++ b/mail/pronto/Makefile
@@ -13,23 +13,23 @@ MAINTAINER= killer@prosalg.no
COMMENT= A Mail Client for Gnome/Gtk written in Perl
BUILD_DEPENDS=\
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/DBD/CSV.pm:${PORTSDIR}/databases/p5-DBD-CSV \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Lingua/Ispell.pm:${PORTSDIR}/textproc/p5-Lingua-Ispell
+ ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
+ ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+ ${SITE_PERL}/DBD/CSV.pm:${PORTSDIR}/databases/p5-DBD-CSV \
+ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
+ ${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement \
+ ${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+ ${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Lingua/Ispell.pm:${PORTSDIR}/textproc/p5-Lingua-Ispell
.if defined(WITH_HTML)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/XmHTML.pm:${PORTSDIR}/x11-toolkits/p5-GtkXmHTML
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Gtk/XmHTML.pm:${PORTSDIR}/x11-toolkits/p5-GtkXmHTML
.endif
.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
.endif
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/mail/ricochet/Makefile b/mail/ricochet/Makefile
index 335b1a0d4dcc..dc42e8be8a49 100644
--- a/mail/ricochet/Makefile
+++ b/mail/ricochet/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES= http://vipul.net/perl/sources/spamcontrol/ricochet/
MAINTAINER= ache@FreeBSD.org
COMMENT= An automated agent for tracing and reporting internet junk mail
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
+ ${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
+ ${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
NO_BUILD= yes
PERL_CONFIGURE= yes
diff --git a/mail/rmoldmail/Makefile b/mail/rmoldmail/Makefile
index 88adc0571d6d..e1f57b2077e4 100644
--- a/mail/rmoldmail/Makefile
+++ b/mail/rmoldmail/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://probiers.net/projects/rmoldmail/
MAINTAINER= petef@FreeBSD.org
COMMENT= Prune a mailbox of messages older than a set number of days
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
NO_BUILD= yes
diff --git a/mail/tlb/Makefile b/mail/tlb/Makefile
index d66267b175c5..d6b4bcec7116 100644
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@@ -16,9 +16,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
COMMENT= The List Batcher, a general purpose mail list delivery engine
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS= ${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
NO_BUILD= yes
USE_PERL5= yes