Update to 2.8.0. It is interface-compatible with Xerces-C++ 2.7.0 and

contains a large number of bug fixes as well as improvements to the build
system. For the compete list of upstream changes see:

http://xerces.apache.org/xerces-c/releases_archive.html#Release280

4 files changed, 59 insertions, 52 deletions

diff --git a/textproc/xerces-c/patches/patch-aa b/textproc/xerces-c/patches/patch-aa
index d7e9a52cf8f..798c52afa88 100644
--- a/textproc/xerces-c/patches/patch-aa
+++ b/textproc/xerces-c/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2006/08/10 13:44:22 abs Exp $
+$NetBSD: patch-aa,v 1.5 2009/05/10 11:24:27 hasso Exp $
 
---- ../../samples/Makefile.incl.orig	2005-09-07 16:56:50.000000000 +0100
-+++ ../../samples/Makefile.incl
-@@ -240,6 +240,21 @@ ifeq (${PLATFORM}, FREEBSD)
-   SHLIBSUFFIX=.so
+--- ../../samples/Makefile.incl.orig	2007-08-28 21:47:02 +0300
++++ ../../samples/Makefile.incl	2009-05-08 12:50:45 +0300
+@@ -270,6 +270,20 @@ ifeq (${PLATFORM}, FREEBSD)
+   endif
  endif
  
 +#=============== DRAGONFLY SPECIFIC OPTIONS =========================
@@ -18,7 +18,6 @@ $NetBSD: patch-aa,v 1.4 2006/08/10 13:44:22 abs Exp $
 +  else
 +    EXTRA_LINK_OPTIONS=${EXTRA_LIBS} -lstdc++
 +  endif
-+  SHLIBSUFFIX=.so
 +endif
 +
  #=============== NETBSD SPECIFIC OPTIONS =========================
diff --git a/textproc/xerces-c/patches/patch-af b/textproc/xerces-c/patches/patch-af
index 45e4bacc98b..dc8ae6c8d0b 100644
--- a/textproc/xerces-c/patches/patch-af
+++ b/textproc/xerces-c/patches/patch-af
@@ -1,30 +1,39 @@
-$NetBSD: patch-af,v 1.6 2006/08/10 13:44:22 abs Exp $
+$NetBSD: patch-af,v 1.7 2009/05/10 11:24:27 hasso Exp $
 
---- Makefile.incl.orig	2005-09-07 16:55:53.000000000 +0100
-+++ Makefile.incl
-@@ -423,6 +423,21 @@ LD_SONAME = -Wl,-soname,${SO_NAME}
- LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
+--- Makefile.incl.orig	2007-08-30 15:10:20 +0300
++++ Makefile.incl	2009-05-08 12:55:42 +0300
+@@ -603,6 +603,30 @@ ifeq (${PLATFORM}, FREEBSD)
+   LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
  endif
  
 +#=============== DRAGONFLY SPECIFIC OPTIONS =========================
 +ifeq (${PLATFORM}, DRAGONFLY)
-+MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
-+MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
-+ifeq (${TRANSCODER}, ICU)
-+    PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include
-+    ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -L${ICUROOT} -licudata -lgcc
-+else
-+    PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
++  PLATFORM_COMPILE_OPTIONS = -D${PLATFORM}
++
++  ifeq (${LIBTYPE},shared)
++    PLATFORM_COMPILE_OPTIONS += -fPIC
++    MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
++    MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
++  endif
++
++  ifeq (${TRANSCODER}, ICU)
++    PLATFORM_COMPILE_OPTIONS += -I/usr/local/include
++    ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc
++  else
 +    ALLLIBS = ${LIBS}
++  endif
++
++  SHLIBSUFFIX=.so
++  ICUSHLIBSUFFIX=.so
++  ## Compiler switch to embed a library name
++  LD_SONAME = -Wl,-soname,${SO_NAME}
++  LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
 +endif
-+SHLIBSUFFIX=.so
-+## Compiler switch to embed a library name
-+LD_SONAME = -Wl,-soname,${SO_NAME}
-+endif
++
  #=============== NETBSD SPECIFIC OPTIONS =========================
  ifeq (${PLATFORM}, NETBSD)
- MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
-@@ -682,6 +697,11 @@ LINK_LIBNAME=xercesc
+   PLATFORM_COMPILE_OPTIONS = -D${PLATFORM}
+@@ -969,6 +993,10 @@ LINK_LIBNAME=xercesc
  LIBDEPDOM=libxercesdepdom
  endif
  
@@ -32,7 +41,6 @@ $NetBSD: patch-af,v 1.6 2006/08/10 13:44:22 abs Exp $
 +    ALLLIBS += -liconv
 +endif
 +
-+
- ###################### SO_NAME ####################################
+ ###################### A_NAME ####################################
  #
  #
diff --git a/textproc/xerces-c/patches/patch-ag b/textproc/xerces-c/patches/patch-ag
index 04480485c95..c4e5dd18ad0 100644
--- a/textproc/xerces-c/patches/patch-ag
+++ b/textproc/xerces-c/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2006/08/10 13:44:22 abs Exp $
+$NetBSD: patch-ag,v 1.6 2009/05/10 11:24:27 hasso Exp $
 
---- configure.orig	2005-09-07 16:55:53.000000000 +0100
-+++ configure
-@@ -1309,6 +1309,7 @@ case "${host}" in
+--- configure.orig	2007-08-28 21:44:56 +0300
++++ configure	2009-05-08 12:58:10 +0300
+@@ -3943,6 +3943,7 @@ case "${host}" in
          *-*-nto*)       platform=QNX ;;
          *-*-linux*)     platform=LINUX ;;
          *-*-freebsd*)   platform=FREEBSD ;;
@@ -10,19 +10,20 @@ $NetBSD: patch-ag,v 1.5 2006/08/10 13:44:22 abs Exp $
          *-*-netbsd*)    platform=NETBSD ;;
          *-*-irix*)      platform=IRIX ;;
          *-*-aix*)       platform=AIX
-@@ -1520,6 +1521,7 @@ util/Platforms/BeOS/Makefile \
- util/Platforms/QNX/Makefile \
- util/Platforms/Interix/Makefile \
- util/Platforms/Linux/Makefile \
-+util/Platforms/DragonFly/Makefile \
- util/Platforms/FreeBSD/Makefile \
- util/Platforms/NetBSD/Makefile \
- util/Platforms/HPUX/Makefile \
-@@ -1681,6 +1683,7 @@ util/Platforms/QNX/Makefile \
- util/Platforms/Interix/Makefile \
- util/Platforms/Linux/Makefile \
- util/Platforms/FreeBSD/Makefile \
-+util/Platforms/DragonFly/Makefile \
- util/Platforms/NetBSD/Makefile \
- util/Platforms/HPUX/Makefile \
- util/Platforms/OS390/Makefile \
+@@ -4024,7 +4025,7 @@ libtype=${LIBTYPE}
+ bitstobuild=${BITSTOBUILD}
+ 
+ 
+-ac_config_files="$ac_config_files Makefile util/Makefile util/Transcoders/Cygwin/Makefile util/Transcoders/Win32/Makefile util/Transcoders/ICU/Makefile util/Transcoders/Iconv/Makefile util/Transcoders/Iconv390/Makefile util/Transcoders/Uniconv390/Makefile util/Transcoders/Iconv400/Makefile util/Transcoders/IconvFBSD/Makefile util/Transcoders/IconvGNU/Makefile util/Transcoders/MacOSUnicodeConverter/Makefile util/Platforms/Makefile util/Platforms/Solaris/Makefile util/Platforms/AIX/Makefile util/Platforms/BeOS/Makefile util/Platforms/QNX/Makefile util/Platforms/Linux/Makefile util/Platforms/FreeBSD/Makefile util/Platforms/NetBSD/Makefile util/Platforms/HPUX/Makefile util/Platforms/OS390/Makefile util/Platforms/OS400/Makefile util/Platforms/IRIX/Makefile util/Platforms/PTX/Makefile util/Platforms/OpenServer/Makefile util/Platforms/UnixWare/Makefile util/Platforms/Tru64/Makefile util/Platforms/MacOS/Makefile util/Platforms/Win32/Makefile util/Platforms/Cygwin/Makefile util/Compilers/Makefile util/MsgLoaders/InMemory/Makefile util/MsgLoaders/ICU/Makefile util/MsgLoaders/ICU/resources/Makefile util/MsgLoaders/MsgCatalog/Makefile util/MsgLoaders/MsgFile/Makefile util/NetAccessors/Socket/Makefile util/NetAccessors/WinSock/Makefile util/NetAccessors/libWWW/Makefile util/NetAccessors/MacOSURLAccessCF/Makefile util/regx/Makefile validators/Makefile validators/common/Makefile validators/datatype/Makefile validators/DTD/Makefile validators/schema/Makefile validators/schema/identity/Makefile framework/Makefile framework/psvi/Makefile dom/Makefile dom/impl/Makefile dom/deprecated/Makefile parsers/Makefile internal/Makefile sax/Makefile sax2/Makefile ../../obj/Makefile"
++ac_config_files="$ac_config_files Makefile util/Makefile util/Transcoders/Cygwin/Makefile util/Transcoders/Win32/Makefile util/Transcoders/ICU/Makefile util/Transcoders/Iconv/Makefile util/Transcoders/Iconv390/Makefile util/Transcoders/Uniconv390/Makefile util/Transcoders/Iconv400/Makefile util/Transcoders/IconvFBSD/Makefile util/Transcoders/IconvGNU/Makefile util/Transcoders/MacOSUnicodeConverter/Makefile util/Platforms/Makefile util/Platforms/Solaris/Makefile util/Platforms/AIX/Makefile util/Platforms/BeOS/Makefile util/Platforms/QNX/Makefile util/Platforms/Linux/Makefile util/Platforms/FreeBSD/Makefile util/Platforms/DragonFly/Makefile util/Platforms/NetBSD/Makefile util/Platforms/HPUX/Makefile util/Platforms/OS390/Makefile util/Platforms/OS400/Makefile util/Platforms/IRIX/Makefile util/Platforms/PTX/Makefile util/Platforms/OpenServer/Makefile util/Platforms/UnixWare/Makefile util/Platforms/Tru64/Makefile util/Platforms/MacOS/Makefile util/Platforms/Win32/Makefile util/Platforms/Cygwin/Makefile util/Compilers/Makefile util/MsgLoaders/InMemory/Makefile util/MsgLoaders/ICU/Makefile util/MsgLoaders/ICU/resources/Makefile util/MsgLoaders/MsgCatalog/Makefile util/MsgLoaders/MsgFile/Makefile util/NetAccessors/Socket/Makefile util/NetAccessors/WinSock/Makefile util/NetAccessors/libWWW/Makefile util/NetAccessors/MacOSURLAccessCF/Makefile util/regx/Makefile validators/Makefile validators/common/Makefile validators/datatype/Makefile validators/DTD/Makefile validators/schema/Makefile validators/schema/identity/Makefile framework/Makefile framework/psvi/Makefile dom/Makefile dom/impl/Makefile dom/deprecated/Makefile parsers/Makefile internal/Makefile sax/Makefile sax2/Makefile ../../obj/Makefile"
+ 
+ ac_config_commands="$ac_config_commands default"
+ 
+@@ -4624,6 +4625,7 @@ do
+     "util/Platforms/QNX/Makefile") CONFIG_FILES="$CONFIG_FILES util/Platforms/QNX/Makefile" ;;
+     "util/Platforms/Linux/Makefile") CONFIG_FILES="$CONFIG_FILES util/Platforms/Linux/Makefile" ;;
+     "util/Platforms/FreeBSD/Makefile") CONFIG_FILES="$CONFIG_FILES util/Platforms/FreeBSD/Makefile" ;;
++    "util/Platforms/DragonFly/Makefile") CONFIG_FILES="$CONFIG_FILES util/Platforms/DragonFly/Makefile" ;;
+     "util/Platforms/NetBSD/Makefile") CONFIG_FILES="$CONFIG_FILES util/Platforms/NetBSD/Makefile" ;;
+     "util/Platforms/HPUX/Makefile") CONFIG_FILES="$CONFIG_FILES util/Platforms/HPUX/Makefile" ;;
+     "util/Platforms/OS390/Makefile") CONFIG_FILES="$CONFIG_FILES util/Platforms/OS390/Makefile" ;;
diff --git a/textproc/xerces-c/patches/patch-ar b/textproc/xerces-c/patches/patch-ar
index c5f0b954d7c..cce0234ee51 100644
--- a/textproc/xerces-c/patches/patch-ar
+++ b/textproc/xerces-c/patches/patch-ar
@@ -1,9 +1,9 @@
-$NetBSD: patch-ar,v 1.2 2006/08/10 13:44:22 abs Exp $
+$NetBSD: patch-ar,v 1.3 2009/05/10 11:24:27 hasso Exp $
 
---- ../../tests/Makefile.incl.orig	2005-09-07 16:56:40.000000000 +0100
-+++ ../../tests/Makefile.incl
-@@ -240,6 +240,21 @@ ifeq (${PLATFORM}, FREEBSD)
-   SHLIBSUFFIX=.so
+--- ../../tests/Makefile.incl.orig	2007-08-28 21:46:48 +0300
++++ ../../tests/Makefile.incl	2009-05-08 13:00:19 +0300
+@@ -269,6 +269,20 @@ ifeq (${PLATFORM}, FREEBSD)
+   endif
  endif
  
 +#=============== DRAGONFLY SPECIFIC OPTIONS =========================
@@ -18,7 +18,6 @@ $NetBSD: patch-ar,v 1.2 2006/08/10 13:44:22 abs Exp $
 +  else
 +    EXTRA_LINK_OPTIONS=${EXTRA_LIBS} -lstdc++
 +  endif
-+  SHLIBSUFFIX=.so
 +endif
 +
  #=============== NETBSD SPECIFIC OPTIONS =========================