4 files changed, 28 insertions, 30 deletions

diff --git a/textproc/p5-XML-SAX-Machines/Makefile b/textproc/p5-XML-SAX-Machines/Makefile
index 7548a17556ef..6d8d722d7c41 100644
--- a/textproc/p5-XML-SAX-Machines/Makefile
+++ b/textproc/p5-XML-SAX-Machines/Makefile
@@ -6,28 +6,27 @@
 #
 
 PORTNAME=	XML-SAX-Machines
-PORTVERSION=	0.37
+PORTVERSION=	0.4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
+COMMENT=	Manage collections of SAX processors
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+BUILD_DEPENDS=	${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
+		${SITE_PERL}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-PLIST_SUB+=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
 MAN3=		XML::Filter::Distributor.3 XML::Filter::DocSplitter.3 \
 		XML::Filter::Merger.3 XML::Filter::Tee.3 \
 		XML::SAX::ByRecord.3 XML::SAX::EventMethodMaker.3 \
 		XML::SAX::Machine.3 XML::SAX::Machines.3 \
 		XML::SAX::Manifold.3 XML::SAX::Pipeline.3 XML::SAX::Tap.3
-
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/textproc/p5-XML-SAX-Machines/distinfo b/textproc/p5-XML-SAX-Machines/distinfo
index a3d54df93a0b..4724619a9861 100644
--- a/textproc/p5-XML-SAX-Machines/distinfo
+++ b/textproc/p5-XML-SAX-Machines/distinfo
@@ -1 +1 @@
-MD5 (XML-SAX-Machines-0.37.tar.gz) = a36a1edd64fd3960377a4908fa8f8e7a
+MD5 (XML-SAX-Machines-0.4.tar.gz) = c4ce6704ff5cd71b17dcaf296fb170c7
diff --git a/textproc/p5-XML-SAX-Machines/pkg-comment b/textproc/p5-XML-SAX-Machines/pkg-comment
deleted file mode 100644
index 4cebad699c74..000000000000
--- a/textproc/p5-XML-SAX-Machines/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Manage collections of SAX processors
diff --git a/textproc/p5-XML-SAX-Machines/pkg-plist b/textproc/p5-XML-SAX-Machines/pkg-plist
index 243d66488bf7..79c40bca1de7 100644
--- a/textproc/p5-XML-SAX-Machines/pkg-plist
+++ b/textproc/p5-XML-SAX-Machines/pkg-plist
@@ -1,22 +1,22 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Machines/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/Distributor.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/DocSplitter.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/Merger.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/Tee.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/ByRecord.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/EventMethodMaker.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Machine.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Machines.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Machines/ConfigDefaults.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Machines/ConfigHelper.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Machines/SiteConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Manifold.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Pipeline.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Tap.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Machines
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Machines
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Machines/.packlist
+%%SITE_PERL%%/XML/Filter/Distributor.pm
+%%SITE_PERL%%/XML/Filter/DocSplitter.pm
+%%SITE_PERL%%/XML/Filter/Merger.pm
+%%SITE_PERL%%/XML/Filter/Tee.pm
+%%SITE_PERL%%/XML/SAX/ByRecord.pm
+%%SITE_PERL%%/XML/SAX/EventMethodMaker.pm
+%%SITE_PERL%%/XML/SAX/Machine.pm
+%%SITE_PERL%%/XML/SAX/Machines.pm
+%%SITE_PERL%%/XML/SAX/Machines/ConfigDefaults.pm
+%%SITE_PERL%%/XML/SAX/Machines/ConfigHelper.pm
+%%SITE_PERL%%/XML/SAX/Machines/SiteConfig.pm
+%%SITE_PERL%%/XML/SAX/Manifold.pm
+%%SITE_PERL%%/XML/SAX/Pipeline.pm
+%%SITE_PERL%%/XML/SAX/Tap.pm
+@dirrm %%SITE_PERL%%/XML/SAX/Machines
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Machines
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true