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.

18 files changed, 308 insertions, 1129 deletions

diff --git a/textproc/xerces-c/DESCR b/textproc/xerces-c/DESCR
index 75bc20d597a..f6299106f10 100644
--- a/textproc/xerces-c/DESCR
+++ b/textproc/xerces-c/DESCR
@@ -1,8 +1,7 @@
-Xerces (named after the Xerces Blue butterfly) provides world-class XML
-parsing and generation. Fully-validating parsers are available for both
-Java and C++, implementing the W3C XML and DOM (Level 1 and 2) standards,
-as well as the defacto SAX (version 2) standard. The parsers are highly
-modular and configurable.  Initial support for XML Schema (draft W3C
-standard) is also provided.
+Xerces-C++ is a validating XML parser written in a portable subset of
+C++.  Xerces-C++ 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.
 
-This package provides the C++ version of Xerces.
+Xerces-C++ is faithful to the XML 1.0 recommendation and many
+associated standards.
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index cf2e676ef49..f47834c143f 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/11 04:06:04 minskim Exp $
 #
 
-DISTNAME=	xerces-c-src1_7_0
-PKGNAME=	${DISTNAME:S/-src/-/:S/_/./g}
+DISTNAME=	xerces-c-src_2_3_0
+PKGNAME=	${DISTNAME:S/-src_/-/:S/_/./g}
 CATEGORIES=	textproc
-MASTER_SITES=	http://xml.apache.org/dist/xerces-c/stable/archives/Xerces-C_${DISTNAME:S/xerces-c-src//}/
+MASTER_SITES=	http://archive.apache.org/dist/xml/xerces-c/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://xml.apache.org/xerces-c/
 COMMENT=	Validating C++ XML parser with DOM and SAX support
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/xercesc
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.prefs.mk"
@@ -23,29 +25,29 @@ XERCES_PLATFORM=	macosx
 XERCES_PLATFORM=	${LOWER_OPSYS}
 .endif
 XERCES_ENV+=		XERCESCROOT="${WRKDIR}/${DISTNAME}"
-XERCES_ENV+=		ICUROOT="${BUILDLINK_PREFIX.icu}"
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./runConfigure
 CONFIGURE_ARGS+=	-P ${PREFIX}		# installation prefix
 CONFIGURE_ARGS+=	-p ${XERCES_PLATFORM}	# platform
 CONFIGURE_ARGS+=	-n socket		# net accessor
-CONFIGURE_ARGS+=	-m icu			# message loader
-CONFIGURE_ARGS+=	-t icu			# transcoder
+CONFIGURE_ARGS+=	-m inmem		# message loader
 CONFIGURE_ARGS+=	-r none			# threading
 
+.include "../../converters/libiconv/buildlink3.mk"
+.if defined(ICONV_IS_GNU)
+CONFIGURE_ARGS+=	-t IconvGNU		# transcoder
+PLIST_SUBST+=		NATIVEICONV="@comment " GNUICONV=""
+.else
+CONFIGURE_ARGS+=	-t native		# transcoder
+PLIST_SUBST+=		NATIVEICONV="" GNUICONV="@comment "
+.endif
+
 CONFIGURE_ENV+=		${XERCES_ENV}
 MAKE_ENV+=		${XERCES_ENV}
 
-post-extract:
-	${MKDIR} ${WRKSRC}/util/Platforms/NetBSD
-	${CP}	${FILESDIR}/Makefile.in					\
-		${FILESDIR}/NetBSDDefs.hpp				\
-		${FILESDIR}/NetBSDPlatformUtils.cpp			\
-		${WRKSRC}/util/Platforms/NetBSD
-
-pre-configure:
-	${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT}
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/dom/impl/*.hpp \
+		${PREFIX}/include/xercesc/dom/impl
 
-.include "../../textproc/icu/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xerces-c/PLIST b/textproc/xerces-c/PLIST
index 279b20be61c..2ce48568e42 100644
--- a/textproc/xerces-c/PLIST
+++ b/textproc/xerces-c/PLIST
@@ -1,35 +1,122 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/23 07:52:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/11 04:06:04 minskim Exp $
 include/xercesc/dom/DOM.hpp
-include/xercesc/dom/DOMString.hpp
-include/xercesc/dom/DOM_Attr.hpp
-include/xercesc/dom/DOM_CDATASection.hpp
-include/xercesc/dom/DOM_CharacterData.hpp
-include/xercesc/dom/DOM_Comment.hpp
-include/xercesc/dom/DOM_DOMException.hpp
-include/xercesc/dom/DOM_DOMImplementation.hpp
-include/xercesc/dom/DOM_Document.hpp
-include/xercesc/dom/DOM_DocumentFragment.hpp
-include/xercesc/dom/DOM_DocumentType.hpp
-include/xercesc/dom/DOM_Element.hpp
-include/xercesc/dom/DOM_Entity.hpp
-include/xercesc/dom/DOM_EntityReference.hpp
-include/xercesc/dom/DOM_NamedNodeMap.hpp
-include/xercesc/dom/DOM_Node.hpp
-include/xercesc/dom/DOM_NodeFilter.hpp
-include/xercesc/dom/DOM_NodeIterator.hpp
-include/xercesc/dom/DOM_NodeList.hpp
-include/xercesc/dom/DOM_Notation.hpp
-include/xercesc/dom/DOM_ProcessingInstruction.hpp
-include/xercesc/dom/DOM_Range.hpp
-include/xercesc/dom/DOM_RangeException.hpp
-include/xercesc/dom/DOM_Text.hpp
-include/xercesc/dom/DOM_TreeWalker.hpp
-include/xercesc/dom/DOM_XMLDecl.hpp
-include/xercesc/dom/DomMemDebug.hpp
+include/xercesc/dom/DOMAttr.hpp
+include/xercesc/dom/DOMBuilder.hpp
+include/xercesc/dom/DOMCDATASection.hpp
+include/xercesc/dom/DOMCharacterData.hpp
+include/xercesc/dom/DOMComment.hpp
+include/xercesc/dom/DOMConfiguration.hpp
+include/xercesc/dom/DOMDocument.hpp
+include/xercesc/dom/DOMDocumentFragment.hpp
+include/xercesc/dom/DOMDocumentRange.hpp
+include/xercesc/dom/DOMDocumentTraversal.hpp
+include/xercesc/dom/DOMDocumentType.hpp
+include/xercesc/dom/DOMElement.hpp
+include/xercesc/dom/DOMEntity.hpp
+include/xercesc/dom/DOMEntityReference.hpp
+include/xercesc/dom/DOMEntityResolver.hpp
+include/xercesc/dom/DOMError.hpp
+include/xercesc/dom/DOMErrorHandler.hpp
+include/xercesc/dom/DOMException.hpp
+include/xercesc/dom/DOMImplementation.hpp
+include/xercesc/dom/DOMImplementationLS.hpp
+include/xercesc/dom/DOMImplementationRegistry.hpp
+include/xercesc/dom/DOMImplementationSource.hpp
+include/xercesc/dom/DOMInputSource.hpp
+include/xercesc/dom/DOMLocator.hpp
+include/xercesc/dom/DOMNamedNodeMap.hpp
+include/xercesc/dom/DOMNode.hpp
+include/xercesc/dom/DOMNodeFilter.hpp
+include/xercesc/dom/DOMNodeIterator.hpp
+include/xercesc/dom/DOMNodeList.hpp
+include/xercesc/dom/DOMNotation.hpp
+include/xercesc/dom/DOMProcessingInstruction.hpp
+include/xercesc/dom/DOMRange.hpp
+include/xercesc/dom/DOMRangeException.hpp
+include/xercesc/dom/DOMText.hpp
+include/xercesc/dom/DOMTreeWalker.hpp
+include/xercesc/dom/DOMTypeInfo.hpp
+include/xercesc/dom/DOMUserDataHandler.hpp
+include/xercesc/dom/DOMWriter.hpp
+include/xercesc/dom/DOMWriterFilter.hpp
+include/xercesc/dom/StDOMNode.hpp
+include/xercesc/dom/deprecated/DOM.hpp
+include/xercesc/dom/deprecated/DOMParser.hpp
+include/xercesc/dom/deprecated/DOMString.hpp
+include/xercesc/dom/deprecated/DOM_Attr.hpp
+include/xercesc/dom/deprecated/DOM_CDATASection.hpp
+include/xercesc/dom/deprecated/DOM_CharacterData.hpp
+include/xercesc/dom/deprecated/DOM_Comment.hpp
+include/xercesc/dom/deprecated/DOM_DOMException.hpp
+include/xercesc/dom/deprecated/DOM_DOMImplementation.hpp
+include/xercesc/dom/deprecated/DOM_Document.hpp
+include/xercesc/dom/deprecated/DOM_DocumentFragment.hpp
+include/xercesc/dom/deprecated/DOM_DocumentType.hpp
+include/xercesc/dom/deprecated/DOM_Element.hpp
+include/xercesc/dom/deprecated/DOM_Entity.hpp
+include/xercesc/dom/deprecated/DOM_EntityReference.hpp
+include/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp
+include/xercesc/dom/deprecated/DOM_Node.hpp
+include/xercesc/dom/deprecated/DOM_NodeFilter.hpp
+include/xercesc/dom/deprecated/DOM_NodeIterator.hpp
+include/xercesc/dom/deprecated/DOM_NodeList.hpp
+include/xercesc/dom/deprecated/DOM_Notation.hpp
+include/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp
+include/xercesc/dom/deprecated/DOM_Range.hpp
+include/xercesc/dom/deprecated/DOM_RangeException.hpp
+include/xercesc/dom/deprecated/DOM_Text.hpp
+include/xercesc/dom/deprecated/DOM_TreeWalker.hpp
+include/xercesc/dom/deprecated/DOM_XMLDecl.hpp
+include/xercesc/dom/deprecated/DomMemDebug.hpp
+include/xercesc/dom/impl/DOMAttrImpl.hpp
+include/xercesc/dom/impl/DOMAttrMapImpl.hpp
+include/xercesc/dom/impl/DOMAttrNSImpl.hpp
+include/xercesc/dom/impl/DOMCDATASectionImpl.hpp
+include/xercesc/dom/impl/DOMCasts.hpp
+include/xercesc/dom/impl/DOMCharacterDataImpl.hpp
+include/xercesc/dom/impl/DOMChildNode.hpp
+include/xercesc/dom/impl/DOMCommentImpl.hpp
+include/xercesc/dom/impl/DOMConfigurationImpl.hpp
+include/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
+include/xercesc/dom/impl/DOMDeepNodeListPool.c
+include/xercesc/dom/impl/DOMDeepNodeListPool.hpp
+include/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
+include/xercesc/dom/impl/DOMDocumentImpl.hpp
+include/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
+include/xercesc/dom/impl/DOMElementImpl.hpp
+include/xercesc/dom/impl/DOMElementNSImpl.hpp
+include/xercesc/dom/impl/DOMEntityImpl.hpp
+include/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
+include/xercesc/dom/impl/DOMErrorImpl.hpp
+include/xercesc/dom/impl/DOMImplementationImpl.hpp
+include/xercesc/dom/impl/DOMLocatorImpl.hpp
+include/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
+include/xercesc/dom/impl/DOMNodeIDMap.hpp
+include/xercesc/dom/impl/DOMNodeImpl.hpp
+include/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
+include/xercesc/dom/impl/DOMNodeListImpl.hpp
+include/xercesc/dom/impl/DOMNodeVector.hpp
+include/xercesc/dom/impl/DOMNormalizer.hpp
+include/xercesc/dom/impl/DOMNotationImpl.hpp
+include/xercesc/dom/impl/DOMParentNode.hpp
+include/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
+include/xercesc/dom/impl/DOMRangeImpl.hpp
+include/xercesc/dom/impl/DOMStringPool.hpp
+include/xercesc/dom/impl/DOMTextImpl.hpp
+include/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
+include/xercesc/dom/impl/DOMTypeInfoImpl.hpp
+include/xercesc/dom/impl/DOMWriterImpl.hpp
+include/xercesc/dom/impl/XSDElementNSImpl.hpp
+include/xercesc/framework/LocalFileFormatTarget.hpp
 include/xercesc/framework/LocalFileInputSource.hpp
+include/xercesc/framework/MemBufFormatTarget.hpp
 include/xercesc/framework/MemBufInputSource.hpp
+include/xercesc/framework/MemoryManager.hpp
 include/xercesc/framework/StdInInputSource.hpp
+include/xercesc/framework/StdOutFormatTarget.hpp
 include/xercesc/framework/URLInputSource.hpp
+include/xercesc/framework/Wrapper4DOMInputSource.hpp
+include/xercesc/framework/Wrapper4InputSource.hpp
 include/xercesc/framework/XMLAttDef.hpp
 include/xercesc/framework/XMLAttDefList.hpp
 include/xercesc/framework/XMLAttr.hpp
@@ -49,51 +136,27 @@ include/xercesc/framework/XMLRecognizer.hpp
 include/xercesc/framework/XMLRefInfo.hpp
 include/xercesc/framework/XMLValidator.hpp
 include/xercesc/framework/XMLValidityCodes.hpp
-include/xercesc/idom/IDCasts.hpp
-include/xercesc/idom/IDChildNode.hpp
-include/xercesc/idom/IDDeepNodeListPool.c
-include/xercesc/idom/IDDeepNodeListPool.hpp
-include/xercesc/idom/IDNodeIDMap.hpp
-include/xercesc/idom/IDNodeVector.hpp
-include/xercesc/idom/IDOM.hpp
-include/xercesc/idom/IDOM_Attr.hpp
-include/xercesc/idom/IDOM_CDATASection.hpp
-include/xercesc/idom/IDOM_CharacterData.hpp
-include/xercesc/idom/IDOM_Comment.hpp
-include/xercesc/idom/IDOM_DOMException.hpp
-include/xercesc/idom/IDOM_DOMImplementation.hpp
-include/xercesc/idom/IDOM_Document.hpp
-include/xercesc/idom/IDOM_DocumentFragment.hpp
-include/xercesc/idom/IDOM_DocumentType.hpp
-include/xercesc/idom/IDOM_Element.hpp
-include/xercesc/idom/IDOM_Entity.hpp
-include/xercesc/idom/IDOM_EntityReference.hpp
-include/xercesc/idom/IDOM_NamedNodeMap.hpp
-include/xercesc/idom/IDOM_Node.hpp
-include/xercesc/idom/IDOM_NodeFilter.hpp
-include/xercesc/idom/IDOM_NodeIterator.hpp
-include/xercesc/idom/IDOM_NodeList.hpp
-include/xercesc/idom/IDOM_Notation.hpp
-include/xercesc/idom/IDOM_ProcessingInstruction.hpp
-include/xercesc/idom/IDOM_Range.hpp
-include/xercesc/idom/IDOM_RangeException.hpp
-include/xercesc/idom/IDOM_Text.hpp
-include/xercesc/idom/IDOM_TreeWalker.hpp
-include/xercesc/idom/IDParentNode.hpp
-include/xercesc/idom/IDStringPool.hpp
 include/xercesc/internal/CharTypeTables.hpp
+include/xercesc/internal/DGXMLScanner.hpp
 include/xercesc/internal/ElemStack.hpp
 include/xercesc/internal/EndOfEntityException.hpp
+include/xercesc/internal/IANAEncodings.hpp
+include/xercesc/internal/IGXMLScanner.hpp
+include/xercesc/internal/MemoryManagerImpl.hpp
 include/xercesc/internal/ReaderMgr.hpp
+include/xercesc/internal/SGXMLScanner.hpp
 include/xercesc/internal/VecAttrListImpl.hpp
 include/xercesc/internal/VecAttributesImpl.hpp
+include/xercesc/internal/WFXMLScanner.hpp
 include/xercesc/internal/XMLInternalErrorHandler.hpp
 include/xercesc/internal/XMLReader.hpp
 include/xercesc/internal/XMLScanner.hpp
-include/xercesc/parsers/DOMParser.hpp
-include/xercesc/parsers/IDOMParser.hpp
+include/xercesc/internal/XMLScannerResolver.hpp
+include/xercesc/parsers/AbstractDOMParser.hpp
+include/xercesc/parsers/DOMBuilderImpl.hpp
 include/xercesc/parsers/SAX2XMLReaderImpl.hpp
 include/xercesc/parsers/SAXParser.hpp
+include/xercesc/parsers/XercesDOMParser.hpp
 include/xercesc/sax/AttributeList.hpp
 include/xercesc/sax/DTDHandler.hpp
 include/xercesc/sax/DocumentHandler.hpp
@@ -115,6 +178,8 @@ include/xercesc/sax2/XMLReaderFactory.hpp
 include/xercesc/util/ArrayIndexOutOfBoundsException.hpp
 include/xercesc/util/AutoSense.hpp
 include/xercesc/util/Base64.hpp
+include/xercesc/util/BaseRefVectorOf.c
+include/xercesc/util/BaseRefVectorOf.hpp
 include/xercesc/util/BinFileInputStream.hpp
 include/xercesc/util/BinInputStream.hpp
 include/xercesc/util/BinMemInputStream.hpp
@@ -132,6 +197,7 @@ include/xercesc/util/Compilers/MIPSproDefs.hpp
 include/xercesc/util/Compilers/MVSCPPDefs.hpp
 include/xercesc/util/Compilers/OS400SetDefs.hpp
 include/xercesc/util/Compilers/PTXCCDefs.hpp
+include/xercesc/util/Compilers/QCCDefs.hpp
 include/xercesc/util/Compilers/SCOCCDefs.hpp
 include/xercesc/util/Compilers/SunCCDefs.hpp
 include/xercesc/util/Compilers/SunKaiDefs.hpp
@@ -139,7 +205,9 @@ include/xercesc/util/Compilers/TandemCCDefs.hpp
 include/xercesc/util/Compilers/VCPPDefs.hpp
 include/xercesc/util/CountedPointer.c
 include/xercesc/util/CountedPointer.hpp
+include/xercesc/util/DefaultPanicHandler.hpp
 include/xercesc/util/EmptyStackException.hpp
+include/xercesc/util/EncodingValidator.hpp
 include/xercesc/util/FlagJanitor.c
 include/xercesc/util/FlagJanitor.hpp
 include/xercesc/util/HashBase.hpp
@@ -153,22 +221,31 @@ include/xercesc/util/InvalidCastException.hpp
 include/xercesc/util/Janitor.c
 include/xercesc/util/Janitor.hpp
 include/xercesc/util/KVStringPair.hpp
+include/xercesc/util/KeyRefPair.c
+include/xercesc/util/KeyRefPair.hpp
 include/xercesc/util/KeyValuePair.c
 include/xercesc/util/KeyValuePair.hpp
-include/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
+include/xercesc/util/LogicalPath.c
+include/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp
+include/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
 include/xercesc/util/Mutexes.hpp
 include/xercesc/util/NameIdPool.c
 include/xercesc/util/NameIdPool.hpp
+include/xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp
+include/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
 include/xercesc/util/NoDefTranscoderException.hpp
 include/xercesc/util/NoSuchElementException.hpp
 include/xercesc/util/NullPointerException.hpp
 include/xercesc/util/NumberFormatException.hpp
+include/xercesc/util/PanicHandler.hpp
 include/xercesc/util/ParseException.hpp
 include/xercesc/util/PlatformUtils.hpp
-include/xercesc/util/Platforms/NetBSD/NetBSDDefs.hpp
+include/xercesc/util/Platforms/${OPSYS}/${OPSYS}Defs.hpp
 include/xercesc/util/QName.hpp
 include/xercesc/util/RefArrayOf.c
 include/xercesc/util/RefArrayOf.hpp
+include/xercesc/util/RefArrayVectorOf.c
+include/xercesc/util/RefArrayVectorOf.hpp
 include/xercesc/util/RefHash2KeysTableOf.c
 include/xercesc/util/RefHash2KeysTableOf.hpp
 include/xercesc/util/RefHash3KeysIdPool.c
@@ -181,17 +258,21 @@ include/xercesc/util/RefVectorOf.c
 include/xercesc/util/RefVectorOf.hpp
 include/xercesc/util/RuntimeException.hpp
 include/xercesc/util/SchemaDateTimeException.hpp
+include/xercesc/util/SecurityManager.hpp
 include/xercesc/util/StringPool.hpp
 include/xercesc/util/TransENameMap.c
 include/xercesc/util/TransENameMap.hpp
 include/xercesc/util/TransService.hpp
-include/xercesc/util/Transcoders/ICU/ICUTransService.hpp
+${NATIVEICONV}include/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
+${GNUICONV}include/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
 include/xercesc/util/TranscodingException.hpp
 include/xercesc/util/UTFDataFormatException.hpp
 include/xercesc/util/UnexpectedEOFException.hpp
 include/xercesc/util/UnsupportedEncodingException.hpp
 include/xercesc/util/ValueArrayOf.c
 include/xercesc/util/ValueArrayOf.hpp
+include/xercesc/util/ValueHashTableOf.c
+include/xercesc/util/ValueHashTableOf.hpp
 include/xercesc/util/ValueStackOf.c
 include/xercesc/util/ValueStackOf.hpp
 include/xercesc/util/ValueVectorOf.c
@@ -203,6 +284,8 @@ include/xercesc/util/XMLAbstractDoubleFloat.hpp
 include/xercesc/util/XMLBigDecimal.hpp
 include/xercesc/util/XMLBigInteger.hpp
 include/xercesc/util/XMLChTranscoder.hpp
+include/xercesc/util/XMLChar.hpp
+include/xercesc/util/XMLDOMMsg.hpp
 include/xercesc/util/XMLDateTime.hpp
 include/xercesc/util/XMLDeleterFor.c
 include/xercesc/util/XMLDeleterFor.hpp
@@ -228,7 +311,9 @@ include/xercesc/util/XMLUni.hpp
 include/xercesc/util/XMLUniDefs.hpp
 include/xercesc/util/XMLUri.hpp
 include/xercesc/util/XMLWin1252Transcoder.hpp
+include/xercesc/util/XMemory.hpp
 include/xercesc/util/XercesDefs.hpp
+include/xercesc/util/XercesVersion.hpp
 include/xercesc/util/regx/ASCIIRangeFactory.hpp
 include/xercesc/util/regx/BMPattern.hpp
 include/xercesc/util/regx/BlockRangeFactory.hpp
@@ -318,6 +403,7 @@ include/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
 include/xercesc/validators/schema/ComplexTypeInfo.hpp
 include/xercesc/validators/schema/GeneralAttributeCheck.hpp
 include/xercesc/validators/schema/NamespaceScope.hpp
+include/xercesc/validators/schema/PSVIDefs.hpp
 include/xercesc/validators/schema/SchemaAttDef.hpp
 include/xercesc/validators/schema/SchemaAttDefList.hpp
 include/xercesc/validators/schema/SchemaElementDecl.hpp
@@ -327,6 +413,9 @@ include/xercesc/validators/schema/SchemaSymbols.hpp
 include/xercesc/validators/schema/SchemaValidator.hpp
 include/xercesc/validators/schema/SubstitutionGroupComparator.hpp
 include/xercesc/validators/schema/TraverseSchema.hpp
+include/xercesc/validators/schema/XSDDOMParser.hpp
+include/xercesc/validators/schema/XSDErrorReporter.hpp
+include/xercesc/validators/schema/XSDLocator.hpp
 include/xercesc/validators/schema/XUtil.hpp
 include/xercesc/validators/schema/XercesAttGroupInfo.hpp
 include/xercesc/validators/schema/XercesElementWildcard.hpp
@@ -346,7 +435,9 @@ include/xercesc/validators/schema/identity/XPathMatcher.hpp
 include/xercesc/validators/schema/identity/XPathMatcherStack.hpp
 include/xercesc/validators/schema/identity/XPathSymbols.hpp
 include/xercesc/validators/schema/identity/XercesXPath.hpp
-lib/libxerces-c1_7_0.so
+lib/libxerces-c.so
+lib/libxerces-c.so.23
+lib/libxerces-c.so.23.0
 @dirrm include/xercesc/validators/schema/identity
 @dirrm include/xercesc/validators/schema
 @dirrm include/xercesc/validators/datatype
@@ -354,19 +445,23 @@ lib/libxerces-c1_7_0.so
 @dirrm include/xercesc/validators/DTD
 @dirrm include/xercesc/validators
 @dirrm include/xercesc/util/regx
-@dirrm include/xercesc/util/Transcoders/ICU
+${GNUICONV}@dirrm include/xercesc/util/Transcoders/IconvGNU
+${NATIVEICONV}@dirrm include/xercesc/util/Transcoders/Iconv
 @dirrm include/xercesc/util/Transcoders
 @dirrm include/xercesc/util/Platforms/${OPSYS}
 @dirrm include/xercesc/util/Platforms
-@dirrm include/xercesc/util/MsgLoaders/ICU
-@dirrm include/xercesc/util/MsgLoaders
+@dirrm include/xercesc/util/NetAccessors/Socket
+@dirrm include/xercesc/util/NetAccessors
 @dirrm include/xercesc/util/Compilers
+@dirrm include/xercesc/util/MsgLoaders/InMemory
+@dirrm include/xercesc/util/MsgLoaders
 @dirrm include/xercesc/util
 @dirrm include/xercesc/sax2
 @dirrm include/xercesc/sax
 @dirrm include/xercesc/parsers
 @dirrm include/xercesc/internal
-@dirrm include/xercesc/idom
 @dirrm include/xercesc/framework
+@dirrm include/xercesc/dom/impl
+@dirrm include/xercesc/dom/deprecated
 @dirrm include/xercesc/dom
 @dirrm include/xercesc
diff --git a/textproc/xerces-c/buildlink2.mk b/textproc/xerces-c/buildlink2.mk
index 9679f0a771f..893acdc2026 100644
--- a/textproc/xerces-c/buildlink2.mk
+++ b/textproc/xerces-c/buildlink2.mk
@@ -1,15 +1,13 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/06/23 07:52:40 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/11 04:06:04 minskim Exp $
 #
 # This Makefile fragment is included by packages that use xerces-c.
 #
-# This file was created automatically using createbuildlink 2.2.
-#
 
 .if !defined(XERCES_C_BUILDLINK2_MK)
 XERCES_C_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		xerces-c
-BUILDLINK_DEPENDS.xerces-c?=	xerces-c>=1.7.0
+BUILDLINK_DEPENDS.xerces-c?=	xerces-c>=2.3.0
 BUILDLINK_PKGSRCDIR.xerces-c?=	../../textproc/xerces-c
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xerces-c=xerces-c
@@ -19,7 +17,7 @@ BUILDLINK_FILES.xerces-c+=	include/xercesc/*/*/*
 BUILDLINK_FILES.xerces-c+=	include/xercesc/*/*
 BUILDLINK_FILES.xerces-c+=	lib/libxerces-c*.*
 
-.include "../../textproc/icu/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xerces-c-buildlink
 
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
new file mode 100644
index 00000000000..909c266b455
--- /dev/null
+++ b/textproc/xerces-c/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:06:04 minskim Exp $
+#
+# This Makefile fragment is included by packages that use xerces-c.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+XERCES_C_BUILDLINK3_MK:=	${XERCES_C_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xerces-c
+.endif
+
+.if !empty(XERCES_C_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			xerces-c
+BUILDLINK_DEPENDS.xerces-c+=		xerces-c>=2.3.0
+BUILDLINK_PKGSRCDIR.xerces-c?=		../../textproc/xerces-c
+
+.include "../../converters/libiconv/buildlink3.mk"
+
+.endif # XERCES_C_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xerces-c/distinfo b/textproc/xerces-c/distinfo
index 97bca24a1b0..e989d9e61a7 100644
--- a/textproc/xerces-c/distinfo
+++ b/textproc/xerces-c/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/06/23 07:52:40 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/02/11 04:06:04 minskim Exp $
 
-SHA1 (xerces-c-src1_7_0.tar.gz) = 39048b762d3def44492493b2fbd6ca00125584b1
-Size (xerces-c-src1_7_0.tar.gz) = 6914463 bytes
-SHA1 (patch-aa) = e9452b5cd5318ff85aa0a6a2e2744d895f704766
-SHA1 (patch-ab) = ff2ce93680d8b373f152235b62196d9443f8b11f
-SHA1 (patch-ac) = 30ce79950ec4091ef77c79b124bea4d2db1d9810
-SHA1 (patch-ad) = 5cfa9095f4ca47cc56d7ab2db0894ac5d1aa71a5
-SHA1 (patch-ae) = 1ee42f883ddef78e308cc364409da824468c4976
-SHA1 (patch-af) = ebf8a00d8665f8e786ec063cf657e3fa5407d5da
-SHA1 (patch-ag) = d5a1503dd00bac7c6f6ec89b9350e09fde701aaa
-SHA1 (patch-ah) = aba02b027b22c40f659c604c7e7cc6b95095405d
-SHA1 (patch-ai) = f84599c94366a9b7f75d133087dbc5a08a02b967
+SHA1 (xerces-c-src_2_3_0.tar.gz) = ea47e1899d569344e7ff1ca09f31f725bbe92033
+Size (xerces-c-src_2_3_0.tar.gz) = 6885335 bytes
+SHA1 (patch-aa) = e72de819f840a867d17db1a8b5d0198213497c54
+SHA1 (patch-ac) = fb187d0c5b7dbc09d31be8dea09c88bea755f87d
diff --git a/textproc/xerces-c/files/Makefile.in b/textproc/xerces-c/files/Makefile.in
index 10f13f7a8d6..e69de29bb2d 100644
--- a/textproc/xerces-c/files/Makefile.in
+++ b/textproc/xerces-c/files/Makefile.in
@@ -1,82 +0,0 @@
-#
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. The end-user documentation included with the redistribution,
-#    if any, must include the following acknowledgment:
-#       "This product includes software developed by the
-#        Apache Software Foundation (http://www.apache.org/)."
-#    Alternately, this acknowledgment may appear in the software itself,
-#    if and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Xerces" and "Apache Software Foundation" must
-#    not be used to endorse or promote products derived from this
-#    software without prior written permission. For written
-#    permission, please contact apache\@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache",
-#    nor may "Apache" appear in their name, without prior written
-#    permission of the Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation, and was
-# originally based on software copyright (c) 1999, International
-# Business Machines, Inc., http://www.ibm.com .  For more information
-# on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
-#
-#  
-#
-
-PLATFORM = @platform@
-CC  = @cc@
-CXX = @cxx@
-CXXFLAGS = @cxxflags@
-CFLAGS = @cflags@
-PREFIX = @prefix@
-PREFIX_INCLUDE = @prefix_include@
-LDFLAGS = @ldflags@
-LIBS = @libs@
-OSVER = @osver@
-USELIBWWW = @uselibwww@
-MESSAGELOADER = @messageloader@
-TRANSCODER = @transcoder@
-THREADS = @threads@
-
-MODULE = util
-
-include ../../../Makefile.incl
-
-SUBMODULE = Platforms/NetBSD
-CPP_PUBHEADERS = NetBSDDefs.hpp
-CPP_OBJECTS = NetBSDPlatformUtils.$(TO)
-
-include ../../Makefile.util.submodule
diff --git a/textproc/xerces-c/files/NetBSDDefs.hpp b/textproc/xerces-c/files/NetBSDDefs.hpp
index bd6bbd2ca04..e69de29bb2d 100644
--- a/textproc/xerces-c/files/NetBSDDefs.hpp
+++ b/textproc/xerces-c/files/NetBSDDefs.hpp
@@ -1,76 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- * 
- * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
- * reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- * 
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache\@apache.org.
- * 
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- * 
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation, and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com .  For more information
- * on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-/*
- * 
- *
- */
-
-
-// ---------------------------------------------------------------------------
-//  NetBSD runs on 29 hardware plateforms...
-// ---------------------------------------------------------------------------
-#ifdef __i386__
-#define ENDIANMODE_LITTLE
-#else
-#define ENDIANMODE_BIG
-#endif
-
-typedef void* FileHandle;
-
-#ifndef NETBSD
-#define NETBSD
-#endif
diff --git a/textproc/xerces-c/files/NetBSDPlatformUtils.cpp b/textproc/xerces-c/files/NetBSDPlatformUtils.cpp
index fdf6afdbf3c..e69de29bb2d 100644
--- a/textproc/xerces-c/files/NetBSDPlatformUtils.cpp
+++ b/textproc/xerces-c/files/NetBSDPlatformUtils.cpp
@@ -1,663 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- * 
- * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
- * reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- * 
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache\@apache.org.
- * 
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- * 
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation, and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com .  For more information
- * on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-/*
- * 
- *
- */
-
-
-// ---------------------------------------------------------------------------
-//  Includes
-// ---------------------------------------------------------------------------
-
-#if !defined(APP_NO_THREADS)
-#include    <pthread.h>
-#endif
-
-/* #ifndef __USE_UNIX98
-    #error __USE_UNIX98 is not defined in your compile settings
-#endif */
-
-#include    <unistd.h>
-#include    <stdio.h>
-#include    <stdlib.h>
-#include    <errno.h>
-#include    <libgen.h>
-#include    <sys/time.h>
-#include    <string.h>
-#include    <strings.h>/* for strcasecmp & strncasecmp */
-#include    <wchar.h>  /* for win_t */
-#include    <xercesc/util/PlatformUtils.hpp>
-#include    <xercesc/util/RuntimeException.hpp>
-#include    <xercesc/util/Janitor.hpp>
-#include    <xercesc/util/Mutexes.hpp>
-#include    <xercesc/util/XMLString.hpp>
-#include    <xercesc/util/XMLUniDefs.hpp>
-#include    <xercesc/util/XMLUni.hpp>
-
-#if defined(XML_USE_ICU_TRANSCODER)
-    #include <xercesc/util/Transcoders/ICU/ICUTransService.hpp>
-#else
-    // Use native transcoder. Same as -DXML_USE_NATIVE_TRANSCODER
-    #include <xercesc/util/Transcoders/Iconv/IconvTransService.hpp>
-#endif
-
-
-#if defined(XML_USE_ICU_MESSAGELOADER)
-    #include <xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp>
-#else
-    // Same as -DXML_USE_INMEM_MESSAGELOADER
-    #include <xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp>
-#endif
-
-
-#if defined (XML_USE_NETACCESSOR_SOCKET)
-    #include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
-#endif
-
-
-
-// ---------------------------------------------------------------------------
-//  Local Methods
-// ---------------------------------------------------------------------------
-
-static void WriteCharStr( FILE* stream, const char* const toWrite)
-{
-    if (fputs(toWrite, stream) == EOF)
-    {
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::Strm_StdErrWriteFailure);
-    }
-}
-
-static void WriteUStrStdErr( const XMLCh* const toWrite)
-{
-    char* tmpVal = XMLString::transcode(toWrite);
-    ArrayJanitor<char> janText(tmpVal);
-    if (fputs(tmpVal, stderr) == EOF)
-    {
-       ThrowXML(XMLPlatformUtilsException,
-                XMLExcepts::Strm_StdErrWriteFailure);
-   }
-}
-
-static void WriteUStrStdOut( const XMLCh* const toWrite)
- {
-    char* tmpVal = XMLString::transcode(toWrite);
-    ArrayJanitor<char> janText(tmpVal);
-    if (fputs(tmpVal, stdout) == EOF)
-    {
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::Strm_StdOutWriteFailure);
-    }
-}
-
-XMLNetAccessor* XMLPlatformUtils::makeNetAccessor()
-{
-#if defined (XML_USE_NETACCESSOR_SOCKET)
-    return new SocketNetAccessor();
-#else
-    return 0;
-#endif
-}
-
-
-
-XMLCh* XMLPlatformUtils::weavePaths(const   XMLCh* const    basePath
-                                    , const XMLCh* const    relativePath)
-
-{
-    // Create a buffer as large as both parts and empty it
-    XMLCh* tmpBuf = new XMLCh[XMLString::stringLen(basePath)
-                              + XMLString::stringLen(relativePath)
-                              + 2];
-    *tmpBuf = 0;
-
-    //
-    //  If we have no base path, then just take the relative path as
-    //  is.
-    //
-    if (!basePath)
-    {
-        XMLString::copyString(tmpBuf, relativePath);
-        return tmpBuf;
-    }
-
-    if (!*basePath)
-    {
-        XMLString::copyString(tmpBuf, relativePath);
-        return tmpBuf;
-    }
-
-    const XMLCh* basePtr = basePath + (XMLString::stringLen(basePath) - 1);
-    if ((*basePtr != chForwardSlash)
-    &&  (*basePtr != chBackSlash))
-    {
-        while ((basePtr >= basePath)
-        &&     ((*basePtr != chForwardSlash) && (*basePtr != chBackSlash)))
-        {
-            basePtr--;
-        }
-    }
-
-    // There is no relevant base path, so just take the relative part
-    if (basePtr < basePath)
-    {
-        XMLString::copyString(tmpBuf, relativePath);
-        return tmpBuf;
-    }
-
-    // After this, make sure the buffer gets handled if we exit early
-    ArrayJanitor<XMLCh> janBuf(tmpBuf);
-
-    //
-    //  We have some path part, so we need to check to see if we ahve to
-    //  weave any of the parts together.
-    //
-    const XMLCh* pathPtr = relativePath;
-    while (true)
-    {
-        // If it does not start with some period, then we are done
-        if (*pathPtr != chPeriod)
-            break;
-
-        unsigned int periodCount = 1;
-        pathPtr++;
-        if (*pathPtr == chPeriod)
-        {
-            pathPtr++;
-            periodCount++;
-        }
-
-        // Has to be followed by a \ or / or the null to mean anything
-        if ((*pathPtr != chForwardSlash) && (*pathPtr != chBackSlash)
-        &&  *pathPtr)
-        {
-            break;
-        }
-        if (*pathPtr)
-            pathPtr++;
-
-        // If its one period, just eat it, else move backwards in the base
-        if (periodCount == 2)
-        {
-            basePtr--;
-            while ((basePtr >= basePath)
-            &&     ((*basePtr != chForwardSlash) && (*basePtr != chBackSlash)))
-            {
-                basePtr--;
-            }
-
-            // The base cannot provide enough levels, so its in error/
-            if (basePtr < basePath)
-                ThrowXML(XMLPlatformUtilsException,
-                         XMLExcepts::File_BasePathUnderflow);
-        }
-    }
-
-    // Copy the base part up to the base pointer
-    XMLCh* bufPtr = tmpBuf;
-    const XMLCh* tmpPtr = basePath;
-    while (tmpPtr <= basePtr)
-        *bufPtr++ = *tmpPtr++;
-
-    // And then copy on the rest of our path
-    XMLString::copyString(bufPtr, pathPtr);
-
-    // Orphan the buffer and return it
-    janBuf.orphan();
-    return tmpBuf;
-}
-
-
-// ---------------------------------------------------------------------------
-//  XMLPlatformUtils: Private Static Methods
-// ---------------------------------------------------------------------------
-
-//
-//  This method is called by the platform independent part of this class
-//  when client code asks to have one of the supported message sets loaded.
-//
-
-XMLMsgLoader* XMLPlatformUtils::loadAMsgSet(const XMLCh* const msgDomain)
-{
-    XMLMsgLoader* retVal;
-    try
-    {
-#if defined (XML_USE_ICU_MESSAGELOADER)
-        retVal = new ICUMsgLoader(msgDomain);
-#else
-        // same as -DXML_USE_INMEM_MESSAGELOADER
-        retVal = new InMemMsgLoader(msgDomain);
-#endif
-    }
-
-    catch(...)
-    {
-        panic(XMLPlatformUtils::Panic_CantLoadMsgDomain);
-    }
-    return retVal;
-}
-
-
-//
-//  This method is called very early in the bootstrapping process. This guy
-//  must create a transcoding service and return it. It cannot use any string
-//  methods, any transcoding services, throw any exceptions, etc... It just
-//  makes a transcoding service and returns it, or returns zero on failure.
-//
-
-XMLTransService* XMLPlatformUtils::makeTransService()
-{
-#if defined (XML_USE_ICU_TRANSCODER)
-    // Use ICU transcoding services.
-    // same as -DXML_USE_ICU_MESSAGELOADER
-    return new ICUTransService;
-#else
-    // Use native transcoding services.
-    // same as -DXML_USE_INMEM_MESSAGELOADER
-    return new IconvTransService;
-
-#endif
-}
-
-// ---------------------------------------------------------------------------
-//  XMLPlatformUtils: The panic method
-// ---------------------------------------------------------------------------
-void XMLPlatformUtils::panic(const PanicReasons reason)
-{
-     const char* reasonStr = "Unknown reason";
-    if (reason == Panic_NoTransService)
-        reasonStr = "Could not load a transcoding service";
-    else if (reason == Panic_NoDefTranscoder)
-        reasonStr = "Could not load a local code page transcoder";
-    else if (reason == Panic_CantFindLib)
-        reasonStr = "Could not find the xerces-c DLL";
-    else if (reason == Panic_UnknownMsgDomain)
-        reasonStr = "Unknown message domain";
-    else if (reason == Panic_CantLoadMsgDomain)
-        reasonStr = "Cannot load message domain";
-    else if (reason == Panic_SynchronizationErr)
-        reasonStr = "Cannot synchronize system or mutex";
-    else if (reason == Panic_SystemInit)
-        reasonStr = "Cannot initialize the system or mutex";
-
-    fprintf(stderr, "%s\n", reasonStr);
-    
-    exit(-1);
-}
-
-
-// ---------------------------------------------------------------------------
-//  XMLPlatformUtils: File Methods
-// ---------------------------------------------------------------------------
-
-unsigned int XMLPlatformUtils::curFilePos(FileHandle theFile)
-{
-    int curPos = ftell( (FILE*)theFile);
-    if (curPos == -1)
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotGetSize);
-
-    return (unsigned int)curPos;
-}
-
-void XMLPlatformUtils::closeFile(FileHandle theFile)
-{
-    if (fclose((FILE*)theFile))
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotCloseFile);
-}
-
-unsigned int XMLPlatformUtils::fileSize(FileHandle theFile)
-{
-    // Get the current position
-    long  int curPos = ftell((FILE*) theFile);
-    if (curPos == -1)
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotGetCurPos);
-
-    // Seek to the end and save that value for return
-     if (fseek((FILE*) theFile, 0, SEEK_END))
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotSeekToEnd);
-
-    long int retVal = ftell((FILE*)theFile);
-    if (retVal == -1)
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotSeekToEnd);
-
-    // And put the pointer back
-
-    if (fseek( (FILE*)theFile, curPos, SEEK_SET) )
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotSeekToPos);
-
-    return (unsigned int)retVal;
-}
-
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
-{
-    const char* tmpFileName = XMLString::transcode(fileName);
-    ArrayJanitor<char> janText((char*)tmpFileName);
-    FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
-
-    if (retVal == NULL)
-        return 0;
-    return retVal;
-}
-
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
-{
-    FileHandle retVal = (FILE*)fopen( fileName , "rb" );
-
-    if (retVal == NULL)
-        return 0;
-    return retVal;
-}
-
-
-FileHandle XMLPlatformUtils::openStdInHandle()
-{
-        return (FileHandle)fdopen(dup(0), "rb");
-}
-
-
-
-unsigned int
-XMLPlatformUtils::readFileBuffer( FileHandle          theFile
-                                , const unsigned int  toRead
-                                , XMLByte* const      toFill)
-{
-    size_t noOfItemsRead = fread((void*) toFill, 1, toRead, (FILE*)theFile);
-
-    if(ferror((FILE*)theFile))
-    {
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotReadFromFile);
-    }
-
-    return (unsigned int)noOfItemsRead;
-}
-
-
-void XMLPlatformUtils::resetFile(FileHandle theFile)
-{
-    // Seek to the start of the file
-    if (fseek((FILE*)theFile, 0, SEEK_SET))
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::File_CouldNotResetFile);
-}
-
-
-// ---------------------------------------------------------------------------
-//  XMLPlatformUtils: Timing Methods
-// ---------------------------------------------------------------------------
-
-unsigned long XMLPlatformUtils::getCurrentMillis()
-{
-    struct timeval t;
-    struct timezone tz;
-
-    gettimeofday(&t, &tz);
-    return (unsigned long)(t.tv_sec*1000 + t.tv_usec);
-}
-
-XMLCh* XMLPlatformUtils::getFullPath(const XMLCh* const srcPath)
-{
-
-    //
-    //  NOTE: THe path provided has always already been opened successfully,
-    //  so we know that its not some pathological freaky path. It comes in
-    //  in native format, and goes out as Unicode always
-    //
-    char* newSrc = XMLString::transcode(srcPath);
-    ArrayJanitor<char> janText(newSrc);
-
-    // Use a local buffer that is big enough for the largest legal path
-    char *absPath = new char[1024];
-    // get the absolute path 
-    char* retPath = realpath(newSrc, absPath);  
-    ArrayJanitor<char> janText2(retPath);
-    
-    if (!retPath)
-    {
-        ThrowXML(XMLPlatformUtilsException, XMLExcepts::File_CouldNotGetBasePathName);
-    }
-    return XMLString::transcode(absPath);
-}
-
-bool XMLPlatformUtils::isRelative(const XMLCh* const toCheck)
-{
-    // Check for pathological case of empty path
-    if (!toCheck[0])
-        return false;
-
-    //
-    //  If it starts with a slash, then it cannot be relative. This covers
-    //  both something like "\Test\File.xml" and an NT Lan type remote path
-    //  that starts with a node like "\\MyNode\Test\File.xml".
-    //
-    if (toCheck[0] == XMLCh('/'))
-        return false;
-
-    // Else assume its a relative path
-    return true;
-}
-
-
-// -----------------------------------------------------------------------
-//  Mutex methods
-// -----------------------------------------------------------------------
-
-#if !defined(APP_NO_THREADS)
-
-// ---------------------------------------------------------------------------
-//  XMLPlatformUtils: Platform init method
-// ---------------------------------------------------------------------------
-
-static XMLMutex atomicOpsMutex;
-
-void XMLPlatformUtils::platformInit()
-{
-    //
-    // The atomicOps mutex needs to be created early.
-    // Normally, mutexes are created on first use, but there is a
-    // circular dependency between compareAndExchange() and
-    // mutex creation that must be broken.
-
-    atomicOpsMutex.fHandle = XMLPlatformUtils::makeMutex();
-}
-
-void* XMLPlatformUtils::makeMutex()
-{
-    pthread_mutex_t* mutex = new pthread_mutex_t;
-    pthread_mutexattr_t*  attr = new pthread_mutexattr_t;
-    pthread_mutexattr_init(attr);
-    pthread_mutexattr_settype(attr, PTHREAD_MUTEX_RECURSIVE);
-    if (pthread_mutex_init(mutex, attr))
-    {
-        ThrowXML(XMLPlatformUtilsException,
-                 XMLExcepts::Mutex_CouldNotCreate);
-    }
-    pthread_mutexattr_destroy(attr);
-    delete attr;
-    return (void*)(mutex);
-
-}
-
-void XMLPlatformUtils::closeMutex(void* const mtxHandle)
-{
-    if (mtxHandle != NULL)
-    {
-        if (pthread_mutex_destroy((pthread_mutex_t*) mtxHandle))
-        {
-            ThrowXML(XMLPlatformUtilsException,
-                     XMLExcepts::Mutex_CouldNotDestroy);
-        }
-        delete mtxHandle;
-    }
-}
-
-
-void XMLPlatformUtils::lockMutex(void* const mtxHandle)
-{
-    if (mtxHandle != NULL)
-    {
-        if (pthread_mutex_lock((pthread_mutex_t*) mtxHandle))
-        {
-            ThrowXML(XMLPlatformUtilsException,
-                     XMLExcepts::Mutex_CouldNotLock);
-        }
-    }
-}
-
-
-void XMLPlatformUtils::unlockMutex(void* const mtxHandle)
-{
-    if (mtxHandle != NULL)
-    {
-        if (pthread_mutex_unlock((pthread_mutex_t*) mtxHandle))
-        {
-            ThrowXML(XMLPlatformUtilsException,
-                     XMLExcepts::Mutex_CouldNotUnlock);
-        }
-    }
-}
-
-
-// -----------------------------------------------------------------------
-//  Miscellaneous synchronization methods
-// -----------------------------------------------------------------------
-
-void* XMLPlatformUtils::compareAndSwap(void**            toFill
-                                     , const void* const newValue
-                                     , const void* const toCompare)
-{
-    XMLMutexLock lockMutex(&atomicOpsMutex);
-
-    void *retVal = *toFill;
-    if (*toFill == toCompare)
-        *toFill = (void *)newValue;
-
-    return retVal;
-}
-
-int XMLPlatformUtils::atomicIncrement(int &location)
-{
-    XMLMutexLock localLock(&atomicOpsMutex);
-
-    return ++location;
-}
-
-int XMLPlatformUtils::atomicDecrement(int &location)
-{
-    XMLMutexLock localLock(&atomicOpsMutex);
-
-    return --location;
-}
-
-#else // #if !defined (APP_NO_THREADS)
-
-void XMLPlatformUtils::platformInit()
-{
-}
-
-void* XMLPlatformUtils::makeMutex()
-{
-        return 0;
-}
-
-void XMLPlatformUtils::closeMutex(void* const mtxHandle)
-{
-}
-
-void XMLPlatformUtils::lockMutex(void* const mtxHandle)
-{
-}
-
-void XMLPlatformUtils::unlockMutex(void* const mtxHandle)
-{
-}
-
-void* XMLPlatformUtils::compareAndSwap (void**             toFill,
-                                        const void* const  newValue,
-                                        const void* const  toCompare)
-{
-    void *retVal = *toFill;
-    if (*toFill == toCompare)
-       *toFill = (void *)newValue;
-    return retVal;
-}
-
-int XMLPlatformUtils::atomicIncrement(int &location)
-{
-    return ++location;
-}
-
-int XMLPlatformUtils::atomicDecrement(int &location)
-{
-    return --location;
-}
-
-#endif // APP_NO_THREADS
-
-void XMLPlatformUtils::platformTerm()
-{
-    // We don't have any termination requirements at this time
-}
-
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