3 files changed, 49 insertions, 38 deletions

diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index fddc73a018b4..8e150783cc87 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	XML-Parser
-PORTVERSION=	2.31
-PORTREVISION=	1
+PORTVERSION=	2.34
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
@@ -21,8 +20,12 @@ LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	EXPATLIBPATH=${LOCALBASE}/lib EXPATINCPATH=${LOCALBASE}/include
 
-MAN3=		XML::Parser.3 XML::Parser::Expat.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		XML::Parser.3 XML::Parser::Expat.3 \
+		XML::Parser::Style::Debug.3 \
+		XML::Parser::Style::Objects.3 \
+		XML::Parser::Style::Stream.3 \
+		XML::Parser::Style::Subs.3 \
+		XML::Parser::Style::Tree.3
 PLIST_SUB=	EUCJP=${EUCJP} SJIS=${SJIS}
 
 # XMLPARSER_EUCJP=	x-euc-jp-(jisx0221|unicode)
diff --git a/textproc/p5-XML-Parser/distinfo b/textproc/p5-XML-Parser/distinfo
index dedb7858aea9..4891894787fc 100644
--- a/textproc/p5-XML-Parser/distinfo
+++ b/textproc/p5-XML-Parser/distinfo
@@ -1 +1 @@
-MD5 (XML-Parser-2.31.tar.gz) = 01f136a5f71631845979fd2b797b3ce3
+MD5 (XML-Parser-2.34.tar.gz) = 84d9e0001fe01c14867256c3fe115899
diff --git a/textproc/p5-XML-Parser/pkg-plist b/textproc/p5-XML-Parser/pkg-plist
index a1eb0c76930c..4fc87a1dbc0b 100644
--- a/textproc/p5-XML-Parser/pkg-plist
+++ b/textproc/p5-XML-Parser/pkg-plist
@@ -1,33 +1,41 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Parser/Expat/Expat.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Parser/Expat/Expat.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Parser/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/Japanese_Encodings.msg
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/README
-%%SJIS%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/Shift_JIS.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/big5.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-kr.enc
-%%EUCJP%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-jp.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-2.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-3.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-4.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-5.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-7.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-8.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-9.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1250.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-euc-jp-unicode.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-cp932.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-jdk117.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-jisx0221.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-unicode.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Expat.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/LWPExternEnt.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Parser/Expat
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Parser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Expat/Expat.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Expat/Expat.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/Japanese_Encodings.msg
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/README
+%%SJIS%%%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/Shift_JIS.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/big5.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-kr.enc
+%%EUCJP%%%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-jp.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-2.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-3.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-4.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-5.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-7.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-8.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-9.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1250.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1252.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-euc-jp-unicode.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-cp932.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-jdk117.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-jisx0221.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-sjis-unicode.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Debug.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Objects.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Stream.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Subs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style/Tree.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Expat.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/LWPExternEnt.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Expat
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true