37 files changed, 56 insertions, 64 deletions

diff --git a/textproc/p5-Spreadsheet-Read/Makefile b/textproc/p5-Spreadsheet-Read/Makefile
index abbb27d0866b..2df570e9785f 100644
--- a/textproc/p5-Spreadsheet-Read/Makefile
+++ b/textproc/p5-Spreadsheet-Read/Makefile
@@ -12,6 +12,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Read the data from a spreadsheet
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
 		p5-Text-CSV_XS>0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
 		p5-Text-CSV>0:${PORTSDIR}/textproc/p5-Text-CSV \
@@ -23,7 +26,4 @@ TEST_DEPENDS=	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Spreadsheet::Read.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-Read/pkg-plist b/textproc/p5-Spreadsheet-Read/pkg-plist
index eff6ba56d3f9..df06a17e3e1f 100644
--- a/textproc/p5-Spreadsheet-Read/pkg-plist
+++ b/textproc/p5-Spreadsheet-Read/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Spreadsheet::Read.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/Read/.packlist
 %%SITE_PERL%%/Spreadsheet/Read.pm
 @dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-ReadSXC/Makefile b/textproc/p5-Spreadsheet-ReadSXC/Makefile
index 0e269a9f3814..55b795e6ed13 100644
--- a/textproc/p5-Spreadsheet-ReadSXC/Makefile
+++ b/textproc/p5-Spreadsheet-ReadSXC/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Spreadsheet::ReadSXC.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-ReadSXC/pkg-plist b/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
index 382f2df80a60..63ba6f63aaef 100644
--- a/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
+++ b/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Spreadsheet::ReadSXC.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ReadSXC/.packlist
 %%SITE_PERL%%/Spreadsheet/ReadSXC.pm
 @dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-XLSX/Makefile b/textproc/p5-Spreadsheet-XLSX/Makefile
index a5a91db50132..d59dbaa6320a 100644
--- a/textproc/p5-Spreadsheet-XLSX/Makefile
+++ b/textproc/p5-Spreadsheet-XLSX/Makefile
@@ -21,7 +21,4 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Spreadsheet::XLSX.3 Spreadsheet::XLSX::Fmt2007.3 Spreadsheet::XLSX::Utility2007.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-XLSX/pkg-descr b/textproc/p5-Spreadsheet-XLSX/pkg-descr
index be2534c5724b..07d2ff69f3d5 100644
--- a/textproc/p5-Spreadsheet-XLSX/pkg-descr
+++ b/textproc/p5-Spreadsheet-XLSX/pkg-descr
@@ -3,4 +3,4 @@ This Perl module is a emulation of Spreadsheet::ParseExcel for Excel 2007
 all. It populates the classes from Spreadsheet::ParseExcel for
 interoperability; including Workbook, Worksheet, and Cell.
 
-WWW:	http://search.cpan.org/dist/Spreadsheet-XLSX
+WWW: http://search.cpan.org/dist/Spreadsheet-XLSX/
diff --git a/textproc/p5-Spreadsheet-XLSX/pkg-plist b/textproc/p5-Spreadsheet-XLSX/pkg-plist
index 0acfc27184bb..e0de40f59aaf 100644
--- a/textproc/p5-Spreadsheet-XLSX/pkg-plist
+++ b/textproc/p5-Spreadsheet-XLSX/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/Spreadsheet::XLSX.3.gz
+%%PERL5_MAN3%%/Spreadsheet::XLSX::Fmt2007.3.gz
+%%PERL5_MAN3%%/Spreadsheet::XLSX::Utility2007.3.gz
 %%SITE_PERL%%/Spreadsheet/XLSX/Utility2007.pm
 %%SITE_PERL%%/Spreadsheet/XLSX/Fmt2007.pm
 %%SITE_PERL%%/Spreadsheet/XLSX.pm
diff --git a/textproc/p5-String-BufferStack/Makefile b/textproc/p5-String-BufferStack/Makefile
index e0e7c8f70022..9a00b8853989 100644
--- a/textproc/p5-String-BufferStack/Makefile
+++ b/textproc/p5-String-BufferStack/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Nested buffers for templating systems
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::BufferStack.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-BufferStack/pkg-plist b/textproc/p5-String-BufferStack/pkg-plist
index 5d088931c2f4..31f6ca1ce83d 100644
--- a/textproc/p5-String-BufferStack/pkg-plist
+++ b/textproc/p5-String-BufferStack/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::BufferStack.3.gz
 %%SITE_PERL%%/String/BufferStack.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/BufferStack/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/BufferStack
diff --git a/textproc/p5-String-CamelCase/Makefile b/textproc/p5-String-CamelCase/Makefile
index f0f14947961f..cdf814dde3b2 100644
--- a/textproc/p5-String-CamelCase/Makefile
+++ b/textproc/p5-String-CamelCase/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kaoru@kaisei.org
 COMMENT=	Perl module for camelcase, de-camelcase
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::CamelCase.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-CamelCase/pkg-plist b/textproc/p5-String-CamelCase/pkg-plist
index 41112c904220..49076e2e1d68 100644
--- a/textproc/p5-String-CamelCase/pkg-plist
+++ b/textproc/p5-String-CamelCase/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::CamelCase.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CamelCase/.packlist
 %%SITE_PERL%%/String/CamelCase.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CamelCase
diff --git a/textproc/p5-String-Compare-ConstantTime/Makefile b/textproc/p5-String-Compare-ConstantTime/Makefile
index d09c688cbfb9..d79aabc5e10f 100644
--- a/textproc/p5-String-Compare-ConstantTime/Makefile
+++ b/textproc/p5-String-Compare-ConstantTime/Makefile
@@ -12,8 +12,4 @@ COMMENT=	Perl extension for timing side-channel protected string compare
 USES=	perl5
 USE_PERL5=	configure
 
-MAN3=	String::Compare::ConstantTime.3 \
-	String::Compare::README.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Compare-ConstantTime/pkg-plist b/textproc/p5-String-Compare-ConstantTime/pkg-plist
index 794351e51898..80f8f41595f7 100644
--- a/textproc/p5-String-Compare-ConstantTime/pkg-plist
+++ b/textproc/p5-String-Compare-ConstantTime/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/String::Compare::ConstantTime.3.gz
+%%PERL5_MAN3%%/String::Compare::README.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Compare/ConstantTime/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Compare/ConstantTime/ConstantTime.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Compare/ConstantTime/ConstantTime.so
diff --git a/textproc/p5-String-Divert/Makefile b/textproc/p5-String-Divert/Makefile
index 3392d9ab7590..34d0d6ac18b6 100644
--- a/textproc/p5-String-Divert/Makefile
+++ b/textproc/p5-String-Divert/Makefile
@@ -13,7 +13,4 @@ COMMENT=	String::Divert - String Object supporting Folding and Diversions
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::Divert.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Divert/pkg-plist b/textproc/p5-String-Divert/pkg-plist
index 086c2cf33541..1e4080b4e7cc 100644
--- a/textproc/p5-String-Divert/pkg-plist
+++ b/textproc/p5-String-Divert/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Divert.3.gz
 %%SITE_PERL%%/String/Divert.pm
 %%SITE_PERL%%/String/Divert.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert/.packlist
diff --git a/textproc/p5-String-Escape/Makefile b/textproc/p5-String-Escape/Makefile
index 59a203c8d3c3..b58eccd2e98f 100644
--- a/textproc/p5-String-Escape/Makefile
+++ b/textproc/p5-String-Escape/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	catone@cpan.org
 COMMENT=	Registry of string functions, including backslash escapes
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::Escape.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Escape/pkg-plist b/textproc/p5-String-Escape/pkg-plist
index 964f4418c4e7..90392aa7edca 100644
--- a/textproc/p5-String-Escape/pkg-plist
+++ b/textproc/p5-String-Escape/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Escape.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Escape/.packlist
 %%SITE_PERL%%/String/Escape.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Escape
diff --git a/textproc/p5-String-Flogger/Makefile b/textproc/p5-String-Flogger/Makefile
index c9fb2ca52b03..9c19ed1ca07d 100644
--- a/textproc/p5-String-Flogger/Makefile
+++ b/textproc/p5-String-Flogger/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	String munging for loggers
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Params-Util>0:${PORTSDIR}/devel/p5-Params-Util \
 		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
 		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
@@ -20,7 +23,4 @@ TEST_DEPENDS=	p5-Test-Simple>=0.82:${PORTSDIR}/devel/p5-Test-Simple
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::Flogger.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Flogger/pkg-plist b/textproc/p5-String-Flogger/pkg-plist
index f034a75ae105..8d292776b67d 100644
--- a/textproc/p5-String-Flogger/pkg-plist
+++ b/textproc/p5-String-Flogger/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Flogger.3.gz
 %%SITE_PERL%%/String/Flogger.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Flogger/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Flogger
diff --git a/textproc/p5-String-Format/Makefile b/textproc/p5-String-Format/Makefile
index 5fbfe1d82201..533dff51c95c 100644
--- a/textproc/p5-String-Format/Makefile
+++ b/textproc/p5-String-Format/Makefile
@@ -15,7 +15,4 @@ LICENSE=	GPLv2
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Format.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Format/pkg-plist b/textproc/p5-String-Format/pkg-plist
index 44c19c9b7ef6..864365e523e3 100644
--- a/textproc/p5-String-Format/pkg-plist
+++ b/textproc/p5-String-Format/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Format.3.gz
 %%SITE_PERL%%/String/Format.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Format/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Format
diff --git a/textproc/p5-String-HexConvert/Makefile b/textproc/p5-String-HexConvert/Makefile
index 93ff90bbbad4..50b7875d3bc2 100644
--- a/textproc/p5-String-HexConvert/Makefile
+++ b/textproc/p5-String-HexConvert/Makefile
@@ -16,7 +16,4 @@ WRKSRC=	${WRKDIR}/${PORTNAME}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::HexConvert.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-HexConvert/pkg-plist b/textproc/p5-String-HexConvert/pkg-plist
index c674b544c756..31d42a70efaa 100644
--- a/textproc/p5-String-HexConvert/pkg-plist
+++ b/textproc/p5-String-HexConvert/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::HexConvert.3.gz
 %%SITE_PERL%%/String/HexConvert.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/HexConvert/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/HexConvert
diff --git a/textproc/p5-String-RewritePrefix/Makefile b/textproc/p5-String-RewritePrefix/Makefile
index f1411e00f8bb..e2900e0a5a40 100644
--- a/textproc/p5-String-RewritePrefix/Makefile
+++ b/textproc/p5-String-RewritePrefix/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bill.brinzer@gmail.com
 COMMENT=	Rewrite strings based on a set of known prefixes
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 TEST_DEPENDS=	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::RewritePrefix.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-RewritePrefix/pkg-plist b/textproc/p5-String-RewritePrefix/pkg-plist
index 050f0fd50c7a..b8a80ade62c0 100644
--- a/textproc/p5-String-RewritePrefix/pkg-plist
+++ b/textproc/p5-String-RewritePrefix/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::RewritePrefix.3.gz
 %%SITE_PERL%%/String/RewritePrefix.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RewritePrefix/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RewritePrefix
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 8d3c6cb307a8..627d2f587d23 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -13,8 +13,4 @@ COMMENT=	Perl module for quote strings for passing through the shell
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=	shell-quote.1
-MAN3=	String::ShellQuote.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-ShellQuote/pkg-plist b/textproc/p5-String-ShellQuote/pkg-plist
index fdd55b1e7d27..083ce5df94ed 100644
--- a/textproc/p5-String-ShellQuote/pkg-plist
+++ b/textproc/p5-String-ShellQuote/pkg-plist
@@ -1,6 +1,8 @@
 bin/shell-quote
+%%PERL5_MAN3%%/String::ShellQuote.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist
 %%SITE_PERL%%/String/ShellQuote.pm
+man/man1/shell-quote.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
 @dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Strip/Makefile b/textproc/p5-String-Strip/Makefile
index 34ee63d44960..7186ead518fb 100644
--- a/textproc/p5-String-Strip/Makefile
+++ b/textproc/p5-String-Strip/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl extension for fast, commonly used, string operations
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Strip.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Strip/pkg-plist b/textproc/p5-String-Strip/pkg-plist
index f40dfce73b2d..897277ad9ae9 100644
--- a/textproc/p5-String-Strip/pkg-plist
+++ b/textproc/p5-String-Strip/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Strip.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/Strip.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/Strip.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/autosplit.ix
diff --git a/textproc/p5-String-Urandom/Makefile b/textproc/p5-String-Urandom/Makefile
index cdf18e417661..5729f1fa1ae6 100644
--- a/textproc/p5-String-Urandom/Makefile
+++ b/textproc/p5-String-Urandom/Makefile
@@ -9,6 +9,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to convert /dev/urandom to 8-bit chars
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	\
 	p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
@@ -16,7 +19,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::Urandom.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Urandom/pkg-plist b/textproc/p5-String-Urandom/pkg-plist
index 101e9029fbda..914ba23981d6 100644
--- a/textproc/p5-String-Urandom/pkg-plist
+++ b/textproc/p5-String-Urandom/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Urandom.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Urandom/.packlist
 %%SITE_PERL%%/String/Urandom.pm
 %%SITE_PERL%%/String/example.pl
diff --git a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
index d8f1f3e58440..4021b9da40d5 100644
--- a/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
+++ b/textproc/p5-Syntax-Highlight-Perl-Improved/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Syntax highlighting for Perl code
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Syntax::Highlight::Perl::Improved.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
index d091b981263a..7248e7a76046 100644
--- a/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
+++ b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Syntax::Highlight::Perl::Improved.3.gz
 %%SITE_PERL%%/Syntax/Highlight/Perl/Improved.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved
diff --git a/textproc/p5-TeX-Hyphen/Makefile b/textproc/p5-TeX-Hyphen/Makefile
index 75d70b3ebf0f..7b55e3af0bc7 100644
--- a/textproc/p5-TeX-Hyphen/Makefile
+++ b/textproc/p5-TeX-Hyphen/Makefile
@@ -12,7 +12,4 @@ COMMENT=	Hyphenate words using TeX's patterns
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		TeX::Hyphen.3 TeX::Hyphen::czech.3 TeX::Hyphen::german.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-TeX-Hyphen/pkg-plist b/textproc/p5-TeX-Hyphen/pkg-plist
index c1623c6053a2..4db167b43b46 100644
--- a/textproc/p5-TeX-Hyphen/pkg-plist
+++ b/textproc/p5-TeX-Hyphen/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/TeX::Hyphen.3.gz
+%%PERL5_MAN3%%/TeX::Hyphen::czech.3.gz
+%%PERL5_MAN3%%/TeX::Hyphen::german.3.gz
 %%SITE_PERL%%/TeX/Hyphen.pm
 %%SITE_PERL%%/TeX/Hyphen/czech.pm
 %%SITE_PERL%%/TeX/Hyphen/german.pm
diff --git a/textproc/p5-Template-Declare/Makefile b/textproc/p5-Template-Declare/Makefile
index 90f753edb3f0..d486cd000e17 100644
--- a/textproc/p5-Template-Declare/Makefile
+++ b/textproc/p5-Template-Declare/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perlish declarative templates
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 COMMON_DEPENDS=	p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn \
 		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
@@ -22,14 +25,4 @@ RUN_DEPENDS=	${COMMON_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Template::Declare.3 \
-	Template::Declare::Buffer.3 \
-	Template::Declare::TagSet.3 \
-	Template::Declare::TagSet::HTML.3 \
-	Template::Declare::TagSet::RDF.3 \
-	Template::Declare::TagSet::RDF::EM.3 \
-	Template::Declare::TagSet::XUL.3 \
-	Template::Declare::Tags.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Template-Declare/pkg-plist b/textproc/p5-Template-Declare/pkg-plist
index be6a1b5b331d..e54e9179130c 100644
--- a/textproc/p5-Template-Declare/pkg-plist
+++ b/textproc/p5-Template-Declare/pkg-plist
@@ -1,3 +1,11 @@
+%%PERL5_MAN3%%/Template::Declare.3.gz
+%%PERL5_MAN3%%/Template::Declare::Buffer.3.gz
+%%PERL5_MAN3%%/Template::Declare::TagSet.3.gz
+%%PERL5_MAN3%%/Template::Declare::TagSet::HTML.3.gz
+%%PERL5_MAN3%%/Template::Declare::TagSet::RDF.3.gz
+%%PERL5_MAN3%%/Template::Declare::TagSet::RDF::EM.3.gz
+%%PERL5_MAN3%%/Template::Declare::TagSet::XUL.3.gz
+%%PERL5_MAN3%%/Template::Declare::Tags.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Declare/.packlist
 %%SITE_PERL%%/Template/Declare.pm
 %%SITE_PERL%%/Template/Declare/Buffer.pm