- Convert to staging

- Add license
- Pet portlint

Sponsored by:	Absolight

36 files changed, 79 insertions, 91 deletions

diff --git a/textproc/p5-Text-Truncate/Makefile b/textproc/p5-Text-Truncate/Makefile
index 05b84f06c202..1f0f8539ca16 100644
--- a/textproc/p5-Text-Truncate/Makefile
+++ b/textproc/p5-Text-Truncate/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module with simple string truncating routine
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::Truncate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Truncate/pkg-plist b/textproc/p5-Text-Truncate/pkg-plist
index 0cbf7f17b10b..56f33278178a 100644
--- a/textproc/p5-Text-Truncate/pkg-plist
+++ b/textproc/p5-Text-Truncate/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Truncate.3.gz
 %%SITE_PERL%%/Text/Truncate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Truncate/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Truncate
diff --git a/textproc/p5-Text-VimColor/Makefile b/textproc/p5-Text-VimColor/Makefile
index a1f5ae72e7a1..b55b4a5925e1 100644
--- a/textproc/p5-Text-VimColor/Makefile
+++ b/textproc/p5-Text-VimColor/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Syntax color text in HTML or XML using Vim
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
 		p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install \
 		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
@@ -22,10 +25,6 @@ RUN_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		text-vimcolor.1
-MAN3=		Text::VimColor.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/textproc/p5-Text-VimColor/pkg-plist b/textproc/p5-Text-VimColor/pkg-plist
index 7275a0149470..0bd82b2f31e9 100644
--- a/textproc/p5-Text-VimColor/pkg-plist
+++ b/textproc/p5-Text-VimColor/pkg-plist
@@ -1,9 +1,11 @@
 bin/text-vimcolor
+%%PERL5_MAN3%%/Text::VimColor.3.gz
 %%SITE_PERL%%/Text/VimColor.pm
 %%SITE_PERL%%/auto/share/dist/Text-VimColor/light.css
 %%SITE_PERL%%/auto/share/dist/Text-VimColor/light.xsl
 %%SITE_PERL%%/auto/share/dist/Text-VimColor/mark.vim
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor/.packlist
+man/man1/text-vimcolor.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
 @dirrm %%SITE_PERL%%/auto/share/dist/Text-VimColor
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index bdac7e655456..36c7f55d6782 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -9,10 +9,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple word wrapping routine
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Text::Wrapper.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Wrapper/pkg-plist b/textproc/p5-Text-Wrapper/pkg-plist
index 5ca0f34fafb5..d974556bf1c8 100644
--- a/textproc/p5-Text-Wrapper/pkg-plist
+++ b/textproc/p5-Text-Wrapper/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Wrapper.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist
 %%SITE_PERL%%/Text/Wrapper.pm
 @dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
index f4c4dd8fae85..bd428fe6931f 100644
--- a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
+++ b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
@@ -9,6 +9,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of TT2 Variable Method Clone for Text::Xslate
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	\
 	p5-Text-Xslate>=1.3000:${PORTSDIR}/textproc/p5-Text-Xslate
 BUILD_DEPENDS=	${RUN_DEPENDS}
@@ -16,7 +19,4 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Text::Xslate::Bridge::TT2Like.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist b/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist
index ac62ae7286a5..667189067643 100644
--- a/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist
+++ b/textproc/p5-Text-Xslate-Bridge-TT2Like/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Xslate::Bridge::TT2Like.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/Bridge/TT2Like/.packlist
 %%SITE_PERL%%/Text/Xslate/Bridge/TT2Like.pm
 %%SITE_PERL%%/Text/Xslate/Bridge/TT2Like.pod
diff --git a/textproc/p5-Text-Xslate/Makefile b/textproc/p5-Text-Xslate/Makefile
index 08a72e79e70e..7a41f0c0747b 100644
--- a/textproc/p5-Text-Xslate/Makefile
+++ b/textproc/p5-Text-Xslate/Makefile
@@ -28,35 +28,6 @@ MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=	xslate.1
-MAN3=	Text::Xslate.3 \
-	Text::Xslate::Bridge.3 \
-	Text::Xslate::Bridge::Star.3 \
-	Text::Xslate::Compiler.3 \
-	Text::Xslate::HashWithDefault.3 \
-	Text::Xslate::Manual.3 \
-	Text::Xslate::Manual::Builtin.3 \
-	Text::Xslate::Manual::Cookbook.3 \
-	Text::Xslate::Manual::Debugging.3 \
-	Text::Xslate::Manual::FAQ.3 \
-	Text::Xslate::PP.3 \
-	Text::Xslate::PP::Const.3 \
-	Text::Xslate::PP::Method.3 \
-	Text::Xslate::PP::Opcode.3 \
-	Text::Xslate::PP::State.3 \
-	Text::Xslate::PP::Type::Macro.3 \
-	Text::Xslate::PP::Type::Pair.3 \
-	Text::Xslate::PP::Type::Raw.3 \
-	Text::Xslate::Parser.3 \
-	Text::Xslate::Runner.3 \
-	Text::Xslate::Symbol.3 \
-	Text::Xslate::Syntax::Kolon.3 \
-	Text::Xslate::Syntax::Metakolon.3 \
-	Text::Xslate::Syntax::TTerse.3 \
-	Text::Xslate::Type::Raw.3 \
-	Text::Xslate::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501600
diff --git a/textproc/p5-Text-Xslate/pkg-plist b/textproc/p5-Text-Xslate/pkg-plist
index f8f83cde3a37..7b8531d746f8 100644
--- a/textproc/p5-Text-Xslate/pkg-plist
+++ b/textproc/p5-Text-Xslate/pkg-plist
@@ -1,3 +1,29 @@
+%%PERL5_MAN3%%/Text::Xslate.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Bridge.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Bridge::Star.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Compiler.3.gz
+%%PERL5_MAN3%%/Text::Xslate::HashWithDefault.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Manual.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Manual::Builtin.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Manual::Cookbook.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Manual::Debugging.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Manual::FAQ.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP::Const.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP::Method.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP::Opcode.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP::State.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP::Type::Macro.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP::Type::Pair.3.gz
+%%PERL5_MAN3%%/Text::Xslate::PP::Type::Raw.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Parser.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Runner.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Symbol.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Syntax::Kolon.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Syntax::Metakolon.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Syntax::TTerse.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Type::Raw.3.gz
+%%PERL5_MAN3%%/Text::Xslate::Util.3.gz
 bin/xslate
 %%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Bridge.pm
@@ -28,6 +54,7 @@ bin/xslate
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/Xslate.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate/Xslate.so
+man/man1/xslate.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Xslate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text/Xslate/Type
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index 3ad0d2b17f2b..bb672605fe9b 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -18,8 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::XMLViewer.3
-MAN1=		tkxmlview.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Tk-XMLViewer/pkg-plist b/textproc/p5-Tk-XMLViewer/pkg-plist
index 552894836cb0..57f2d34bdec4 100644
--- a/textproc/p5-Tk-XMLViewer/pkg-plist
+++ b/textproc/p5-Tk-XMLViewer/pkg-plist
@@ -1,6 +1,8 @@
 bin/tkxmlview
+%%PERL5_MAN3%%/Tk::XMLViewer.3.gz
 %%SITE_PERL%%/Tk/XMLViewer.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer/.packlist
+man/man1/tkxmlview.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
 @dirrmtry %%SITE_PERL%%/Tk
diff --git a/textproc/p5-Unicode-CheckUTF8/Makefile b/textproc/p5-Unicode-CheckUTF8/Makefile
index 22a2c24ab7dc..92481a8a923c 100644
--- a/textproc/p5-Unicode-CheckUTF8/Makefile
+++ b/textproc/p5-Unicode-CheckUTF8/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Check if scalar is valid UTF-8
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unicode::CheckUTF8.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Unicode-CheckUTF8/pkg-plist b/textproc/p5-Unicode-CheckUTF8/pkg-plist
index f9c00f9b19c8..c7203de68e4c 100644
--- a/textproc/p5-Unicode-CheckUTF8/pkg-plist
+++ b/textproc/p5-Unicode-CheckUTF8/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Unicode::CheckUTF8.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/CheckUTF8.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/CheckUTF8/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/CheckUTF8/CheckUTF8.bs
diff --git a/textproc/p5-Unicode-Unihan/Makefile b/textproc/p5-Unicode-Unihan/Makefile
index 83b8a53306c8..dc9bc81362e1 100644
--- a/textproc/p5-Unicode-Unihan/Makefile
+++ b/textproc/p5-Unicode-Unihan/Makefile
@@ -13,10 +13,4 @@ COMMENT=	The Unihan Data Base 5.1.0
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unicode::Unihan.3
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e '/use 5.008001;/d' ${WRKSRC}/Unihan.pm
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-Unicode-Unihan/pkg-plist b/textproc/p5-Unicode-Unihan/pkg-plist
index f4ec66e49567..3800959e09b8 100644
--- a/textproc/p5-Unicode-Unihan/pkg-plist
+++ b/textproc/p5-Unicode-Unihan/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Unicode::Unihan.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Unihan/.packlist
 %%SITE_PERL%%/Unicode/Unihan.pm
 %%SITE_PERL%%/Unicode/Unihan/AccountingNumeric.db
diff --git a/textproc/p5-Version-Next/Makefile b/textproc/p5-Version-Next/Makefile
index 3269ef5b1da0..9ecf392f170f 100644
--- a/textproc/p5-Version-Next/Makefile
+++ b/textproc/p5-Version-Next/Makefile
@@ -10,13 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Increment module version numbers simply and correctly
 
+LICENSE=	APACHE20
+
 BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Version::Next.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-Version-Next/pkg-plist b/textproc/p5-Version-Next/pkg-plist
index bb64676c519d..a17be1b3e217 100644
--- a/textproc/p5-Version-Next/pkg-plist
+++ b/textproc/p5-Version-Next/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Version::Next.3.gz
 %%SITE_PERL%%/Version/Next.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Version/Next/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Version/Next
diff --git a/textproc/p5-Vroom/Makefile b/textproc/p5-Vroom/Makefile
index 4977f02eef11..1d41b79e4f6b 100644
--- a/textproc/p5-Vroom/Makefile
+++ b/textproc/p5-Vroom/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Slide Shows in Vim
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
 		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
 		p5-Template-Toolkit-Simple>=0:${PORTSDIR}/www/p5-Template-Toolkit-Simple \
@@ -21,8 +24,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Vroom.3
-
-NO_STAGE=	yes
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-Vroom/pkg-plist b/textproc/p5-Vroom/pkg-plist
index be817aefd56a..d72d73a6dadf 100644
--- a/textproc/p5-Vroom/pkg-plist
+++ b/textproc/p5-Vroom/pkg-plist
@@ -1,4 +1,5 @@
 bin/vroom
+%%PERL5_MAN3%%/Vroom.3.gz
 %%SITE_PERL%%/Vroom.pm
 %%SITE_PERL%%/Vroom.pod
 %%SITE_PERL%%/Vroom/Mo.pm
diff --git a/textproc/p5-WWW-Wordnik-API/Makefile b/textproc/p5-WWW-Wordnik-API/Makefile
index 8212582fe673..667b4a0b77ef 100644
--- a/textproc/p5-WWW-Wordnik-API/Makefile
+++ b/textproc/p5-WWW-Wordnik-API/Makefile
@@ -13,19 +13,20 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Wordnik API implementation
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		WWW::Wordnik::API.3
 PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wordnik/API/.packlist \
-		%%SITE_PERL%%/WWW/Wordnik/API.pm
+		%%SITE_PERL%%/WWW/Wordnik/API.pm \
+		%%PERL5_MAN3%%/WWW::Wordnik::API.3.gz
 PLIST_DIRS=	%%SITE_PERL%%/WWW/Wordnik %%SITE_PERL%%/WWW \
 		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wordnik/API \
 		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wordnik \
 		%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Atom-SimpleFeed/Makefile b/textproc/p5-XML-Atom-SimpleFeed/Makefile
index 277fb43099ef..851a07e3fb37 100644
--- a/textproc/p5-XML-Atom-SimpleFeed/Makefile
+++ b/textproc/p5-XML-Atom-SimpleFeed/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	XML::Atom::SimpleFeed - Generate simple Atom syndication feeds
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	XML::Atom::SimpleFeed.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
index eb0c3b2dbcde..f51148905cae 100644
--- a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
+++ b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/XML::Atom::SimpleFeed.3.gz
 %%SITE_PERL%%/XML/Atom/SimpleFeed.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed
diff --git a/textproc/p5-XML-AutoWriter/Makefile b/textproc/p5-XML-AutoWriter/Makefile
index fe020e1cf877..13b2496b2066 100644
--- a/textproc/p5-XML-AutoWriter/Makefile
+++ b/textproc/p5-XML-AutoWriter/Makefile
@@ -4,24 +4,20 @@ PORTNAME=	XML-AutoWriter
 PORTVERSION=	0.40
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-DISTNAME=	${PORTNAME}-0.4
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-0.4
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module for DOCTYPE based XML output
 
+LICENSE=	ART10 GPLv1 BSD4CLAUSE
+LICENSE_COMB=	dual
+
 TEST_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		XML::AutoWriter.3 \
-		XML::Doctype::AttDef.3 \
-		XML::ValidWriter.3 \
-		XML::Doctype::ElementDecl.3 \
-		XML::Doctype.3
-
-NO_STAGE=	yes
 post-patch:
 	${RM} ${WRKSRC}/lib/XML/*.orig
 
diff --git a/textproc/p5-XML-AutoWriter/pkg-plist b/textproc/p5-XML-AutoWriter/pkg-plist
index 6e9509e5aa10..226007159892 100644
--- a/textproc/p5-XML-AutoWriter/pkg-plist
+++ b/textproc/p5-XML-AutoWriter/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/XML::AutoWriter.3.gz
+%%PERL5_MAN3%%/XML::Doctype::AttDef.3.gz
+%%PERL5_MAN3%%/XML::ValidWriter.3.gz
+%%PERL5_MAN3%%/XML::Doctype::ElementDecl.3.gz
+%%PERL5_MAN3%%/XML::Doctype.3.gz
 %%SITE_PERL%%/XML/AutoWriter.pm
 %%SITE_PERL%%/XML/Doctype.pm
 %%SITE_PERL%%/XML/Doctype/AttDef.pm
diff --git a/textproc/p5-XML-Canonical/Makefile b/textproc/p5-XML-Canonical/Makefile
index 779566740ef4..24e2ea0fd74a 100644
--- a/textproc/p5-XML-Canonical/Makefile
+++ b/textproc/p5-XML-Canonical/Makefile
@@ -19,7 +19,4 @@ LIB_DEPENDS=	gdome:${PORTSDIR}/textproc/gdome2
 USES=		perl5 pkgconfig
 USE_PERL5=	configure
 
-MAN3=		XML::Canonical.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Canonical/pkg-descr b/textproc/p5-XML-Canonical/pkg-descr
index 3fac5350ba22..91f54c9073ac 100644
--- a/textproc/p5-XML-Canonical/pkg-descr
+++ b/textproc/p5-XML-Canonical/pkg-descr
@@ -4,4 +4,4 @@ XPath nodes.
 
 It provides a XS wrapper around libxml2's Canonical XML code.
 
-WWW:	http://search.cpan.org/dist/XML-Canonical/
+WWW: http://search.cpan.org/dist/XML-Canonical/
diff --git a/textproc/p5-XML-Canonical/pkg-plist b/textproc/p5-XML-Canonical/pkg-plist
index fe9791df800f..96ed6279f5b4 100644
--- a/textproc/p5-XML-Canonical/pkg-plist
+++ b/textproc/p5-XML-Canonical/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/XML::Canonical.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Canonical.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Canonical/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Canonical/Canonical.bs
diff --git a/textproc/p5-XML-CanonicalizeXML/Makefile b/textproc/p5-XML-CanonicalizeXML/Makefile
index a94a5fc6748a..0d9d0e424a58 100644
--- a/textproc/p5-XML-CanonicalizeXML/Makefile
+++ b/textproc/p5-XML-CanonicalizeXML/Makefile
@@ -16,7 +16,4 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		XML::CanonicalizeXML.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-CanonicalizeXML/pkg-descr b/textproc/p5-XML-CanonicalizeXML/pkg-descr
index af1112566762..f968138292a3 100644
--- a/textproc/p5-XML-CanonicalizeXML/pkg-descr
+++ b/textproc/p5-XML-CanonicalizeXML/pkg-descr
@@ -1,4 +1,4 @@
 Perl extension for inclusive and exclusive canonicalization of XML
 using libxml2.
 
-WWW:	http://search.cpan.org/dist/XML-CanonicalizeXML/
+WWW: http://search.cpan.org/dist/XML-CanonicalizeXML/
diff --git a/textproc/p5-XML-CanonicalizeXML/pkg-plist b/textproc/p5-XML-CanonicalizeXML/pkg-plist
index b976886c1f28..34aa6b91643b 100644
--- a/textproc/p5-XML-CanonicalizeXML/pkg-plist
+++ b/textproc/p5-XML-CanonicalizeXML/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/XML::CanonicalizeXML.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/CanonicalizeXML.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML/CanonicalizeXML.bs
diff --git a/textproc/p5-XML-Clean/Makefile b/textproc/p5-XML-Clean/Makefile
index 611fc7a6f7b4..ae499efdffe9 100644
--- a/textproc/p5-XML-Clean/Makefile
+++ b/textproc/p5-XML-Clean/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Ensure, that *(HTML)* text pass throught an XML parser
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		XML::Clean.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Clean/pkg-plist b/textproc/p5-XML-Clean/pkg-plist
index e6f5c3c2770a..8aaf7e584de0 100644
--- a/textproc/p5-XML-Clean/pkg-plist
+++ b/textproc/p5-XML-Clean/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/XML::Clean.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean/.packlist
 %%SITE_PERL%%/XML/Clean.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean
diff --git a/textproc/p5-XML-Compile-Dumper/Makefile b/textproc/p5-XML-Compile-Dumper/Makefile
index 9b60f9ad8f79..32de5890ae44 100644
--- a/textproc/p5-XML-Compile-Dumper/Makefile
+++ b/textproc/p5-XML-Compile-Dumper/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	papowell@astart.com
 COMMENT=	Dump Compiled XML Translators
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Data-Dump-Streamer>=2.08:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
 		p5-Log-Report>=0.19:${PORTSDIR}/devel/p5-Log-Report \
 		p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod \
@@ -22,7 +25,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	XML::Compile::Dumper.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Compile-Dumper/pkg-descr b/textproc/p5-XML-Compile-Dumper/pkg-descr
index 811e669102ac..ed0c0f355221 100644
--- a/textproc/p5-XML-Compile-Dumper/pkg-descr
+++ b/textproc/p5-XML-Compile-Dumper/pkg-descr
@@ -1,4 +1,4 @@
 p5-XML-Compile-Dumper is a perl module to dump compiled
 XML translators.
 
-WWW:	http://search.cpan.org/dist/XML-Compile-Dumper/
+WWW: http://search.cpan.org/dist/XML-Compile-Dumper/
diff --git a/textproc/p5-XML-Compile-Dumper/pkg-plist b/textproc/p5-XML-Compile-Dumper/pkg-plist
index 8a18c6808ee6..f0f1cb203310 100644
--- a/textproc/p5-XML-Compile-Dumper/pkg-plist
+++ b/textproc/p5-XML-Compile-Dumper/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/XML::Compile::Dumper.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/Dumper/.packlist
 %%SITE_PERL%%/XML/Compile/Dumper.pod
 %%SITE_PERL%%/XML/Compile/Dumper.pm