Attachment #32229 for bug #53348

View | Details | Raw Unified | Return to bug 53348
Collapse All | Expand All




#

PORTNAME=	xerces-c2
PORTVERSION=	2.3.0
PORTREVISION=	0
CATEGORIES=	textproc
MASTER_SITES=	${MASTER_SITE_APACHE_XML}
MASTER_SITE_SUBDIR=	xerces-c/stable
DISTNAME=	xerces-c-src_${PORTVERSION:S/./_/g}

MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
COMMENT=	Validating XML parser from the Apache XML Project

.if !defined(TRANSCODER)
LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv

PLIST_SUB+=		TRANSICU="@comment "
.else
.if (${TRANSCODER} == "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"

# 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}

PLIST_SUB+=	NO_SAMPLES="@comment "
.endif

pre-everything::
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
	@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-message 15 75 || \
		${TRUE})

Line 1 Link Here

(-)xerces-c2/distinfo (-1 / +1 lines)
1	MD5 (xerces-c-src2_2_0.tar.gz) = e23a0ba22074b59a7a2be4fa7416a3e4	1	MD5 (xerces-c-src_2_3_0.tar.gz) = 5167dca8942dd2dd719fa5a8ebe0c18b




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 @@
  */
 
 /*
- * $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 $
  */
 
 
@@ -127,11 +127,11 @@
 
 
 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;
 // ---------------------------------------------------------------------------
 // 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 */
 
 #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




--- 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
@@ -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.
+ *
  * Revision 1.4  2002/11/04 15:14:34  tng
  * C++ Namespace Support.
  *
@@ -85,11 +88,13 @@
 
 #include <xercesc/util/TransService.hpp>
 
+#ifdef XML_USE_LIBICONV
+#  include <iconv.h>
+#endif
+
 XERCES_CPP_NAMESPACE_BEGIN
 
 #ifdef XML_USE_LIBICONV
-
-#  include <iconv.h>
 
 // ---------------------------------------------------------------------------
 //  Libiconv wrapper (low-level conversion utilities collection)

Lines 40-45 Link Here

(-)xerces-c2/pkg-plist (-22 / +98 lines)
40	include/xercesc/util/XMLDeleterFor.hpp	40	include/xercesc/util/XMLDeleterFor.hpp
41	include/xercesc/util/XMLDOMMsg.hpp	41	include/xercesc/util/XMLDOMMsg.hpp
42	include/xercesc/util/XMLChar.hpp	42	include/xercesc/util/XMLChar.hpp
		43	include/xercesc/util/XMemory.hpp
		44	include/xercesc/util/SecurityManager.hpp
		45	include/xercesc/util/PanicHandler.hpp
		46	include/xercesc/util/DefaultPanicHandler.hpp
		47	include/xercesc/util/LogicalPath.c
43	include/xercesc/util/regx/RegxDefs.hpp	48	include/xercesc/util/regx/RegxDefs.hpp
44	include/xercesc/util/regx/ParserForXMLSchema.hpp	49	include/xercesc/util/regx/ParserForXMLSchema.hpp
45	include/xercesc/util/regx/RegxParser.hpp	50	include/xercesc/util/regx/RegxParser.hpp
Lines 150-155 Link Here
150	include/xercesc/util/Compilers/SunKaiDefs.hpp	155	include/xercesc/util/Compilers/SunKaiDefs.hpp
151	include/xercesc/util/Compilers/SunCCDefs.hpp	156	include/xercesc/util/Compilers/SunCCDefs.hpp
152	include/xercesc/util/Compilers/SCOCCDefs.hpp	157	include/xercesc/util/Compilers/SCOCCDefs.hpp
		158	include/xercesc/util/Compilers/QCCDefs.hpp
153	include/xercesc/util/Compilers/PTXCCDefs.hpp	159	include/xercesc/util/Compilers/PTXCCDefs.hpp
154	include/xercesc/util/Compilers/MVSCPPDefs.hpp	160	include/xercesc/util/Compilers/MVSCPPDefs.hpp
155	include/xercesc/util/Compilers/IBMVAW32Defs.hpp	161	include/xercesc/util/Compilers/IBMVAW32Defs.hpp
Lines 183-188 Link Here
183	include/xercesc/internal/XMLInternalErrorHandler.hpp	189	include/xercesc/internal/XMLInternalErrorHandler.hpp
184	include/xercesc/internal/VecAttributesImpl.hpp	190	include/xercesc/internal/VecAttributesImpl.hpp
185	include/xercesc/internal/VecAttrListImpl.hpp	191	include/xercesc/internal/VecAttrListImpl.hpp
		192	include/xercesc/internal/MemoryManagerImpl.hpp
186	include/xercesc/internal/ReaderMgr.hpp	193	include/xercesc/internal/ReaderMgr.hpp
187	include/xercesc/internal/IANAEncodings.hpp	194	include/xercesc/internal/IANAEncodings.hpp
188	include/xercesc/internal/EndOfEntityException.hpp	195	include/xercesc/internal/EndOfEntityException.hpp
Lines 217-222 Link Here
217	include/xercesc/framework/URLInputSource.hpp	224	include/xercesc/framework/URLInputSource.hpp
218	include/xercesc/framework/StdOutFormatTarget.hpp	225	include/xercesc/framework/StdOutFormatTarget.hpp
219	include/xercesc/framework/StdInInputSource.hpp	226	include/xercesc/framework/StdInInputSource.hpp
		227	include/xercesc/framework/MemoryManager.hpp
220	include/xercesc/framework/MemBufFormatTarget.hpp	228	include/xercesc/framework/MemBufFormatTarget.hpp
221	include/xercesc/framework/MemBufInputSource.hpp	229	include/xercesc/framework/MemBufInputSource.hpp
222	include/xercesc/framework/LocalFileFormatTarget.hpp	230	include/xercesc/framework/LocalFileFormatTarget.hpp
Lines 259-270 Link Here
259	include/xercesc/dom/DOMDocumentTraversal.hpp	267	include/xercesc/dom/DOMDocumentTraversal.hpp
260	include/xercesc/dom/DOMDocumentRange.hpp	268	include/xercesc/dom/DOMDocumentRange.hpp
261	include/xercesc/dom/DOMDocument.hpp	269	include/xercesc/dom/DOMDocument.hpp
		270	include/xercesc/dom/DOMConfiguration.hpp
262	include/xercesc/dom/DOMComment.hpp	271	include/xercesc/dom/DOMComment.hpp
263	include/xercesc/dom/DOMCharacterData.hpp	272	include/xercesc/dom/DOMCharacterData.hpp
264	include/xercesc/dom/DOMCDATASection.hpp	273	include/xercesc/dom/DOMCDATASection.hpp
265	include/xercesc/dom/DOMBuilder.hpp	274	include/xercesc/dom/DOMBuilder.hpp
266	include/xercesc/dom/DOMAttr.hpp	275	include/xercesc/dom/DOMAttr.hpp
267	include/xercesc/dom/DOMWriterFilter.hpp	276	include/xercesc/dom/DOMWriterFilter.hpp
		277	include/xercesc/dom/StDOMNode.hpp
268	include/xercesc/dom/impl/DOMDeepNodeListPool.c	278	include/xercesc/dom/impl/DOMDeepNodeListPool.c
269	include/xercesc/dom/deprecated/DOM.hpp	279	include/xercesc/dom/deprecated/DOM.hpp
270	include/xercesc/dom/deprecated/DOM_TreeWalker.hpp	280	include/xercesc/dom/deprecated/DOM_TreeWalker.hpp
Lines 1005-1032 Link Here
1005	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__42.png	1015	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__42.png
1006	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__43.png	1016	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__43.png
1007	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__44.png	1017	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__44.png
1008	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__45.png
1009	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__46.png
1010	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__47.png
1011	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__48.png
1012	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__49.png
1013	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__5.png	1018	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__5.png
1014	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__50.png
1015	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__51.png
1016	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__52.png
1017	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__53.png
1018	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__54.png
1019	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__55.png
1020	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__56.png
1021	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__57.png
1022	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__58.png
1023	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__59.png
1024	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__6.png	1019	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__6.png
1025	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__60.png
1026	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__61.png
1027	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__62.png
1028	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__63.png
1029	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__64.png
1030	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__7.png	1020	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__7.png
1031	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__8.png	1021	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__8.png
1032	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__9.png	1022	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherit__graph__9.png
Lines 1170-1176 Link Here
1170	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigDecimal_8hpp__incl.png	1160	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigDecimal_8hpp__incl.png
1171	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp-source.html	1161	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp-source.html
1172	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp.html	1162	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp.html
1173	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__dep__incl.png
1174	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__incl.png	1163	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLBigInteger_8hpp__incl.png
1175	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp-source.html	1164	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp-source.html
1176	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp.html	1165	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMLChar_8hpp.html
Lines 1310-1315 Link Here
1310	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherits.html	1299	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/inherits.html
1311	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/tail.html	1300	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/tail.html
1312	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XercesApi.css	1301	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XercesApi.css
		1302	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classBinInputStream__coll__graph.png
		1303	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler-members.html
		1304	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler.html
		1305	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__coll__graph.png
		1306	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDefaultPanicHandler__inherit__graph.png
		1307	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration-members.html
		1308	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classDOMConfiguration.html
		1309	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classInputSource__coll__graph.png
		1310	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager-members.html
		1311	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classMemoryManager.html
		1312	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler.html
		1313	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler-members.html
		1314	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classPanicHandler__inherit__graph.png
		1315	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__coll__graph.png
		1316	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classQName__inherit__graph.png
		1317	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSAXException__coll__graph.png
		1318	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager-members.html
		1319	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classSecurityManager.html
		1320	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode-members.html
		1321	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode.html
		1322	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classStDOMNode__coll__graph.png
		1323	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory-members.html
		1324	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory.html
		1325	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMemory__inherit__graph.png
		1326	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__coll__graph.png
		1327	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDefList__inherit__graph.png
		1328	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__coll__graph.png
		1329	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttDef__inherit__graph.png
		1330	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLAttr__inherit__graph.png
		1331	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__coll__graph.png
		1332	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLBigInteger__inherit__graph.png
		1333	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__coll__graph.png
		1334	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLContentModel__inherit__graph.png
		1335	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLElementDecl__inherit__graph.png
		1336	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__coll__graph.png
		1337	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLEntityDecl__inherit__graph.png
		1338	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLException__coll__graph.png
		1339	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatTarget__coll__graph.png
		1340	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLFormatter__inherit__graph.png
		1341	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__coll__graph.png
		1342	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLInteger__inherit__graph.png
		1343	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__coll__graph.png
		1344	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLLCPTranscoder__inherit__graph.png
		1345	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__coll__graph.png
		1346	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNetAccessor__inherit__graph.png
		1347	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__coll__graph.png
		1348	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNotationDecl__inherit__graph.png
		1349	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLNumber__coll__graph.png
		1350	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__coll__graph.png
		1351	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLStringTokenizer__inherit__graph.png
		1352	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLString__coll__graph.png
		1353	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__coll__graph.png
		1354	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTranscoder__inherit__graph.png
		1355	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__coll__graph.png
		1356	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLTransService__inherit__graph.png
		1357	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__coll__graph.png
		1358	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLUri__inherit__graph.png
		1359	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__coll__graph.png
		1360	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLURL__inherit__graph.png
		1361	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/classXMLValidator__inherit__graph.png
		1362	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp-source.html
		1363	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp.html
		1364	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DefaultPanicHandler_8hpp__incl.png
		1365	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMAttr_8hpp__dep__incl.png
1366	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp-source.html
1367	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp.html
1368	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMConfiguration_8hpp__incl.png
1369	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMElement_8hpp__dep__incl.png
1370	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/DOMError_8hpp__dep__incl.png
1371	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp-source.html
1372	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp.html
1373	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__dep__incl.png
1374	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/MemoryManager_8hpp__incl.png
1375	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp-source.html
1376	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp.html
1377	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__dep__incl.png
1378	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/PanicHandler_8hpp__incl.png
1379	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp.html
1380	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp-source.html
1381	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp.html
1382	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__dep__incl.png
1383	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/SecurityManager_8hpp__incl.png
1384	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp-source.html
1385	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/StDOMNode_8hpp__incl.png
1386	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp-source.html
1387	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp.html
1388	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__dep__incl.png
1389	%%PORTDOCS%%share/doc/xerces-c/html/apiDocs/XMemory_8hpp__incl.png
1313	%%PORTDOCS%%share/doc/xerces-c/html/bug-report.html	1390	%%PORTDOCS%%share/doc/xerces-c/html/bug-report.html
1314	%%PORTDOCS%%share/doc/xerces-c/html/build-misc.html	1391	%%PORTDOCS%%share/doc/xerces-c/html/build-misc.html
1315	%%PORTDOCS%%share/doc/xerces-c/html/build-other.html	1392	%%PORTDOCS%%share/doc/xerces-c/html/build-other.html
Lines 1444-1450 Link Here
1444	%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-hi.gif	1521	%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-hi.gif
1445	%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-lo.gif	1522	%%PORTDOCS%%share/doc/xerces-c/html/resources/button-xml-lo.gif
1446	%%PORTDOCS%%share/doc/xerces-c/html/resources/close.gif	1523	%%PORTDOCS%%share/doc/xerces-c/html/resources/close.gif
1447	%%PORTDOCS%%share/doc/xerces-c/html/resources/CVS
1448	%%PORTDOCS%%share/doc/xerces-c/html/resources/dot.gif	1524	%%PORTDOCS%%share/doc/xerces-c/html/resources/dot.gif
1449	%%PORTDOCS%%share/doc/xerces-c/html/resources/join.gif	1525	%%PORTDOCS%%share/doc/xerces-c/html/resources/join.gif
1450	%%PORTDOCS%%share/doc/xerces-c/html/resources/line.gif	1526	%%PORTDOCS%%share/doc/xerces-c/html/resources/line.gif

Return to bug 53348

Lines 6-20 Link Here

(-)xerces-c2/Makefile (-10 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= xerces-c2	8	PORTNAME= xerces-c2
9	PORTVERSION= 2.2.0	9	PORTVERSION= 2.3.0
10	PORTREVISION= 0
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= ${MASTER_SITE_APACHE_XML}	11	MASTER_SITES= ${MASTER_SITE_APACHE_XML}
13	MASTER_SITE_SUBDIR= xerces-c/stable	12	MASTER_SITE_SUBDIR= xerces-c/stable
14	DISTNAME= xerces-c-src${PORTVERSION:S/./_/g}	13	DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g}
15		14
16	MAINTAINER?= bzeeb+freebsdports@zabbadoz.net	15	MAINTAINER= bzeeb+freebsdports@zabbadoz.net
17	COMMENT?= Validating XML parser from the Apache XML Project	16	COMMENT= Validating XML parser from the Apache XML Project
18		17
19	.if !defined(TRANSCODER)	18	.if !defined(TRANSCODER)
20	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv	19	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
Lines 23-30 Link Here
23	PLIST_SUB+= TRANSICU="@comment "	22	PLIST_SUB+= TRANSICU="@comment "
24	.else	23	.else
25	.if (${TRANSCODER} == "icu")	24	.if (${TRANSCODER} == "icu")
26	PKGNAMESUFFIX+= -icu	25	PKGNAMESUFFIX+= -icu2
27	LIB_DEPENDS+= icuuc.24:${PORTSDIR}/devel/icu	26	LIB_DEPENDS+= icuuc.26:${PORTSDIR}/devel/icu2
28	ICUROOT?= ${LOCALBASE}	27	ICUROOT?= ${LOCALBASE}
29	CONFIGURE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"	28	CONFIGURE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
30	MAKE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"	29	MAKE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
Lines 45-52 Link Here
45	# expect this to get broken some day	44	# expect this to get broken some day
46	NO_FILTER_SHLIBS= yes	45	NO_FILTER_SHLIBS= yes
47	INSTALLS_SHLIB= yes	46	INSTALLS_SHLIB= yes
48	LDCONFIG_DIRS= ${PREFIX}/lib
49	NOCLEANDEPENDS= yes
50		47
51	XERCESWRKSRC= ${WRKSRC}/src/xercesc	48	XERCESWRKSRC= ${WRKSRC}/src/xercesc
52	CONFIGURE_WRKSRC= ${XERCESWRKSRC}	49	CONFIGURE_WRKSRC= ${XERCESWRKSRC}
Lines 89-95 Link Here
89	PLIST_SUB+= NO_SAMPLES="@comment "	86	PLIST_SUB+= NO_SAMPLES="@comment "
90	.endif	87	.endif
91		88
92	pre-fetch:	89	pre-everything::
93	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)	90	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
94	@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-message 15 75 \|\| \	91	@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-message 15 75 \|\| \
95	${TRUE})	92	${TRUE})

Lines 1-68 Link Here

(-)xerces-c2/files/patch-aa (-66 / +24 lines)
1	--- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2002/12/31 18:42:43 1.7	1	diff -x CVS -urN src/xercesc/util/Transcoders/ICU/ICUTransService.cpp src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp
2	+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp 2003/03/07 15:08:57 1.10	2	--- src/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sat May 17 16:32:17 2003
3	@@ -56,6 +56,15 @@	3	+++ src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sun Jun 15 10:02:16 2003
		4	@@ -55,7 +55,7 @@
		5	*/
4		6
5	/*	7	/*
6	* $Log: IconvFBSDTransService.cpp,v $	8	- * $Id: ICUTransService.cpp,v 1.9 2003/05/17 16:32:17 knoaman Exp $
7	+ * Revision 1.10 2003/03/07 15:08:57 tng	9	+ * $Id: ICUTransService.cpp,v 1.10 2003/05/30 09:19:24 gareth Exp $
8	+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.	10	*/
9	+ *	11
10	+ * Revision 1.9 2003/03/07 14:42:45 tng	12
11	+ * [Bug 17570] IconvFBSD build on alpha,sparc. Patch from Bjoern A. Zeeb.	13	@@ -127,11 +127,11 @@
12	+ *	14
13	+ * Revision 1.8 2003/02/25 08:15:42 gareth	15
14	+ * Patch to fix compile problem in bug #17358. Patch by Michael Cahill.	16	static XMLCh* convertToXMLCh( const UChar* const toConvert,
15	+ *	17	- , MemoryManager* const manager = 0)
16	* Revision 1.7 2002/12/31 18:42:43 tng	18	+ MemoryManager* const manager = 0)
17	* [Bug 15608] IconvLCPTranscoder::transcode() is wrong at wcstombs() usage.	19	{
18	*	20	const unsigned int srcLen = u_strlen(toConvert);
19	@@ -103,8 +112,6 @@	21	XMLCh* retBuf = (manager)
20	# include <errno.h>	22	- ? (XMLCh*) manager->allocate((srcLen+1) sizeof(XMLCh))
21	# include <machine/endian.h>	23	+ ? (XMLCh) manager->allocate((srcLen+1) sizeof(XMLCh))
22		24	: new XMLCh[srcLen + 1];
23	-XERCES_CPP_NAMESPACE_BEGIN	25
24	-	26	XMLCh* outPtr = retBuf;
25	// ---------------------------------------------------------------------------
26	// Description of encoding schemas, supported by iconv()
27	// ---------------------------------------------------------------------------
28	@@ -209,6 +216,12 @@
29	#include <stdlib.h>
30	#include <stdio.h>
31
32	+#if !defined(APP_NO_THREADS)
33	+#include <xercesc/util/Mutexes.hpp>
34	+#endif
35	+
36	+XERCES_CPP_NAMESPACE_BEGIN
37	+
38	// ---------------------------------------------------------------------------
39	// Local, const data
40	// ---------------------------------------------------------------------------
41	@@ -314,8 +327,6 @@
42	#else /* XML_USE_LIBICONV */
43
44	#if !defined(APP_NO_THREADS)
45	-
46	-#include <xercesc/util/Mutexes.hpp>
47	// Iconv() access syncronization point
48	static XMLMutex *gIconvMutex = NULL;
49	# define ICONV_LOCK XMLMutexLock lockConverter(gIconvMutex);
50	@@ -1099,7 +1110,8 @@
51	// perform conversion
52	wLent *= uChSize();
53	char *ptr = retVal;
54	- size_t rc = iconvTo(wideCharBuf, &wLent, &ptr, neededLen);
55	+ size_t tmpwLent = wLent;
56	+ size_t rc = iconvTo(wideCharBuf, &tmpwLent, &ptr, neededLen);
57	if (rc == (size_t)-1) {
58	if (wBufPtr)
59	delete [] wBufPtr;
60	@@ -1563,6 +1575,6 @@
61	return (rc != (size_t)-1) && (len == 0);
62	}
63
64	-XERCES_CPP_NAMESPACE_END
65	-
66	#endif /* XML_USE_LIBICONV */
67	+
68	+XERCES_CPP_NAMESPACE_END

Lines 1-28 Link Here

(-)xerces-c2/files/patch-ab (-28 lines)
1	--- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2002/11/04 15:14:34 1.4
2	+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2003/03/07 15:08:57 1.5
3	@@ -56,6 +56,9 @@
4
5	/*
6	* $Log: IconvFBSDTransService.hpp,v $
7	+ * Revision 1.5 2003/03/07 15:08:57 tng
8	+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
9	+ *
10	* Revision 1.4 2002/11/04 15:14:34 tng
11	* C++ Namespace Support.
12	*
13	@@ -85,11 +88,13 @@
14
15	#include <xercesc/util/TransService.hpp>
16
17	+#ifdef XML_USE_LIBICONV
18	+# include <iconv.h>
19	+#endif
20	+
21	XERCES_CPP_NAMESPACE_BEGIN
22
23	#ifdef XML_USE_LIBICONV
24	-
25	-# include <iconv.h>
26
27	// ---------------------------------------------------------------------------
28	// Libiconv wrapper (low-level conversion utilities collection)