Update xerces-c to 2.3.0. This closes PR pkg/23861.

Too many changes to list here.  This package hasn't been updated since
1.7.0.  See http://xml.apache.org/xerces-c/releases_archive.html for
the complete list.

9 files changed, 86 insertions, 197 deletions

diff --git a/textproc/xerces-c/patches/patch-aa b/textproc/xerces-c/patches/patch-aa
index e0eb8d7e2aa..9b7c2baefed 100644
--- a/textproc/xerces-c/patches/patch-aa
+++ b/textproc/xerces-c/patches/patch-aa
@@ -1,24 +1,58 @@
-$NetBSD: patch-aa,v 1.2 2003/06/23 07:52:41 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2004/02/11 04:06:05 minskim Exp $
 
---- Makefile.incl.orig	Thu Mar  7 14:45:22 2002
-+++ Makefile.incl
-@@ -437,6 +437,19 @@ ifeq (${PLATFORM}, MACOSX)
- 	SHLIBSUFFIX=.dylib
- endif
+--- util/Platforms/NetBSD/NetBSDPlatformUtils.cpp.orig	2003-05-27 10:04:53.000000000 -0500
++++ util/Platforms/NetBSD/NetBSDPlatformUtils.cpp
+@@ -92,6 +92,8 @@
  
-+#=============== NETBSD SPECIFIC OPTIONS =========================
-+ifeq (${PLATFORM}, NETBSD)
-+PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
-+MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
-+MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
-+ifeq (${TRANSCODER}, ICU)
-+    ALLLIBS = ${LIBS} -L${ICUROOT}/lib -licuuc -licudata -lm
-+else
-+    ALLLIBS = ${LIBS} -lm
-+endif
-+SHLIBSUFFIX=.so
-+endif
-+
+ #if defined(XML_USE_ICU_TRANSCODER)
+     #include <xercesc/util/Transcoders/ICU/ICUTransService.hpp>
++#elif defined (XML_USE_GNU_TRANSCODER)
++    #include <xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp>
+ #else
+     // Use native transcoder. Same as -DXML_USE_NATIVE_TRANSCODER
+     #include <xercesc/util/Transcoders/Iconv/IconvTransService.hpp>
+@@ -100,6 +102,8 @@
  
- ###################### STANDARD TOOLS #############################
- ifeq (${PLATFORM}, OS400)
+ #if defined(XML_USE_ICU_MESSAGELOADER)
+     #include <xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp>
++#elif defined(XML_USE_ICONV_MESSAGELOADER)
++    #include <xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp>
+ #else
+     // Same as -DXML_USE_INMEM_MESSAGELOADER
+     #include <xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp>
+@@ -172,6 +176,8 @@ XMLMsgLoader* XMLPlatformUtils::loadAMsg
+     {
+ #if defined (XML_USE_ICU_MESSAGELOADER)
+         retVal = new ICUMsgLoader(msgDomain);
++#elif defined (XML_USE_ICONV_MESSAGELOADER)
++        retVal = new MsgCatalogLoader(msgDomain);        
+ #else
+         // same as -DXML_USE_INMEM_MESSAGELOADER
+         retVal = new InMemMsgLoader(msgDomain);
+@@ -199,6 +205,8 @@ XMLTransService* XMLPlatformUtils::makeT
+     // Use ICU transcoding services.
+     // same as -DXML_USE_ICU_MESSAGELOADER
+     return new ICUTransService;
++#elif defined (XML_USE_GNU_TRANSCODER)
++    return new IconvGNUTransService;
+ #else
+     // Use native transcoding services.
+     // same as -DXML_USE_INMEM_MESSAGELOADER
+@@ -421,7 +429,7 @@ unsigned long XMLPlatformUtils::getCurre
+     return (unsigned long)(t.tv_sec*1000 + t.tv_usec);
+ }
+ 
+-XMLCh* XMLPlatformUtils::getFullPath(const XMLCh* const srcPath)
++XMLCh* XMLPlatformUtils::getFullPath(const XMLCh* const srcPath, MemoryManager* const)
+ {
+ 
+     //
+@@ -463,7 +471,7 @@ bool XMLPlatformUtils::isRelative(const 
+     return true;
+ }
+ 
+-XMLCh* XMLPlatformUtils::getCurrentDirectory()
++XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const)
+ {
+     char  dirBuf[PATH_MAX + 1];
+     char  *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
diff --git a/textproc/xerces-c/patches/patch-ab b/textproc/xerces-c/patches/patch-ab
deleted file mode 100644
index 8f8cfc65aa0..00000000000
--- a/textproc/xerces-c/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/06/23 07:52:41 jlam Exp $
-
---- configure.orig	Thu Mar  7 14:45:12 2002
-+++ configure
-@@ -1276,6 +1276,7 @@ case "${host}" in
-         *-*-OS400*)     platform=OS400 ;;
-         *-*-osf*)		platform=TRU64 ;;
-         *-apple-*)		platform=MACOSX ;;
-+        *-*-netbsd*)    platform=NETBSD ;;
-         *)              platform=UNKNOWN ;;
- esac
- 
-@@ -1457,6 +1458,7 @@ util/Platforms/OpenServer/Makefile \
- util/Platforms/UnixWare/Makefile \
- util/Platforms/Tru64/Makefile \
- util/Platforms/MacOS/Makefile \
-+util/Platforms/NetBSD/Makefile \
- util/Compilers/Makefile \
- util/MsgLoaders/InMemory/Makefile \
- util/MsgLoaders/ICU/Makefile \
-@@ -1601,6 +1603,7 @@ util/Platforms/OpenServer/Makefile \
- util/Platforms/UnixWare/Makefile \
- util/Platforms/Tru64/Makefile \
- util/Platforms/MacOS/Makefile \
-+util/Platforms/NetBSD/Makefile \
- util/Compilers/Makefile \
- util/MsgLoaders/InMemory/Makefile \
- util/MsgLoaders/ICU/Makefile \
diff --git a/textproc/xerces-c/patches/patch-ac b/textproc/xerces-c/patches/patch-ac
index 81de500819a..0e29fcfba04 100644
--- a/textproc/xerces-c/patches/patch-ac
+++ b/textproc/xerces-c/patches/patch-ac
@@ -1,22 +1,33 @@
-$NetBSD: patch-ac,v 1.2 2003/06/23 07:52:41 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2004/02/11 04:06:05 minskim Exp $
 
---- runConfigure.orig	Thu Mar  7 14:45:22 2002
-+++ runConfigure
-@@ -80,7 +80,7 @@ usage()
-     echo "       where options may be any of the following:"
-     echo "       -p <platform> (accepts 'aix', 'linux', 'freebsd', 'solaris',
-             'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix',
--            'ptx', 'tru64', 'macosx')"
-+            'ptx', 'tru64', 'macosx', 'netbsd')"
-     echo "       -c <C compiler name> (e.g. gcc, cc, xlc_r, icc)"
-     echo "       -x <C++ compiler name> (e.g. g++, CC, xlC_r, icc, c++)"
-     echo "       -d (specifies that you want to build debug version)"
-@@ -220,7 +220,7 @@ echo "Extra configure options: $configur
- #
+--- framework/StdOutFormatTarget.cpp.orig	2003-05-27 10:04:45.000000000 -0500
++++ framework/StdOutFormatTarget.cpp
+@@ -80,7 +80,7 @@
+  */
+ 
+ #include <xercesc/framework/StdOutFormatTarget.hpp>
+-#include <iostream.h>
++#include <iostream>
+ 
+ XERCES_CPP_NAMESPACE_BEGIN
+ 
+@@ -92,7 +92,7 @@ StdOutFormatTarget::~StdOutFormatTarget(
+ 
+ void StdOutFormatTarget::flush()
+ {
+-    cout.flush();
++    std::cout.flush();
+ }
+ 
+ void StdOutFormatTarget::writeChars(const XMLByte* const  toWrite
+@@ -104,8 +104,8 @@ void StdOutFormatTarget::writeChars(cons
+         // Without the cast, it was printing the pointer value in hex.
+         // Quite annoying, considering every other platform printed
+         // the string with the explicit cast to char* below.
+-    cout.write((char *) toWrite, (int) count);
+-    cout.flush();
++    std::cout.write((char *) toWrite, (int) count);
++    std::cout.flush();
+ 
+ }
  
- case $platform in
--   aix | linux | freebsd | solaris | hp-10 | hp-11 | irix | openserver | unixware | os400 | ptx | tru64 | macosx)
-+   aix | linux | freebsd | solaris | hp-10 | hp-11 | irix | openserver | unixware | os400 | ptx | tru64 | macosx | netbsd)
-        # platform has been recognized
-        ;;
-    *)
diff --git a/textproc/xerces-c/patches/patch-ad b/textproc/xerces-c/patches/patch-ad
deleted file mode 100644
index b2d804b1a5c..00000000000
--- a/textproc/xerces-c/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/06/23 07:52:41 jlam Exp $
-
---- util/AutoSense.hpp.orig	Thu Mar  7 14:45:24 2002
-+++ util/AutoSense.hpp
-@@ -219,6 +219,9 @@
-     #define XML_MACOSX
- #elif defined(__alpha) && defined(__osf__)
-     #define XML_TRU64
-+#elif defined(__NetBSD__)
-+    #define XML_NETBSD
-+    #define XML_UNIX
- #else
-     #error Code requires port to host OS!
- #endif
diff --git a/textproc/xerces-c/patches/patch-ae b/textproc/xerces-c/patches/patch-ae
deleted file mode 100644
index 665a44205b4..00000000000
--- a/textproc/xerces-c/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/06/23 07:52:41 jlam Exp $
-
---- util/Compilers/Makefile.in.orig	Fri Jun 20 05:37:23 2003
-+++ util/Compilers/Makefile.in
-@@ -135,6 +135,9 @@ ifeq (${CXX},c++)
-     ifeq (${PLATFORM},MACOSX)
-         CPP_OBJECTS = GCCDefs.$(TO)
-     endif
-+    ifeq (${PLATFORM},NETBSD)
-+        CPP_OBJECTS = GCCDefs.$(TO)
-+    endif
- endif
- ifeq (${CXX},cc)
-     ifeq (${PLATFORM},MACOSX)
diff --git a/textproc/xerces-c/patches/patch-af b/textproc/xerces-c/patches/patch-af
deleted file mode 100644
index 361cc9b1cb1..00000000000
--- a/textproc/xerces-c/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/06/23 07:52:42 jlam Exp $
-
---- util/Platforms/Makefile.in.orig	Thu Mar  7 14:45:28 2002
-+++ util/Platforms/Makefile.in
-@@ -176,6 +176,9 @@ endif
- ifeq (${PLATFORM}, MACOSX)
-     SUBMODULE = MacOS
- endif
-+ifeq (${PLATFORM}, NETBSD)
-+    SUBMODULE = NetBSD
-+endif
- 
- includes::
- 	${MAKE} -C $(SUBMODULE) $@
diff --git a/textproc/xerces-c/patches/patch-ag b/textproc/xerces-c/patches/patch-ag
deleted file mode 100644
index 9fd3ecc7295..00000000000
--- a/textproc/xerces-c/patches/patch-ag
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2003/06/23 07:52:42 jlam Exp $
-
---- util/Transcoders/ICU/ICUTransService.cpp.orig	Thu Mar  7 14:45:34 2002
-+++ util/Transcoders/ICU/ICUTransService.cpp
-@@ -69,7 +69,7 @@
- #include "ICUTransService.hpp"
- #include <string.h>
- #include <unicode/uloc.h>
--#include <unicode/unicode.h>
-+#include <unicode/uchar.h>
- #include <unicode/ucnv.h>
- #include <unicode/ucnv_err.h>
- #include <unicode/ustring.h>
-@@ -188,7 +188,7 @@ int ICUTransService::compareIString(cons
-         //  larger than 0xFFFF, so our cast here will work for both possible
-         //  sizes of XMLCh.
-         //
--        if (Unicode::toUpperCase(UChar(*psz1)) != Unicode::toUpperCase(UChar(*psz2)))
-+        if (u_toupper(UChar(*psz1)) != u_toupper(UChar(*psz2)))
-             return int(*psz1) - int(*psz2);
- 
-         // If either has ended, then they both ended, so equal
-@@ -219,7 +219,7 @@ int ICUTransService::compareNIString(con
-         //  larger than 0xFFFF, so our cast here will work for both possible
-         //  sizes of XMLCh.
-         //
--        if (Unicode::toUpperCase(UChar(*psz1)) != Unicode::toUpperCase(UChar(*psz2)))
-+        if (u_toupper(UChar(*psz1)) != u_toupper(UChar(*psz2)))
-             return int(*psz1) - int(*psz2);
- 
-         // If either ended, then both ended, so equal
-@@ -263,7 +263,7 @@ bool ICUTransService::isSpace(const XMLC
-     {
-         return true;
-     }
--    return (Unicode::isSpaceChar(UChar(toCheck)) != 0);
-+    return (u_isspace(UChar(toCheck)) != 0);
- }
- 
- 
-@@ -296,7 +296,7 @@ void ICUTransService::upperCase(XMLCh* c
-     XMLCh* outPtr = toUpperCase;
-     while (*outPtr)
-     {
--        *outPtr = XMLCh(Unicode::toUpperCase(UChar(*outPtr)));
-+        *outPtr = XMLCh(u_toupper(UChar(*outPtr)));
-         outPtr++;
-     }
- }
diff --git a/textproc/xerces-c/patches/patch-ah b/textproc/xerces-c/patches/patch-ah
deleted file mode 100644
index d8069a458df..00000000000
--- a/textproc/xerces-c/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/06/23 07:52:42 jlam Exp $
-
---- util/XercesDefs.hpp.orig	Thu Mar  7 14:45:34 2002
-+++ util/XercesDefs.hpp
-@@ -270,6 +270,10 @@ const unsigned int   gXercesRevision   =
- #include	<xercesc/util/Platforms/Tru64/Tru64Defs.hpp>
- #endif
- 
-+#if defined(XML_NETBSD)
-+#include    <xercesc/util/Platforms/NetBSD/NetBSDDefs.hpp>
-+#endif
-+
- 
- // ---------------------------------------------------------------------------
- //  And now we subinclude a header according to the development environment
diff --git a/textproc/xerces-c/patches/patch-ai b/textproc/xerces-c/patches/patch-ai
deleted file mode 100644
index a84c9e74377..00000000000
--- a/textproc/xerces-c/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/06/23 07:52:42 jlam Exp $
-
---- util/regx/XMLUniCharacter.cpp.orig	Thu Mar  7 14:45:32 2002
-+++ util/regx/XMLUniCharacter.cpp
-@@ -74,7 +74,7 @@
- #include <xercesc/util/regx/XMLUniCharacter.hpp>
- 
- #if defined (XML_USE_ICU_TRANSCODER)
--   #include <unicode/unicode.h>
-+   #include <unicode/uchar.h>
- #else
-    #include <xercesc/util/regx/UniCharTable.hpp>
- #endif
-@@ -85,7 +85,7 @@
- unsigned short XMLUniCharacter::getType(const XMLCh ch) {
- 
- #if defined (XML_USE_ICU_TRANSCODER)
--	return (unsigned short) Unicode::getType(ch);
-+	return (unsigned short) u_charType(ch);
- #else
- 	return (unsigned short) fgUniCharsTable[ch];
- #endif