Support STAGEDIR.

10 files changed, 27 insertions, 36 deletions

diff --git a/net-mgmt/p5-Mon/Makefile b/net-mgmt/p5-Mon/Makefile
index 679a786dffb8..8bb7d38cd2eb 100644
--- a/net-mgmt/p5-Mon/Makefile
+++ b/net-mgmt/p5-Mon/Makefile
@@ -14,9 +14,4 @@ COMMENT=	A perl module that supports mon, a network and system monitoring daemon
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mon::SNMP.3 \
-		Mon::Client.3 \
-		Mon::Protocol.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Mon/pkg-plist b/net-mgmt/p5-Mon/pkg-plist
index 1e891925646e..56d5fc23c522 100644
--- a/net-mgmt/p5-Mon/pkg-plist
+++ b/net-mgmt/p5-Mon/pkg-plist
@@ -1,6 +1,9 @@
-%%SITE_PERL%%/Mon/SNMP.pm
+%%PERL5_MAN3%%/Mon::Client.3.gz
+%%PERL5_MAN3%%/Mon::Protocol.3.gz
+%%PERL5_MAN3%%/Mon::SNMP.3.gz
 %%SITE_PERL%%/Mon/Client.pm
 %%SITE_PERL%%/Mon/Protocol.pm
+%%SITE_PERL%%/Mon/SNMP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon
-@dirrm %%SITE_PERL%%/Mon
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon
+@dirrmtry %%SITE_PERL%%/Mon
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
index e25a3c505914..6dfe2ab379e4 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
@@ -19,16 +19,14 @@ BUILD_DEPENDS+=	p5-Nagios-Plugin>=0:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
 		p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
-MAN3=		Nagios::Plugins::Memcached.3
 PORTDOCS=	Changes README
 
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${LOCALBASE}/libexec/nagios
-	${INSTALL} ${WRKSRC}/bin/check_memcached ${LOCALBASE}/libexec/nagios/check_memcached
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
+	${INSTALL} ${WRKSRC}/bin/check_memcached ${STAGEDIR}${PREFIX}/libexec/nagios/check_memcached
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist b/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist
index 604fabb4cc7b..dbf99741aea4 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/pkg-plist
@@ -1,9 +1,10 @@
-libexec/nagios/check_memcached
+%%PERL5_MAN3%%/Nagios::Plugins::Memcached.3.gz
 %%SITE_PERL%%/Nagios/Plugins/Memcached.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugins/Memcached/.packlist
+libexec/nagios/check_memcached
 @dirrmtry libexec/nagios
-@dirrmtry %%SITE_PERL%%/Nagios/Plugins
-@dirrmtry %%SITE_PERL%%/Nagios
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugins/Memcached
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugins/Memcached
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios/Plugins
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nagios
+@dirrmtry %%SITE_PERL%%/Nagios/Plugins
+@dirrmtry %%SITE_PERL%%/Nagios
diff --git a/net-mgmt/p5-Net-IPv4Addr/Makefile b/net-mgmt/p5-Net-IPv4Addr/Makefile
index d2ac3e20d538..0340575da181 100644
--- a/net-mgmt/p5-Net-IPv4Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv4Addr/Makefile
@@ -16,8 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		ipv4calc.1
-MAN3=		Net::IPv4Addr.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Net-IPv4Addr/pkg-plist b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
index e318a3dd047f..162d6dd534f7 100644
--- a/net-mgmt/p5-Net-IPv4Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
@@ -1,9 +1,11 @@
 bin/ipv4calc
+%%PERL5_MAN3%%/Net::IPv4Addr.3.gz
 %%SITE_PERL%%/Net/IPv4Addr.pm
 %%SITE_PERL%%/auto/Net/IPv4Addr/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
-@dirrm %%SITE_PERL%%/auto/Net/IPv4Addr
+man/man1/ipv4calc.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/auto/Net/IPv4Addr
 @dirrmtry %%SITE_PERL%%/auto/Net
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IPv6Addr/Makefile b/net-mgmt/p5-Net-IPv6Addr/Makefile
index f5a04b7dc988..a40bc206905c 100644
--- a/net-mgmt/p5-Net-IPv6Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv6Addr/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::IPv6Addr.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Net-IPv6Addr/pkg-plist b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
index 1d0cf77ed40c..41b439f22532 100644
--- a/net-mgmt/p5-Net-IPv6Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Net::IPv6Addr.3.gz
 %%SITE_PERL%%/Net/IPv6Addr.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-POE-Component-SNMP/Makefile b/net-mgmt/p5-POE-Component-SNMP/Makefile
index a7d2b240ddbb..79c6b2428058 100644
--- a/net-mgmt/p5-POE-Component-SNMP/Makefile
+++ b/net-mgmt/p5-POE-Component-SNMP/Makefile
@@ -17,9 +17,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::SNMP.3
-
-NO_STAGE=	yes
 post-patch:
 	@${TOUCH} ${WRKSRC}/config.cache
 
diff --git a/net-mgmt/p5-POE-Component-SNMP/pkg-plist b/net-mgmt/p5-POE-Component-SNMP/pkg-plist
index b6bc259f77b6..08a7b2057d8a 100644
--- a/net-mgmt/p5-POE-Component-SNMP/pkg-plist
+++ b/net-mgmt/p5-POE-Component-SNMP/pkg-plist
@@ -1,9 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP/.packlist
+%%PERL5_MAN3%%/POE::Component::SNMP.3.gz
 %%SITE_PERL%%/POE/Component/SNMP.pm
 %%SITE_PERL%%/POE/Component/SNMP/Dispatcher.pm
-@dirrm %%SITE_PERL%%/POE/Component/SNMP
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component/SNMP
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE