21 files changed, 119 insertions, 100 deletions

diff --git a/textproc/p5-AI-Categorizer/Makefile b/textproc/p5-AI-Categorizer/Makefile
index 95713839f01d..d69a7f1228e3 100644
--- a/textproc/p5-AI-Categorizer/Makefile
+++ b/textproc/p5-AI-Categorizer/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatic Text Categorization
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Class-Container>=0:${PORTSDIR}/devel/p5-Class-Container \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-Statistics-Contingency>=0:${PORTSDIR}/math/p5-Statistics-Contingency \
@@ -21,31 +24,7 @@ BUILD_DEPENDS=	p5-Class-Container>=0:${PORTSDIR}/devel/p5-Class-Container \
 		p5-Algorithm-NaiveBayes>=0:${PORTSDIR}/devel/p5-Algorithm-NaiveBayes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	AI::Categorizer.3 \
-	AI::Categorizer::Category.3 \
-	AI::Categorizer::Collection.3 \
-	AI::Categorizer::Collection::Files.3 \
-	AI::Categorizer::Document.3 \
-	AI::Categorizer::Experiment.3 \
-	AI::Categorizer::FeatureSelector.3 \
-	AI::Categorizer::FeatureSelector::CategorySelector.3 \
-	AI::Categorizer::FeatureSelector::ChiSquare.3 \
-	AI::Categorizer::FeatureSelector::DocFrequency.3 \
-	AI::Categorizer::FeatureVector.3 \
-	AI::Categorizer::Hypothesis.3 \
-	AI::Categorizer::KnowledgeSet.3 \
-	AI::Categorizer::Learner.3 \
-	AI::Categorizer::Learner::Boolean.3 \
-	AI::Categorizer::Learner::DecisionTree.3 \
-	AI::Categorizer::Learner::Guesser.3 \
-	AI::Categorizer::Learner::KNN.3 \
-	AI::Categorizer::Learner::NaiveBayes.3 \
-	AI::Categorizer::Learner::SVM.3 \
-	AI::Categorizer::Learner::Weka.3 \
-	AI::Categorizer::Storable.3
-
 USES=		perl5
 USE_PERL5=	modbuild
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-AI-Categorizer/pkg-plist b/textproc/p5-AI-Categorizer/pkg-plist
index 37d1cb8faf1c..621156fb6bc9 100644
--- a/textproc/p5-AI-Categorizer/pkg-plist
+++ b/textproc/p5-AI-Categorizer/pkg-plist
@@ -1,3 +1,25 @@
+%%PERL5_MAN3%%/AI::Categorizer.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Category.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Collection.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Collection::Files.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Document.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Experiment.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::FeatureSelector.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::FeatureSelector::CategorySelector.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::FeatureSelector::ChiSquare.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::FeatureSelector::DocFrequency.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::FeatureVector.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Hypothesis.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::KnowledgeSet.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner::Boolean.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner::DecisionTree.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner::Guesser.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner::KNN.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner::NaiveBayes.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner::SVM.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Learner::Weka.3.gz
+%%PERL5_MAN3%%/AI::Categorizer::Storable.3.gz
 %%SITE_PERL%%/AI/Categorizer.pm
 %%SITE_PERL%%/AI/Categorizer/Category.pm
 %%SITE_PERL%%/AI/Categorizer/Collection.pm
diff --git a/textproc/p5-Algorithm-CheckDigits/Makefile b/textproc/p5-Algorithm-CheckDigits/Makefile
index de0cca11f08e..6cd8972923eb 100644
--- a/textproc/p5-Algorithm-CheckDigits/Makefile
+++ b/textproc/p5-Algorithm-CheckDigits/Makefile
@@ -3,46 +3,21 @@
 
 PORTNAME=	Algorithm-CheckDigits
 PORTVERSION=	1.2.0
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl extension to generate and test check digits
 
-TEST_DEPENDS=	p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
 
-PKGNAMEPREFIX=	p5-
+TEST_DEPENDS=	p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=	checkdigits.pl.1
-
-MAN3=	Algorithm::CheckDigits.3 \
-	Algorithm::CheckDigits::M07_001.3 Algorithm::CheckDigits::M09_001.3 \
-	Algorithm::CheckDigits::M10_001.3 Algorithm::CheckDigits::M10_002.3 \
-	Algorithm::CheckDigits::M10_003.3 Algorithm::CheckDigits::M10_004.3 \
-	Algorithm::CheckDigits::M10_005.3 Algorithm::CheckDigits::M10_006.3 \
-	Algorithm::CheckDigits::M10_008.3 Algorithm::CheckDigits::M10_009.3 \
-	Algorithm::CheckDigits::M10_010.3 Algorithm::CheckDigits::M10_011.3 \
-	Algorithm::CheckDigits::M11_001.3 Algorithm::CheckDigits::M11_002.3 \
-	Algorithm::CheckDigits::M11_003.3 Algorithm::CheckDigits::M11_004.3 \
-	Algorithm::CheckDigits::M11_006.3 Algorithm::CheckDigits::M11_007.3 \
-	Algorithm::CheckDigits::M11_008.3 Algorithm::CheckDigits::M11_009.3 \
-	Algorithm::CheckDigits::M11_010.3 Algorithm::CheckDigits::M11_011.3 \
-	Algorithm::CheckDigits::M11_012.3 Algorithm::CheckDigits::M11_013.3 \
-	Algorithm::CheckDigits::M11_015.3 Algorithm::CheckDigits::M11_016.3 \
-	Algorithm::CheckDigits::M11_017.3 Algorithm::CheckDigits::M16_001.3 \
-	Algorithm::CheckDigits::M23_001.3 Algorithm::CheckDigits::M23_002.3 \
-	Algorithm::CheckDigits::M43_001.3 Algorithm::CheckDigits::M89_001.3 \
-	Algorithm::CheckDigits::M97_001.3 Algorithm::CheckDigits::M97_002.3 \
-	Algorithm::CheckDigits::MBase_001.3 Algorithm::CheckDigits::MBase_002.3 \
-	Algorithm::CheckDigits::MBase_003.3 Algorithm::CheckDigits::MXX_001.3 \
-	Algorithm::CheckDigits::MXX_002.3 Algorithm::CheckDigits::MXX_003.3 \
-	Algorithm::CheckDigits::MXX_004.3 Algorithm::CheckDigits::MXX_005.3 \
-	Algorithm::CheckDigits::MXX_006.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Algorithm-CheckDigits/pkg-plist b/textproc/p5-Algorithm-CheckDigits/pkg-plist
index 38f83ee8f395..04e9bc0e544b 100644
--- a/textproc/p5-Algorithm-CheckDigits/pkg-plist
+++ b/textproc/p5-Algorithm-CheckDigits/pkg-plist
@@ -1,4 +1,49 @@
 bin/checkdigits.pl
+man/man1/checkdigits.pl.1.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M07_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M09_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_002.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_003.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_004.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_005.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_006.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_008.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_009.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_010.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M10_011.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_002.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_003.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_004.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_006.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_007.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_008.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_009.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_010.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_011.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_012.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_013.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_015.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_016.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M11_017.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M16_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M23_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M23_002.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M43_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M89_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M97_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::M97_002.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MBase_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MBase_002.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MBase_003.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MXX_001.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MXX_002.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MXX_003.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MXX_004.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MXX_005.3.gz
+%%PERL5_MAN3%%/Algorithm::CheckDigits::MXX_006.3.gz
 %%SITE_PERL%%/Algorithm/CheckDigits/M07_001.pm
 %%SITE_PERL%%/Algorithm/CheckDigits/M09_001.pm
 %%SITE_PERL%%/Algorithm/CheckDigits/M10_001.pm
diff --git a/textproc/p5-CSS-Compressor/Makefile b/textproc/p5-CSS-Compressor/Makefile
index 7b8770005270..8083c63bb66c 100644
--- a/textproc/p5-CSS-Compressor/Makefile
+++ b/textproc/p5-CSS-Compressor/Makefile
@@ -14,10 +14,7 @@ COMMENT=	Perl extension for CSS minification
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/csscompressor ${PREFIX}/bin
-
-MAN3=		CSS::Compressor.3
+	${INSTALL_SCRIPT} ${FILESDIR}/csscompressor ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-CSS-Compressor/pkg-plist b/textproc/p5-CSS-Compressor/pkg-plist
index 2ad0e5432c88..24ebd7e495b9 100644
--- a/textproc/p5-CSS-Compressor/pkg-plist
+++ b/textproc/p5-CSS-Compressor/pkg-plist
@@ -1,7 +1,8 @@
 @comment $FreeBSD$
+bin/csscompressor
+%%PERL5_MAN3%%/CSS::Compressor.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Compressor/.packlist
 %%SITE_PERL%%/CSS/Compressor.pm
-bin/csscompressor
 @dirrmtry %%SITE_PERL%%/CSS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Compressor
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
diff --git a/textproc/p5-CSS-Simple/Makefile b/textproc/p5-CSS-Simple/Makefile
index c9cdcdd884c1..8dabcd8bdfee 100644
--- a/textproc/p5-CSS-Simple/Makefile
+++ b/textproc/p5-CSS-Simple/Makefile
@@ -10,18 +10,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Interface through which to read/write/manipulate CSS files
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
 RUN_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CSS::Simple.3
 PLIST_FILES=	%%SITE_PERL%%/CSS/Simple.pm \
+		%%PERL5_MAN3%%/CSS::Simple.3.gz \
 		%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Simple/.packlist
 PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Simple \
 		%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS \
 		%%SITE_PERL%%/CSS
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Data-Report/Makefile b/textproc/p5-Data-Report/Makefile
index e6f3520a2f36..96aa51746c81 100644
--- a/textproc/p5-Data-Report/Makefile
+++ b/textproc/p5-Data-Report/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::Report - Framework for flexible reporting
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 COMMON_DEPENDS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Text-CSV_XS>0:${PORTSDIR}/textproc/p5-Text-CSV_XS
 BUILD_DEPENDS=	p5-Module-Build>=0.28:${PORTSDIR}/devel/p5-Module-Build \
@@ -20,7 +23,4 @@ RUN_DEPENDS=	${COMMON_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Data::Report.3 Data::Report::Base.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Data-Report/pkg-plist b/textproc/p5-Data-Report/pkg-plist
index 993b6e3f7ed8..06160ea03851 100644
--- a/textproc/p5-Data-Report/pkg-plist
+++ b/textproc/p5-Data-Report/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Data::Report.3.gz
+%%PERL5_MAN3%%/Data::Report::Base.3.gz
 %%SITE_PERL%%/Data/Report.pm
 %%SITE_PERL%%/Data/Report/Base.pm
 %%SITE_PERL%%/Data/Report/Plugin/Csv.pm
diff --git a/textproc/p5-Data-SpreadPagination/Makefile b/textproc/p5-Data-SpreadPagination/Makefile
index b92aa0472c82..6b8fd68b229a 100644
--- a/textproc/p5-Data-SpreadPagination/Makefile
+++ b/textproc/p5-Data-SpreadPagination/Makefile
@@ -18,9 +18,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Data::SpreadPagination.3
-
-NO_STAGE=	yes
 test:
 	cd ${WRKSRC} && ${MAKE} test
 
diff --git a/textproc/p5-Data-SpreadPagination/pkg-plist b/textproc/p5-Data-SpreadPagination/pkg-plist
index fecfc461a8b4..20781e0c99a2 100644
--- a/textproc/p5-Data-SpreadPagination/pkg-plist
+++ b/textproc/p5-Data-SpreadPagination/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Data::SpreadPagination.3.gz
 %%SITE_PERL%%/Data/SpreadPagination.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/SpreadPagination/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/SpreadPagination
diff --git a/textproc/p5-DelimMatch/Makefile b/textproc/p5-DelimMatch/Makefile
index 84f884ac8de8..2ac3218aa53d 100644
--- a/textproc/p5-DelimMatch/Makefile
+++ b/textproc/p5-DelimMatch/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl extension to find regexp delimited strings with proper nesting
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::DelimMatch.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-DelimMatch/pkg-plist b/textproc/p5-DelimMatch/pkg-plist
index 15f021d11872..c06c5a379d85 100644
--- a/textproc/p5-DelimMatch/pkg-plist
+++ b/textproc/p5-DelimMatch/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::DelimMatch.3.gz
 %%SITE_PERL%%/auto/Text/DelimMatch/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
 %%SITE_PERL%%/Text/DelimMatch.pm
diff --git a/textproc/p5-Devel-TraceSAX/Makefile b/textproc/p5-Devel-TraceSAX/Makefile
index 9c44eb66e018..a11ecb24c51b 100644
--- a/textproc/p5-Devel-TraceSAX/Makefile
+++ b/textproc/p5-Devel-TraceSAX/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Devel::TraceSAX.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Devel-TraceSAX/pkg-plist b/textproc/p5-Devel-TraceSAX/pkg-plist
index dbc973c34a33..abe20fa3ed58 100644
--- a/textproc/p5-Devel-TraceSAX/pkg-plist
+++ b/textproc/p5-Devel-TraceSAX/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Devel::TraceSAX.3.gz
 %%SITE_PERL%%/Devel/TraceSAX.pm
 %%SITE_PERL%%/Devel/TraceSAX/DB.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX/.packlist
diff --git a/textproc/p5-EBook-Tools/Makefile b/textproc/p5-EBook-Tools/Makefile
index 43cc59d4b5fd..45658ca2392e 100644
--- a/textproc/p5-EBook-Tools/Makefile
+++ b/textproc/p5-EBook-Tools/Makefile
@@ -3,14 +3,16 @@
 
 PORTNAME=	EBook-Tools
 PORTVERSION=	0.4.9
+DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	simond@irrelevant.org
 COMMENT=	Object class for manipulating and generating E-books
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
 		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
@@ -33,15 +35,4 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/tidy4:${PORTSDIR}/www/tidy
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN1=	ebook.1
-MAN3=		EBook::Tools.3 \
-		EBook::Tools::EReader.3 \
-		EBook::Tools::IMP.3 \
-		EBook::Tools::LZSS.3 \
-		EBook::Tools::MSReader.3 \
-		EBook::Tools::Mobipocket.3 \
-		EBook::Tools::PalmDoc.3 \
-		EBook::Tools::Unpack.3 \
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-EBook-Tools/pkg-plist b/textproc/p5-EBook-Tools/pkg-plist
index 0f393552ff8a..2a57da0c651d 100644
--- a/textproc/p5-EBook-Tools/pkg-plist
+++ b/textproc/p5-EBook-Tools/pkg-plist
@@ -1,3 +1,12 @@
+man/man1/ebook.1.gz
+%%PERL5_MAN3%%/EBook::Tools.3.gz
+%%PERL5_MAN3%%/EBook::Tools::EReader.3.gz
+%%PERL5_MAN3%%/EBook::Tools::IMP.3.gz
+%%PERL5_MAN3%%/EBook::Tools::LZSS.3.gz
+%%PERL5_MAN3%%/EBook::Tools::MSReader.3.gz
+%%PERL5_MAN3%%/EBook::Tools::Mobipocket.3.gz
+%%PERL5_MAN3%%/EBook::Tools::PalmDoc.3.gz
+%%PERL5_MAN3%%/EBook::Tools::Unpack.3.gz
 %%SITE_PERL%%/EBook/Tools.pm
 %%SITE_PERL%%/EBook/Tools/EReader.pm
 %%SITE_PERL%%/EBook/Tools/IMP.pm
diff --git a/textproc/p5-ElasticSearch/Makefile b/textproc/p5-ElasticSearch/Makefile
index 10f6984f29ba..8fdb573efdae 100644
--- a/textproc/p5-ElasticSearch/Makefile
+++ b/textproc/p5-ElasticSearch/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	ElasticSearch API
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS:=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp
 RUN_DEPENDS:=	p5-ElasticSearch-SearchBuilder>=0:${PORTSDIR}/textproc/p5-ElasticSearch-SearchBuilder \
 		p5-Carp>=0:${PORTSDIR}/devel/p5-Carp \
@@ -38,16 +41,4 @@ TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		ElasticSearch.3 \
-		ElasticSearch::Error.3 \
-		ElasticSearch::QueryParser.3 \
-		ElasticSearch::ScrolledSearch.3 \
-		ElasticSearch::TestServer.3 \
-		ElasticSearch::Transport.3 \
-		ElasticSearch::Transport::HTTP.3 \
-		ElasticSearch::Transport::HTTPLite.3 \
-		ElasticSearch::Transport::HTTPTiny.3 \
-		ElasticSearch::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-ElasticSearch/pkg-plist b/textproc/p5-ElasticSearch/pkg-plist
index 03626b581ce4..dff68f1be315 100644
--- a/textproc/p5-ElasticSearch/pkg-plist
+++ b/textproc/p5-ElasticSearch/pkg-plist
@@ -1,3 +1,13 @@
+%%PERL5_MAN3%%/ElasticSearch.3.gz
+%%PERL5_MAN3%%/ElasticSearch::Error.3.gz
+%%PERL5_MAN3%%/ElasticSearch::QueryParser.3.gz
+%%PERL5_MAN3%%/ElasticSearch::ScrolledSearch.3.gz
+%%PERL5_MAN3%%/ElasticSearch::TestServer.3.gz
+%%PERL5_MAN3%%/ElasticSearch::Transport.3.gz
+%%PERL5_MAN3%%/ElasticSearch::Transport::HTTP.3.gz
+%%PERL5_MAN3%%/ElasticSearch::Transport::HTTPLite.3.gz
+%%PERL5_MAN3%%/ElasticSearch::Transport::HTTPTiny.3.gz
+%%PERL5_MAN3%%/ElasticSearch::Util.3.gz
 %%SITE_PERL%%/ElasticSearch.pm
 %%SITE_PERL%%/ElasticSearch/Error.pm
 %%SITE_PERL%%/ElasticSearch/QueryParser.pm
diff --git a/textproc/p5-String-Koremutake/Makefile b/textproc/p5-String-Koremutake/Makefile
index e5b09196232b..316d62fc5746 100644
--- a/textproc/p5-String-Koremutake/Makefile
+++ b/textproc/p5-String-Koremutake/Makefile
@@ -10,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Convert to/from Koremutake Memorable Random Strings
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
@@ -17,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	String::Koremutake.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-String-Koremutake/pkg-plist b/textproc/p5-String-Koremutake/pkg-plist
index a622fa38a889..0687e67f16d2 100644
--- a/textproc/p5-String-Koremutake/pkg-plist
+++ b/textproc/p5-String-Koremutake/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Koremutake.3.gz
 %%SITE_PERL%%/String/Koremutake.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake