diff options
23 files changed, 607 insertions, 685 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index c8f3c8fdc0c..8f01ef3ed79 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.2551 2003/06/23 07:50:05 jlam Exp $ +$NetBSD: CHANGES,v 1.2552 2003/06/23 07:53:22 jlam Exp $ Changes to the packages collection and infrastructure in 2003: @@ -2517,3 +2517,4 @@ Changes to the packages collection and infrastructure in 2003: Updated perl5 to 5.6.1nb9 [jlam 2003-06-23] Updated perl58 to 5.8.0nb2 [jlam 2003-06-23] Updated icu to 2.6 [jlam 2003-06-23] + Updated xerces-c to 1.7.0 [jlam 2003-06-23] diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile index eaa2e69431c..4189ce4ba90 100644 --- a/textproc/xerces-c/Makefile +++ b/textproc/xerces-c/Makefile @@ -1,55 +1,51 @@ -# $NetBSD: Makefile,v 1.10 2003/06/02 01:16:23 jschauma Exp $ +# $NetBSD: Makefile,v 1.11 2003/06/23 07:52:39 jlam Exp $ # -DISTNAME= xerces-c-src1_3_0 -PKGNAME= xerces-c-1.3.0 -PKGREVISION= 1 -WRKSRC= ${WRKDIR}/xerces-c-src1_3_0/src/ +DISTNAME= xerces-c-src1_7_0 +PKGNAME= ${DISTNAME:S/-src/-/:S/_/./g} +WRKSRC= ${WRKDIR}/${DISTNAME}/src/xercesc CATEGORIES= textproc -MASTER_SITES= http://xml.apache.org/dist/xerces-c/stable/ +MASTER_SITES= http://xml.apache.org/dist/xerces-c/stable/archives/Xerces-C_${DISTNAME:S/xerces-c-src//}/ MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://xml.apache.org/xerces-c/ -COMMENT= The Apache Project's validating XML parser with DOM and SAX support - -GNU_CONFIGURE= YES -USE_GMAKE= YES -USE_BUILDLINK2= YES - -ICUROOT= ${BUILDLINK_PREFIX.icu} - -SCRIPT_ENV+= ICUROOT="${BUILDLINK_PREFIX.icu}" - -FLAGS+= -O2 -I${ICUROOT}/include \ - -DXML_USE_ICU_TRANSCODER \ - -DXML_USE_NETACCESSOR_SOCKET \ - -DAPP_NO_THREADS - -CFLAGS+= ${FLAGS} -CXXFLAGS+= ${FLAGS} -LIBS= -L${ICUROOT}/lib -Wl,${RPATH_FLAG}${ICUROOT}/lib -LIBS+= -L${ICUROOT}/lib/icu/current -Wl,${RPATH_FLAG}${ICUROOT}/lib/icu/current - -CONFIGURE_ENV+= XERCESCROOT="${WRKDIR}/xerces-c-src1_3_0" \ - ICUROOT=${ICUROOT} \ - NETACCESSOR=Socket \ - TRANSCODER=ICU - -MAKE_ENV+= XERCESCROOT="${WRKDIR}/xerces-c-src1_3_0" \ - ICUROOT="${BUILDLINK_PREFIX.icu}" \ - NETACCESSOR=Socket \ - TRANSCODER=ICU \ +COMMENT= validating C++ XML parser with DOM and SAX support + +USE_BUILDLINK2= YES +USE_GMAKE= YES + +.include "../../mk/bsd.prefs.mk" +.if ${LOWER_OPSYS} == "SunOS" +XERCES_PLATFORM= solaris +.elif ${LOWER_OPSYS} == "Darwin" +XERCES_PLATFORM= macosx +.else +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+= -r none # threading + +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 \ + ${CP} ${FILESDIR}/Makefile.in \ + ${FILESDIR}/NetBSDDefs.hpp \ + ${FILESDIR}/NetBSDPlatformUtils.cpp \ ${WRKSRC}/util/Platforms/NetBSD pre-configure: - ${CHMOD} a+x ${WRKSRC}/configure + ${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT} .include "../../textproc/icu/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xerces-c/PLIST b/textproc/xerces-c/PLIST index b95ec7008ce..279b20be61c 100644 --- a/textproc/xerces-c/PLIST +++ b/textproc/xerces-c/PLIST @@ -1,206 +1,372 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:16 zuntum Exp $ -include/dom/DOM.hpp -include/dom/DOMString.hpp -include/dom/DOM_Attr.hpp -include/dom/DOM_CDATASection.hpp -include/dom/DOM_CharacterData.hpp -include/dom/DOM_Comment.hpp -include/dom/DOM_DOMException.hpp -include/dom/DOM_DOMImplementation.hpp -include/dom/DOM_Document.hpp -include/dom/DOM_DocumentFragment.hpp -include/dom/DOM_DocumentType.hpp -include/dom/DOM_Element.hpp -include/dom/DOM_Entity.hpp -include/dom/DOM_EntityReference.hpp -include/dom/DOM_NamedNodeMap.hpp -include/dom/DOM_Node.hpp -include/dom/DOM_NodeFilter.hpp -include/dom/DOM_NodeIterator.hpp -include/dom/DOM_NodeList.hpp -include/dom/DOM_Notation.hpp -include/dom/DOM_ProcessingInstruction.hpp -include/dom/DOM_Range.hpp -include/dom/DOM_RangeException.hpp -include/dom/DOM_Text.hpp -include/dom/DOM_TreeWalker.hpp -include/dom/DOM_XMLDecl.hpp -include/dom/DomMemDebug.hpp -include/framework/LocalFileInputSource.hpp -include/framework/MemBufInputSource.hpp -include/framework/StdInInputSource.hpp -include/framework/URLInputSource.hpp -include/framework/XMLAttDef.hpp -include/framework/XMLAttDefList.hpp -include/framework/XMLAttr.hpp -include/framework/XMLBuffer.hpp -include/framework/XMLBufferMgr.hpp -include/framework/XMLContentModel.hpp -include/framework/XMLDocumentHandler.hpp -include/framework/XMLElementDecl.hpp -include/framework/XMLEntityDecl.hpp -include/framework/XMLEntityHandler.hpp -include/framework/XMLErrorCodes.hpp -include/framework/XMLErrorReporter.hpp -include/framework/XMLFormatter.hpp -include/framework/XMLNotationDecl.hpp -include/framework/XMLPScanToken.hpp -include/framework/XMLRecognizer.hpp -include/framework/XMLRefInfo.hpp -include/framework/XMLValidator.hpp -include/framework/XMLValidityCodes.hpp -include/internal/CharTypeTables.hpp -include/internal/ElemStack.hpp -include/internal/EndOfEntityException.hpp -include/internal/ReaderMgr.hpp -include/internal/VecAttrListImpl.hpp -include/internal/VecAttributesImpl.hpp -include/internal/XMLReader.hpp -include/internal/XMLScanner.hpp -include/parsers/DOMParser.hpp -include/parsers/SAX2XMLReaderImpl.hpp -include/parsers/SAXParser.hpp -include/sax/AttributeList.hpp -include/sax/DTDHandler.hpp -include/sax/DocumentHandler.hpp -include/sax/EntityResolver.hpp -include/sax/ErrorHandler.hpp -include/sax/HandlerBase.hpp -include/sax/InputSource.hpp -include/sax/Locator.hpp -include/sax/Parser.hpp -include/sax/SAXException.hpp -include/sax/SAXParseException.hpp -include/sax2/Attributes.hpp -include/sax2/ContentHandler.hpp -include/sax2/DefaultHandler.hpp -include/sax2/SAX2XMLReader.hpp -include/sax2/XMLReaderFactory.hpp -include/util/ArrayIndexOutOfBoundsException.hpp -include/util/AutoSense.hpp -include/util/BinFileInputStream.hpp -include/util/BinInputStream.hpp -include/util/BinMemInputStream.hpp -include/util/BitOps.hpp -include/util/BitSet.hpp -include/util/Compilers/BorlandCDefs.hpp -include/util/Compilers/CSetDefs.hpp -include/util/Compilers/CodeWarriorDefs.hpp -include/util/Compilers/DECCXXDefs.hpp -include/util/Compilers/GCCDefs.hpp -include/util/Compilers/HPCCDefs.hpp -include/util/Compilers/IBMVAOS2Defs.hpp -include/util/Compilers/IBMVAW32Defs.hpp -include/util/Compilers/MIPSproDefs.hpp -include/util/Compilers/MVSCPPDefs.hpp -include/util/Compilers/OS400SetDefs.hpp -include/util/Compilers/PTXCCDefs.hpp -include/util/Compilers/SCOCCDefs.hpp -include/util/Compilers/SunCCDefs.hpp -include/util/Compilers/SunKaiDefs.hpp -include/util/Compilers/TandemCCDefs.hpp -include/util/Compilers/VCPPDefs.hpp -include/util/CountedPointer.c -include/util/CountedPointer.hpp -include/util/EmptyStackException.hpp -include/util/FlagJanitor.c -include/util/FlagJanitor.hpp -include/util/HashBase.hpp -include/util/HashPtr.hpp -include/util/HashXMLCh.hpp -include/util/IOException.hpp -include/util/IllegalArgumentException.hpp -include/util/InvalidCastException.hpp -include/util/Janitor.c -include/util/Janitor.hpp -include/util/KVStringPair.hpp -include/util/KeyValuePair.c -include/util/KeyValuePair.hpp -include/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp -include/util/MsgLoaders/InMemory/InMemMsgLoader.hpp -include/util/Mutexes.hpp -include/util/NameIdPool.c -include/util/NameIdPool.hpp -include/util/NoDefTranscoderException.hpp -include/util/NoSuchElementException.hpp -include/util/NullPointerException.hpp -include/util/PlatformUtils.hpp -include/util/Platforms/NetBSD/NetBSDDefs.hpp -include/util/RefArrayOf.c -include/util/RefArrayOf.hpp -include/util/RefHashTableOf.c -include/util/RefHashTableOf.hpp -include/util/RefStackOf.c -include/util/RefStackOf.hpp -include/util/RefVectorOf.c -include/util/RefVectorOf.hpp -include/util/RuntimeException.hpp -include/util/StringPool.hpp -include/util/TransENameMap.c -include/util/TransENameMap.hpp -include/util/TransService.hpp -include/util/Transcoders/ICU/ICUTransService.hpp -include/util/TranscodingException.hpp -include/util/UTFDataFormatException.hpp -include/util/UnexpectedEOFException.hpp -include/util/UnsupportedEncodingException.hpp -include/util/ValueArrayOf.c -include/util/ValueArrayOf.hpp -include/util/ValueStackOf.c -include/util/ValueStackOf.hpp -include/util/ValueVectorOf.c -include/util/ValueVectorOf.hpp -include/util/XML256TableTranscoder.hpp -include/util/XML88591Transcoder.hpp -include/util/XMLASCIITranscoder.hpp -include/util/XMLChTranscoder.hpp -include/util/XMLDeleterFor.c -include/util/XMLDeleterFor.hpp -include/util/XMLEBCDICTranscoder.hpp -include/util/XMLEnumerator.hpp -include/util/XMLExceptMsgs.hpp -include/util/XMLException.hpp -include/util/XMLIBM1140Transcoder.hpp -include/util/XMLMsgLoader.hpp -include/util/XMLNetAccessor.hpp -include/util/XMLString.hpp -include/util/XMLUCS4Transcoder.hpp -include/util/XMLURL.hpp -include/util/XMLUTF16Transcoder.hpp -include/util/XMLUTF8Transcoder.hpp -include/util/XMLUni.hpp -include/util/XMLUniDefs.hpp -include/util/XMLWin1252Transcoder.hpp -include/util/XercesDefs.hpp -include/validators/DTD/CMBinaryOp.hpp -include/validators/DTD/CMLeaf.hpp -include/validators/DTD/CMNode.hpp -include/validators/DTD/CMStateSet.hpp -include/validators/DTD/CMUnaryOp.hpp -include/validators/DTD/ContentSpecNode.hpp -include/validators/DTD/DFAContentModel.hpp -include/validators/DTD/DTDAttDef.hpp -include/validators/DTD/DTDAttDefList.hpp -include/validators/DTD/DTDElementDecl.hpp -include/validators/DTD/DTDEntityDecl.hpp -include/validators/DTD/DTDValidator.hpp -include/validators/DTD/DocTypeHandler.hpp -include/validators/DTD/MixedContentModel.hpp -include/validators/DTD/SimpleContentModel.hpp -lib/libxerces-c1_3.so -@dirrm include/validators/DTD -@dirrm include/validators -@dirrm include/util/Transcoders/ICU -@dirrm include/util/Transcoders -@dirrm include/util/Platforms/${OPSYS} -@dirrm include/util/Platforms -@dirrm include/util/MsgLoaders/InMemory -@dirrm include/util/MsgLoaders -@dirrm include/util/Compilers -@dirrm include/util -@dirrm include/sax2 -@dirrm include/sax -@dirrm include/parsers -@dirrm include/internal -@dirrm include/framework -@dirrm include/dom +@comment $NetBSD: PLIST,v 1.2 2003/06/23 07:52:39 jlam 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/framework/LocalFileInputSource.hpp +include/xercesc/framework/MemBufInputSource.hpp +include/xercesc/framework/StdInInputSource.hpp +include/xercesc/framework/URLInputSource.hpp +include/xercesc/framework/XMLAttDef.hpp +include/xercesc/framework/XMLAttDefList.hpp +include/xercesc/framework/XMLAttr.hpp +include/xercesc/framework/XMLBuffer.hpp +include/xercesc/framework/XMLBufferMgr.hpp +include/xercesc/framework/XMLContentModel.hpp +include/xercesc/framework/XMLDocumentHandler.hpp +include/xercesc/framework/XMLElementDecl.hpp +include/xercesc/framework/XMLEntityDecl.hpp +include/xercesc/framework/XMLEntityHandler.hpp +include/xercesc/framework/XMLErrorCodes.hpp +include/xercesc/framework/XMLErrorReporter.hpp +include/xercesc/framework/XMLFormatter.hpp +include/xercesc/framework/XMLNotationDecl.hpp +include/xercesc/framework/XMLPScanToken.hpp +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/ElemStack.hpp +include/xercesc/internal/EndOfEntityException.hpp +include/xercesc/internal/ReaderMgr.hpp +include/xercesc/internal/VecAttrListImpl.hpp +include/xercesc/internal/VecAttributesImpl.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/parsers/SAX2XMLReaderImpl.hpp +include/xercesc/parsers/SAXParser.hpp +include/xercesc/sax/AttributeList.hpp +include/xercesc/sax/DTDHandler.hpp +include/xercesc/sax/DocumentHandler.hpp +include/xercesc/sax/EntityResolver.hpp +include/xercesc/sax/ErrorHandler.hpp +include/xercesc/sax/HandlerBase.hpp +include/xercesc/sax/InputSource.hpp +include/xercesc/sax/Locator.hpp +include/xercesc/sax/Parser.hpp +include/xercesc/sax/SAXException.hpp +include/xercesc/sax/SAXParseException.hpp +include/xercesc/sax2/Attributes.hpp +include/xercesc/sax2/ContentHandler.hpp +include/xercesc/sax2/DeclHandler.hpp +include/xercesc/sax2/DefaultHandler.hpp +include/xercesc/sax2/LexicalHandler.hpp +include/xercesc/sax2/SAX2XMLReader.hpp +include/xercesc/sax2/XMLReaderFactory.hpp +include/xercesc/util/ArrayIndexOutOfBoundsException.hpp +include/xercesc/util/AutoSense.hpp +include/xercesc/util/Base64.hpp +include/xercesc/util/BinFileInputStream.hpp +include/xercesc/util/BinInputStream.hpp +include/xercesc/util/BinMemInputStream.hpp +include/xercesc/util/BitOps.hpp +include/xercesc/util/BitSet.hpp +include/xercesc/util/Compilers/BorlandCDefs.hpp +include/xercesc/util/Compilers/CSetDefs.hpp +include/xercesc/util/Compilers/CodeWarriorDefs.hpp +include/xercesc/util/Compilers/DECCXXDefs.hpp +include/xercesc/util/Compilers/GCCDefs.hpp +include/xercesc/util/Compilers/HPCCDefs.hpp +include/xercesc/util/Compilers/IBMVAOS2Defs.hpp +include/xercesc/util/Compilers/IBMVAW32Defs.hpp +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/SCOCCDefs.hpp +include/xercesc/util/Compilers/SunCCDefs.hpp +include/xercesc/util/Compilers/SunKaiDefs.hpp +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/EmptyStackException.hpp +include/xercesc/util/FlagJanitor.c +include/xercesc/util/FlagJanitor.hpp +include/xercesc/util/HashBase.hpp +include/xercesc/util/HashCMStateSet.hpp +include/xercesc/util/HashPtr.hpp +include/xercesc/util/HashXMLCh.hpp +include/xercesc/util/HexBin.hpp +include/xercesc/util/IOException.hpp +include/xercesc/util/IllegalArgumentException.hpp +include/xercesc/util/InvalidCastException.hpp +include/xercesc/util/Janitor.c +include/xercesc/util/Janitor.hpp +include/xercesc/util/KVStringPair.hpp +include/xercesc/util/KeyValuePair.c +include/xercesc/util/KeyValuePair.hpp +include/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp +include/xercesc/util/Mutexes.hpp +include/xercesc/util/NameIdPool.c +include/xercesc/util/NameIdPool.hpp +include/xercesc/util/NoDefTranscoderException.hpp +include/xercesc/util/NoSuchElementException.hpp +include/xercesc/util/NullPointerException.hpp +include/xercesc/util/NumberFormatException.hpp +include/xercesc/util/ParseException.hpp +include/xercesc/util/PlatformUtils.hpp +include/xercesc/util/Platforms/NetBSD/NetBSDDefs.hpp +include/xercesc/util/QName.hpp +include/xercesc/util/RefArrayOf.c +include/xercesc/util/RefArrayOf.hpp +include/xercesc/util/RefHash2KeysTableOf.c +include/xercesc/util/RefHash2KeysTableOf.hpp +include/xercesc/util/RefHash3KeysIdPool.c +include/xercesc/util/RefHash3KeysIdPool.hpp +include/xercesc/util/RefHashTableOf.c +include/xercesc/util/RefHashTableOf.hpp +include/xercesc/util/RefStackOf.c +include/xercesc/util/RefStackOf.hpp +include/xercesc/util/RefVectorOf.c +include/xercesc/util/RefVectorOf.hpp +include/xercesc/util/RuntimeException.hpp +include/xercesc/util/SchemaDateTimeException.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 +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/ValueStackOf.c +include/xercesc/util/ValueStackOf.hpp +include/xercesc/util/ValueVectorOf.c +include/xercesc/util/ValueVectorOf.hpp +include/xercesc/util/XML256TableTranscoder.hpp +include/xercesc/util/XML88591Transcoder.hpp +include/xercesc/util/XMLASCIITranscoder.hpp +include/xercesc/util/XMLAbstractDoubleFloat.hpp +include/xercesc/util/XMLBigDecimal.hpp +include/xercesc/util/XMLBigInteger.hpp +include/xercesc/util/XMLChTranscoder.hpp +include/xercesc/util/XMLDateTime.hpp +include/xercesc/util/XMLDeleterFor.c +include/xercesc/util/XMLDeleterFor.hpp +include/xercesc/util/XMLDouble.hpp +include/xercesc/util/XMLEBCDICTranscoder.hpp +include/xercesc/util/XMLEnumerator.hpp +include/xercesc/util/XMLExceptMsgs.hpp +include/xercesc/util/XMLException.hpp +include/xercesc/util/XMLFloat.hpp +include/xercesc/util/XMLIBM1140Transcoder.hpp +include/xercesc/util/XMLInteger.hpp +include/xercesc/util/XMLMsgLoader.hpp +include/xercesc/util/XMLNetAccessor.hpp +include/xercesc/util/XMLNumber.hpp +include/xercesc/util/XMLRegisterCleanup.hpp +include/xercesc/util/XMLString.hpp +include/xercesc/util/XMLStringTokenizer.hpp +include/xercesc/util/XMLUCS4Transcoder.hpp +include/xercesc/util/XMLURL.hpp +include/xercesc/util/XMLUTF16Transcoder.hpp +include/xercesc/util/XMLUTF8Transcoder.hpp +include/xercesc/util/XMLUni.hpp +include/xercesc/util/XMLUniDefs.hpp +include/xercesc/util/XMLUri.hpp +include/xercesc/util/XMLWin1252Transcoder.hpp +include/xercesc/util/XercesDefs.hpp +include/xercesc/util/regx/ASCIIRangeFactory.hpp +include/xercesc/util/regx/BMPattern.hpp +include/xercesc/util/regx/BlockRangeFactory.hpp +include/xercesc/util/regx/CharToken.hpp +include/xercesc/util/regx/ClosureToken.hpp +include/xercesc/util/regx/ConcatToken.hpp +include/xercesc/util/regx/ConditionToken.hpp +include/xercesc/util/regx/Match.hpp +include/xercesc/util/regx/ModifierToken.hpp +include/xercesc/util/regx/Op.hpp +include/xercesc/util/regx/OpFactory.hpp +include/xercesc/util/regx/ParenToken.hpp +include/xercesc/util/regx/ParserForXMLSchema.hpp +include/xercesc/util/regx/RangeFactory.hpp +include/xercesc/util/regx/RangeToken.hpp +include/xercesc/util/regx/RangeTokenMap.hpp +include/xercesc/util/regx/RegularExpression.hpp +include/xercesc/util/regx/RegxDefs.hpp +include/xercesc/util/regx/RegxParser.hpp +include/xercesc/util/regx/RegxUtil.hpp +include/xercesc/util/regx/StringToken.hpp +include/xercesc/util/regx/Token.hpp +include/xercesc/util/regx/TokenFactory.hpp +include/xercesc/util/regx/TokenInc.hpp +include/xercesc/util/regx/UniCharTable.hpp +include/xercesc/util/regx/UnicodeRangeFactory.hpp +include/xercesc/util/regx/UnionToken.hpp +include/xercesc/util/regx/XMLRangeFactory.hpp +include/xercesc/util/regx/XMLUniCharacter.hpp +include/xercesc/validators/DTD/DTDAttDef.hpp +include/xercesc/validators/DTD/DTDAttDefList.hpp +include/xercesc/validators/DTD/DTDElementDecl.hpp +include/xercesc/validators/DTD/DTDEntityDecl.hpp +include/xercesc/validators/DTD/DTDGrammar.hpp +include/xercesc/validators/DTD/DTDScanner.hpp +include/xercesc/validators/DTD/DTDValidator.hpp +include/xercesc/validators/DTD/DocTypeHandler.hpp +include/xercesc/validators/common/AllContentModel.hpp +include/xercesc/validators/common/CMAny.hpp +include/xercesc/validators/common/CMBinaryOp.hpp +include/xercesc/validators/common/CMLeaf.hpp +include/xercesc/validators/common/CMNode.hpp +include/xercesc/validators/common/CMStateSet.hpp +include/xercesc/validators/common/CMUnaryOp.hpp +include/xercesc/validators/common/ContentLeafNameTypeVector.hpp +include/xercesc/validators/common/ContentSpecNode.hpp +include/xercesc/validators/common/DFAContentModel.hpp +include/xercesc/validators/common/Grammar.hpp +include/xercesc/validators/common/GrammarResolver.hpp +include/xercesc/validators/common/MixedContentModel.hpp +include/xercesc/validators/common/SimpleContentModel.hpp +include/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp +include/xercesc/validators/datatype/AbstractNumericValidator.hpp +include/xercesc/validators/datatype/AbstractStringValidator.hpp +include/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp +include/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp +include/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp +include/xercesc/validators/datatype/BooleanDatatypeValidator.hpp +include/xercesc/validators/datatype/DatatypeValidator.hpp +include/xercesc/validators/datatype/DatatypeValidatorFactory.hpp +include/xercesc/validators/datatype/DateDatatypeValidator.hpp +include/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp +include/xercesc/validators/datatype/DateTimeValidator.hpp +include/xercesc/validators/datatype/DayDatatypeValidator.hpp +include/xercesc/validators/datatype/DecimalDatatypeValidator.hpp +include/xercesc/validators/datatype/DoubleDatatypeValidator.hpp +include/xercesc/validators/datatype/DurationDatatypeValidator.hpp +include/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp +include/xercesc/validators/datatype/FloatDatatypeValidator.hpp +include/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp +include/xercesc/validators/datatype/IDDatatypeValidator.hpp +include/xercesc/validators/datatype/IDREFDatatypeValidator.hpp +include/xercesc/validators/datatype/InvalidDatatypeFacetException.hpp +include/xercesc/validators/datatype/InvalidDatatypeValueException.hpp +include/xercesc/validators/datatype/ListDatatypeValidator.hpp +include/xercesc/validators/datatype/MonthDatatypeValidator.hpp +include/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp +include/xercesc/validators/datatype/NCNameDatatypeValidator.hpp +include/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp +include/xercesc/validators/datatype/NameDatatypeValidator.hpp +include/xercesc/validators/datatype/QNameDatatypeValidator.hpp +include/xercesc/validators/datatype/StringDatatypeValidator.hpp +include/xercesc/validators/datatype/TimeDatatypeValidator.hpp +include/xercesc/validators/datatype/UnionDatatypeValidator.hpp +include/xercesc/validators/datatype/YearDatatypeValidator.hpp +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/SchemaAttDef.hpp +include/xercesc/validators/schema/SchemaAttDefList.hpp +include/xercesc/validators/schema/SchemaElementDecl.hpp +include/xercesc/validators/schema/SchemaGrammar.hpp +include/xercesc/validators/schema/SchemaInfo.hpp +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/XUtil.hpp +include/xercesc/validators/schema/XercesAttGroupInfo.hpp +include/xercesc/validators/schema/XercesElementWildcard.hpp +include/xercesc/validators/schema/XercesGroupInfo.hpp +include/xercesc/validators/schema/identity/FieldActivator.hpp +include/xercesc/validators/schema/identity/FieldValueMap.hpp +include/xercesc/validators/schema/identity/IC_Field.hpp +include/xercesc/validators/schema/identity/IC_Key.hpp +include/xercesc/validators/schema/identity/IC_KeyRef.hpp +include/xercesc/validators/schema/identity/IC_Selector.hpp +include/xercesc/validators/schema/identity/IC_Unique.hpp +include/xercesc/validators/schema/identity/IdentityConstraint.hpp +include/xercesc/validators/schema/identity/ValueStore.hpp +include/xercesc/validators/schema/identity/ValueStoreCache.hpp +include/xercesc/validators/schema/identity/XPathException.hpp +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 +@dirrm include/xercesc/validators/schema/identity +@dirrm include/xercesc/validators/schema +@dirrm include/xercesc/validators/datatype +@dirrm include/xercesc/validators/common +@dirrm include/xercesc/validators/DTD +@dirrm include/xercesc/validators +@dirrm include/xercesc/util/regx +@dirrm include/xercesc/util/Transcoders/ICU +@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/Compilers +@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 +@dirrm include/xercesc diff --git a/textproc/xerces-c/buildlink2.mk b/textproc/xerces-c/buildlink2.mk index 1de8373e41d..9679f0a771f 100644 --- a/textproc/xerces-c/buildlink2.mk +++ b/textproc/xerces-c/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2003/03/22 00:40:50 salo Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/06/23 07:52:40 jlam Exp $ # # This Makefile fragment is included by packages that use xerces-c. # @@ -8,201 +8,16 @@ .if !defined(XERCES_C_BUILDLINK2_MK) XERCES_C_BUILDLINK2_MK= # defined -BUILDLINK_PACKAGES+= xerces-c -BUILDLINK_DEPENDS.xerces-c?= xerces-c>=1.3.0nb1 -BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c +BUILDLINK_PACKAGES+= xerces-c +BUILDLINK_DEPENDS.xerces-c?= xerces-c>=1.7.0 +BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c EVAL_PREFIX+= BUILDLINK_PREFIX.xerces-c=xerces-c BUILDLINK_PREFIX.xerces-c_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.xerces-c+= include/dom/DOM.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOMString.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Attr.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_CDATASection.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_CharacterData.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Comment.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_DOMException.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_DOMImplementation.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Document.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_DocumentFragment.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_DocumentType.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Element.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Entity.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_EntityReference.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_NamedNodeMap.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Node.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_NodeFilter.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_NodeIterator.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_NodeList.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Notation.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_ProcessingInstruction.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Range.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_RangeException.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_Text.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_TreeWalker.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DOM_XMLDecl.hpp -BUILDLINK_FILES.xerces-c+= include/dom/DomMemDebug.hpp -BUILDLINK_FILES.xerces-c+= include/framework/LocalFileInputSource.hpp -BUILDLINK_FILES.xerces-c+= include/framework/MemBufInputSource.hpp -BUILDLINK_FILES.xerces-c+= include/framework/StdInInputSource.hpp -BUILDLINK_FILES.xerces-c+= include/framework/URLInputSource.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLAttDef.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLAttDefList.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLAttr.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLBuffer.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLBufferMgr.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLContentModel.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLDocumentHandler.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLElementDecl.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLEntityDecl.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLEntityHandler.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLErrorCodes.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLErrorReporter.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLFormatter.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLNotationDecl.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLPScanToken.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLRecognizer.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLRefInfo.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLValidator.hpp -BUILDLINK_FILES.xerces-c+= include/framework/XMLValidityCodes.hpp -BUILDLINK_FILES.xerces-c+= include/internal/CharTypeTables.hpp -BUILDLINK_FILES.xerces-c+= include/internal/ElemStack.hpp -BUILDLINK_FILES.xerces-c+= include/internal/EndOfEntityException.hpp -BUILDLINK_FILES.xerces-c+= include/internal/ReaderMgr.hpp -BUILDLINK_FILES.xerces-c+= include/internal/VecAttrListImpl.hpp -BUILDLINK_FILES.xerces-c+= include/internal/VecAttributesImpl.hpp -BUILDLINK_FILES.xerces-c+= include/internal/XMLReader.hpp -BUILDLINK_FILES.xerces-c+= include/internal/XMLScanner.hpp -BUILDLINK_FILES.xerces-c+= include/parsers/DOMParser.hpp -BUILDLINK_FILES.xerces-c+= include/parsers/SAX2XMLReaderImpl.hpp -BUILDLINK_FILES.xerces-c+= include/parsers/SAXParser.hpp -BUILDLINK_FILES.xerces-c+= include/sax/AttributeList.hpp -BUILDLINK_FILES.xerces-c+= include/sax/DTDHandler.hpp -BUILDLINK_FILES.xerces-c+= include/sax/DocumentHandler.hpp -BUILDLINK_FILES.xerces-c+= include/sax/EntityResolver.hpp -BUILDLINK_FILES.xerces-c+= include/sax/ErrorHandler.hpp -BUILDLINK_FILES.xerces-c+= include/sax/HandlerBase.hpp -BUILDLINK_FILES.xerces-c+= include/sax/InputSource.hpp -BUILDLINK_FILES.xerces-c+= include/sax/Locator.hpp -BUILDLINK_FILES.xerces-c+= include/sax/Parser.hpp -BUILDLINK_FILES.xerces-c+= include/sax/SAXException.hpp -BUILDLINK_FILES.xerces-c+= include/sax/SAXParseException.hpp -BUILDLINK_FILES.xerces-c+= include/sax2/Attributes.hpp -BUILDLINK_FILES.xerces-c+= include/sax2/ContentHandler.hpp -BUILDLINK_FILES.xerces-c+= include/sax2/DefaultHandler.hpp -BUILDLINK_FILES.xerces-c+= include/sax2/SAX2XMLReader.hpp -BUILDLINK_FILES.xerces-c+= include/sax2/XMLReaderFactory.hpp -BUILDLINK_FILES.xerces-c+= include/util/ArrayIndexOutOfBoundsException.hpp -BUILDLINK_FILES.xerces-c+= include/util/AutoSense.hpp -BUILDLINK_FILES.xerces-c+= include/util/BinFileInputStream.hpp -BUILDLINK_FILES.xerces-c+= include/util/BinInputStream.hpp -BUILDLINK_FILES.xerces-c+= include/util/BinMemInputStream.hpp -BUILDLINK_FILES.xerces-c+= include/util/BitOps.hpp -BUILDLINK_FILES.xerces-c+= include/util/BitSet.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/BorlandCDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/CSetDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/CodeWarriorDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/DECCXXDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/GCCDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/HPCCDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/IBMVAOS2Defs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/IBMVAW32Defs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/MIPSproDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/MVSCPPDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/OS400SetDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/PTXCCDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/SCOCCDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/SunCCDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/SunKaiDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/TandemCCDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/Compilers/VCPPDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/CountedPointer.c -BUILDLINK_FILES.xerces-c+= include/util/CountedPointer.hpp -BUILDLINK_FILES.xerces-c+= include/util/EmptyStackException.hpp -BUILDLINK_FILES.xerces-c+= include/util/FlagJanitor.c -BUILDLINK_FILES.xerces-c+= include/util/FlagJanitor.hpp -BUILDLINK_FILES.xerces-c+= include/util/HashBase.hpp -BUILDLINK_FILES.xerces-c+= include/util/HashPtr.hpp -BUILDLINK_FILES.xerces-c+= include/util/HashXMLCh.hpp -BUILDLINK_FILES.xerces-c+= include/util/IOException.hpp -BUILDLINK_FILES.xerces-c+= include/util/IllegalArgumentException.hpp -BUILDLINK_FILES.xerces-c+= include/util/InvalidCastException.hpp -BUILDLINK_FILES.xerces-c+= include/util/Janitor.c -BUILDLINK_FILES.xerces-c+= include/util/Janitor.hpp -BUILDLINK_FILES.xerces-c+= include/util/KVStringPair.hpp -BUILDLINK_FILES.xerces-c+= include/util/KeyValuePair.c -BUILDLINK_FILES.xerces-c+= include/util/KeyValuePair.hpp -BUILDLINK_FILES.xerces-c+= include/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp -BUILDLINK_FILES.xerces-c+= include/util/MsgLoaders/InMemory/InMemMsgLoader.hpp -BUILDLINK_FILES.xerces-c+= include/util/Mutexes.hpp -BUILDLINK_FILES.xerces-c+= include/util/NameIdPool.c -BUILDLINK_FILES.xerces-c+= include/util/NameIdPool.hpp -BUILDLINK_FILES.xerces-c+= include/util/NoDefTranscoderException.hpp -BUILDLINK_FILES.xerces-c+= include/util/NoSuchElementException.hpp -BUILDLINK_FILES.xerces-c+= include/util/NullPointerException.hpp -BUILDLINK_FILES.xerces-c+= include/util/PlatformUtils.hpp -BUILDLINK_FILES.xerces-c+= include/util/Platforms/NetBSD/NetBSDDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/RefArrayOf.c -BUILDLINK_FILES.xerces-c+= include/util/RefArrayOf.hpp -BUILDLINK_FILES.xerces-c+= include/util/RefHashTableOf.c -BUILDLINK_FILES.xerces-c+= include/util/RefHashTableOf.hpp -BUILDLINK_FILES.xerces-c+= include/util/RefStackOf.c -BUILDLINK_FILES.xerces-c+= include/util/RefStackOf.hpp -BUILDLINK_FILES.xerces-c+= include/util/RefVectorOf.c -BUILDLINK_FILES.xerces-c+= include/util/RefVectorOf.hpp -BUILDLINK_FILES.xerces-c+= include/util/RuntimeException.hpp -BUILDLINK_FILES.xerces-c+= include/util/StringPool.hpp -BUILDLINK_FILES.xerces-c+= include/util/TransENameMap.c -BUILDLINK_FILES.xerces-c+= include/util/TransENameMap.hpp -BUILDLINK_FILES.xerces-c+= include/util/TransService.hpp -BUILDLINK_FILES.xerces-c+= include/util/Transcoders/ICU/ICUTransService.hpp -BUILDLINK_FILES.xerces-c+= include/util/TranscodingException.hpp -BUILDLINK_FILES.xerces-c+= include/util/UTFDataFormatException.hpp -BUILDLINK_FILES.xerces-c+= include/util/UnexpectedEOFException.hpp -BUILDLINK_FILES.xerces-c+= include/util/UnsupportedEncodingException.hpp -BUILDLINK_FILES.xerces-c+= include/util/ValueArrayOf.c -BUILDLINK_FILES.xerces-c+= include/util/ValueArrayOf.hpp -BUILDLINK_FILES.xerces-c+= include/util/ValueStackOf.c -BUILDLINK_FILES.xerces-c+= include/util/ValueStackOf.hpp -BUILDLINK_FILES.xerces-c+= include/util/ValueVectorOf.c -BUILDLINK_FILES.xerces-c+= include/util/ValueVectorOf.hpp -BUILDLINK_FILES.xerces-c+= include/util/XML256TableTranscoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XML88591Transcoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLASCIITranscoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLChTranscoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLDeleterFor.c -BUILDLINK_FILES.xerces-c+= include/util/XMLDeleterFor.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLEBCDICTranscoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLEnumerator.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLExceptMsgs.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLException.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLIBM1140Transcoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLMsgLoader.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLNetAccessor.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLString.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLUCS4Transcoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLURL.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLUTF16Transcoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLUTF8Transcoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLUni.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLUniDefs.hpp -BUILDLINK_FILES.xerces-c+= include/util/XMLWin1252Transcoder.hpp -BUILDLINK_FILES.xerces-c+= include/util/XercesDefs.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/CMBinaryOp.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/CMLeaf.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/CMNode.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/CMStateSet.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/CMUnaryOp.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/ContentSpecNode.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/DFAContentModel.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/DTDAttDef.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/DTDAttDefList.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/DTDElementDecl.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/DTDEntityDecl.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/DTDValidator.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/DocTypeHandler.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/MixedContentModel.hpp -BUILDLINK_FILES.xerces-c+= include/validators/DTD/SimpleContentModel.hpp -BUILDLINK_FILES.xerces-c+= lib/libxerces-c1_3.* +BUILDLINK_FILES.xerces-c= include/xercesc/*/*/*/* +BUILDLINK_FILES.xerces-c+= include/xercesc/*/*/* +BUILDLINK_FILES.xerces-c+= include/xercesc/*/* +BUILDLINK_FILES.xerces-c+= lib/libxerces-c*.* .include "../../textproc/icu/buildlink2.mk" diff --git a/textproc/xerces-c/distinfo b/textproc/xerces-c/distinfo index c1f4ad693f1..97bca24a1b0 100644 --- a/textproc/xerces-c/distinfo +++ b/textproc/xerces-c/distinfo @@ -1,20 +1,13 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 15:05:13 skrll Exp $ +$NetBSD: distinfo,v 1.3 2003/06/23 07:52:40 jlam Exp $ -SHA1 (xerces-c-src1_3_0.tar.gz) = 74d632a0f7080110fc9d203055d3b6dd16e400c8 -Size (xerces-c-src1_3_0.tar.gz) = 4192315 bytes -SHA1 (patch-aa) = 85cb4489813102d6eed0331f86d268ea4485c6d8 -SHA1 (patch-ab) = 7d5836be474ed0edd8ffe1266e58c2d5478c6d2d -SHA1 (patch-ac) = fc50d3a96740182f1a9f65f2e06791f8399c9770 -SHA1 (patch-ad) = 3ae75424accf4b661298cbdf12790af672768826 -SHA1 (patch-ae) = 5223e628ca53d215cd92d746bc47113c1277a414 -SHA1 (patch-af) = 7cf92c47dc62b364e4b974954cf43c8dccc709d9 -SHA1 (patch-ag) = b37a51322b6bb7e59a8b44125c96cd0e034b8302 -SHA1 (patch-ah) = 2c5e52b56eaaec856cbb3426906387ada52b72fe -SHA1 (patch-ai) = adde8ffb50aeb24616ba64f418c529b23854e3ef -SHA1 (patch-aj) = cc853dd9771ee0be09bbe297acea9a12708a738a -SHA1 (patch-ak) = 615fedd6c272179b80a27c7488bb1ddf74c56ccb -SHA1 (patch-al) = 0a07643330d0bdfc58d7c527ce46e73795a25d93 -SHA1 (patch-am) = 1761441d0afd5f63a0873bfd1cad8946e27f3ad7 -SHA1 (patch-an) = 4b8af155b34f4930075c9d22f162014117c84b62 -SHA1 (patch-ao) = 2c13b5f5b7d6edd4cf88ad8061f1f9ad981b41b5 -SHA1 (patch-ap) = b762f1c86cb273095c36ff9a4475353f8afca2ce +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 diff --git a/textproc/xerces-c/files/Makefile.in b/textproc/xerces-c/files/Makefile.in index 8184d97c8cf..10f13f7a8d6 100644 --- a/textproc/xerces-c/files/Makefile.in +++ b/textproc/xerces-c/files/Makefile.in @@ -62,12 +62,14 @@ 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 @@ -78,4 +80,3 @@ CPP_PUBHEADERS = NetBSDDefs.hpp CPP_OBJECTS = NetBSDPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/textproc/xerces-c/files/NetBSDPlatformUtils.cpp b/textproc/xerces-c/files/NetBSDPlatformUtils.cpp index 8da8f3a17bf..fdf6afdbf3c 100644 --- a/textproc/xerces-c/files/NetBSDPlatformUtils.cpp +++ b/textproc/xerces-c/files/NetBSDPlatformUtils.cpp @@ -81,32 +81,32 @@ #include <string.h> #include <strings.h>/* for strcasecmp & strncasecmp */ #include <wchar.h> /* for win_t */ -#include <util/PlatformUtils.hpp> -#include <util/RuntimeException.hpp> -#include <util/Janitor.hpp> -#include <util/Mutexes.hpp> -#include <util/XMLString.hpp> -#include <util/XMLUniDefs.hpp> -#include <util/XMLUni.hpp> +#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 <util/Transcoders/ICU/ICUTransService.hpp> + #include <xercesc/util/Transcoders/ICU/ICUTransService.hpp> #else // Use native transcoder. Same as -DXML_USE_NATIVE_TRANSCODER - #include <util/Transcoders/Iconv/IconvTransService.hpp> + #include <xercesc/util/Transcoders/Iconv/IconvTransService.hpp> #endif #if defined(XML_USE_ICU_MESSAGELOADER) - #include <util/MsgLoaders/ICU/ICUMsgLoader.hpp> + #include <xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp> #else // Same as -DXML_USE_INMEM_MESSAGELOADER - #include <util/MsgLoaders/InMemory/InMemMsgLoader.hpp> + #include <xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp> #endif #if defined (XML_USE_NETACCESSOR_SOCKET) - #include <util/NetAccessors/Socket/SocketNetAccessor.hpp> + #include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp> #endif diff --git a/textproc/xerces-c/patches/patch-aa b/textproc/xerces-c/patches/patch-aa index e5d8cf695cc..e0eb8d7e2aa 100644 --- a/textproc/xerces-c/patches/patch-aa +++ b/textproc/xerces-c/patches/patch-aa @@ -1,24 +1,24 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/01/13 16:38:22 skrll Exp $ +$NetBSD: patch-aa,v 1.2 2003/06/23 07:52:41 jlam Exp $ ---- Makefile.incl.orig Sat Sep 30 18:37:28 2000 +--- Makefile.incl.orig Thu Mar 7 14:45:22 2002 +++ Makefile.incl -@@ -369,6 +369,19 @@ - SHLIBSUFFIX=.so +@@ -437,6 +437,19 @@ ifeq (${PLATFORM}, MACOSX) + SHLIBSUFFIX=.dylib endif -+#=============== NETBSD SPECIFIC OPTIONS ======================== ++#=============== NETBSD SPECIFIC OPTIONS ========================= +ifeq (${PLATFORM}, NETBSD) -+ PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -+ ifeq (${TRANSCODER}, ICU) -+ ALLLIBS = ${LIBS} -L${LOCALBASE} -licuuc -licudata -lm -+ else -+ ALLLIBS = ${LIBS} -L${LOCALBASE} -lm -+ endif -+ SHLIBSUFFIX=.so ++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 + + ###################### STANDARD TOOLS ############################# ifeq (${PLATFORM}, OS400) - CP = -cp -fph diff --git a/textproc/xerces-c/patches/patch-ab b/textproc/xerces-c/patches/patch-ab index 8086bd763cf..8f8cfc65aa0 100644 --- a/textproc/xerces-c/patches/patch-ab +++ b/textproc/xerces-c/patches/patch-ab @@ -1,27 +1,27 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/01/13 16:38:27 skrll Exp $ +$NetBSD: patch-ab,v 1.2 2003/06/23 07:52:41 jlam Exp $ ---- configure.orig Sat Sep 30 18:37:26 2000 +--- configure.orig Thu Mar 7 14:45:12 2002 +++ configure -@@ -1315,6 +1315,7 @@ - *-*-os400*) platform=OS400 ;; +@@ -1276,6 +1276,7 @@ case "${host}" in *-*-OS400*) platform=OS400 ;; - *-*-osf*) platform=TRU64 ;; -+ *-*-netbsd*) platform=NETBSD ;; + *-*-osf*) platform=TRU64 ;; + *-apple-*) platform=MACOSX ;; ++ *-*-netbsd*) platform=NETBSD ;; *) platform=UNKNOWN ;; esac -@@ -1485,6 +1486,7 @@ - util/Platforms/PTX/Makefile \ +@@ -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 \ -@@ -1613,6 +1615,7 @@ - util/Platforms/PTX/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 \ diff --git a/textproc/xerces-c/patches/patch-ac b/textproc/xerces-c/patches/patch-ac index 6f1e76ef69b..81de500819a 100644 --- a/textproc/xerces-c/patches/patch-ac +++ b/textproc/xerces-c/patches/patch-ac @@ -1,12 +1,22 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/01/13 16:38:27 skrll Exp $ +$NetBSD: patch-ac,v 1.2 2003/06/23 07:52:41 jlam Exp $ ---- dom/Makefile.in.orig Sat Sep 30 18:37:26 2000 -+++ dom/Makefile.in -@@ -225,5 +225,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/,$(DOM_CPP_PUBHEADERS)) +--- 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 + # - install:: -- -mkdir -p $(PREFIX)/$(MODULE) -- $(CP) $(DOM_CPP_PUBHEADERS) $(DOM_C_FILES) $(PREFIX)/$(MODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE) -+ $(CP) $(DOM_CPP_PUBHEADERS) $(DOM_C_FILES) $(PREFIX)/include/$(MODULE) + 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 index c1d653a36b0..b2d804b1a5c 100644 --- a/textproc/xerces-c/patches/patch-ad +++ b/textproc/xerces-c/patches/patch-ad @@ -1,12 +1,14 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/01/13 16:38:27 skrll Exp $ +$NetBSD: patch-ad,v 1.2 2003/06/23 07:52:41 jlam Exp $ ---- framework/Makefile.in.orig Sat Sep 30 18:37:28 2000 -+++ framework/Makefile.in -@@ -179,5 +179,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/,$(FRAMEWORK_CPP_PUBHEADERS)) - - install:: -- -mkdir -p $(PREFIX)/$(MODULE) -- $(CP) $(FRAMEWORK_CPP_PUBHEADERS) $(FRAMEWORK_C_FILES) $(PREFIX)/$(MODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE) -+ $(CP) $(FRAMEWORK_CPP_PUBHEADERS) $(FRAMEWORK_C_FILES) $(PREFIX)/include/$(MODULE) +--- 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 index 9eb144e5b4c..665a44205b4 100644 --- a/textproc/xerces-c/patches/patch-ae +++ b/textproc/xerces-c/patches/patch-ae @@ -1,12 +1,14 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/01/13 16:38:27 skrll Exp $ +$NetBSD: patch-ae,v 1.2 2003/06/23 07:52:41 jlam Exp $ ---- internal/Makefile.in.orig Sat Sep 30 18:37:28 2000 -+++ internal/Makefile.in -@@ -119,5 +119,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/,$(INTERNAL_CPP_PUBHEADERS)) - - install:: -- -mkdir -p $(PREFIX)/$(MODULE) -- $(CP) $(INTERNAL_CPP_PUBHEADERS) $(INTERNAL_C_FILES) $(PREFIX)/$(MODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE) -+ $(CP) $(INTERNAL_CPP_PUBHEADERS) $(INTERNAL_C_FILES) $(PREFIX)/include/$(MODULE) +--- 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 index 7e4bf6a7787..361cc9b1cb1 100644 --- a/textproc/xerces-c/patches/patch-af +++ b/textproc/xerces-c/patches/patch-af @@ -1,12 +1,14 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/01/13 16:38:27 skrll Exp $ +$NetBSD: patch-af,v 1.2 2003/06/23 07:52:42 jlam Exp $ ---- parsers/Makefile.in.orig Sat Sep 30 18:37:28 2000 -+++ parsers/Makefile.in -@@ -112,5 +112,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/,$(PARSERS_CPP_PUBHEADERS)) +--- 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 - install:: -- -mkdir -p $(PREFIX)/$(MODULE) -- $(CP) $(PARSERS_CPP_PUBHEADERS) $(PARSERS_C_FILES) $(PREFIX)/$(MODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE) -+ $(CP) $(PARSERS_CPP_PUBHEADERS) $(PARSERS_C_FILES) $(PREFIX)/include/$(MODULE) + includes:: + ${MAKE} -C $(SUBMODULE) $@ diff --git a/textproc/xerces-c/patches/patch-ag b/textproc/xerces-c/patches/patch-ag index 913dd73b2f2..9fd3ecc7295 100644 --- a/textproc/xerces-c/patches/patch-ag +++ b/textproc/xerces-c/patches/patch-ag @@ -1,12 +1,49 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/01/13 16:38:27 skrll Exp $ +$NetBSD: patch-ag,v 1.2 2003/06/23 07:52:42 jlam Exp $ ---- sax/Makefile.in.orig Sat Sep 30 18:37:28 2000 -+++ sax/Makefile.in -@@ -119,5 +119,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/,$(SAX_CPP_PUBHEADERS)) - - install:: -- -mkdir -p $(PREFIX)/$(MODULE) -- $(CP) $(SAX_CPP_PUBHEADERS) $(SAX_C_FILES) $(PREFIX)/$(MODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE) -+ $(CP) $(SAX_CPP_PUBHEADERS) $(SAX_C_FILES) $(PREFIX)/include/$(MODULE) +--- 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 index 6b527ba07ed..d8069a458df 100644 --- a/textproc/xerces-c/patches/patch-ah +++ b/textproc/xerces-c/patches/patch-ah @@ -1,12 +1,15 @@ -$NetBSD: patch-ah,v 1.1.1.1 2001/01/13 16:38:23 skrll Exp $ +$NetBSD: patch-ah,v 1.2 2003/06/23 07:52:42 jlam Exp $ ---- sax2/Makefile.in.orig Sat Sep 30 18:37:28 2000 -+++ sax2/Makefile.in -@@ -110,5 +110,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/,$(SAX2_CPP_PUBHEADERS)) +--- 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 - install:: -- -mkdir -p $(PREFIX)/$(MODULE) -- $(CP) $(SAX2_CPP_PUBHEADERS) $(SAX2_C_FILES) $(PREFIX)/$(MODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE) -+ $(CP) $(SAX2_CPP_PUBHEADERS) $(SAX2_C_FILES) $(PREFIX)/include/$(MODULE) ++#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 index 9c42c258936..a84c9e74377 100644 --- a/textproc/xerces-c/patches/patch-ai +++ b/textproc/xerces-c/patches/patch-ai @@ -1,13 +1,22 @@ -$NetBSD: patch-ai,v 1.1.1.1 2001/01/13 16:38:23 skrll Exp $ +$NetBSD: patch-ai,v 1.2 2003/06/23 07:52:42 jlam Exp $ ---- util/AutoSense.hpp.orig Sat Sep 30 18:37:28 2000 -+++ util/AutoSense.hpp -@@ -179,6 +179,8 @@ - #define XML_MACOSX - #elif defined(__alpha) && defined(__osf__) - #define XML_TRU64 -+#elif defined(__NetBSD__) -+ #define XML_NETBSD +--- 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 - #error Code requires port to host OS! + #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 diff --git a/textproc/xerces-c/patches/patch-aj b/textproc/xerces-c/patches/patch-aj deleted file mode 100644 index 6e8a718ad18..00000000000 --- a/textproc/xerces-c/patches/patch-aj +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2001/01/13 16:38:23 skrll Exp $ - ---- util/Compilers/GCCDefs.hpp.orig Sat Sep 30 18:37:28 2000 -+++ util/Compilers/GCCDefs.hpp -@@ -130,7 +130,7 @@ - #define XERCES_DEBUG - #endif - -- -+#ifndef __NetBSD__ - // --------------------------------------------------------------------------- - // Provide some common string ops that are different/notavail on GCC - // --------------------------------------------------------------------------- -@@ -147,11 +147,19 @@ - return char(toLower + 0x20); - return toLower; - } -- - int stricmp(const char* const str1, const char* const str2); - int strnicmp(const char* const str1, const char* const str2, const unsigned int count); -+#else /* __NetBSD__ */ -+#ifndef XML_NETBSD_STRICMP_DEFINED -+#define XML_NETBSD_STRICMP_DEFINED -+#include <strings.h> -+inline int stricmp(const char* const str1, const char* const str2); -+inline int strnicmp(const char* const str1, const char* const str2, const unsigned int count); - -- -+inline int stricmp(const char* const str1, const char* const str2) { return strcasecmp(str1,str2);} -+inline int strnicmp(const char* const str1, const char* const str2, const unsigned int count) { return strncasecmp(str1,str2,count);} -+#endif /* XML_NETBSD_STRICMP_DEFINED */ -+#endif /* __NetBSD__ */ - - // --------------------------------------------------------------------------- - // The name of the DLL that is built by the GCC version of the system. diff --git a/textproc/xerces-c/patches/patch-ak b/textproc/xerces-c/patches/patch-ak deleted file mode 100644 index 8582e73d287..00000000000 --- a/textproc/xerces-c/patches/patch-ak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2001/01/13 16:38:23 skrll Exp $ - ---- util/Makefile.in.orig Sat Sep 30 18:37:28 2000 -+++ util/Makefile.in -@@ -392,8 +392,8 @@ - - - install:: -- -mkdir -p $(PREFIX)/$(MODULE) -- $(CP) $(UTIL_CPP_PUBHEADERS) $(C_FILES) $(PREFIX)/$(MODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE) -+ $(CP) $(UTIL_CPP_PUBHEADERS) $(C_FILES) $(PREFIX)/include/$(MODULE) - cd Platforms ; $(MAKE) $@ ; cd .. - cd Transcoders/$(TRANSCODERMODULE) ; $(MAKE) $@ ; cd ../.. - cd MsgLoaders/$(MESSAGELOADERMODULE) ; $(MAKE) $@ ; cd ../.. diff --git a/textproc/xerces-c/patches/patch-al b/textproc/xerces-c/patches/patch-al deleted file mode 100644 index 58210b9db45..00000000000 --- a/textproc/xerces-c/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2001/01/13 16:38:23 skrll Exp $ - ---- util/Makefile.util.submodule.orig Sat Sep 30 18:37:32 2000 -+++ util/Makefile.util.submodule -@@ -76,5 +76,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)/,$(CPP_PUBHEADERS)) - - install: -- -mkdir -p $(PREFIX)/$(MODULE)/$(SUBMODULE) -- $(CP) $(CPP_PUBHEADERS) $(PREFIX)/$(MODULE)/$(SUBMODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE)/$(SUBMODULE) -+ $(CP) $(CPP_PUBHEADERS) $(PREFIX)/include/$(MODULE)/$(SUBMODULE) diff --git a/textproc/xerces-c/patches/patch-am b/textproc/xerces-c/patches/patch-am deleted file mode 100644 index 0b54d03d8e6..00000000000 --- a/textproc/xerces-c/patches/patch-am +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2001/01/13 16:38:23 skrll Exp $ - ---- util/Platforms/Makefile.in.orig Sat Sep 30 18:37:34 2000 -+++ util/Platforms/Makefile.in -@@ -148,6 +148,9 @@ - ifeq (${PLATFORM}, TRU64) - SUBMODULE = Tru64 - endif -+ifeq (${PLATFORM}, NETBSD) -+ SUBMODULE = NetBSD -+endif - - includes:: - ${CD} $(SUBMODULE) ; $(MAKE) $@ ; ${CD} .. diff --git a/textproc/xerces-c/patches/patch-an b/textproc/xerces-c/patches/patch-an deleted file mode 100644 index e2c26d06ae0..00000000000 --- a/textproc/xerces-c/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2001/01/13 16:38:23 skrll Exp $ - ---- util/Transcoders/Iconv/IconvTransService.cpp.orig Sat Sep 30 18:37:34 2000 -+++ util/Transcoders/Iconv/IconvTransService.cpp -@@ -66,7 +66,7 @@ - #include <util/XMLUni.hpp> - #include "IconvTransService.hpp" - #include <wchar.h> --#if defined (XML_GCC) || defined (XML_PTX) || defined (XML_IBMVAOS2) -+#if (defined (XML_GCC) || defined (XML_PTX) || defined (XML_IBMVAOS2)) && (!defined (XML_NETBSD)) - #include <wctype.h> - #endif - #include <string.h> diff --git a/textproc/xerces-c/patches/patch-ao b/textproc/xerces-c/patches/patch-ao deleted file mode 100644 index 0c4410918f6..00000000000 --- a/textproc/xerces-c/patches/patch-ao +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2001/01/13 16:38:22 skrll Exp $ - ---- util/XercesDefs.hpp.orig Sat Sep 30 18:37:34 2000 -+++ util/XercesDefs.hpp -@@ -214,6 +214,9 @@ - #include <util/Platforms/Tru64/Tru64Defs.hpp> - #endif - -+#if defined(XML_NETBSD) -+#include <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-ap b/textproc/xerces-c/patches/patch-ap deleted file mode 100644 index bf647eaba95..00000000000 --- a/textproc/xerces-c/patches/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2001/01/13 16:38:27 skrll Exp $ - ---- validators/DTD/Makefile.in.orig Sat Sep 30 18:37:36 2000 -+++ validators/DTD/Makefile.in -@@ -159,5 +159,5 @@ - $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)/,$(VALIDATORS_DTD_CPP_PUBHEADERS)) - - install:: -- -mkdir -p $(PREFIX)/$(MODULE)/$(SUBMODULE) -- $(CP) $(VALIDATORS_DTD_CPP_PUBHEADERS) $(VALIDATORS_DTD_C_FILES) $(PREFIX)/$(MODULE)/$(SUBMODULE) -+ -mkdir -p $(PREFIX)/include/$(MODULE)/$(SUBMODULE) -+ $(CP) $(VALIDATORS_DTD_CPP_PUBHEADERS) $(VALIDATORS_DTD_C_FILES) $(PREFIX)/include/$(MODULE)/$(SUBMODULE) |