2 files changed, 96 insertions, 12 deletions

diff --git a/textproc/xerces-c2/files/patch-aa b/textproc/xerces-c2/files/patch-aa
index 1e3aad521e00..46f227555235 100644
--- a/textproc/xerces-c2/files/patch-aa
+++ b/textproc/xerces-c2/files/patch-aa
@@ -1,12 +1,68 @@
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.orig	Tue Aug 27 09:24:38 2002
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp	Sun Jan 12 01:44:04 2003
-@@ -1091,7 +1091,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;
+--- 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 @@
+ 
+ /*
+  * $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>
+ 
+-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 */
+ 
+ #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
diff --git a/textproc/xerces-c2/files/patch-ab b/textproc/xerces-c2/files/patch-ab
new file mode 100644
index 000000000000..8b613207d833
--- /dev/null
+++ b/textproc/xerces-c2/files/patch-ab
@@ -0,0 +1,28 @@
+--- 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)