27 files changed, 152 insertions, 157 deletions

diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index 4d0eb785256f..b969db700d8d 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Perl5 module to validate/generate credit card checksums/names
 
 PERL_CONFIGURE=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Business::CreditCard.3
 
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-CreditCard/pkg-plist b/finance/p5-Business-CreditCard/pkg-plist
index 7e378dff00e8..1e4fd4adc9b1 100644
--- a/finance/p5-Business-CreditCard/pkg-plist
+++ b/finance/p5-Business-CreditCard/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/CreditCard.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/CreditCard/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/CreditCard
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business 2>/dev/null || true
+%%SITE_PERL%%/Business/CreditCard.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/CreditCard/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/CreditCard
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
index 493ffa581b9a..35ed06f86ce4 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/2CheckOut.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/2CheckOut/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/2CheckOut
+%%SITE_PERL%%/Business/OnlinePayment/2CheckOut.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/2CheckOut/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/2CheckOut
 @unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
index 50f1b84189cd..777449e73911 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/AuthorizeNet.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/AuthorizeNet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/AuthorizeNet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/AuthorizeNet.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/AuthorizeNet/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/AuthorizeNet
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
index b68a0cd10e1b..137530e67f43 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/BankOfAmerica.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/BankOfAmerica/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/BankOfAmerica
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/BankOfAmerica.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/BankOfAmerica/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/BankOfAmerica
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
index 921153dae2f5..0b67429a01cf 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Beanstream.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Beanstream/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Beanstream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Beanstream.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Beanstream/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Beanstream
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
index af9de49deade..06fdb0b47c38 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Cardstream.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Cardstream/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Cardstream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Cardstream.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Cardstream/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Cardstream
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
index 37d73b3e5fc3..f96f934eca99 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Jettis.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Jettis/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Jettis
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Jettis.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Jettis/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Jettis
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
index 68a5a04ffba6..0e48d959feee 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/LinkPoint.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/LinkPoint/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/LinkPoint
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/LinkPoint.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/LinkPoint/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/LinkPoint
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
index 59ee55516fd4..c244efd14859 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/MerchantCommerce.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/MerchantCommerce/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/MerchantCommerce
+%%SITE_PERL%%/Business/OnlinePayment/MerchantCommerce.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/MerchantCommerce/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/MerchantCommerce
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
index 72f2730b9c3d..d733e8a6142b 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Network1Financial.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Network1Financial/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Network1Financial
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Network1Financial.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Network1Financial/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Network1Financial
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
index 2221cd75a575..096b70a83566 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/PayConnect.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PayConnect/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PayConnect
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/PayConnect.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/PayConnect/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/PayConnect
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
index 67e43b5ff8ec..3243f897c03d 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/PaymentsGateway.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PaymentsGateway/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PaymentsGateway
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/PaymentsGateway.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/PaymentsGateway/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/PaymentsGateway
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
index 112e1772d159..bceac1e33d7a 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/SurePay.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay
+%%SITE_PERL%%/Business/OnlinePayment/SurePay.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay
 @unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
index 3b2a8627c8a2..b810b118954c 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/TCLink.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/TCLink/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/TCLink
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/TCLink.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/TCLink/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/TCLink
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
index d11416b0fe99..9f732513f9d8 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/VirtualNet.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/VirtualNet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/VirtualNet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/VirtualNet.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/VirtualNet/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/VirtualNet
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-eSec/pkg-plist b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
index 0211119016a0..38c055d1ba3b 100644
--- a/finance/p5-Business-OnlinePayment-eSec/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/eSec.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/eSec/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/eSec
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/eSec.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/eSec/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/eSec
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment/pkg-plist b/finance/p5-Business-OnlinePayment/pkg-plist
index 54531fc978c1..acce58f6a7cc 100644
--- a/finance/p5-Business-OnlinePayment/pkg-plist
+++ b/finance/p5-Business-OnlinePayment/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Business
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business
+%%SITE_PERL%%/Business/OnlinePayment.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Business
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment
+@dirrm %%SITE_PERL%%/auto/Business
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 8a0147932420..9f90512f3efa 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Business/CreditCard.pm:${PORTSDIR}/finance/p5-Busine
 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=		Business::WorldPay::Junior.3
diff --git a/finance/p5-Finance-Currency-Convert/Makefile b/finance/p5-Finance-Currency-Convert/Makefile
index 4ab058133e71..2c0b78df88c3 100644
--- a/finance/p5-Finance-Currency-Convert/Makefile
+++ b/finance/p5-Finance-Currency-Convert/Makefile
@@ -19,6 +19,5 @@ COMMENT=	Convert currencies and fetch their exchange rates
 PERL_CONFIGURE=	yes
 
 MAN3=		Finance::Currency::Convert.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/finance/p5-Finance-Currency-Convert/pkg-plist b/finance/p5-Finance-Currency-Convert/pkg-plist
index 73fda488e846..0f529d8b2deb 100644
--- a/finance/p5-Finance-Currency-Convert/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Currency/Convert.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency/Convert/autosplit.ix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
+%%SITE_PERL%%/Finance/Currency/Convert.pm
+%%SITE_PERL%%/auto/Finance/Currency/Convert/autosplit.ix
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index e059a4582ad7..286dc2e5c6e6 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Get stock and mutual fund quotes from various exchanges
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
+		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Finance::Quote.3 Finance::Quote::AEX.3 Finance::Quote::ASX.3 \
 		Finance::Quote::Cdnfundlibrary.3 Finance::Quote::DWS.3 \
 		Finance::Quote::Fidelity.3 Finance::Quote::Fool.3 \
diff --git a/finance/p5-Finance-Quote/pkg-plist b/finance/p5-Finance-Quote/pkg-plist
index fa2532f90873..14061834195d 100644
--- a/finance/p5-Finance-Quote/pkg-plist
+++ b/finance/p5-Finance-Quote/pkg-plist
@@ -1,24 +1,24 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Quote/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/AEX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/ASX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Cdnfundlibrary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/DWS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Fidelity.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Fool.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Tdwaterhouse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Tiaacref.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Troweprice.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Trustnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/VWD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Asia.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Australia.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Europe.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/USA.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Quote
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote/.packlist
+%%SITE_PERL%%/Finance/Quote.pm
+%%SITE_PERL%%/Finance/Quote/AEX.pm
+%%SITE_PERL%%/Finance/Quote/ASX.pm
+%%SITE_PERL%%/Finance/Quote/Cdnfundlibrary.pm
+%%SITE_PERL%%/Finance/Quote/DWS.pm
+%%SITE_PERL%%/Finance/Quote/Fidelity.pm
+%%SITE_PERL%%/Finance/Quote/Fool.pm
+%%SITE_PERL%%/Finance/Quote/Tdwaterhouse.pm
+%%SITE_PERL%%/Finance/Quote/Tiaacref.pm
+%%SITE_PERL%%/Finance/Quote/Troweprice.pm
+%%SITE_PERL%%/Finance/Quote/Trustnet.pm
+%%SITE_PERL%%/Finance/Quote/UserAgent.pm
+%%SITE_PERL%%/Finance/Quote/VWD.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Asia.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Australia.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Base.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Europe.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/USA.pm
+@dirrm %%SITE_PERL%%/Finance/Quote/Yahoo
+@dirrm %%SITE_PERL%%/Finance/Quote
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile
index bd22ac434806..7dbe3d946be7 100644
--- a/finance/p5-Finance-QuoteHist/Makefile
+++ b/finance/p5-Finance-QuoteHist/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 		${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL=	${SITE_PERL}
 PERL_CONFIGURE=		yes
 
 MAN3=		Finance::QuoteHist::Yahoo.3 \
@@ -28,6 +28,5 @@ MAN3=		Finance::QuoteHist::Yahoo.3 \
 		Finance::QuoteHist::WallStreetCity.3 \
 		Finance::QuoteHist::SiliconInvestor.3 \
 		Finance::QuoteHist::Generic.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/finance/p5-Finance-QuoteHist/pkg-plist b/finance/p5-Finance-QuoteHist/pkg-plist
index 02a621c4500e..b2674a16e66b 100644
--- a/finance/p5-Finance-QuoteHist/pkg-plist
+++ b/finance/p5-Finance-QuoteHist/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance-QuoteHist/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/Generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/SiliconInvestor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/Yahoo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/WallStreetCity.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance-QuoteHist 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist/.packlist
+%%SITE_PERL%%/Finance/QuoteHist.pm
+%%SITE_PERL%%/Finance/QuoteHist/Generic.pm
+%%SITE_PERL%%/Finance/QuoteHist/SiliconInvestor.pm
+%%SITE_PERL%%/Finance/QuoteHist/Yahoo.pm
+%%SITE_PERL%%/Finance/QuoteHist/WallStreetCity.pm
+@unexec rmdir %D/%%SITE_PERL%%/Finance/QuoteHist 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist 2>/dev/null || true
diff --git a/finance/p5-Math-Financial/Makefile b/finance/p5-Math-Financial/Makefile
index 411676a6b1d8..2c25cc74437a 100644
--- a/finance/p5-Math-Financial/Makefile
+++ b/finance/p5-Math-Financial/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Perl module containing common functions for loans and annuities
 
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Math::Financial.3
 
 .include <bsd.port.mk>
diff --git a/finance/p5-Math-Financial/pkg-plist b/finance/p5-Math-Financial/pkg-plist
index 88ad2cd27ee5..c355eb260985 100644
--- a/finance/p5-Math-Financial/pkg-plist
+++ b/finance/p5-Math-Financial/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Math/Financial.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
+%%SITE_PERL%%/Math/Financial.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Financial
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true