summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/p5-XML-LibXML/Makefile17
-rw-r--r--textproc/p5-XML-LibXML/distinfo9
-rw-r--r--textproc/p5-XML-LibXML/patches/patch-aa22
3 files changed, 15 insertions, 33 deletions
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index de048f33558..45a977cc586 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:49 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/11/05 14:05:07 seb Exp $
#
-DISTNAME= XML-LibXML-1.58
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 3
+DISTNAME= XML-LibXML-1.61003
+PKGNAME= p5-XML-LibXML-1.61.003
SVR4_PKGNAME= p5xlx
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=XML/}
@@ -12,10 +11,16 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/~phish/XML-LibXML/
COMMENT= Perl interface to the libxml2 library
-DEPENDS+= p5-XML-SAX>=0.03:../../textproc/p5-XML-SAX
-DEPENDS+= p5-XML-Checker-[0-9]*:../../textproc/p5-XML-Checker
+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
+# 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.61
+
PERL5_PACKLIST= auto/XML/LibXML/.packlist
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/p5-XML-LibXML/distinfo b/textproc/p5-XML-LibXML/distinfo
index 411c57e41d8..5bd61bc24dd 100644
--- a/textproc/p5-XML-LibXML/distinfo
+++ b/textproc/p5-XML-LibXML/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/03/17 09:03:17 snj Exp $
+$NetBSD: distinfo,v 1.9 2006/11/05 14:05:07 seb Exp $
-SHA1 (XML-LibXML-1.58.tar.gz) = f2660677e2a579ba0bf9ef5d675ea2883b786abe
-RMD160 (XML-LibXML-1.58.tar.gz) = 04ce4bb3896f5b07eaffcb9ac55fd005b87015a8
-Size (XML-LibXML-1.58.tar.gz) = 171713 bytes
-SHA1 (patch-aa) = 820e73f774c5eb5421c6a6d1711b745c3fbb9b34
+SHA1 (XML-LibXML-1.61003.tar.gz) = 25c869ad781f2f1d6de07057fdcc8bf85e67fb52
+RMD160 (XML-LibXML-1.61003.tar.gz) = 7f5814b89856887accc7d176850fc2d5c8b3db1f
+Size (XML-LibXML-1.61003.tar.gz) = 258364 bytes
diff --git a/textproc/p5-XML-LibXML/patches/patch-aa b/textproc/p5-XML-LibXML/patches/patch-aa
deleted file mode 100644
index 707914ac268..00000000000
--- a/textproc/p5-XML-LibXML/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/03/16 15:05:35 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- perl-libxml-mm.c.orig Wed Mar 31 21:32:08 2004
-+++ perl-libxml-mm.c Wed Mar 16 03:16:34 2005
-@@ -959,13 +959,14 @@ nodeC2Sv( const xmlChar * string, xmlNo
- if ( refnode != NULL ) {
- xmlDocPtr real_doc = refnode->doc;
- if ( real_doc != NULL && real_doc->encoding != NULL ) {
-+ xmlChar * decoded;
- xs_warn( " encode node !!" );
- /* The following statement is to handle bad
- values set by XML::LibXSLT */
- if ( PmmNodeEncoding(real_doc) == XML_CHAR_ENCODING_NONE ) {
- PmmNodeEncoding(real_doc) = XML_CHAR_ENCODING_UTF8;
- }
-- xmlChar * decoded = PmmFastDecodeString( PmmNodeEncoding(real_doc) ,
-+ decoded = PmmFastDecodeString( PmmNodeEncoding(real_doc) ,
- (const xmlChar *)string,
- (const xmlChar*)real_doc->encoding);
- xs_warn( "push decoded string into SV" );