7 files changed, 45 insertions, 40 deletions

diff --git a/net/p5-Net-Proxy/Makefile b/net/p5-Net-Proxy/Makefile
index dc277fcc0d2f..9b9af01f76ad 100644
--- a/net/p5-Net-Proxy/Makefile
+++ b/net/p5-Net-Proxy/Makefile
@@ -14,18 +14,7 @@ COMMENT=	Framework for proxying network connections in many ways
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Net::Proxy.3 \
-	Net::Proxy::Connector.3 \
-	Net::Proxy::Connector::connect.3 \
-	Net::Proxy::Connector::connect_ssl.3 \
-	Net::Proxy::Connector::dual.3 \
-	Net::Proxy::Connector::dummy.3 \
-	Net::Proxy::Connector::ssl.3 \
-	Net::Proxy::Connector::tcp.3 \
-	Net::Proxy::Tutorial.3
-
 MAN1=	connect-tunnel.1 \
 	sslh.1
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Proxy/pkg-plist b/net/p5-Net-Proxy/pkg-plist
index 28209c4f46f5..6ba7785d0750 100644
--- a/net/p5-Net-Proxy/pkg-plist
+++ b/net/p5-Net-Proxy/pkg-plist
@@ -1,5 +1,7 @@
 bin/connect-tunnel
 bin/sslh
+man/man1/connect-tunnel.1.gz
+man/man1/sslh.1.gz
 %%SITE_PERL%%/Net/Proxy.pm
 %%SITE_PERL%%/Net/Proxy/Connector.pm
 %%SITE_PERL%%/Net/Proxy/Connector/connect.pm
@@ -10,6 +12,15 @@ bin/sslh
 %%SITE_PERL%%/Net/Proxy/Connector/tcp.pm
 %%SITE_PERL%%/Net/Proxy/Tutorial.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Proxy/.packlist
+%%PERL5_MAN3%%/Net::Proxy.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Connector.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Connector::connect.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Connector::connect_ssl.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Connector::dual.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Connector::dummy.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Connector::ssl.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Connector::tcp.3.gz
+%%PERL5_MAN3%%/Net::Proxy::Tutorial.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Proxy
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/Proxy/Connector
diff --git a/net/p5-Net-SSH2/Makefile b/net/p5-Net-SSH2/Makefile
index 1772d71bc13c..3e052375ca79 100644
--- a/net/p5-Net-SSH2/Makefile
+++ b/net/p5-Net-SSH2/Makefile
@@ -18,10 +18,4 @@ LIB_DEPENDS=	ssh2.1:${PORTSDIR}/security/libssh2
 USES=	perl5
 USE_PERL5=	configure
 
-MAN3=		Net::SSH2.3 Net::SSH2::Channel.3 \
-		Net::SSH2::Dir.3 Net::SSH2::File.3 \
-		Net::SSH2::Listener.3 Net::SSH2::PublicKey.3 \
-		Net::SSH2::SFTP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net/p5-Net-SSH2/pkg-plist b/net/p5-Net-SSH2/pkg-plist
index 05d45c946a30..0b07a6ff4c46 100644
--- a/net/p5-Net-SSH2/pkg-plist
+++ b/net/p5-Net-SSH2/pkg-plist
@@ -1,3 +1,10 @@
+%%PERL5_MAN3%%/Net::SSH2.3.gz
+%%PERL5_MAN3%%/Net::SSH2::Channel.3.gz
+%%PERL5_MAN3%%/Net::SSH2::Dir.3.gz
+%%PERL5_MAN3%%/Net::SSH2::File.3.gz
+%%PERL5_MAN3%%/Net::SSH2::Listener.3.gz
+%%PERL5_MAN3%%/Net::SSH2::PublicKey.3.gz
+%%PERL5_MAN3%%/Net::SSH2::SFTP.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/Channel.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSH2/Dir.pm
diff --git a/net/raggle/Makefile b/net/raggle/Makefile
index 5407e227c42b..50c852d833d9 100644
--- a/net/raggle/Makefile
+++ b/net/raggle/Makefile
@@ -21,21 +21,23 @@ DOCS=		AUTHORS BUGS COPYING ChangeLog README TODO \
 		doc/default_config.rb doc/pauls_feeds.opml.gz \
 		doc/theme_documentation.txt
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/raggle ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/raggle.1 ${MAN1PREFIX}/man/man1
-	@${MKDIR} ${DATADIR}/themes ${DATADIR}/extras/web_ui/images \
-		${DATADIR}/extras/web_ui/inc ${DATADIR}/extras/win32
-	${INSTALL_DATA} ${WRKSRC}/extras/*.rb ${DATADIR}/extras
-	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/*.html ${DATADIR}/extras/web_ui
-	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/images/* ${DATADIR}/extras/web_ui/images
-	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/inc/* ${DATADIR}/extras/web_ui/inc
-	${INSTALL_DATA} ${WRKSRC}/extras/win32/* ${DATADIR}/extras/win32
-	${INSTALL_DATA} ${WRKSRC}/themes/* ${DATADIR}/themes
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/raggle ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/themes \
+	${STAGEDIR}${DATADIR}/extras/web_ui/images \
+	${STAGEDIR}${DATADIR}/extras/web_ui/inc ${STAGEDIR}${DATADIR}/extras/win32
+	${INSTALL_DATA} ${WRKSRC}/extras/*.rb ${STAGEDIR}${DATADIR}/extras
+	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/*.html \
+	${STAGEDIR}${DATADIR}/extras/web_ui
+	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/images/* \
+	${STAGEDIR}${DATADIR}/extras/web_ui/images
+	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/inc/* \
+	${STAGEDIR}${DATADIR}/extras/web_ui/inc
+	${INSTALL_DATA} ${WRKSRC}/extras/win32/* ${STAGEDIR}${DATADIR}/extras/win32
+	${INSTALL_DATA} ${WRKSRC}/themes/* ${STAGEDIR}${DATADIR}/themes
+.if ${PORT_OPTIONS:MDOCS} 
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index eaf1c3a5e0ff..370140fdb722 100644
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -14,14 +14,15 @@ PORTDOCS=	README CHANGES
 
 HAS_CONFIGURE=	yes
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net/uplog/Makefile b/net/uplog/Makefile
index 76f5db2178a7..d4f85aa18277 100644
--- a/net/uplog/Makefile
+++ b/net/uplog/Makefile
@@ -16,17 +16,18 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 PORTDOCS=	README
 PLIST_FILES=	bin/uplog
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e \
 	's|#include <malloc.h>||g' \
 		${WRKSRC}/${PORTNAME}.c
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif