5 files changed, 38 insertions, 21 deletions
diff --git a/textproc/p5-XML-LibXML/DEINSTALL b/textproc/p5-XML-LibXML/DEINSTALL
new file mode 100644
index 00000000000..8d56b158c6d
--- /dev/null
+++ b/textproc/p5-XML-LibXML/DEINSTALL
@@ -0,0 +1,12 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/06/13 23:29:00 heinz Exp $
+
+case ${STAGE} in
+
+DEINSTALL)
+        ${PERL5} -I@PERL5_INSTALLVENDORLIB@ -MXML::SAX -e "XML::SAX->remove_parser(q(XML::LibXML::SAX))->save_parsers()"
+        ${PERL5} -I@PERL5_INSTALLVENDORLIB@ -MXML::SAX -e "XML::SAX->remove_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
+	${ECHO} "Removed parser from XML::SAX registry."
+	;;
+
+esac
+
diff --git a/textproc/p5-XML-LibXML/INSTALL b/textproc/p5-XML-LibXML/INSTALL
new file mode 100644
index 00000000000..6168669ecae
--- /dev/null
+++ b/textproc/p5-XML-LibXML/INSTALL
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.1 2007/06/13 23:29:00 heinz Exp $
+
+case ${STAGE} in
+
+POST-INSTALL)
+	${PERL5} -I@PERL5_INSTALLVENDORLIB@ -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
+	${PERL5} -I@PERL5_INSTALLVENDORLIB@ -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
+	${ECHO} "Added parser to XML::SAX registry."
+	;;
+
+esac
+
diff --git a/textproc/p5-XML-LibXML/MESSAGE b/textproc/p5-XML-LibXML/MESSAGE
deleted file mode 100644
index e41b6b5e834..00000000000
--- a/textproc/p5-XML-LibXML/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/12/01 15:49:34 wiz Exp $
-
-You also need to config the XML parser yourself, here is an example
-of ${PREFIX}/libdata/perl5/site_perl/XML/SAX/ParserDetails.ini :
-
-[XML::LibXML::SAX::Parser]
-http://xml.org/sax/features/namespaces = 1
-
-===========================================================================
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 7a78a957c1e..334be19715d 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -1,28 +1,31 @@
-# $NetBSD: Makefile,v 1.24 2007/02/27 14:08:33 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/06/13 23:29:01 heinz Exp $
 #
 
-DISTNAME=	XML-LibXML-1.62001
-PKGNAME=	p5-XML-LibXML-1.62.001
+DISTNAME=	XML-LibXML-1.63
+PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5xlx
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/~phish/XML-LibXML/
+HOMEPAGE=	http://search.cpan.org/dist/XML-LibXML/
 COMMENT=	Perl interface to the libxml2 library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-XML-SAX>=0.11:../../textproc/p5-XML-SAX
 DEPENDS+=	p5-XML-NamespaceSupport>=1.07:../../textproc/p5-XML-NamespaceSupport
-DEPENDS+=	p5-XML-LibXML-Common-[0-9]*:../../textproc/p5-XML-LibXML-Common
+DEPENDS+=	p5-XML-LibXML-Common>=0.13:../../textproc/p5-XML-LibXML-Common
 
 # since version 1.61 the XML::LibXML Perl module
 # includes XML::LibXML::XPathContext module
 CONFLICTS+=	p5-XML-LibXML-XPathContext-[0-9]*
 
-WRKSRC=		${WRKDIR}/XML-LibXML-1.62
-
+MAKE_ENV+=		SKIP_SAX_INSTALL=1 # Must be done in the INSTALL script
 PERL5_PACKLIST=		auto/XML/LibXML/.packlist
 
+FILES_SUBST+=		PERL5_INSTALLVENDORLIB=${PERL5_INSTALLVENDORLIB:Q}
+
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-LibXML/distinfo b/textproc/p5-XML-LibXML/distinfo
index b4e47811a79..fc45697d1df 100644
--- a/textproc/p5-XML-LibXML/distinfo
+++ b/textproc/p5-XML-LibXML/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2007/02/27 14:08:34 wiz Exp $
+$NetBSD: distinfo,v 1.11 2007/06/13 23:29:01 heinz Exp $
 
-SHA1 (XML-LibXML-1.62001.tar.gz) = 5beb93df6cfa718b69610aa41c2a4866230d3a1b
-RMD160 (XML-LibXML-1.62001.tar.gz) = afd7687b5f1b6744e5e1c840f6c10afa23abb91b
-Size (XML-LibXML-1.62001.tar.gz) = 230721 bytes
+SHA1 (XML-LibXML-1.63.tar.gz) = e0e0e47c2f2d54d9ecb431cbae692ac808917bfb
+RMD160 (XML-LibXML-1.63.tar.gz) = d7164829c586d6d2cc3d32801668e84bd76fff20
+Size (XML-LibXML-1.63.tar.gz) = 261774 bytes