summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2003-08-23 13:12:45 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2003-08-23 13:12:45 +0000
commit384325efe41e09425a64bfd1aa150c836cef55fc (patch)
tree820c40c83cf0a13294b2d97b49fe1349c38524f1 /textproc
parentFix to ports/lang/ici build problem on 5-CURRENT (diff)
iMAINTAINER-UPDATE: textproc/xerces-c2
Apache XML project has release a new version of xerces-c. Please see http://xml.apache.org/xerces-c/releases.html for more information. PR: ports/53348 Submitted by: Bjoern A. Zeeb <bzeeb+freebsdports@zabbadoz.net>
Notes
Notes: svn path=/head/; revision=87552
Diffstat (limited to 'textproc')
-rw-r--r--textproc/xerces-c2-devel/Makefile26
-rw-r--r--textproc/xerces-c2-devel/distinfo2
-rw-r--r--textproc/xerces-c2-devel/files/patch-aa82
-rw-r--r--textproc/xerces-c2-devel/files/patch-ab54
-rw-r--r--textproc/xerces-c2-devel/pkg-plist122
-rw-r--r--textproc/xerces-c2/Makefile26
-rw-r--r--textproc/xerces-c2/distinfo2
-rw-r--r--textproc/xerces-c2/files/patch-aa82
-rw-r--r--textproc/xerces-c2/files/patch-ab54
-rw-r--r--textproc/xerces-c2/pkg-plist122
-rw-r--r--textproc/xerces-c27/Makefile26
-rw-r--r--textproc/xerces-c27/distinfo2
-rw-r--r--textproc/xerces-c27/files/patch-aa82
-rw-r--r--textproc/xerces-c27/files/patch-ab54
-rw-r--r--textproc/xerces-c27/pkg-plist122
15 files changed, 504 insertions, 354 deletions
diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile
index 460d7d5cd18e..7aca8c3d0f59 100644
--- a/textproc/xerces-c2-devel/Makefile
+++ b/textproc/xerces-c2-devel/Makefile
@@ -6,15 +6,14 @@
#
PORTNAME= xerces-c2
-PORTVERSION= 2.2.0
-PORTREVISION= 0
+PORTVERSION= 2.3.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_APACHE_XML}
MASTER_SITE_SUBDIR= xerces-c/stable
-DISTNAME= xerces-c-src${PORTVERSION:S/./_/g}
+DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g}
-MAINTAINER?= bzeeb+freebsdports@zabbadoz.net
-COMMENT?= Validating XML parser from the Apache XML Project
+MAINTAINER= bzeeb+freebsdports@zabbadoz.net
+COMMENT= Validating XML parser from the Apache XML Project
.if !defined(TRANSCODER)
LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
@@ -23,8 +22,8 @@ PLIST_SUB+= TRANSICONV=""
PLIST_SUB+= TRANSICU="@comment "
.else
.if (${TRANSCODER} == "icu")
-PKGNAMESUFFIX+= -icu
-LIB_DEPENDS+= icuuc.24:${PORTSDIR}/devel/icu
+PKGNAMESUFFIX+= -icu2
+LIB_DEPENDS+= icuuc.26:${PORTSDIR}/devel/icu2
ICUROOT?= ${LOCALBASE}
CONFIGURE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
@@ -45,8 +44,6 @@ PLIST_SUB+= TRANSICU="@comment "
# expect this to get broken some day
NO_FILTER_SHLIBS= yes
INSTALLS_SHLIB= yes
-LDCONFIG_DIRS= ${PREFIX}/lib
-NOCLEANDEPENDS= yes
XERCESWRKSRC= ${WRKSRC}/src/xercesc
CONFIGURE_WRKSRC= ${XERCESWRKSRC}
@@ -65,6 +62,12 @@ CONFIGURE_ARGS+= -t ${TRANSCODER}
.include <bsd.port.pre.mk>
+.if defined(DEBUG)
+PKGNAMESUFFIX+= -debug
+CONFIGURE_ARGS+= -d
+STRIP=
+.endif
+
.if defined(NO_THREADS)
CONFIGURE_ARGS+= -r none
.endif
@@ -89,7 +92,7 @@ SAMPLES_CONFIG_ARGS+= -r pthread
PLIST_SUB+= NO_SAMPLES="@comment "
.endif
-pre-fetch:
+pre-everything::
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-message 15 75 || \
${TRUE})
@@ -100,6 +103,7 @@ pre-fetch:
@${ECHO} 'NO_THREADS do not build a thread enabled shared library'
@${ECHO} 'NO_SAMPLES do not copy sample binaries and sources'
@${ECHO} 'NOPORTDOCS do not copy documentation'
+ @${ECHO} 'DEBUG include debugging information, do not strip'
@${ECHO} ''
@${ECHO} 'Also you may set TRANSODER to the following values (without -D):'
@${ECHO} ''
@@ -135,7 +139,9 @@ post-configure:
.endif
post-install:
+.if !defined(DEBUG)
@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/xerces-c
@${CP} -r ${WRKSRC}/doc/ ${PREFIX}/share/doc/xerces-c/
diff --git a/textproc/xerces-c2-devel/distinfo b/textproc/xerces-c2-devel/distinfo
index 276c143c5967..c025be1a51b5 100644
--- a/textproc/xerces-c2-devel/distinfo
+++ b/textproc/xerces-c2-devel/distinfo
@@ -1 +1 @@
-MD5 (xerces-c-src2_2_0.tar.gz) = e23a0ba22074b59a7a2be4fa7416a3e4
+MD5 (xerces-c-src_2_3_0.tar.gz) = 5167dca8942dd2dd719fa5a8ebe0c18b
diff --git a/textproc/xerces-c2-devel/files/patch-aa b/textproc/xerces-c2-devel/files/patch-aa
index 46f227555235..7295016afa9f 100644
--- a/textproc/xerces-c2-devel/files/patch-aa
+++ b/textproc/xerces-c2-devel/files/patch-aa
@@ -1,68 +1,26 @@
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2002/12/31 18:42:43 1.7
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2003/03/07 15:08:57 1.10
-@@ -56,6 +56,15 @@
+diff -x CVS -urN src/xercesc/util/Transcoders/ICU/ICUTransService.cpp src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp
+--- src/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sat May 17 16:32:17 2003
++++ src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sun Jun 15 10:02:16 2003
+@@ -55,7 +55,7 @@
+ */
/*
- * $Log: IconvFBSDTransService.cpp,v $
-+ * Revision 1.10 2003/03/07 15:08:57 tng
-+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
-+ *
-+ * Revision 1.9 2003/03/07 14:42:45 tng
-+ * [Bug 17570] IconvFBSD build on alpha,sparc. Patch from Bjoern A. Zeeb.
-+ *
-+ * Revision 1.8 2003/02/25 08:15:42 gareth
-+ * Patch to fix compile problem in bug #17358. Patch by Michael Cahill.
-+ *
- * Revision 1.7 2002/12/31 18:42:43 tng
- * [Bug 15608] IconvLCPTranscoder::transcode() is wrong at wcstombs() usage.
- *
-@@ -103,8 +112,6 @@
- # include <errno.h>
- # include <machine/endian.h>
+- * $Id: ICUTransService.cpp,v 1.9 2003/05/17 16:32:17 knoaman Exp $
++ * $Id: ICUTransService.cpp,v 1.10 2003/05/30 09:19:24 gareth Exp $
+ */
--XERCES_CPP_NAMESPACE_BEGIN
--
- // ---------------------------------------------------------------------------
- // Description of encoding schemas, supported by iconv()
- // ---------------------------------------------------------------------------
-@@ -209,6 +216,12 @@
- #include <stdlib.h>
- #include <stdio.h>
-+#if !defined(APP_NO_THREADS)
-+#include <xercesc/util/Mutexes.hpp>
-+#endif
-+
-+XERCES_CPP_NAMESPACE_BEGIN
-+
- // ---------------------------------------------------------------------------
- // Local, const data
- // ---------------------------------------------------------------------------
-@@ -314,8 +327,6 @@
- #else /* XML_USE_LIBICONV */
+@@ -127,11 +127,11 @@
- #if !defined(APP_NO_THREADS)
--
--#include <xercesc/util/Mutexes.hpp>
- // Iconv() access syncronization point
- static XMLMutex *gIconvMutex = NULL;
- # define ICONV_LOCK XMLMutexLock lockConverter(gIconvMutex);
-@@ -1099,7 +1110,8 @@
- // perform conversion
- wLent *= uChSize();
- char *ptr = retVal;
-- size_t rc = iconvTo(wideCharBuf, &wLent, &ptr, neededLen);
-+ size_t tmpwLent = wLent;
-+ size_t rc = iconvTo(wideCharBuf, &tmpwLent, &ptr, neededLen);
- if (rc == (size_t)-1) {
- if (wBufPtr)
- delete [] wBufPtr;
-@@ -1563,6 +1575,6 @@
- return (rc != (size_t)-1) && (len == 0);
- }
--XERCES_CPP_NAMESPACE_END
--
- #endif /* XML_USE_LIBICONV */
-+
-+XERCES_CPP_NAMESPACE_END
+ static XMLCh* convertToXMLCh( const UChar* const toConvert,
+- , MemoryManager* const manager = 0)
++ MemoryManager* const manager = 0)
+ {
+ const unsigned int srcLen = u_strlen(toConvert);
+ XMLCh* retBuf = (manager)
+- ? (XMLCh*) manager->allocate((srcLen+1) sizeof(XMLCh))
++ ? (XMLCh*) manager->allocate((srcLen+1) * sizeof(XMLCh))
+ : new XMLCh[srcLen + 1];
+
+ XMLCh* outPtr = retBuf;
diff --git a/textproc/xerces-c2-devel/files/patch-ab b/textproc/xerces-c2-devel/files/patch-ab
index 8b613207d833..6358303a748d 100644
--- a/textproc/xerces-c2-devel/files/patch-ab
+++ b/textproc/xerces-c2-devel/files/patch-ab
@@ -1,28 +1,38 @@
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2002/11/04 15:14:34 1.4
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2003/03/07 15:08:57 1.5
+--- src/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:06 2003
++++ src.cvs/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:39 2003
+@@ -90,7 +90,11 @@
+ initialize(modulus);
+
+ // create default hasher
++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600)
++ fHash = new HashPtr();
++#else
+ fHash = new (fMemoryManager) HashPtr();
++#endif
+
+ //
+ // Allocate the initial id pointers array. We don't have to zero them
+--- src/xercesc/util/RefHash3KeysIdPool.c Tue Jun 17 22:12:13 2003
++++ src.cvs/xercesc/util/RefHash3KeysIdPool.c Sun Jun 15 09:57:39 2003
@@ -56,6 +56,9 @@
- /*
- * $Log: IconvFBSDTransService.hpp,v $
-+ * Revision 1.5 2003/03/07 15:08:57 tng
-+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
+ /**
+ * $Log: RefHash3KeysIdPool.c,v $
++ * Revision 1.6 2003/06/02 15:18:08 neilg
++ * fix for bug #20092; thanks to Berin Lautenbach
+ *
- * Revision 1.4 2002/11/04 15:14:34 tng
- * C++ Namespace Support.
- *
-@@ -85,11 +88,13 @@
+ * Revision 1.5 2003/05/21 21:08:04 knoaman
+ * gcc 2.95.x is generating an internal error for some template definitions, so
+ * we use the default memory manger in such cases.
+@@ -118,7 +121,11 @@
+ initialize(modulus);
- #include <xercesc/util/TransService.hpp>
-
-+#ifdef XML_USE_LIBICONV
-+# include <iconv.h>
+ // create default hasher
++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600)
++ fHash = new HashXMLCh();
++#else
+ fHash = new (fMemoryManager) HashXMLCh();
+#endif
-+
- XERCES_CPP_NAMESPACE_BEGIN
-
- #ifdef XML_USE_LIBICONV
--
--# include <iconv.h>
- // ---------------------------------------------------------------------------
- // Libiconv wrapper (low-level conversion utilities collection)
+ //
+ // Allocate the initial id pointers array. We don't have to zero them
diff --git a/textproc/xerces-c2-devel/pkg-plist b/textproc/xerces-c2-devel/pkg-plist
index 5205494b0dc3..d1e22503e882 100644
--- a/textproc/xerces-c2-devel/pkg-plist
+++ b/textproc/xerces-c2-devel/pkg-plist
@@ -40,6 +40,11 @@ include/xercesc/util/XMLEBCDICTranscoder.hpp
include/xercesc/util/XMLDeleterFor.hpp
include/xercesc/util/XMLDOMMsg.hpp
include/xercesc/util/XMLChar.hpp
+include/xercesc/util/XMemory.hpp
+include/xercesc/util/SecurityManager.hpp
+include/xercesc/util/PanicHandler.hpp
+include/xercesc/util/DefaultPanicHandler.hpp
+include/xercesc/util/LogicalPath.c
include/xercesc/util/regx/RegxDefs.hpp
include/xercesc/util/regx/ParserForXMLSchema.hpp
include/xercesc/util/regx/RegxParser.hpp
@@ -150,6 +155,7 @@ include/xercesc/util/Compilers/OS400SetDefs.hpp
include/xercesc/util/Compilers/SunKaiDefs.hpp
include/xercesc/util/Compilers/SunCCDefs.hpp
include/xercesc/util/Compilers/SCOCCDefs.hpp
+include/xercesc/util/Compilers/QCCDefs.hpp
include/xercesc/util/Compilers/PTXCCDefs.hpp
include/xercesc/util/Compilers/MVSCPPDefs.hpp
include/xercesc/util/Compilers/IBMVAW32Defs.hpp
@@ -183,6 +189,7 @@ include/xercesc/internal/XMLReader.hpp
include/xercesc/internal/XMLInternalErrorHandler.hpp
include/xercesc/internal/VecAttributesImpl.hpp
include/xercesc/internal/VecAttrListImpl.hpp
+include/xercesc/internal/MemoryManagerImpl.hpp
include/xercesc/internal/ReaderMgr.hpp
include/xercesc/internal/IANAEncodings.hpp
include/xercesc/internal/EndOfEntityException.hpp
@@ -217,6 +224,7 @@ include/xercesc/framework/Wrapper4DOMInputSource.hpp
include/xercesc/framework/URLInputSource.hpp
include/xercesc/framework/StdOutFormatTarget.hpp
include/xercesc/framework/StdInInputSource.hpp
+include/xercesc/framework/MemoryManager.hpp
include/xercesc/framework/MemBufFormatTarget.hpp
include/xercesc/framework/MemBufInputSource.hpp
include/xercesc/framework/LocalFileFormatTarget.hpp
@@ -259,12 +267,14 @@ include/xercesc/dom/DOMDocumentFragment.hpp
include/xercesc/dom/DOMDocumentTraversal.hpp
include/xercesc/dom/DOMDocumentRange.hpp
include/xercesc/dom/DOMDocument.hpp
+include/xercesc/dom/DOMConfiguration.hpp
include/xercesc/dom/DOMComment.hpp
include/xercesc/dom/DOMCharacterData.hpp
include/xercesc/dom/DOMCDATASection.hpp
include/xercesc/dom/DOMBuilder.hpp
include/xercesc/dom/DOMAttr.hpp
include/xercesc/dom/DOMWriterFilter.hpp
+include/xercesc/dom/StDOMNode.hpp
include/xercesc/dom/impl/DOMDeepNodeListPool.c
include/xercesc/dom/deprecated/DOM.hpp
include/xercesc/dom/deprecated/DOM_TreeWalker.hpp
@@ -390,7 +400,7 @@ lib/%%XERCESC_LIB%%
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so; fi
-@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
+@unexec if test ! -r %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
@dirrm include/xercesc/validators/schema/identity
@dirrm include/xercesc/validators/schema
@dirrm include/xercesc/validators/DTD
@@ -1005,28 +1015,8 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__42.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__43.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__44.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__45.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__46.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__47.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__48.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__49.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__5.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__50.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__51.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__52.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__53.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__54.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__55.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__56.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__57.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__58.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__59.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__6.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__60.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__61.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__62.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__63.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__64.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__7.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__8.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__9.png
@@ -1170,7 +1160,6 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigDecimal_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp-source.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp.html
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__dep__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp-source.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp.html
@@ -1310,6 +1299,94 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherits.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/tail.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XercesApi.css
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classBinInputStream__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classInputSource__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSAXException__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttr__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLElementDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLException__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatTarget__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatter__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNumber__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLString__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLValidator__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMAttr_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMElement_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMError_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/bug-report.html
%%PORTDOCS%%share/doc/xerces-c/html/build-misc.html
%%PORTDOCS%%share/doc/xerces-c/html/build-other.html
@@ -1444,7 +1521,6 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-hi.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-lo.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/close.gif
-%%PORTDOCS%%share/doc/xerces-c/html/resources/CVS
%%PORTDOCS%%share/doc/xerces-c/html/resources/dot.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/join.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/line.gif
diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile
index 460d7d5cd18e..7aca8c3d0f59 100644
--- a/textproc/xerces-c2/Makefile
+++ b/textproc/xerces-c2/Makefile
@@ -6,15 +6,14 @@
#
PORTNAME= xerces-c2
-PORTVERSION= 2.2.0
-PORTREVISION= 0
+PORTVERSION= 2.3.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_APACHE_XML}
MASTER_SITE_SUBDIR= xerces-c/stable
-DISTNAME= xerces-c-src${PORTVERSION:S/./_/g}
+DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g}
-MAINTAINER?= bzeeb+freebsdports@zabbadoz.net
-COMMENT?= Validating XML parser from the Apache XML Project
+MAINTAINER= bzeeb+freebsdports@zabbadoz.net
+COMMENT= Validating XML parser from the Apache XML Project
.if !defined(TRANSCODER)
LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
@@ -23,8 +22,8 @@ PLIST_SUB+= TRANSICONV=""
PLIST_SUB+= TRANSICU="@comment "
.else
.if (${TRANSCODER} == "icu")
-PKGNAMESUFFIX+= -icu
-LIB_DEPENDS+= icuuc.24:${PORTSDIR}/devel/icu
+PKGNAMESUFFIX+= -icu2
+LIB_DEPENDS+= icuuc.26:${PORTSDIR}/devel/icu2
ICUROOT?= ${LOCALBASE}
CONFIGURE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
@@ -45,8 +44,6 @@ PLIST_SUB+= TRANSICU="@comment "
# expect this to get broken some day
NO_FILTER_SHLIBS= yes
INSTALLS_SHLIB= yes
-LDCONFIG_DIRS= ${PREFIX}/lib
-NOCLEANDEPENDS= yes
XERCESWRKSRC= ${WRKSRC}/src/xercesc
CONFIGURE_WRKSRC= ${XERCESWRKSRC}
@@ -65,6 +62,12 @@ CONFIGURE_ARGS+= -t ${TRANSCODER}
.include <bsd.port.pre.mk>
+.if defined(DEBUG)
+PKGNAMESUFFIX+= -debug
+CONFIGURE_ARGS+= -d
+STRIP=
+.endif
+
.if defined(NO_THREADS)
CONFIGURE_ARGS+= -r none
.endif
@@ -89,7 +92,7 @@ SAMPLES_CONFIG_ARGS+= -r pthread
PLIST_SUB+= NO_SAMPLES="@comment "
.endif
-pre-fetch:
+pre-everything::
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-message 15 75 || \
${TRUE})
@@ -100,6 +103,7 @@ pre-fetch:
@${ECHO} 'NO_THREADS do not build a thread enabled shared library'
@${ECHO} 'NO_SAMPLES do not copy sample binaries and sources'
@${ECHO} 'NOPORTDOCS do not copy documentation'
+ @${ECHO} 'DEBUG include debugging information, do not strip'
@${ECHO} ''
@${ECHO} 'Also you may set TRANSODER to the following values (without -D):'
@${ECHO} ''
@@ -135,7 +139,9 @@ post-configure:
.endif
post-install:
+.if !defined(DEBUG)
@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/xerces-c
@${CP} -r ${WRKSRC}/doc/ ${PREFIX}/share/doc/xerces-c/
diff --git a/textproc/xerces-c2/distinfo b/textproc/xerces-c2/distinfo
index 276c143c5967..c025be1a51b5 100644
--- a/textproc/xerces-c2/distinfo
+++ b/textproc/xerces-c2/distinfo
@@ -1 +1 @@
-MD5 (xerces-c-src2_2_0.tar.gz) = e23a0ba22074b59a7a2be4fa7416a3e4
+MD5 (xerces-c-src_2_3_0.tar.gz) = 5167dca8942dd2dd719fa5a8ebe0c18b
diff --git a/textproc/xerces-c2/files/patch-aa b/textproc/xerces-c2/files/patch-aa
index 46f227555235..7295016afa9f 100644
--- a/textproc/xerces-c2/files/patch-aa
+++ b/textproc/xerces-c2/files/patch-aa
@@ -1,68 +1,26 @@
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2002/12/31 18:42:43 1.7
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2003/03/07 15:08:57 1.10
-@@ -56,6 +56,15 @@
+diff -x CVS -urN src/xercesc/util/Transcoders/ICU/ICUTransService.cpp src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp
+--- src/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sat May 17 16:32:17 2003
++++ src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sun Jun 15 10:02:16 2003
+@@ -55,7 +55,7 @@
+ */
/*
- * $Log: IconvFBSDTransService.cpp,v $
-+ * Revision 1.10 2003/03/07 15:08:57 tng
-+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
-+ *
-+ * Revision 1.9 2003/03/07 14:42:45 tng
-+ * [Bug 17570] IconvFBSD build on alpha,sparc. Patch from Bjoern A. Zeeb.
-+ *
-+ * Revision 1.8 2003/02/25 08:15:42 gareth
-+ * Patch to fix compile problem in bug #17358. Patch by Michael Cahill.
-+ *
- * Revision 1.7 2002/12/31 18:42:43 tng
- * [Bug 15608] IconvLCPTranscoder::transcode() is wrong at wcstombs() usage.
- *
-@@ -103,8 +112,6 @@
- # include <errno.h>
- # include <machine/endian.h>
+- * $Id: ICUTransService.cpp,v 1.9 2003/05/17 16:32:17 knoaman Exp $
++ * $Id: ICUTransService.cpp,v 1.10 2003/05/30 09:19:24 gareth Exp $
+ */
--XERCES_CPP_NAMESPACE_BEGIN
--
- // ---------------------------------------------------------------------------
- // Description of encoding schemas, supported by iconv()
- // ---------------------------------------------------------------------------
-@@ -209,6 +216,12 @@
- #include <stdlib.h>
- #include <stdio.h>
-+#if !defined(APP_NO_THREADS)
-+#include <xercesc/util/Mutexes.hpp>
-+#endif
-+
-+XERCES_CPP_NAMESPACE_BEGIN
-+
- // ---------------------------------------------------------------------------
- // Local, const data
- // ---------------------------------------------------------------------------
-@@ -314,8 +327,6 @@
- #else /* XML_USE_LIBICONV */
+@@ -127,11 +127,11 @@
- #if !defined(APP_NO_THREADS)
--
--#include <xercesc/util/Mutexes.hpp>
- // Iconv() access syncronization point
- static XMLMutex *gIconvMutex = NULL;
- # define ICONV_LOCK XMLMutexLock lockConverter(gIconvMutex);
-@@ -1099,7 +1110,8 @@
- // perform conversion
- wLent *= uChSize();
- char *ptr = retVal;
-- size_t rc = iconvTo(wideCharBuf, &wLent, &ptr, neededLen);
-+ size_t tmpwLent = wLent;
-+ size_t rc = iconvTo(wideCharBuf, &tmpwLent, &ptr, neededLen);
- if (rc == (size_t)-1) {
- if (wBufPtr)
- delete [] wBufPtr;
-@@ -1563,6 +1575,6 @@
- return (rc != (size_t)-1) && (len == 0);
- }
--XERCES_CPP_NAMESPACE_END
--
- #endif /* XML_USE_LIBICONV */
-+
-+XERCES_CPP_NAMESPACE_END
+ static XMLCh* convertToXMLCh( const UChar* const toConvert,
+- , MemoryManager* const manager = 0)
++ MemoryManager* const manager = 0)
+ {
+ const unsigned int srcLen = u_strlen(toConvert);
+ XMLCh* retBuf = (manager)
+- ? (XMLCh*) manager->allocate((srcLen+1) sizeof(XMLCh))
++ ? (XMLCh*) manager->allocate((srcLen+1) * sizeof(XMLCh))
+ : new XMLCh[srcLen + 1];
+
+ XMLCh* outPtr = retBuf;
diff --git a/textproc/xerces-c2/files/patch-ab b/textproc/xerces-c2/files/patch-ab
index 8b613207d833..6358303a748d 100644
--- a/textproc/xerces-c2/files/patch-ab
+++ b/textproc/xerces-c2/files/patch-ab
@@ -1,28 +1,38 @@
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2002/11/04 15:14:34 1.4
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2003/03/07 15:08:57 1.5
+--- src/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:06 2003
++++ src.cvs/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:39 2003
+@@ -90,7 +90,11 @@
+ initialize(modulus);
+
+ // create default hasher
++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600)
++ fHash = new HashPtr();
++#else
+ fHash = new (fMemoryManager) HashPtr();
++#endif
+
+ //
+ // Allocate the initial id pointers array. We don't have to zero them
+--- src/xercesc/util/RefHash3KeysIdPool.c Tue Jun 17 22:12:13 2003
++++ src.cvs/xercesc/util/RefHash3KeysIdPool.c Sun Jun 15 09:57:39 2003
@@ -56,6 +56,9 @@
- /*
- * $Log: IconvFBSDTransService.hpp,v $
-+ * Revision 1.5 2003/03/07 15:08:57 tng
-+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
+ /**
+ * $Log: RefHash3KeysIdPool.c,v $
++ * Revision 1.6 2003/06/02 15:18:08 neilg
++ * fix for bug #20092; thanks to Berin Lautenbach
+ *
- * Revision 1.4 2002/11/04 15:14:34 tng
- * C++ Namespace Support.
- *
-@@ -85,11 +88,13 @@
+ * Revision 1.5 2003/05/21 21:08:04 knoaman
+ * gcc 2.95.x is generating an internal error for some template definitions, so
+ * we use the default memory manger in such cases.
+@@ -118,7 +121,11 @@
+ initialize(modulus);
- #include <xercesc/util/TransService.hpp>
-
-+#ifdef XML_USE_LIBICONV
-+# include <iconv.h>
+ // create default hasher
++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600)
++ fHash = new HashXMLCh();
++#else
+ fHash = new (fMemoryManager) HashXMLCh();
+#endif
-+
- XERCES_CPP_NAMESPACE_BEGIN
-
- #ifdef XML_USE_LIBICONV
--
--# include <iconv.h>
- // ---------------------------------------------------------------------------
- // Libiconv wrapper (low-level conversion utilities collection)
+ //
+ // Allocate the initial id pointers array. We don't have to zero them
diff --git a/textproc/xerces-c2/pkg-plist b/textproc/xerces-c2/pkg-plist
index 5205494b0dc3..d1e22503e882 100644
--- a/textproc/xerces-c2/pkg-plist
+++ b/textproc/xerces-c2/pkg-plist
@@ -40,6 +40,11 @@ include/xercesc/util/XMLEBCDICTranscoder.hpp
include/xercesc/util/XMLDeleterFor.hpp
include/xercesc/util/XMLDOMMsg.hpp
include/xercesc/util/XMLChar.hpp
+include/xercesc/util/XMemory.hpp
+include/xercesc/util/SecurityManager.hpp
+include/xercesc/util/PanicHandler.hpp
+include/xercesc/util/DefaultPanicHandler.hpp
+include/xercesc/util/LogicalPath.c
include/xercesc/util/regx/RegxDefs.hpp
include/xercesc/util/regx/ParserForXMLSchema.hpp
include/xercesc/util/regx/RegxParser.hpp
@@ -150,6 +155,7 @@ include/xercesc/util/Compilers/OS400SetDefs.hpp
include/xercesc/util/Compilers/SunKaiDefs.hpp
include/xercesc/util/Compilers/SunCCDefs.hpp
include/xercesc/util/Compilers/SCOCCDefs.hpp
+include/xercesc/util/Compilers/QCCDefs.hpp
include/xercesc/util/Compilers/PTXCCDefs.hpp
include/xercesc/util/Compilers/MVSCPPDefs.hpp
include/xercesc/util/Compilers/IBMVAW32Defs.hpp
@@ -183,6 +189,7 @@ include/xercesc/internal/XMLReader.hpp
include/xercesc/internal/XMLInternalErrorHandler.hpp
include/xercesc/internal/VecAttributesImpl.hpp
include/xercesc/internal/VecAttrListImpl.hpp
+include/xercesc/internal/MemoryManagerImpl.hpp
include/xercesc/internal/ReaderMgr.hpp
include/xercesc/internal/IANAEncodings.hpp
include/xercesc/internal/EndOfEntityException.hpp
@@ -217,6 +224,7 @@ include/xercesc/framework/Wrapper4DOMInputSource.hpp
include/xercesc/framework/URLInputSource.hpp
include/xercesc/framework/StdOutFormatTarget.hpp
include/xercesc/framework/StdInInputSource.hpp
+include/xercesc/framework/MemoryManager.hpp
include/xercesc/framework/MemBufFormatTarget.hpp
include/xercesc/framework/MemBufInputSource.hpp
include/xercesc/framework/LocalFileFormatTarget.hpp
@@ -259,12 +267,14 @@ include/xercesc/dom/DOMDocumentFragment.hpp
include/xercesc/dom/DOMDocumentTraversal.hpp
include/xercesc/dom/DOMDocumentRange.hpp
include/xercesc/dom/DOMDocument.hpp
+include/xercesc/dom/DOMConfiguration.hpp
include/xercesc/dom/DOMComment.hpp
include/xercesc/dom/DOMCharacterData.hpp
include/xercesc/dom/DOMCDATASection.hpp
include/xercesc/dom/DOMBuilder.hpp
include/xercesc/dom/DOMAttr.hpp
include/xercesc/dom/DOMWriterFilter.hpp
+include/xercesc/dom/StDOMNode.hpp
include/xercesc/dom/impl/DOMDeepNodeListPool.c
include/xercesc/dom/deprecated/DOM.hpp
include/xercesc/dom/deprecated/DOM_TreeWalker.hpp
@@ -390,7 +400,7 @@ lib/%%XERCESC_LIB%%
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so; fi
-@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
+@unexec if test ! -r %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
@dirrm include/xercesc/validators/schema/identity
@dirrm include/xercesc/validators/schema
@dirrm include/xercesc/validators/DTD
@@ -1005,28 +1015,8 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__42.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__43.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__44.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__45.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__46.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__47.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__48.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__49.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__5.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__50.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__51.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__52.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__53.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__54.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__55.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__56.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__57.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__58.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__59.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__6.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__60.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__61.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__62.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__63.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__64.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__7.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__8.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__9.png
@@ -1170,7 +1160,6 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigDecimal_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp-source.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp.html
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__dep__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp-source.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp.html
@@ -1310,6 +1299,94 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherits.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/tail.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XercesApi.css
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classBinInputStream__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classInputSource__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSAXException__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttr__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLElementDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLException__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatTarget__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatter__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNumber__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLString__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLValidator__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMAttr_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMElement_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMError_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/bug-report.html
%%PORTDOCS%%share/doc/xerces-c/html/build-misc.html
%%PORTDOCS%%share/doc/xerces-c/html/build-other.html
@@ -1444,7 +1521,6 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-hi.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-lo.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/close.gif
-%%PORTDOCS%%share/doc/xerces-c/html/resources/CVS
%%PORTDOCS%%share/doc/xerces-c/html/resources/dot.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/join.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/line.gif
diff --git a/textproc/xerces-c27/Makefile b/textproc/xerces-c27/Makefile
index 460d7d5cd18e..7aca8c3d0f59 100644
--- a/textproc/xerces-c27/Makefile
+++ b/textproc/xerces-c27/Makefile
@@ -6,15 +6,14 @@
#
PORTNAME= xerces-c2
-PORTVERSION= 2.2.0
-PORTREVISION= 0
+PORTVERSION= 2.3.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_APACHE_XML}
MASTER_SITE_SUBDIR= xerces-c/stable
-DISTNAME= xerces-c-src${PORTVERSION:S/./_/g}
+DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g}
-MAINTAINER?= bzeeb+freebsdports@zabbadoz.net
-COMMENT?= Validating XML parser from the Apache XML Project
+MAINTAINER= bzeeb+freebsdports@zabbadoz.net
+COMMENT= Validating XML parser from the Apache XML Project
.if !defined(TRANSCODER)
LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
@@ -23,8 +22,8 @@ PLIST_SUB+= TRANSICONV=""
PLIST_SUB+= TRANSICU="@comment "
.else
.if (${TRANSCODER} == "icu")
-PKGNAMESUFFIX+= -icu
-LIB_DEPENDS+= icuuc.24:${PORTSDIR}/devel/icu
+PKGNAMESUFFIX+= -icu2
+LIB_DEPENDS+= icuuc.26:${PORTSDIR}/devel/icu2
ICUROOT?= ${LOCALBASE}
CONFIGURE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
@@ -45,8 +44,6 @@ PLIST_SUB+= TRANSICU="@comment "
# expect this to get broken some day
NO_FILTER_SHLIBS= yes
INSTALLS_SHLIB= yes
-LDCONFIG_DIRS= ${PREFIX}/lib
-NOCLEANDEPENDS= yes
XERCESWRKSRC= ${WRKSRC}/src/xercesc
CONFIGURE_WRKSRC= ${XERCESWRKSRC}
@@ -65,6 +62,12 @@ CONFIGURE_ARGS+= -t ${TRANSCODER}
.include <bsd.port.pre.mk>
+.if defined(DEBUG)
+PKGNAMESUFFIX+= -debug
+CONFIGURE_ARGS+= -d
+STRIP=
+.endif
+
.if defined(NO_THREADS)
CONFIGURE_ARGS+= -r none
.endif
@@ -89,7 +92,7 @@ SAMPLES_CONFIG_ARGS+= -r pthread
PLIST_SUB+= NO_SAMPLES="@comment "
.endif
-pre-fetch:
+pre-everything::
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-message 15 75 || \
${TRUE})
@@ -100,6 +103,7 @@ pre-fetch:
@${ECHO} 'NO_THREADS do not build a thread enabled shared library'
@${ECHO} 'NO_SAMPLES do not copy sample binaries and sources'
@${ECHO} 'NOPORTDOCS do not copy documentation'
+ @${ECHO} 'DEBUG include debugging information, do not strip'
@${ECHO} ''
@${ECHO} 'Also you may set TRANSODER to the following values (without -D):'
@${ECHO} ''
@@ -135,7 +139,9 @@ post-configure:
.endif
post-install:
+.if !defined(DEBUG)
@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/xerces-c
@${CP} -r ${WRKSRC}/doc/ ${PREFIX}/share/doc/xerces-c/
diff --git a/textproc/xerces-c27/distinfo b/textproc/xerces-c27/distinfo
index 276c143c5967..c025be1a51b5 100644
--- a/textproc/xerces-c27/distinfo
+++ b/textproc/xerces-c27/distinfo
@@ -1 +1 @@
-MD5 (xerces-c-src2_2_0.tar.gz) = e23a0ba22074b59a7a2be4fa7416a3e4
+MD5 (xerces-c-src_2_3_0.tar.gz) = 5167dca8942dd2dd719fa5a8ebe0c18b
diff --git a/textproc/xerces-c27/files/patch-aa b/textproc/xerces-c27/files/patch-aa
index 46f227555235..7295016afa9f 100644
--- a/textproc/xerces-c27/files/patch-aa
+++ b/textproc/xerces-c27/files/patch-aa
@@ -1,68 +1,26 @@
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2002/12/31 18:42:43 1.7
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2003/03/07 15:08:57 1.10
-@@ -56,6 +56,15 @@
+diff -x CVS -urN src/xercesc/util/Transcoders/ICU/ICUTransService.cpp src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp
+--- src/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sat May 17 16:32:17 2003
++++ src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sun Jun 15 10:02:16 2003
+@@ -55,7 +55,7 @@
+ */
/*
- * $Log: IconvFBSDTransService.cpp,v $
-+ * Revision 1.10 2003/03/07 15:08:57 tng
-+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
-+ *
-+ * Revision 1.9 2003/03/07 14:42:45 tng
-+ * [Bug 17570] IconvFBSD build on alpha,sparc. Patch from Bjoern A. Zeeb.
-+ *
-+ * Revision 1.8 2003/02/25 08:15:42 gareth
-+ * Patch to fix compile problem in bug #17358. Patch by Michael Cahill.
-+ *
- * Revision 1.7 2002/12/31 18:42:43 tng
- * [Bug 15608] IconvLCPTranscoder::transcode() is wrong at wcstombs() usage.
- *
-@@ -103,8 +112,6 @@
- # include <errno.h>
- # include <machine/endian.h>
+- * $Id: ICUTransService.cpp,v 1.9 2003/05/17 16:32:17 knoaman Exp $
++ * $Id: ICUTransService.cpp,v 1.10 2003/05/30 09:19:24 gareth Exp $
+ */
--XERCES_CPP_NAMESPACE_BEGIN
--
- // ---------------------------------------------------------------------------
- // Description of encoding schemas, supported by iconv()
- // ---------------------------------------------------------------------------
-@@ -209,6 +216,12 @@
- #include <stdlib.h>
- #include <stdio.h>
-+#if !defined(APP_NO_THREADS)
-+#include <xercesc/util/Mutexes.hpp>
-+#endif
-+
-+XERCES_CPP_NAMESPACE_BEGIN
-+
- // ---------------------------------------------------------------------------
- // Local, const data
- // ---------------------------------------------------------------------------
-@@ -314,8 +327,6 @@
- #else /* XML_USE_LIBICONV */
+@@ -127,11 +127,11 @@
- #if !defined(APP_NO_THREADS)
--
--#include <xercesc/util/Mutexes.hpp>
- // Iconv() access syncronization point
- static XMLMutex *gIconvMutex = NULL;
- # define ICONV_LOCK XMLMutexLock lockConverter(gIconvMutex);
-@@ -1099,7 +1110,8 @@
- // perform conversion
- wLent *= uChSize();
- char *ptr = retVal;
-- size_t rc = iconvTo(wideCharBuf, &wLent, &ptr, neededLen);
-+ size_t tmpwLent = wLent;
-+ size_t rc = iconvTo(wideCharBuf, &tmpwLent, &ptr, neededLen);
- if (rc == (size_t)-1) {
- if (wBufPtr)
- delete [] wBufPtr;
-@@ -1563,6 +1575,6 @@
- return (rc != (size_t)-1) && (len == 0);
- }
--XERCES_CPP_NAMESPACE_END
--
- #endif /* XML_USE_LIBICONV */
-+
-+XERCES_CPP_NAMESPACE_END
+ static XMLCh* convertToXMLCh( const UChar* const toConvert,
+- , MemoryManager* const manager = 0)
++ MemoryManager* const manager = 0)
+ {
+ const unsigned int srcLen = u_strlen(toConvert);
+ XMLCh* retBuf = (manager)
+- ? (XMLCh*) manager->allocate((srcLen+1) sizeof(XMLCh))
++ ? (XMLCh*) manager->allocate((srcLen+1) * sizeof(XMLCh))
+ : new XMLCh[srcLen + 1];
+
+ XMLCh* outPtr = retBuf;
diff --git a/textproc/xerces-c27/files/patch-ab b/textproc/xerces-c27/files/patch-ab
index 8b613207d833..6358303a748d 100644
--- a/textproc/xerces-c27/files/patch-ab
+++ b/textproc/xerces-c27/files/patch-ab
@@ -1,28 +1,38 @@
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2002/11/04 15:14:34 1.4
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2003/03/07 15:08:57 1.5
+--- src/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:06 2003
++++ src.cvs/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:39 2003
+@@ -90,7 +90,11 @@
+ initialize(modulus);
+
+ // create default hasher
++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600)
++ fHash = new HashPtr();
++#else
+ fHash = new (fMemoryManager) HashPtr();
++#endif
+
+ //
+ // Allocate the initial id pointers array. We don't have to zero them
+--- src/xercesc/util/RefHash3KeysIdPool.c Tue Jun 17 22:12:13 2003
++++ src.cvs/xercesc/util/RefHash3KeysIdPool.c Sun Jun 15 09:57:39 2003
@@ -56,6 +56,9 @@
- /*
- * $Log: IconvFBSDTransService.hpp,v $
-+ * Revision 1.5 2003/03/07 15:08:57 tng
-+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
+ /**
+ * $Log: RefHash3KeysIdPool.c,v $
++ * Revision 1.6 2003/06/02 15:18:08 neilg
++ * fix for bug #20092; thanks to Berin Lautenbach
+ *
- * Revision 1.4 2002/11/04 15:14:34 tng
- * C++ Namespace Support.
- *
-@@ -85,11 +88,13 @@
+ * Revision 1.5 2003/05/21 21:08:04 knoaman
+ * gcc 2.95.x is generating an internal error for some template definitions, so
+ * we use the default memory manger in such cases.
+@@ -118,7 +121,11 @@
+ initialize(modulus);
- #include <xercesc/util/TransService.hpp>
-
-+#ifdef XML_USE_LIBICONV
-+# include <iconv.h>
+ // create default hasher
++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600)
++ fHash = new HashXMLCh();
++#else
+ fHash = new (fMemoryManager) HashXMLCh();
+#endif
-+
- XERCES_CPP_NAMESPACE_BEGIN
-
- #ifdef XML_USE_LIBICONV
--
--# include <iconv.h>
- // ---------------------------------------------------------------------------
- // Libiconv wrapper (low-level conversion utilities collection)
+ //
+ // Allocate the initial id pointers array. We don't have to zero them
diff --git a/textproc/xerces-c27/pkg-plist b/textproc/xerces-c27/pkg-plist
index 5205494b0dc3..d1e22503e882 100644
--- a/textproc/xerces-c27/pkg-plist
+++ b/textproc/xerces-c27/pkg-plist
@@ -40,6 +40,11 @@ include/xercesc/util/XMLEBCDICTranscoder.hpp
include/xercesc/util/XMLDeleterFor.hpp
include/xercesc/util/XMLDOMMsg.hpp
include/xercesc/util/XMLChar.hpp
+include/xercesc/util/XMemory.hpp
+include/xercesc/util/SecurityManager.hpp
+include/xercesc/util/PanicHandler.hpp
+include/xercesc/util/DefaultPanicHandler.hpp
+include/xercesc/util/LogicalPath.c
include/xercesc/util/regx/RegxDefs.hpp
include/xercesc/util/regx/ParserForXMLSchema.hpp
include/xercesc/util/regx/RegxParser.hpp
@@ -150,6 +155,7 @@ include/xercesc/util/Compilers/OS400SetDefs.hpp
include/xercesc/util/Compilers/SunKaiDefs.hpp
include/xercesc/util/Compilers/SunCCDefs.hpp
include/xercesc/util/Compilers/SCOCCDefs.hpp
+include/xercesc/util/Compilers/QCCDefs.hpp
include/xercesc/util/Compilers/PTXCCDefs.hpp
include/xercesc/util/Compilers/MVSCPPDefs.hpp
include/xercesc/util/Compilers/IBMVAW32Defs.hpp
@@ -183,6 +189,7 @@ include/xercesc/internal/XMLReader.hpp
include/xercesc/internal/XMLInternalErrorHandler.hpp
include/xercesc/internal/VecAttributesImpl.hpp
include/xercesc/internal/VecAttrListImpl.hpp
+include/xercesc/internal/MemoryManagerImpl.hpp
include/xercesc/internal/ReaderMgr.hpp
include/xercesc/internal/IANAEncodings.hpp
include/xercesc/internal/EndOfEntityException.hpp
@@ -217,6 +224,7 @@ include/xercesc/framework/Wrapper4DOMInputSource.hpp
include/xercesc/framework/URLInputSource.hpp
include/xercesc/framework/StdOutFormatTarget.hpp
include/xercesc/framework/StdInInputSource.hpp
+include/xercesc/framework/MemoryManager.hpp
include/xercesc/framework/MemBufFormatTarget.hpp
include/xercesc/framework/MemBufInputSource.hpp
include/xercesc/framework/LocalFileFormatTarget.hpp
@@ -259,12 +267,14 @@ include/xercesc/dom/DOMDocumentFragment.hpp
include/xercesc/dom/DOMDocumentTraversal.hpp
include/xercesc/dom/DOMDocumentRange.hpp
include/xercesc/dom/DOMDocument.hpp
+include/xercesc/dom/DOMConfiguration.hpp
include/xercesc/dom/DOMComment.hpp
include/xercesc/dom/DOMCharacterData.hpp
include/xercesc/dom/DOMCDATASection.hpp
include/xercesc/dom/DOMBuilder.hpp
include/xercesc/dom/DOMAttr.hpp
include/xercesc/dom/DOMWriterFilter.hpp
+include/xercesc/dom/StDOMNode.hpp
include/xercesc/dom/impl/DOMDeepNodeListPool.c
include/xercesc/dom/deprecated/DOM.hpp
include/xercesc/dom/deprecated/DOM_TreeWalker.hpp
@@ -390,7 +400,7 @@ lib/%%XERCESC_LIB%%
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so; fi
-@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
+@unexec if test ! -r %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
@dirrm include/xercesc/validators/schema/identity
@dirrm include/xercesc/validators/schema
@dirrm include/xercesc/validators/DTD
@@ -1005,28 +1015,8 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__42.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__43.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__44.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__45.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__46.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__47.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__48.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__49.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__5.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__50.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__51.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__52.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__53.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__54.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__55.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__56.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__57.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__58.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__59.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__6.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__60.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__61.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__62.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__63.png
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__64.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__7.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__8.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__9.png
@@ -1170,7 +1160,6 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigDecimal_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp-source.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp.html
-%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__dep__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp-source.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp.html
@@ -1310,6 +1299,94 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherits.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/tail.html
%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XercesApi.css
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classBinInputStream__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classInputSource__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSAXException__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory-members.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttr__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLElementDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLException__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatTarget__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatter__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNumber__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLString__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__coll__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLValidator__inherit__graph.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMAttr_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMElement_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMError_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp-source.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp.html
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__dep__incl.png
+%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__incl.png
%%PORTDOCS%%share/doc/xerces-c/html/bug-report.html
%%PORTDOCS%%share/doc/xerces-c/html/build-misc.html
%%PORTDOCS%%share/doc/xerces-c/html/build-other.html
@@ -1444,7 +1521,6 @@ lib/%%XERCESC_LIB%%
%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-hi.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-lo.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/close.gif
-%%PORTDOCS%%share/doc/xerces-c/html/resources/CVS
%%PORTDOCS%%share/doc/xerces-c/html/resources/dot.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/join.gif
%%PORTDOCS%%share/doc/xerces-c/html/resources/line.gif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:20:50 +0000