28 files changed, 81 insertions, 68 deletions

diff --git a/finance/p5-Business-OCV/Makefile b/finance/p5-Business-OCV/Makefile
index 88b59725d00d..67224c0fcaf3 100644
--- a/finance/p5-Business-OCV/Makefile
+++ b/finance/p5-Business-OCV/Makefile
@@ -14,5 +14,4 @@ COMMENT=	Interface to the Ingenico OCV Server
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-OCV/pkg-plist b/finance/p5-Business-OCV/pkg-plist
index f1ca3a6d93f7..9baf7ab63cb4 100644
--- a/finance/p5-Business-OCV/pkg-plist
+++ b/finance/p5-Business-OCV/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Business/OCV.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OCV/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OCV
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OCV
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
index d9246522108c..f2a87b0fdeef 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/Makefile
@@ -19,9 +19,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure patch
 
-MAN3=		Business::OnlinePayment::2CheckOut.3
-
-NO_STAGE=	yes
 post-patch:
 	${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1);$$1/;' \
 		-e '$$_="" if /use 5/;' \
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
index 6b279250955b..e7da2831746c 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
@@ -1,8 +1,11 @@
+%%PERL5_MAN3%%/Business::OnlinePayment::2CheckOut.3.gz
 %%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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment/2CheckOut
 @dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment
 @dirrmtry %%SITE_PERL%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
index 9b4f3f210190..3d8db6a44f0b 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile
@@ -17,4 +17,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+MAN3=		Business::OnlinePayment::LinkPoint.3
+
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
index 0c32432efb86..2d039746d0e6 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
@@ -1,7 +1,8 @@
 %%SITE_PERL%%/Business/OnlinePayment/LinkPoint.pm
+%%PERL5_MAN3%%/Business::OnlinePayment::LinkPoint.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist
 %%PERL5_MAN3%%/Business::OnlinePayment::LinkPoint.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-OCV/Makefile b/finance/p5-Business-OnlinePayment-OCV/Makefile
index a1adfad7ef80..6b790732840b 100644
--- a/finance/p5-Business-OnlinePayment-OCV/Makefile
+++ b/finance/p5-Business-OnlinePayment-OCV/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Business::OnlinePayment::OCV.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-OnlinePayment-OCV/pkg-plist b/finance/p5-Business-OnlinePayment-OCV/pkg-plist
index 0e3e9909f7c4..f966c2bbc781 100644
--- a/finance/p5-Business-OnlinePayment-OCV/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-OCV/pkg-plist
@@ -1,8 +1,11 @@
+%%PERL5_MAN3%%/Business::OnlinePayment::OCV.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/OCV.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/OCV/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/OCV/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/OCV
-@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/OCV
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/OCV
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment/OCV
 @dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment
 @dirrmtry %%SITE_PERL%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
index a4a2e42acbcf..e7be34c14945 100644
--- a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Business::OnlinePayment::PaymenTech.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist b/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist
index ee6364bd6f61..59f6c355534b 100644
--- a/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PaymenTech/pkg-plist
@@ -1,8 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymenTech/.packlist
+%%PERL5_MAN3%%/Business::OnlinePayment::PaymenTech.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/PaymenTech.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymenTech/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymenTech
-@dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment/PaymenTech
-@dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment
-@dirrmtry %%SITE_PERL%%/auto/Business
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business/OnlinePayment
 @dirrmtry %%SITE_PERL%%/Business
diff --git a/finance/p5-Business-OnlinePayment-SurePay/Makefile b/finance/p5-Business-OnlinePayment-SurePay/Makefile
index 59635f728344..f621d3fced68 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/Makefile
+++ b/finance/p5-Business-OnlinePayment-SurePay/Makefile
@@ -17,9 +17,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure patch
 
-MAN3=		Business::OnlinePayment::SurePay.3
-
-NO_STAGE=	yes
 post-patch:
 	${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1);$$1/;' \
 		-e '$$_="" if /use 5/;' \
diff --git a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
index f4ca3cdbe995..852dfadbaf24 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
@@ -1,4 +1,8 @@
+%%PERL5_MAN3%%/Business::OnlinePayment::SurePay.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/SurePay.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business/OnlinePayment
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
index 7dbea626034b..d81f98265b4f 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/Makefile
@@ -19,7 +19,4 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Business::OnlinePayment::iAuthorizer.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist b/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
index faf99d582656..9570f0370a76 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
@@ -1,9 +1,12 @@
+%%PERL5_MAN3%%/Business::OnlinePayment::iAuthorizer.3.gz
 %%SITE_PERL%%/Business/OnlinePayment/certification.pl
 %%SITE_PERL%%/Business/OnlinePayment/iAuthorizer.pm
 %%SITE_PERL%%/auto/Business/OnlinePayment/iAuthorizer/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/iAuthorizer/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/iAuthorizer
-@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/iAuthorizer
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/iAuthorizer
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment/iAuthorizer
 @dirrmtry %%SITE_PERL%%/auto/Business/OnlinePayment
 @dirrmtry %%SITE_PERL%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment/Makefile b/finance/p5-Business-OnlinePayment/Makefile
index 3caba1c75b0f..c4df03f768c2 100644
--- a/finance/p5-Business-OnlinePayment/Makefile
+++ b/finance/p5-Business-OnlinePayment/Makefile
@@ -21,4 +21,10 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+MAN3=		Business::OnlinePayment.3 \
+		Business::FraudDetect.3 \
+		Business::FraudDetect::preCharge.3 \
+		Business::OnlinePayment::HTTPS.3
+
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-OnlinePayment/pkg-plist b/finance/p5-Business-OnlinePayment/pkg-plist
index a6b8afc0908a..a10c8b6e8c24 100644
--- a/finance/p5-Business-OnlinePayment/pkg-plist
+++ b/finance/p5-Business-OnlinePayment/pkg-plist
@@ -2,13 +2,17 @@
 %%PERL5_MAN3%%/Business::OnlinePayment.3.gz
 %%PERL5_MAN3%%/Business::FraudDetect.3.gz
 %%PERL5_MAN3%%/Business::FraudDetect::preCharge.3.gz
+%%PERL5_MAN3%%/Business::FraudDetect.3.gz
+%%PERL5_MAN3%%/Business::FraudDetect::preCharge.3.gz
+%%PERL5_MAN3%%/Business::OnlinePayment.3.gz
 %%PERL5_MAN3%%/Business::OnlinePayment::HTTPS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
 %%SITE_PERL%%/Business/FraudDetect.pm
-%%SITE_PERL%%/Business/OnlinePayment.pm
 %%SITE_PERL%%/Business/FraudDetect/preCharge.pm
+%%SITE_PERL%%/Business/OnlinePayment.pm
 %%SITE_PERL%%/Business/OnlinePayment/HTTPS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
 @dirrmtry %%SITE_PERL%%/Business/OnlinePayment
 @dirrmtry %%SITE_PERL%%/Business/FraudDetect
 @dirrmtry %%SITE_PERL%%/Business
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 168b6ffb58d6..d35ab95ab3ad 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -18,9 +18,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure patch
 
-MAN3=		Business::WorldPay::Junior.3
-
-NO_STAGE=	yes
 post-patch:
 	@${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1);$$1/;' \
 		-e '$$_="" if /use 5/;' \
diff --git a/finance/p5-Business-WorldPay-Junior/pkg-plist b/finance/p5-Business-WorldPay-Junior/pkg-plist
index 03bf8e9ddc88..7dc45761c7a7 100644
--- a/finance/p5-Business-WorldPay-Junior/pkg-plist
+++ b/finance/p5-Business-WorldPay-Junior/pkg-plist
@@ -1,19 +1,21 @@
-%%SITE_PERL%%/auto/Business/WorldPay/Junior/new.al
-%%SITE_PERL%%/auto/Business/WorldPay/Junior/callback.al
-%%SITE_PERL%%/auto/Business/WorldPay/Junior/valid_callback_host.al
-%%SITE_PERL%%/auto/Business/WorldPay/Junior/register.al
+%%PERL5_MAN3%%/Business::WorldPay::Junior.3.gz
+%%SITE_PERL%%/Business/WorldPay/Junior.pm
+%%SITE_PERL%%/Business/WorldPay/get-rates.pl
 %%SITE_PERL%%/auto/Business/WorldPay/Junior/authorised.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/autosplit.ix
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/callback.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/db_connect.al
 %%SITE_PERL%%/auto/Business/WorldPay/Junior/errstr.al
 %%SITE_PERL%%/auto/Business/WorldPay/Junior/exchange_rate.al
-%%SITE_PERL%%/auto/Business/WorldPay/Junior/db_connect.al
-%%SITE_PERL%%/auto/Business/WorldPay/Junior/autosplit.ix
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/new.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/register.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/valid_callback_host.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay/Junior/.packlist
-%%SITE_PERL%%/Business/WorldPay/Junior.pm
-%%SITE_PERL%%/Business/WorldPay/get-rates.pl
-@dirrm %%SITE_PERL%%/auto/Business/WorldPay/Junior
-@dirrm %%SITE_PERL%%/auto/Business/WorldPay
-@dirrm %%SITE_PERL%%/Business/WorldPay
-@dirrmtry %%SITE_PERL%%/auto/Business
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay/Junior
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay/Junior
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/auto/Business/WorldPay/Junior
+@dirrmtry %%SITE_PERL%%/auto/Business/WorldPay
+@dirrmtry %%SITE_PERL%%/auto/Business
+@dirrmtry %%SITE_PERL%%/Business/WorldPay
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/finance/p5-Finance-Amortization/Makefile b/finance/p5-Finance-Amortization/Makefile
index ba9a16a32b88..e9f837eb3440 100644
--- a/finance/p5-Finance-Amortization/Makefile
+++ b/finance/p5-Finance-Amortization/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Simple amortization schedules
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Finance::Amortization.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Finance-Amortization/pkg-plist b/finance/p5-Finance-Amortization/pkg-plist
index a5092452e778..740b4340c609 100644
--- a/finance/p5-Finance-Amortization/pkg-plist
+++ b/finance/p5-Finance-Amortization/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Finance::Amortization.3.gz
 %%SITE_PERL%%/Finance/Amortization.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Amortization/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Amortization
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Amortization
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
 @dirrmtry %%SITE_PERL%%/Finance
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
index 571b5b4faedb..cb3031cbf2f5 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
@@ -17,4 +17,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+MAN3=		Finance::Currency::Convert::WebserviceX.3
+
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
index 9dc2108fb4ac..1048ed8d9c6b 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
@@ -1,7 +1,8 @@
 %%SITE_PERL%%/Finance/Currency/Convert/WebserviceX.pm
+%%PERL5_MAN3%%/Finance::Currency::Convert::WebserviceX.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX/.packlist
 %%PERL5_MAN3%%/Finance::Currency::Convert::WebserviceX.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
diff --git a/finance/p5-Finance-Currency-Convert-XE/Makefile b/finance/p5-Finance-Currency-Convert-XE/Makefile
index 1fb0be759788..5d1b6b27a6b4 100644
--- a/finance/p5-Finance-Currency-Convert-XE/Makefile
+++ b/finance/p5-Finance-Currency-Convert-XE/Makefile
@@ -21,16 +21,14 @@ OPTIONS_DEFINE=	DOCS
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Finance::Currency::Convert::XE.3
 PORTDOCS=	Changes README
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/finance/p5-Finance-Currency-Convert-XE/pkg-plist b/finance/p5-Finance-Currency-Convert-XE/pkg-plist
index 8ffec6288627..aacf36c14459 100644
--- a/finance/p5-Finance-Currency-Convert-XE/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert-XE/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/Finance::Currency::Convert::XE.3.gz
 %%SITE_PERL%%/Finance/Currency/Convert/XE.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/XE/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/XE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/XE
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency
-@dirrmtry %%SITE_PERL%%/Finance/Currency/Convert
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
+@dirrmtry %%SITE_PERL%%/Finance/Currency/Convert
 @dirrmtry %%SITE_PERL%%/Finance/Currency
 @dirrmtry %%SITE_PERL%%/Finance
diff --git a/finance/p5-Finance-TW-EmergingQuote/Makefile b/finance/p5-Finance-TW-EmergingQuote/Makefile
index a0aadd28c39d..3325758572bb 100644
--- a/finance/p5-Finance-TW-EmergingQuote/Makefile
+++ b/finance/p5-Finance-TW-EmergingQuote/Makefile
@@ -16,4 +16,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+MAN3=	Finance::TW::EmergingQuote.3
+
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Finance-TW-EmergingQuote/pkg-plist b/finance/p5-Finance-TW-EmergingQuote/pkg-plist
index 532179650a1c..5c7b9551ca53 100644
--- a/finance/p5-Finance-TW-EmergingQuote/pkg-plist
+++ b/finance/p5-Finance-TW-EmergingQuote/pkg-plist
@@ -1,8 +1,9 @@
 %%SITE_PERL%%/Finance/TW/EmergingQuote.pm
 %%PERL5_MAN3%%/Finance::TW::EmergingQuote.3.gz
-@dirrmtry %%SITE_PERL%%/Finance/TW
-@dirrmtry %%SITE_PERL%%/Finance
+%%PERL5_MAN3%%/Finance::TW::EmergingQuote.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/EmergingQuote/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/EmergingQuote
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/EmergingQuote
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
+@dirrmtry %%SITE_PERL%%/Finance/TW
+@dirrmtry %%SITE_PERL%%/Finance
diff --git a/finance/p5-Finance-TW-TSEQuote/Makefile b/finance/p5-Finance-TW-TSEQuote/Makefile
index 252559e676c5..0311921945fe 100644
--- a/finance/p5-Finance-TW-TSEQuote/Makefile
+++ b/finance/p5-Finance-TW-TSEQuote/Makefile
@@ -23,8 +23,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		pfq.1
-MAN3=		Finance::TW::TSEQuote.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/finance/p5-Finance-TW-TSEQuote/pkg-plist b/finance/p5-Finance-TW-TSEQuote/pkg-plist
index 9f875a83b812..2dad6f4ea532 100644
--- a/finance/p5-Finance-TW-TSEQuote/pkg-plist
+++ b/finance/p5-Finance-TW-TSEQuote/pkg-plist
@@ -1,9 +1,11 @@
 bin/pfq
 bin/twse-eod-dump
 bin/twse-eod-update
+%%PERL5_MAN3%%/Finance::TW::TSEQuote.3.gz
 %%SITE_PERL%%/Finance/TW/TSEQuote.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/TSEQuote/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/TSEQuote
+man/man1/pfq.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/TSEQuote
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
 @dirrmtry %%SITE_PERL%%/Finance/TW