1 files changed, 60 insertions, 13 deletions
diff --git a/textproc/xerces-c/patches/patch-ap b/textproc/xerces-c/patches/patch-ap
index f138af714c5..03c789a74a2 100644
--- a/textproc/xerces-c/patches/patch-ap
+++ b/textproc/xerces-c/patches/patch-ap
@@ -1,14 +1,61 @@
-$NetBSD: patch-ap,v 1.3 2005/12/31 00:56:42 joerg Exp $
+$NetBSD: patch-ap,v 1.4 2006/08/10 13:44:22 abs Exp $
 
---- util/AutoSense.hpp.orig	2005-12-31 00:01:35.000000000 +0000
-+++ util/AutoSense.hpp
-@@ -222,6 +222,9 @@
- #elif defined(__FreeBSD__)
-     #define XML_FREEBSD
-     #define XML_UNIX
-+#elif defined(__DragonFly__)
-+    #define XML_DRAGONFLY
-+    #define XML_UNIX
- #elif defined(IRIX) || defined(__sgi)
-     #define XML_IRIX
-     #define XML_UNIX
+--- util/Transcoders/IconvGNU/IconvGNUTransService.cpp.orig	2005-09-07 16:55:44.000000000 +0100
++++ util/Transcoders/IconvGNU/IconvGNUTransService.cpp
+@@ -26,7 +26,11 @@
+ #include <locale.h>
+ #include <iconv.h>
+ #include <errno.h>
++#ifdef __NetBSD__
++#include <machine/endian.h>
++#else
+ #include <endian.h>
++#endif
+ 
+ #include <xercesc/util/XMLString.hpp>
+ #include <xercesc/util/XMLUniDefs.hpp>
+@@ -243,7 +247,7 @@ XMLCh    IconvGNUWrapper::toUpper (const
+     xmlChToMbc (ch, wcbuf);
+ 
+     char    tmpArr[4];
+-    char*    ptr = wcbuf;
++    const char*    ptr = wcbuf;
+     size_t    len = fUChSize;
+     char    *pTmpArr = tmpArr;
+     size_t    bLen = 2;
+@@ -275,7 +279,7 @@ XMLCh    IconvGNUWrapper::toLower (const
+     xmlChToMbc (ch, wcbuf);
+ 
+     char    tmpArr[4];
+-    char*    ptr = wcbuf;
++    const char*    ptr = wcbuf;
+     size_t    len = fUChSize;
+     char    *pTmpArr = tmpArr;
+     size_t    bLen = 2;
+@@ -307,7 +311,7 @@ bool    IconvGNUWrapper::isSpace(const X
+     char    tmpArr[4];
+ 
+     xmlChToMbc (toCheck, wcbuf);
+-    char*    ptr = wcbuf;
++    const char*    ptr = wcbuf;
+     size_t    len = fUChSize;
+     char    *pTmpArr = tmpArr;
+     size_t    bLen = 2;
+@@ -408,7 +412,7 @@ size_t    IconvGNUWrapper::iconvFrom ( c
+                  size_t        toLen ) const
+ {
+     ICONV_LOCK;
+-    char ** tmpPtr = (char**)&fromPtr;
++    const char ** tmpPtr = &fromPtr;
+     return ::iconv (fCDFrom, tmpPtr, fromLen, toPtr, &toLen);
+ }
+ 
+@@ -418,7 +422,7 @@ size_t    IconvGNUWrapper::iconvTo ( con
+                    size_t        toLen ) const
+ {
+     ICONV_LOCK;
+-    char ** tmpPtr = (char**)&fromPtr;
++    const char ** tmpPtr = &fromPtr;
+     return ::iconv (fCDTo, tmpPtr, fromLen, toPtr, &toLen);
+ }
+