Update p5-XML-Xerces to 2.3.0.4. This closes PR pkg/23862.

Changes since 1.7.0:
        - exposed new API components for DTDValidator and SchemaValidator
	- added XML::Xerces::XMLCatalogResolver, for a standard way of
          using XMLCatalog to resolve file locations
	- added new samples: samples/DOM2hash.pl, samples/EnumVal.pl,
          and samples/SEnumVal.pl
        - improved Win32 support
	- fixed output of all XMLUni::* constants (thanks to Christian
          Orsatti for pointing this out)
	- added LocalFileFormatTarget (thanks to Christian
          Orsatti for pointing this out)
	- added hints/darwin.pl (thanks to Adam Whitney for helping
          with this)
	- added cygwin fix for Xerces-C libname (thanks to Stephen
          Long for helping with this)
	- added fixes for Win32 (thanks to Martin Raspe for helping
          with this)
	- fixes isAnySlash() error
	- fixes support for Attributes::getValue(int) and
          AttributeList::getValue(int)
	- added support for MacOS X.
	- made all tests use Test::More
	- fixed entity resolution in Schema.t test
	- fixed other minor bugs in other tests
	- Added missing operator!= for DOMNode
	- made all tests use Test::More
	- fixed entity resolution in Schema.t test
	- fixed other minor bugs in other tests
	- Removed support for XMLScanner
	- Removed DOMParse support, instead DOMWriter from DOM Level 3
	  is used
	- Added support for DOM_NodeIterator and DOM_TreeWalker
	- Added basic support for XMLScanner
	- DOM_Document's will now stay alive even if the DOMParser
	  that created them goes out of scope. This means it is
          possible to have a subroutine that parses a file and returns
	  the resulting DOM_Document. This used to cause a segfault.
	- Fixed overloaded InputSource constructors that were using
          char* versions instead of Unicode versions
	- Many internal changes that improve code generation and
          maintenance, thanks to the ever-improving SWIG.

4 files changed, 33 insertions, 51 deletions

diff --git a/textproc/p5-XML-Xerces/DESCR b/textproc/p5-XML-Xerces/DESCR
index 967c1e2f6c1..89fad999cff 100644
--- a/textproc/p5-XML-Xerces/DESCR
+++ b/textproc/p5-XML-Xerces/DESCR
@@ -1,18 +1,22 @@
-The Xerces Perl project has created a Perl module, Xerces.pm, as the Perl
-API to the Apache project's Xerces XML parser. It is implemented using
-the Xerces C++ API, and it provides access to all of the C++ API from
-Perl.
+XML::Xerces is the Perl API to the Apache project's Xerces XML parser.
+It is implemented using the Xerces C++ API, and it provides access to
+most of the C++ API from Perl.
 
-Because it is based on Xerces-C, Xerces.pm provides a validating XML parser
-that makes it easy to give your application the ability to read and write
-XML data. A shared library is provided for parsing, generating, manipulating,
-and validating XML documents. Xerces.pm is faithful to the XML 1.0
-recommendation and associated standards ( DOM 1.0, DOM 2.0. SAX 1.0, SAX
-2.0, Namespaces), The parser provides high performance, modularity, and
-scalability. Source code, samples and API documentation are provided with
-the parser.
+Because it is based on Xerces-C, XML::Xerces provides a validating XML
+parser that makes it easy to give your application the ability to read
+and write XML data.  Classes are provided for parsing, generating,
+manipulating, and validating XML documents.  XML::Xerces is faithful
+to the XML 1.0 recommendation and associated standards (DOM levels
+1,2, and 3, SAX 1 and 2, Namespaces, and W3C XML Schema).  The parser
+provides high performance, modularity, and scalability, and provides
+full support for Unicode.
 
-The majority of the API is created automatically using Simplified Wrapper
-Interface Generator (SWIG).  However, care has been taken to make most
-method invocations natural to perl programmers, so a number of rough C++
-edges have been smoothed over (See the Special Perl API Features section).
+XML::Xerces implements the vast majority of the Xerces-C API.  The
+exception is some functions in the C++ API which either have better
+Perl counterparts (such as file I/O) or which manipulate internal C++
+information that has no role in the Perl module.
+
+The majority of the API is created automatically using Simplified
+Wrapper Interface Generator (SWIG).  However, care has been taken to
+make most method invocations natural to perl programmers, so a number
+of rough C++ edges have been smoothed over.
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index 409dd6f2fb9..c90aa1a8e26 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/11 04:14:02 minskim Exp $
 #
 
-DISTNAME=	XML-Xerces-1.7.0-3
+DISTNAME=	XML-Xerces-2.3.0-4
 PKGNAME=	p5-${DISTNAME:C/-([0-9]*)$/.\1/}
 CATEGORIES=	textproc
-MASTER_SITES=	http://xml.apache.org/dist/xerces-p/stable/archives/
+MASTER_SITES=	http://www.apache.org/dist/xml/xerces-p/
 
 MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://xml.apache.org/xerces-p/
@@ -12,17 +12,20 @@ COMMENT=	Validating XML parser API for Perl
 
 CONFLICTS+=	XML-Xerces-[0-9]*
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 PERL5_REQD+=	5.6.0
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Xerces/.packlist
 
-MAKE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}"
-MAKE_ENV+=	ICUROOT="${BUILDLINK_PREFIX.icu}"
+MAKE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}" LANG=""
 
 # Xerces-C is built unthreaded in pkgsrc (for now).
 BUILDLINK_TRANSFORM+=	s:-lpthread:
 
+BUILDLINK_DEPENDS.xerces-c=     xerces-c>=2.3.0
+.include "../../textproc/xerces-c/buildlink3.mk"
+
 .include "../../lang/perl5/module.mk"
-.include "../../textproc/xerces-c/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Xerces/distinfo b/textproc/p5-XML-Xerces/distinfo
index 0b92cc3d2bb..c4ce1535312 100644
--- a/textproc/p5-XML-Xerces/distinfo
+++ b/textproc/p5-XML-Xerces/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/23 08:46:06 jlam Exp $
+$NetBSD: distinfo,v 1.2 2004/02/11 04:14:02 minskim Exp $
 
-SHA1 (XML-Xerces-1.7.0-3.tar.gz) = dc86f655be431a0900dbb632bb86d59118bf54ea
-Size (XML-Xerces-1.7.0-3.tar.gz) = 148103 bytes
-SHA1 (patch-aa) = ad9dbf00b84cdad0ea5357ecb2261b65a0f4026c
+SHA1 (XML-Xerces-2.3.0-4.tar.gz) = d453f7ba6ef2ed9a1ad0e033bdeee18476277bb2
+Size (XML-Xerces-2.3.0-4.tar.gz) = 213770 bytes
diff --git a/textproc/p5-XML-Xerces/patches/patch-aa b/textproc/p5-XML-Xerces/patches/patch-aa
deleted file mode 100644
index 9e8c297e16d..00000000000
--- a/textproc/p5-XML-Xerces/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/23 08:46:06 jlam Exp $
-
---- Makefile.PL.orig	Fri Oct 11 14:25:00 2002
-+++ Makefile.PL
-@@ -4,6 +4,7 @@ use Env qw(XERCES_LIB 
- 	   XERCES_INCLUDE
- 	   XERCESCROOT
- 	   XERCES_DEVEL
-+	   ICUROOT
- 	   SWIG);
- use strict;
- use vars qw($INCLUDES);
-@@ -130,6 +131,11 @@ my $XERCES_VERSION = "$XERCES_LIB_VERSIO
- $XERCES_LIB_VERSION =~ s/\./_/g;
- my $LIBXERCES = "-lxerces-c$XERCES_LIB_VERSION";
- $LIBS .= " $LIBXERCES";
-+
-+if (defined $ICUROOT) {
-+  my $ICULIBS = "-L$ICUROOT/lib -licudata -licuuc -lm";
-+  $LIBS .= " $ICULIBS";
-+} 
- 
- # now we ensure that libxerces is in the library path
- # if not we die()