1. update to 0.37

2. add 'pkg-deinstall'

5 files changed, 25 insertions, 14 deletions

diff --git a/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index 14aa48ffe8ae..231e47a860e4 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XML-SAX-Expat
-PORTVERSION=	0.35
+PORTVERSION=	0.37
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
@@ -15,17 +15,22 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Simple API for XML
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/NamespaceSupport.pm:${PORTSDIR}/textproc/p5-XML-NamespaceSupport
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
+		${SITE_PERL}/XML/NamespaceSupport.pm:${PORTSDIR}/textproc/p5-XML-NamespaceSupport
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		XML::SAX::Expat.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-patch:
 		@${PERL} -pi -e "s/(?<=XML::SAX::Base          => ')1\.00(?=')/0.25/;" ${WRKSRC}/Makefile.PL
 
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${PERL} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
+post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${PERL} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-SAX-Expat/distinfo b/textproc/p5-XML-SAX-Expat/distinfo
index fd18f60cdb86..c9c0af57196f 100644
--- a/textproc/p5-XML-SAX-Expat/distinfo
+++ b/textproc/p5-XML-SAX-Expat/distinfo
@@ -1 +1 @@
-MD5 (XML-SAX-Expat-0.35.tar.gz) = 1cfcf7956a17a881ed414b23cdd3f392
+MD5 (XML-SAX-Expat-0.37.tar.gz) = c48024d363a1ff9abaf8f9af592d38cd
diff --git a/textproc/p5-XML-SAX-Expat/pkg-deinstall b/textproc/p5-XML-SAX-Expat/pkg-deinstall
new file mode 100644
index 000000000000..2955952f3bee
--- /dev/null
+++ b/textproc/p5-XML-SAX-Expat/pkg-deinstall
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+if('DEINSTALL' eq $ARGV[1])	{
+	eval "use XML::SAX;";
+	die $@ if $@;
+	XML::SAX->remove_parser(q(XML::SAX::Expat))->save_parsers();
+}
diff --git a/textproc/p5-XML-SAX-Expat/pkg-descr b/textproc/p5-XML-SAX-Expat/pkg-descr
index f092f2af7c58..195a2049a3f6 100644
--- a/textproc/p5-XML-SAX-Expat/pkg-descr
+++ b/textproc/p5-XML-SAX-Expat/pkg-descr
@@ -5,7 +5,7 @@ programmer intervention.  Those of you familiar with the DBI will be right at
 home.  Some of the designs come from the Java JAXP specification (SAX part),
 only without the javaness.
 
-WWW: http://search.cpan.org/search?dist=XML-SAX-Expat
+WWW: http://search.cpan.org/dist/XML-SAX-Expat/
 
 -- Sergey Skvortsov
 skv@FreeBSD.org
diff --git a/textproc/p5-XML-SAX-Expat/pkg-plist b/textproc/p5-XML-SAX-Expat/pkg-plist
index ed38d8103585..9a0699c56fc8 100644
--- a/textproc/p5-XML-SAX-Expat/pkg-plist
+++ b/textproc/p5-XML-SAX-Expat/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Expat.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/SAX 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Expat
-@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%%/XML 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/Expat/.packlist
+%%SITE_PERL%%/XML/SAX/Expat.pm
+@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true