36 files changed, 108 insertions, 118 deletions

diff --git a/textproc/p5-ElasticSearch-SearchBuilder/Makefile b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
index 62d736d06cfc..a1fb4285e8fb 100644
--- a/textproc/p5-ElasticSearch-SearchBuilder/Makefile
+++ b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	ElasticSearch Query Builder
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	p5-Carp>=0:${PORTSDIR}/devel/p5-Carp \
 		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 TEST_DEPENDS=	p5-Test-Deep>=:${PORTSDIR}/devel/p5-Test-Deep \
@@ -19,7 +22,4 @@ TEST_DEPENDS=	p5-Test-Deep>=:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		ElasticSearch::SearchBuilder.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist b/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist
index 482b3952c8b5..441bd082e965 100644
--- a/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist
+++ b/textproc/p5-ElasticSearch-SearchBuilder/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/ElasticSearch::SearchBuilder.3.gz
 %%SITE_PERL%%/ElasticSearch/SearchBuilder.pm
 %%SITE_PERL%%/mach/auto/ElasticSearch/SearchBuilder/.packlist
 @dirrm %%SITE_PERL%%/mach/auto/ElasticSearch/SearchBuilder
diff --git a/textproc/p5-Excel-Template/Makefile b/textproc/p5-Excel-Template/Makefile
index 6c8668caa90c..1540cb0d6561 100644
--- a/textproc/p5-Excel-Template/Makefile
+++ b/textproc/p5-Excel-Template/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Perl module for templating Excel files
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 		p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
@@ -20,38 +23,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Excel::Template.3 \
-		Excel::Template::Base.3 \
-		Excel::Template::Container.3 \
-		Excel::Template::Container::Bold.3 \
-		Excel::Template::Container::Conditional.3 \
-		Excel::Template::Container::Format.3 \
-		Excel::Template::Container::Hidden.3 \
-		Excel::Template::Container::Italic.3 \
-		Excel::Template::Container::KeepLeadingZeros.3 \
-		Excel::Template::Container::Locked.3 \
-		Excel::Template::Container::Loop.3 \
-		Excel::Template::Container::Outline.3 \
-		Excel::Template::Container::Row.3 \
-		Excel::Template::Container::Scope.3 \
-		Excel::Template::Container::Shadow.3 \
-		Excel::Template::Container::Strikeout.3 \
-		Excel::Template::Container::Workbook.3 \
-		Excel::Template::Container::Worksheet.3 \
-		Excel::Template::Context.3 \
-		Excel::Template::Element.3 \
-		Excel::Template::Element::Backref.3 \
-		Excel::Template::Element::Cell.3 \
-		Excel::Template::Element::Formula.3 \
-		Excel::Template::Element::FreezePanes.3 \
-		Excel::Template::Element::Image.3 \
-		Excel::Template::Element::MergeRange.3 \
-		Excel::Template::Element::Range.3 \
-		Excel::Template::Element::Var.3 \
-		Excel::Template::Factory.3 \
-		Excel::Template::Format.3 \
-		Excel::Template::Iterator.3 \
-		Excel::Template::TextObject.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Excel-Template/pkg-plist b/textproc/p5-Excel-Template/pkg-plist
index 7acf1b8e0ec0..8c533f35c9c6 100644
--- a/textproc/p5-Excel-Template/pkg-plist
+++ b/textproc/p5-Excel-Template/pkg-plist
@@ -1,3 +1,35 @@
+%%PERL5_MAN3%%/Excel::Template.3.gz
+%%PERL5_MAN3%%/Excel::Template::Base.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Bold.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Conditional.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Format.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Hidden.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Italic.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::KeepLeadingZeros.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Locked.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Loop.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Outline.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Row.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Scope.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Shadow.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Strikeout.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Workbook.3.gz
+%%PERL5_MAN3%%/Excel::Template::Container::Worksheet.3.gz
+%%PERL5_MAN3%%/Excel::Template::Context.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::Backref.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::Cell.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::Formula.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::FreezePanes.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::Image.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::MergeRange.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::Range.3.gz
+%%PERL5_MAN3%%/Excel::Template::Element::Var.3.gz
+%%PERL5_MAN3%%/Excel::Template::Factory.3.gz
+%%PERL5_MAN3%%/Excel::Template::Format.3.gz
+%%PERL5_MAN3%%/Excel::Template::Iterator.3.gz
+%%PERL5_MAN3%%/Excel::Template::TextObject.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Excel/Template/.packlist
 %%SITE_PERL%%/Excel/Template.pm
 %%SITE_PERL%%/Excel/Template/Base.pm
diff --git a/textproc/p5-File-Inplace/Makefile b/textproc/p5-File-Inplace/Makefile
index 0c0297e89841..6e6ac01c7d0b 100644
--- a/textproc/p5-File-Inplace/Makefile
+++ b/textproc/p5-File-Inplace/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module for in-place editing of files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		File::Inplace.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-File-Inplace/pkg-plist b/textproc/p5-File-Inplace/pkg-plist
index 04658073501c..904c8ad7e4ed 100644
--- a/textproc/p5-File-Inplace/pkg-plist
+++ b/textproc/p5-File-Inplace/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/File::Inplace.3.gz
 %%SITE_PERL%%/File/Inplace.pm
-@dirrmtry %%SITE_PERL%%/File
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Inplace/.packlist
+@dirrmtry %%SITE_PERL%%/File
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Inplace
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/textproc/p5-FormValidator-Lite/Makefile b/textproc/p5-FormValidator-Lite/Makefile
index 0ed755165e10..33176e796450 100644
--- a/textproc/p5-FormValidator-Lite/Makefile
+++ b/textproc/p5-FormValidator-Lite/Makefile
@@ -26,20 +26,6 @@ TEST_DEPENDS=	p5-Text-TestBase>0:${PORTSDIR}/textproc/p5-Text-TestBase \
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		FormValidator::Lite.3 \
-		FormValidator::Lite::Constraint.3 \
-		FormValidator::Lite::Constraint::Date.3 \
-		FormValidator::Lite::Constraint::Default.3 \
-		FormValidator::Lite::Constraint::Email.3 \
-		FormValidator::Lite::Constraint::File.3 \
-		FormValidator::Lite::Constraint::Japanese.3 \
-		FormValidator::Lite::Constraint::Number.3 \
-		FormValidator::Lite::Constraint::Time.3 \
-		FormValidator::Lite::Constraint::URL.3 \
-		FormValidator::Lite::Messages::en.3 \
-		FormValidator::Lite::Messages::ja.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/textproc/p5-FormValidator-Lite/pkg-plist b/textproc/p5-FormValidator-Lite/pkg-plist
index 7c840eeb9c22..de7a2ab2c57e 100644
--- a/textproc/p5-FormValidator-Lite/pkg-plist
+++ b/textproc/p5-FormValidator-Lite/pkg-plist
@@ -1,3 +1,15 @@
+%%PERL5_MAN3%%/FormValidator::Lite.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::Date.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::Default.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::Email.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::File.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::Japanese.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::Number.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::Time.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Constraint::URL.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Messages::en.3.gz
+%%PERL5_MAN3%%/FormValidator::Lite::Messages::ja.3.gz
 %%SITE_PERL%%/FormValidator/Lite.pm
 %%SITE_PERL%%/FormValidator/Lite/Constraint.pm
 %%SITE_PERL%%/FormValidator/Lite/Constraint/Date.pm
diff --git a/textproc/p5-Getopt-Lucid/Makefile b/textproc/p5-Getopt-Lucid/Makefile
index e51070a2d92d..443512452017 100644
--- a/textproc/p5-Getopt-Lucid/Makefile
+++ b/textproc/p5-Getopt-Lucid/Makefile
@@ -10,6 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Getopt::Lucid - Clear, readable syntax for command line processing
 
+LICENSE=	APACHE20
+
 BUILD_DEPENDS=	p5-Exception-Class>=1.23:${PORTSDIR}/devel/p5-Exception-Class \
 		p5-Exception-Class-TryCatch>=1.10:${PORTSDIR}/devel/p5-Exception-Class-TryCatch \
 		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
@@ -20,7 +22,4 @@ RUN_DEPENDS=	p5-Exception-Class>=1.23:${PORTSDIR}/devel/p5-Exception-Class \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Getopt::Lucid.3 Getopt::Lucid::Exception.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Getopt-Lucid/pkg-plist b/textproc/p5-Getopt-Lucid/pkg-plist
index f9f77ead110d..7ab5aeba690c 100644
--- a/textproc/p5-Getopt-Lucid/pkg-plist
+++ b/textproc/p5-Getopt-Lucid/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Getopt::Lucid.3.gz
+%%PERL5_MAN3%%/Getopt::Lucid::Exception.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Lucid/.packlist
 %%SITE_PERL%%/Getopt/Lucid.pm
 %%SITE_PERL%%/Getopt/Lucid/Exception.pm
diff --git a/textproc/p5-HTML-Entities-ImodePictogram/Makefile b/textproc/p5-HTML-Entities-ImodePictogram/Makefile
index 14a64a1980f5..fc01bd480008 100644
--- a/textproc/p5-HTML-Entities-ImodePictogram/Makefile
+++ b/textproc/p5-HTML-Entities-ImodePictogram/Makefile
@@ -13,8 +13,4 @@ COMMENT=	HTML::Entities::ImodePictogram - encode / decode i-mode pictogram
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	HTML::Entities::ImodePictogram.3 \
-	HTML::Entities::ImodePictogram.ja.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist b/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist
index 528aabf38113..00e02fdf7068 100644
--- a/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist
+++ b/textproc/p5-HTML-Entities-ImodePictogram/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/HTML::Entities::ImodePictogram.3.gz
+%%PERL5_MAN3%%/HTML::Entities::ImodePictogram.ja.3.gz
 %%SITE_PERL%%/HTML/Entities/ImodePictogram.ja.pod
 %%SITE_PERL%%/HTML/Entities/ImodePictogram.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/ImodePictogram/.packlist
diff --git a/textproc/p5-HTML-Entities-Numbered/Makefile b/textproc/p5-HTML-Entities-Numbered/Makefile
index 8d61873678b9..28e3646432e9 100644
--- a/textproc/p5-HTML-Entities-Numbered/Makefile
+++ b/textproc/p5-HTML-Entities-Numbered/Makefile
@@ -13,8 +13,4 @@ COMMENT=	HTML::Entities::Numbered - Conversion of numbered HTML entities
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	HTML::Entities::Numbered.3 \
-	HTML::Entities::Numbered::Table.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Entities-Numbered/pkg-plist b/textproc/p5-HTML-Entities-Numbered/pkg-plist
index f4d48d3e0e3d..3b6bde102bf2 100644
--- a/textproc/p5-HTML-Entities-Numbered/pkg-plist
+++ b/textproc/p5-HTML-Entities-Numbered/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/HTML::Entities::Numbered.3.gz
+%%PERL5_MAN3%%/HTML::Entities::Numbered::Table.3.gz
 %%SITE_PERL%%/HTML/Entities/Numbered.pm
 %%SITE_PERL%%/HTML/Entities/Numbered/Table.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered/.packlist
diff --git a/textproc/p5-HTML-FormatText-WithLinks/Makefile b/textproc/p5-HTML-FormatText-WithLinks/Makefile
index c04658398bd6..e6e7f78ec3fc 100644
--- a/textproc/p5-HTML-FormatText-WithLinks/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks/Makefile
@@ -10,13 +10,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	loader@freebsdmall.com
 COMMENT=	Perl5 module to convert HTML to text with links as footnotes
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=		HTML::FormatText::WithLinks.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-FormatText-WithLinks/pkg-plist b/textproc/p5-HTML-FormatText-WithLinks/pkg-plist
index d224e6e4aa55..02c5858894cc 100644
--- a/textproc/p5-HTML-FormatText-WithLinks/pkg-plist
+++ b/textproc/p5-HTML-FormatText-WithLinks/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/HTML::FormatText::WithLinks.3.gz
 %%SITE_PERL%%/HTML/FormatText/WithLinks.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText/WithLinks/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormatText/WithLinks
diff --git a/textproc/p5-HTML-Fraction/Makefile b/textproc/p5-HTML-Fraction/Makefile
index 33b10323622c..38b4a81e531d 100644
--- a/textproc/p5-HTML-Fraction/Makefile
+++ b/textproc/p5-HTML-Fraction/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	HTML::Fraction - Encode fractions as HTML entities
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	HTML::Fraction.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Fraction/pkg-plist b/textproc/p5-HTML-Fraction/pkg-plist
index ba678ba7cd2c..1bb726af43fb 100644
--- a/textproc/p5-HTML-Fraction/pkg-plist
+++ b/textproc/p5-HTML-Fraction/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/HTML::Fraction.3.gz
 %%SITE_PERL%%/HTML/Fraction.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction
diff --git a/textproc/p5-HTML-HTML5-Entities/Makefile b/textproc/p5-HTML-HTML5-Entities/Makefile
index bb576aa573ae..b4ddbee512da 100644
--- a/textproc/p5-HTML-HTML5-Entities/Makefile
+++ b/textproc/p5-HTML-HTML5-Entities/Makefile
@@ -17,7 +17,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		HTML::HTML5::Entities.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-HTML5-Entities/pkg-plist b/textproc/p5-HTML-HTML5-Entities/pkg-plist
index fb1c8dc3d9f5..2fa706f3287e 100644
--- a/textproc/p5-HTML-HTML5-Entities/pkg-plist
+++ b/textproc/p5-HTML-HTML5-Entities/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/HTML::HTML5::Entities.3.gz
 %%SITE_PERL%%/HTML/HTML5/Entities.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Entities/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Entities
diff --git a/textproc/p5-HTML-HTML5-Parser/Makefile b/textproc/p5-HTML-HTML5-Parser/Makefile
index 991d9814ce01..cabbb23f7c1f 100644
--- a/textproc/p5-HTML-HTML5-Parser/Makefile
+++ b/textproc/p5-HTML-HTML5-Parser/Makefile
@@ -24,11 +24,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		HTML::HTML5::Parser.3 \
-		HTML::HTML5::Parser::Error.3 \
-		HTML::HTML5::Parser::UA.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/textproc/p5-HTML-HTML5-Parser/pkg-plist b/textproc/p5-HTML-HTML5-Parser/pkg-plist
index f0827e907e6c..0425c43e410d 100644
--- a/textproc/p5-HTML-HTML5-Parser/pkg-plist
+++ b/textproc/p5-HTML-HTML5-Parser/pkg-plist
@@ -1,5 +1,8 @@
 bin/html2xhtml
 bin/html5debug
+%%PERL5_MAN3%%/HTML::HTML5::Parser.3.gz
+%%PERL5_MAN3%%/HTML::HTML5::Parser::Error.3.gz
+%%PERL5_MAN3%%/HTML::HTML5::Parser::UA.3.gz
 %%SITE_PERL%%/HTML/HTML5/Parser/Charset/DecodeHandle.pm
 %%SITE_PERL%%/HTML/HTML5/Parser/Charset/Info.pm
 %%SITE_PERL%%/HTML/HTML5/Parser/Charset/UnicodeChecker.pm
diff --git a/textproc/p5-HTML-HTMLDoc/Makefile b/textproc/p5-HTML-HTMLDoc/Makefile
index d79a6a9a6134..8c593fd99fdd 100644
--- a/textproc/p5-HTML-HTMLDoc/Makefile
+++ b/textproc/p5-HTML-HTMLDoc/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		HTML::HTMLDoc.3 HTML::HTMLDoc::PDF.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-HTMLDoc/pkg-plist b/textproc/p5-HTML-HTMLDoc/pkg-plist
index 2e8c8ab443a2..c796758e6e14 100644
--- a/textproc/p5-HTML-HTMLDoc/pkg-plist
+++ b/textproc/p5-HTML-HTMLDoc/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/HTML::HTMLDoc.3.gz
+%%PERL5_MAN3%%/HTML::HTMLDoc::PDF.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTMLDoc/.packlist
 %%SITE_PERL%%/HTML/HTMLDoc.pm
 %%SITE_PERL%%/HTML/HTMLDoc/PDF.pm
diff --git a/textproc/p5-HTML-Quoted/Makefile b/textproc/p5-HTML-Quoted/Makefile
index 3ddd724f5705..41038c9bedb5 100644
--- a/textproc/p5-HTML-Quoted/Makefile
+++ b/textproc/p5-HTML-Quoted/Makefile
@@ -9,13 +9,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Extract structure of quoted HTML mail message
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-HTML-Parser>=3.0:${PORTSDIR}/www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		HTML::Quoted.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Quoted/pkg-plist b/textproc/p5-HTML-Quoted/pkg-plist
index 7ed23e2394ce..192f8e11cc82 100644
--- a/textproc/p5-HTML-Quoted/pkg-plist
+++ b/textproc/p5-HTML-Quoted/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/HTML::Quoted.3.gz
 %%SITE_PERL%%/HTML/Quoted.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Quoted/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Quoted
diff --git a/textproc/p5-HTML-SBC/Makefile b/textproc/p5-HTML-SBC/Makefile
index 4f79c90bfea3..c7a2cbcc8e71 100644
--- a/textproc/p5-HTML-SBC/Makefile
+++ b/textproc/p5-HTML-SBC/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple blog code to valid XHTML
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	HTML::SBC.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-SBC/pkg-plist b/textproc/p5-HTML-SBC/pkg-plist
index ade36e47cb16..071349856589 100644
--- a/textproc/p5-HTML-SBC/pkg-plist
+++ b/textproc/p5-HTML-SBC/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/HTML::SBC.3.gz
 %%SITE_PERL%%/HTML/SBC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SBC/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SBC
diff --git a/textproc/p5-Hailo/Makefile b/textproc/p5-Hailo/Makefile
index dc266ba2a8cc..b95d9be52af1 100644
--- a/textproc/p5-Hailo/Makefile
+++ b/textproc/p5-Hailo/Makefile
@@ -46,30 +46,9 @@ TEST_DEPENDS=	p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		hailo.1
-
-MAN3=		Hailo.3 \
-		Hailo::Command.3 \
-		Hailo::Engine::Default.3 \
-		Hailo::Engine::Scored.3 \
-		Hailo::Role::Arguments.3 \
-		Hailo::Role::Engine.3 \
-		Hailo::Role::Storage.3 \
-		Hailo::Role::Tokenizer.3 \
-		Hailo::Role::UI.3 \
-		Hailo::Storage.3 \
-		Hailo::Storage::MySQL.3 \
-		Hailo::Storage::PostgreSQL.3 \
-		Hailo::Storage::SQLite.3 \
-		Hailo::Storage::Schema.3 \
-		Hailo::Tokenizer::Chars.3 \
-		Hailo::Tokenizer::Words.3 \
-		Hailo::UI::ReadLine.3
-
 OPTIONS_DEFINE=	SQLITE PGSQL MYSQL
 OPTIONS_DEFAULT=	SQLITE
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
diff --git a/textproc/p5-Hailo/pkg-plist b/textproc/p5-Hailo/pkg-plist
index ea8584c86273..a25e8885d4f0 100644
--- a/textproc/p5-Hailo/pkg-plist
+++ b/textproc/p5-Hailo/pkg-plist
@@ -1,4 +1,22 @@
 bin/hailo
+man/man1/hailo.1.gz
+%%PERL5_MAN3%%/Hailo.3.gz
+%%PERL5_MAN3%%/Hailo::Command.3.gz
+%%PERL5_MAN3%%/Hailo::Engine::Default.3.gz
+%%PERL5_MAN3%%/Hailo::Engine::Scored.3.gz
+%%PERL5_MAN3%%/Hailo::Role::Arguments.3.gz
+%%PERL5_MAN3%%/Hailo::Role::Engine.3.gz
+%%PERL5_MAN3%%/Hailo::Role::Storage.3.gz
+%%PERL5_MAN3%%/Hailo::Role::Tokenizer.3.gz
+%%PERL5_MAN3%%/Hailo::Role::UI.3.gz
+%%PERL5_MAN3%%/Hailo::Storage.3.gz
+%%PERL5_MAN3%%/Hailo::Storage::MySQL.3.gz
+%%PERL5_MAN3%%/Hailo::Storage::PostgreSQL.3.gz
+%%PERL5_MAN3%%/Hailo::Storage::SQLite.3.gz
+%%PERL5_MAN3%%/Hailo::Storage::Schema.3.gz
+%%PERL5_MAN3%%/Hailo::Tokenizer::Chars.3.gz
+%%PERL5_MAN3%%/Hailo::Tokenizer::Words.3.gz
+%%PERL5_MAN3%%/Hailo::UI::ReadLine.3.gz
 %%SITE_PERL%%/Hailo.pm
 %%SITE_PERL%%/Hailo/Command.pm
 %%SITE_PERL%%/Hailo/Engine/Default.pm
diff --git a/textproc/p5-Hatena-Keyword/Makefile b/textproc/p5-Hatena-Keyword/Makefile
index 0c6041e1eee0..ac9683aa838c 100644
--- a/textproc/p5-Hatena-Keyword/Makefile
+++ b/textproc/p5-Hatena-Keyword/Makefile
@@ -30,7 +30,4 @@ RUN_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Hatena::Keyword.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Hatena-Keyword/pkg-plist b/textproc/p5-Hatena-Keyword/pkg-plist
index 791f16b1e3bf..f6b85ad0fe9f 100644
--- a/textproc/p5-Hatena-Keyword/pkg-plist
+++ b/textproc/p5-Hatena-Keyword/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Hatena::Keyword.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hatena/Keyword/.packlist
 %%SITE_PERL%%/Hatena/Keyword.pm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hatena/Keyword
diff --git a/textproc/p5-IO-CSVHeaderFile/Makefile b/textproc/p5-IO-CSVHeaderFile/Makefile
index 1cfd4deeb638..5613d27e44b0 100644
--- a/textproc/p5-IO-CSVHeaderFile/Makefile
+++ b/textproc/p5-IO-CSVHeaderFile/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::CSVHeaderFile.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-IO-CSVHeaderFile/pkg-plist b/textproc/p5-IO-CSVHeaderFile/pkg-plist
index 5f9906e100b4..9267d65dd2fe 100644
--- a/textproc/p5-IO-CSVHeaderFile/pkg-plist
+++ b/textproc/p5-IO-CSVHeaderFile/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/IO::CSVHeaderFile.3.gz
 %%SITE_PERL%%/IO/CSVHeaderFile.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile
diff --git a/textproc/p5-Kwalify/Makefile b/textproc/p5-Kwalify/Makefile
index 9488553ed2ec..fb4929d1b046 100644
--- a/textproc/p5-Kwalify/Makefile
+++ b/textproc/p5-Kwalify/Makefile
@@ -11,11 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Implementation of Kwalify parser, validator and data binding tool
 
-MAN1=		pkwalify.1
-MAN3=		Kwalify.3 Schema::Kwalify.3
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
 
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Kwalify/pkg-plist b/textproc/p5-Kwalify/pkg-plist
index d3cf2ef51ec8..6a1355e39c99 100644
--- a/textproc/p5-Kwalify/pkg-plist
+++ b/textproc/p5-Kwalify/pkg-plist
@@ -1,7 +1,10 @@
 bin/pkwalify
+%%PERL5_MAN3%%/Kwalify.3.gz
+%%PERL5_MAN3%%/Schema::Kwalify.3.gz
 %%SITE_PERL%%/Kwalify.pm
 %%SITE_PERL%%/Schema/Kwalify.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwalify/.packlist
+man/man1/pkwalify.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwalify
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrmtry %%SITE_PERL%%/Schema