4 files changed, 27 insertions, 24 deletions

diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 95717d74a8f1..08c724576154 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	XML-Sablotron
-PORTVERSION=	0.96
+PORTVERSION=	0.97
 CATEGORIES=	textproc perl5
-MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	XML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
+COMMENT=	A Perl interface to the Sablotron XSLT processor
 
-LIB_DEPENDS=	sablot.69:${PORTSDIR}/textproc/sablotron \
+LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 PERL_CONFIGURE=	yes
@@ -24,13 +26,15 @@ CONFIGURE_ARGS=	LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \
 		SABLOTLIBPATH='${LOCALBASE}/lib' \
 		SABLOTINCPATH='${LOCALBASE}/include'
 
-post-patch:
-		@${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' \
-			${WRKSRC}/Sablotron/Makefile.PL
-		@${PERL} -pi -e 's/^our /my /;' ${WRKSRC}/Makefile.PL
-
 MAN3=		XML::Sablotron.3 XML::Sablotron::DOM.3 \
 		XML::Sablotron::SAXBuilder.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ${PERL_LEVEL} < 500600
+	@${PERL} -pi -e 's/^our //; $$_="use vars qw(\$$libs \@extras);\n" if $$.==43' ${WRKSRC}/Makefile.PL
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-XML-Sablotron/distinfo b/textproc/p5-XML-Sablotron/distinfo
index 420dc2a79994..37141c5a914c 100644
--- a/textproc/p5-XML-Sablotron/distinfo
+++ b/textproc/p5-XML-Sablotron/distinfo
@@ -1 +1 @@
-MD5 (XML-Sablotron-0.96.tar.gz) = 4fe37c3b1bc2f4441b4fb97c204abb4d
+MD5 (XML-Sablotron-0.97.tar.gz) = 934a209c1b22cc3adc47e2b6153ef5a2
diff --git a/textproc/p5-XML-Sablotron/pkg-comment b/textproc/p5-XML-Sablotron/pkg-comment
deleted file mode 100644
index 3cdd94edbaf3..000000000000
--- a/textproc/p5-XML-Sablotron/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl interface to the Sablotron XSLT processor
diff --git a/textproc/p5-XML-Sablotron/pkg-plist b/textproc/p5-XML-Sablotron/pkg-plist
index 7c20c1064889..3a7c62463d44 100644
--- a/textproc/p5-XML-Sablotron/pkg-plist
+++ b/textproc/p5-XML-Sablotron/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron/DOM.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron/SAXBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM/DOM.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM/DOM.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron/DOM.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron/SAXBuilder.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM/DOM.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM/DOM.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true