10 files changed, 7 insertions, 16 deletions

diff --git a/www/mergelog/Makefile b/www/mergelog/Makefile
index 4cb70d661c60..b1b4a4edf041 100644
--- a/www/mergelog/Makefile
+++ b/www/mergelog/Makefile
@@ -10,10 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A tool to merge and sort by date http log files
 
-USE_GMAKE=	yes
+USES=	gmake
 GNU_CONFIGURE=	yes
 
-MAN1=	mergelog.1 zmergelog.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mergelog/pkg-plist b/www/mergelog/pkg-plist
index c2e7fb4f76b0..9c8d5977504b 100644
--- a/www/mergelog/pkg-plist
+++ b/www/mergelog/pkg-plist
@@ -1,2 +1,4 @@
 bin/mergelog
 bin/zmergelog
+man/man1/mergelog.1.gz
+man/man1/zmergelog.1.gz
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index 9b872ff5ba2a..c05de8e950c3 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -20,7 +20,4 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		CGI::Application::Plugin::DBH.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-DBH/pkg-plist b/www/p5-CGI-Application-Plugin-DBH/pkg-plist
index 0733387f51f0..807d172135ca 100644
--- a/www/p5-CGI-Application-Plugin-DBH/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-DBH/pkg-plist
@@ -1,2 +1,3 @@
 %%SITE_PERL%%/CGI/Application/Plugin/DBH.pm
+%%PERL5_MAN3%%/CGI::Application::Plugin::DBH.3.gz
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
diff --git a/www/p5-CGI-Application-Plugin-JSON/Makefile b/www/p5-CGI-Application-Plugin-JSON/Makefile
index 833226e41d98..2a2970fa0ae9 100644
--- a/www/p5-CGI-Application-Plugin-JSON/Makefile
+++ b/www/p5-CGI-Application-Plugin-JSON/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::JSON.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-JSON/pkg-plist b/www/p5-CGI-Application-Plugin-JSON/pkg-plist
index 82f4c62d415d..9a68bbacddfe 100644
--- a/www/p5-CGI-Application-Plugin-JSON/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-JSON/pkg-plist
@@ -1,2 +1,3 @@
 %%SITE_PERL%%/CGI/Application/Plugin/JSON.pm
+%%PERL5_MAN3%%/CGI::Application::Plugin::JSON.3.gz
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
diff --git a/www/p5-LWP-Protocol-PSGI/Makefile b/www/p5-LWP-Protocol-PSGI/Makefile
index ef15262ed279..420b90f9d030 100644
--- a/www/p5-LWP-Protocol-PSGI/Makefile
+++ b/www/p5-LWP-Protocol-PSGI/Makefile
@@ -17,10 +17,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
 	p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https
 
-NO_STAGE=	yes
 USES=	perl5
 USE_PERL5=	modbuildtiny
 
-MAN3=	LWP::Protocol::PSGI.3
-
 .include <bsd.port.mk>
diff --git a/www/p5-LWP-Protocol-PSGI/pkg-plist b/www/p5-LWP-Protocol-PSGI/pkg-plist
index f5b5f5b39ced..57ad8314a76a 100644
--- a/www/p5-LWP-Protocol-PSGI/pkg-plist
+++ b/www/p5-LWP-Protocol-PSGI/pkg-plist
@@ -1,4 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol/PSGI/.packlist
 %%SITE_PERL%%/LWP/Protocol/PSGI.pm
+%%PERL5_MAN3%%/LWP::Protocol::PSGI.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol/PSGI
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Protocol
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index 3500adb529bd..b1a1621670bf 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -19,12 +19,9 @@ USES=		shebangfix perl5
 USE_PERL5=	configure
 SHEBANG_FILES=	nopaste
 
-MAN3=		WebService::NoPaste.3
-
 OPTIONS_DEFINE=	X11
 X11_DESC=	X11 Clipboard support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
diff --git a/www/p5-WebService-NoPaste/pkg-plist b/www/p5-WebService-NoPaste/pkg-plist
index b9355c93fc9a..1f18e2d64ca5 100644
--- a/www/p5-WebService-NoPaste/pkg-plist
+++ b/www/p5-WebService-NoPaste/pkg-plist
@@ -1,4 +1,5 @@
 bin/nopaste
+%%PERL5_MAN3%%/WebService::NoPaste.3.gz
 %%SITE_PERL%%/WebService/NoPaste.pm
 @dirrmtry %%SITE_PERL%%/WebService
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/NoPaste/.packlist