diff --git a/textproc/p5-Template-Plugin-Autoformat/Makefile b/textproc/p5-Template-Plugin-Autoformat/Makefile
index eb84af2229a9..a99d147b4c8f 100644
--- a/textproc/p5-Template-Plugin-Autoformat/Makefile
+++ b/textproc/p5-Template-Plugin-Autoformat/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Template Toolkit interface to Text::Autoformat module
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	p5-Template-Toolkit>=2.22:${PORTSDIR}/www/p5-Template-Toolkit \
 		p5-Text-Autoformat>0:${PORTSDIR}/textproc/p5-Text-Autoformat
 BUILD_DEPENDS=	p5-Template-Toolkit>=2.22:${PORTSDIR}/www/p5-Template-Toolkit \
@@ -18,7 +21,4 @@ BUILD_DEPENDS=	p5-Template-Toolkit>=2.22:${PORTSDIR}/www/p5-Template-Toolkit \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Template::Plugin::Autoformat.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Template-Plugin-Autoformat/pkg-plist b/textproc/p5-Template-Plugin-Autoformat/pkg-plist
index 8ad8a081b884..c53ac220d711 100644
--- a/textproc/p5-Template-Plugin-Autoformat/pkg-plist
+++ b/textproc/p5-Template-Plugin-Autoformat/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Template::Plugin::Autoformat.3.gz
 %%SITE_PERL%%/Template/Plugin/Autoformat.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template-Plugin-Autoformat/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template-Plugin-Autoformat
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
index 0241e94d5016..eac98417ec82 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Template::Plugin::Lingua::EN::Inflect.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist
index 55ba922c2cde..f2a6f185d1c1 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Template::Plugin::Lingua::EN::Inflect.3.gz
 %%SITE_PERL%%/Template/Plugin/Lingua/EN/Inflect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Lingua/EN/Inflect/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Lingua/EN/Inflect
diff --git a/textproc/p5-Template-Plugin-XML-Escape/Makefile b/textproc/p5-Template-Plugin-XML-Escape/Makefile
index c50320ca3185..544c7d2f35e0 100644
--- a/textproc/p5-Template-Plugin-XML-Escape/Makefile
+++ b/textproc/p5-Template-Plugin-XML-Escape/Makefile
@@ -15,7 +15,5 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=		Template::Plugin::XML::Escape.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Template-Plugin-XML-Escape/pkg-descr b/textproc/p5-Template-Plugin-XML-Escape/pkg-descr
index 77d9c24f98f0..f7ead8ce1bb1 100644
--- a/textproc/p5-Template-Plugin-XML-Escape/pkg-descr
+++ b/textproc/p5-Template-Plugin-XML-Escape/pkg-descr
@@ -2,4 +2,4 @@ Escapes XML entities from text, so that you don't fall prey to people putting
 quotes, less-than/greater-than, and ampersands, into variables that end up in 
 TT templates.
 
-WWW: http://search.cpan.org/dist/Template-Plugin-XML-Escape
+WWW: http://search.cpan.org/dist/Template-Plugin-XML-Escape/
diff --git a/textproc/p5-Template-Plugin-XML-Escape/pkg-plist b/textproc/p5-Template-Plugin-XML-Escape/pkg-plist
index b531a83b9ec8..c5c3da040e12 100644
--- a/textproc/p5-Template-Plugin-XML-Escape/pkg-plist
+++ b/textproc/p5-Template-Plugin-XML-Escape/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Template::Plugin::XML::Escape.3.gz
 %%SITE_PERL%%/Template/Plugin/XML/Escape.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/XML/Escape/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/XML/Escape
diff --git a/textproc/p5-Template-Semantic/Makefile b/textproc/p5-Template-Semantic/Makefile
index 2e4109889b9c..970d1f162f54 100644
--- a/textproc/p5-Template-Semantic/Makefile
+++ b/textproc/p5-Template-Semantic/Makefile
@@ -9,6 +9,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to use pure XHTML/XML as a template
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	\
 	p5-HTML-Selector-XPath>=0.09:${PORTSDIR}/www/p5-HTML-Selector-XPath \
 	p5-XML-LibXML>=1.69:${PORTSDIR}/textproc/p5-XML-LibXML
@@ -19,10 +22,4 @@ TEST_DEPENDS=	\
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Template::Semantic.3 \
-	Template::Semantic::Cookbook.3 \
-	Template::Semantic::Document.3 \
-	Template::Semantic::Filter.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Template-Semantic/pkg-plist b/textproc/p5-Template-Semantic/pkg-plist
index 029900834d01..f8689019965d 100644
--- a/textproc/p5-Template-Semantic/pkg-plist
+++ b/textproc/p5-Template-Semantic/pkg-plist
@@ -1,3 +1,7 @@
+%%PERL5_MAN3%%/Template::Semantic.3.gz
+%%PERL5_MAN3%%/Template::Semantic::Cookbook.3.gz
+%%PERL5_MAN3%%/Template::Semantic::Document.3.gz
+%%PERL5_MAN3%%/Template::Semantic::Filter.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Semantic/.packlist
 %%SITE_PERL%%/Template/Semantic.pm
 %%SITE_PERL%%/Template/Semantic/Cookbook.pod
diff --git a/textproc/p5-Term-QRCode/Makefile b/textproc/p5-Term-QRCode/Makefile
index c20b7de6a8c8..adbd0b8f9171 100644
--- a/textproc/p5-Term-QRCode/Makefile
+++ b/textproc/p5-Term-QRCode/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	stephon@gmail.com
 COMMENT=	Generate QR Code on Terminal
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	libqrencode>=2.0.0:${PORTSDIR}/graphics/libqrencode \
 		p5-Text-QRCode>0:${PORTSDIR}/textproc/p5-Text-QRCode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
@@ -17,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Term::QRCode.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Term-QRCode/pkg-plist b/textproc/p5-Term-QRCode/pkg-plist
index 9266261719be..57778cd88fc7 100644
--- a/textproc/p5-Term-QRCode/pkg-plist
+++ b/textproc/p5-Term-QRCode/pkg-plist
@@ -1,4 +1,5 @@
 bin/term-qrcode
+%%PERL5_MAN3%%/Term::QRCode.3.gz
 %%SITE_PERL%%/Term/QRCode.pm
 %%SITE_PERL%%/mach/auto/Term/QRCode/.packlist
 @dirrm %%SITE_PERL%%/mach/auto/Term/QRCode
diff --git a/textproc/p5-Text-ASCIITable/Makefile b/textproc/p5-Text-ASCIITable/Makefile
index f5d2c4b24371..6f6616e70ad9 100644
--- a/textproc/p5-Text-ASCIITable/Makefile
+++ b/textproc/p5-Text-ASCIITable/Makefile
@@ -10,24 +10,19 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Create a nice formatted table using ASCII characters
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Text::ASCIITable.3 \
-	Text::ASCIITable::Wrap.3
+OPTIONS_DEFINE=	EXAMPLES
 
-NO_STAGE=	yes
-post-extract:
-	@${MKDIR} ${WRKSRC}/example
-	@${MV} ${WRKSRC}/ansi-example.pl ${WRKSRC}/example
-	@${REINPLACE_CMD} -i '' '/ansi-example.pl/d' ${WRKSRC}/MANIFEST
+PORTEXAMPLES=	ansi-example.pl
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/example/ansi-example.pl ${EXAMPLESDIR}
-	@${ECHO_MSG} "===> Example installed in ${EXAMPLESDIR}."
-.endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/ansi-example.pl ${STAGEDIR}${EXAMPLESDIR}
 
 regression-test: build
 	cd ${WRKSRC}/ && ./Build test
diff --git a/textproc/p5-Text-ASCIITable/pkg-plist b/textproc/p5-Text-ASCIITable/pkg-plist
index 0aadf961c784..886ffc04a461 100644
--- a/textproc/p5-Text-ASCIITable/pkg-plist
+++ b/textproc/p5-Text-ASCIITable/pkg-plist
@@ -1,6 +1,9 @@
+%%PERL5_MAN3%%/Text::ASCIITable.3.gz
+%%PERL5_MAN3%%/Text::ASCIITable::Wrap.3.gz
 %%SITE_PERL%%/Text/ASCIITable.pm
 %%SITE_PERL%%/Text/ASCIITable/Wrap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
 @dirrm %%SITE_PERL%%/Text/ASCIITable
 @dirrmtry %%SITE_PERL%%/Text
-%%PORTDOCS%%%%EXAMPLESDIR%%/ansi-example.pl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 69b9eb933a41..cce88e7bb254 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::Autoformat.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Autoformat/pkg-plist b/textproc/p5-Text-Autoformat/pkg-plist
index c72125c91b85..ab83cdba924c 100644
--- a/textproc/p5-Text-Autoformat/pkg-plist
+++ b/textproc/p5-Text-Autoformat/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Autoformat.3.gz
 %%SITE_PERL%%/Text/Autoformat.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat
diff --git a/textproc/p5-Text-Bind/Makefile b/textproc/p5-Text-Bind/Makefile
index a665b1ecc842..3495e510193b 100644
--- a/textproc/p5-Text-Bind/Makefile
+++ b/textproc/p5-Text-Bind/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Bind Perl structures to text files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::Bind.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Bind/pkg-plist b/textproc/p5-Text-Bind/pkg-plist
index 9daa96817abe..9b413baaba36 100644
--- a/textproc/p5-Text-Bind/pkg-plist
+++ b/textproc/p5-Text-Bind/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Bind.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist
 %%SITE_PERL%%/Text/Bind.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind
diff --git a/textproc/p5-Text-Brew/Makefile b/textproc/p5-Text-Brew/Makefile
index 64fab6e98a3c..4e5e3e78fdc1 100644
--- a/textproc/p5-Text-Brew/Makefile
+++ b/textproc/p5-Text-Brew/Makefile
@@ -12,7 +12,4 @@ COMMENT=	Perl extension for the Brew edit distance
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Text::Brew.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Brew/pkg-plist b/textproc/p5-Text-Brew/pkg-plist
index e0399b601974..24e52117cc96 100644
--- a/textproc/p5-Text-Brew/pkg-plist
+++ b/textproc/p5-Text-Brew/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Brew.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Brew/.packlist
 %%SITE_PERL%%/Text/Brew.pm
 @dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-CSV-Encoded/Makefile b/textproc/p5-Text-CSV-Encoded/Makefile
index 4f94a5b18259..c6825cee33f2 100644
--- a/textproc/p5-Text-CSV-Encoded/Makefile
+++ b/textproc/p5-Text-CSV-Encoded/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dereckson@gmail.com
 COMMENT=	Perl module for Encoding aware CVS files parsing
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple \
 		p5-Test-Harness>=0:${PORTSDIR}/devel/p5-Test-Harness \
 		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV
@@ -19,7 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::CSV::Encoded.3 Text::CSV::Encoded::Coder::Base.3 Text::CSV::Encoded::Coder::Encode.3 Text::CSV::Encoded::Coder::EncodeGuess.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV-Encoded/pkg-plist b/textproc/p5-Text-CSV-Encoded/pkg-plist
index e5fab3d4d86e..4c45e74a744b 100644
--- a/textproc/p5-Text-CSV-Encoded/pkg-plist
+++ b/textproc/p5-Text-CSV-Encoded/pkg-plist
@@ -1,3 +1,7 @@
+%%PERL5_MAN3%%/Text::CSV::Encoded.3.gz
+%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::Base.3.gz
+%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::Encode.3.gz
+%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::EncodeGuess.3.gz
 %%SITE_PERL%%/Text/CSV/Encoded.pm
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/Base.pm
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/Encode.pm
diff --git a/textproc/p5-Text-CSV-Hashify/Makefile b/textproc/p5-Text-CSV-Hashify/Makefile
index 8215ff31713d..23267533c662 100644
--- a/textproc/p5-Text-CSV-Hashify/Makefile
+++ b/textproc/p5-Text-CSV-Hashify/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::CSV::Hashify.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV-Hashify/pkg-plist b/textproc/p5-Text-CSV-Hashify/pkg-plist
index d2561c8d871d..4878cac239ee 100644
--- a/textproc/p5-Text-CSV-Hashify/pkg-plist
+++ b/textproc/p5-Text-CSV-Hashify/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::CSV::Hashify.3.gz
 %%SITE_PERL%%/Text/CSV/Hashify.pm
 %%SITE_PERL%%/mach/auto/Text/CSV/Hashify/.packlist
 @dirrm %%SITE_PERL%%/mach/auto/Text/CSV/Hashify
diff --git a/textproc/p5-Text-CSV-Simple/Makefile b/textproc/p5-Text-CSV-Simple/Makefile
index 98fe37de3e3e..abd3481f18a3 100644
--- a/textproc/p5-Text-CSV-Simple/Makefile
+++ b/textproc/p5-Text-CSV-Simple/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::CSV::Simple.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV-Simple/pkg-plist b/textproc/p5-Text-CSV-Simple/pkg-plist
index e7cce3444697..d2c4bc92ea65 100644
--- a/textproc/p5-Text-CSV-Simple/pkg-plist
+++ b/textproc/p5-Text-CSV-Simple/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::CSV::Simple.3.gz
 %%SITE_PERL%%/Text/CSV/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple
diff --git a/textproc/p5-Text-ClearSilver/Makefile b/textproc/p5-Text-ClearSilver/Makefile
index 6efaa1b3a01e..b0e747372bfe 100644
--- a/textproc/p5-Text-ClearSilver/Makefile
+++ b/textproc/p5-Text-ClearSilver/Makefile
@@ -9,20 +9,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to the ClearSilver template engine
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 TEST_DEPENDS=	\
 	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
 	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse
 
-USES=		perl5
+USES=		perl5 gmake
 USE_PERL5=	configure
-USE_GMAKE=	yes
-CONFIGURE_ENV=	MAKE=${LOCALBASE}/bin/gmake
 
-MAN3=	Text::ClearSilver.3 \
-	Text::ClearSilver::Compat.3 \
-	Text::ClearSilver::FunctionSet.3 \
-	Text::ClearSilver::FunctionSet::html.3 \
-	Text::ClearSilver::FunctionSet::string.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-ClearSilver/pkg-plist b/textproc/p5-Text-ClearSilver/pkg-plist
index 9a5ee51f3ee2..8140b461284f 100644
--- a/textproc/p5-Text-ClearSilver/pkg-plist
+++ b/textproc/p5-Text-ClearSilver/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/Text::ClearSilver.3.gz
+%%PERL5_MAN3%%/Text::ClearSilver::Compat.3.gz
+%%PERL5_MAN3%%/Text::ClearSilver::FunctionSet.3.gz
+%%PERL5_MAN3%%/Text::ClearSilver::FunctionSet::html.3.gz
+%%PERL5_MAN3%%/Text::ClearSilver::FunctionSet::string.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ClearSilver/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ClearSilver/ClearSilver.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ClearSilver/ClearSilver.so
diff --git a/textproc/p5-Text-Context-EitherSide/Makefile b/textproc/p5-Text-Context-EitherSide/Makefile
index 1bcccca0d8e8..ff73e6bcb8f4 100644
--- a/textproc/p5-Text-Context-EitherSide/Makefile
+++ b/textproc/p5-Text-Context-EitherSide/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Text::Context::EitherSide - Get n words either side of search keywords
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Text::Context::EitherSide.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Context-EitherSide/pkg-plist b/textproc/p5-Text-Context-EitherSide/pkg-plist
index 86593615ed17..8267326e43d0 100644
--- a/textproc/p5-Text-Context-EitherSide/pkg-plist
+++ b/textproc/p5-Text-Context-EitherSide/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Context::EitherSide.3.gz
 %%SITE_PERL%%/Text/Context/EitherSide.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide
diff --git a/textproc/p5-Text-DHCPLeases/Makefile b/textproc/p5-Text-DHCPLeases/Makefile
index 3a4ae1970d92..82cc43ecb940 100644
--- a/textproc/p5-Text-DHCPLeases/Makefile
+++ b/textproc/p5-Text-DHCPLeases/Makefile
@@ -9,12 +9,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to parse DHCP leases file from ISC dhcpd
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Text::DHCPLeases.3 \
-	Text::DHCPLeases::Object.3 \
-	Text::DHCPLeases::Object::Iterator.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-DHCPLeases/pkg-plist b/textproc/p5-Text-DHCPLeases/pkg-plist
index d0e62eef8990..5029068dc1fc 100644
--- a/textproc/p5-Text-DHCPLeases/pkg-plist
+++ b/textproc/p5-Text-DHCPLeases/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/Text::DHCPLeases.3.gz
+%%PERL5_MAN3%%/Text::DHCPLeases::Object.3.gz
+%%PERL5_MAN3%%/Text::DHCPLeases::Object::Iterator.3.gz
 %%SITE_PERL%%/Text/DHCPLeases.pm
 %%SITE_PERL%%/Text/DHCPLeases/Object.pm
 %%SITE_PERL%%/Text/DHCPLeases/Object/Iterator.pm
diff --git a/textproc/p5-Text-Delimited/Makefile b/textproc/p5-Text-Delimited/Makefile
index 4b73a243a2b2..1819b2aff282 100644
--- a/textproc/p5-Text-Delimited/Makefile
+++ b/textproc/p5-Text-Delimited/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Module for parsing delimited text files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::Delimited.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Delimited/pkg-descr b/textproc/p5-Text-Delimited/pkg-descr
index 60697951f4d4..4f4aacc45245 100644
--- a/textproc/p5-Text-Delimited/pkg-descr
+++ b/textproc/p5-Text-Delimited/pkg-descr
@@ -7,4 +7,4 @@ After instancing, for each call to Read the next row's data is
 returned as a hash reference. The individual elements are keyed by
 their corresonding column headings.
 
-WWW:	http://search.cpan.org/dist/Text-Delimited/
+WWW: http://search.cpan.org/dist/Text-Delimited/
diff --git a/textproc/p5-Text-Delimited/pkg-plist b/textproc/p5-Text-Delimited/pkg-plist
index 5aa55b96c382..49ce1e2e35d4 100644
--- a/textproc/p5-Text-Delimited/pkg-plist
+++ b/textproc/p5-Text-Delimited/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Delimited.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Delimited/.packlist
 %%SITE_PERL%%/Text/Delimited.pm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Delimited
diff --git a/textproc/p5-Text-Diff-HTML/Makefile b/textproc/p5-Text-Diff-HTML/Makefile
index 19c92499f907..94f5e5faee1e 100644
--- a/textproc/p5-Text-Diff-HTML/Makefile
+++ b/textproc/p5-Text-Diff-HTML/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Text::Diff::HTML - XHTML format for Text::Diff::Unified
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
@@ -17,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Text::Diff::HTML.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Diff-HTML/pkg-plist b/textproc/p5-Text-Diff-HTML/pkg-plist
index e066197c36bd..e4aeee26c421 100644
--- a/textproc/p5-Text-Diff-HTML/pkg-plist
+++ b/textproc/p5-Text-Diff-HTML/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Diff::HTML.3.gz
 %%SITE_PERL%%/Text/Diff/HTML.pm
 @dirrmtry %%SITE_PERL%%/Text/Diff
 @dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index c3dcf32682bb..daec8833caea 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Text::Diff - Perform diffs on files and record sets
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 COMMON_DEPENDS=	p5-Algorithm-Diff>=1.19:${PORTSDIR}/devel/p5-Algorithm-Diff
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
@@ -17,7 +20,4 @@ RUN_DEPENDS=	${COMMON_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::Diff.3 Text::Diff::Config.3 Text::Diff::Table.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Diff/pkg-plist b/textproc/p5-Text-Diff/pkg-plist
index 813e019e3c58..a1d66eeaa4c0 100644
--- a/textproc/p5-Text-Diff/pkg-plist
+++ b/textproc/p5-Text-Diff/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/Text::Diff.3.gz
+%%PERL5_MAN3%%/Text::Diff::Config.3.gz
+%%PERL5_MAN3%%/Text::Diff::Table.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff/.packlist
 %%SITE_PERL%%/Text/Diff.pm
 %%SITE_PERL%%/Text/Diff/Config.pm