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

8 files changed, 77 insertions, 71 deletions

diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 2618e966bad..b8b542d3e76 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2009/01/18 10:22:47 obache Exp $
+# $NetBSD: Makefile,v 1.36 2009/05/10 11:24:26 hasso Exp $
 #
 
-DISTNAME=	xerces-c-src_2_7_0
+DISTNAME=	xerces-c-src_2_8_0
 PKGNAME=	${DISTNAME:S/-src_/-/:S/_/./g}
-PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://apache.rmplc.co.uk/xml/xerces-c/source/
 
diff --git a/textproc/xerces-c/PLIST b/textproc/xerces-c/PLIST
index 5869e66fcc0..4862fe37d08 100644
--- a/textproc/xerces-c/PLIST
+++ b/textproc/xerces-c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/05/10 11:24:26 hasso Exp $
 include/xercesc/dom/DOM.hpp
 include/xercesc/dom/DOMAttr.hpp
 include/xercesc/dom/DOMBuilder.hpp
@@ -502,11 +502,11 @@ include/xercesc/validators/schema/identity/XPathMatcherStack.hpp
 include/xercesc/validators/schema/identity/XPathSymbols.hpp
 include/xercesc/validators/schema/identity/XercesXPath.hpp
 lib/libxerces-c.so
-lib/libxerces-c.so.27
-lib/libxerces-c.so.27.0
+lib/libxerces-c.so.28
+lib/libxerces-c.so.28.0
 lib/libxerces-depdom.so
-lib/libxerces-depdom.so.27
-lib/libxerces-depdom.so.27.0
+lib/libxerces-depdom.so.28
+lib/libxerces-depdom.so.28.0
 @dirrm include/xercesc/validators/schema/identity
 @dirrm include/xercesc/validators/schema
 @dirrm include/xercesc/validators/datatype
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index 2cd6b0a0400..048eb357d79 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/05/10 11:24:26 hasso Exp $
 
 BUILDLINK_TREE+=	xerces-c
 
 .if !defined(XERCES_C_BUILDLINK3_MK)
 XERCES_C_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xerces-c+=	xerces-c>=2.7.0
-BUILDLINK_ABI_DEPENDS.xerces-c?=	xerces-c>=2.7.0
+BUILDLINK_API_DEPENDS.xerces-c+=	xerces-c>=2.8.0
+BUILDLINK_ABI_DEPENDS.xerces-c?=	xerces-c>=2.8.0
 BUILDLINK_PKGSRCDIR.xerces-c?=	../../textproc/xerces-c
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/textproc/xerces-c/distinfo b/textproc/xerces-c/distinfo
index 2f2d8067114..f9a86852858 100644
--- a/textproc/xerces-c/distinfo
+++ b/textproc/xerces-c/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.11 2006/08/22 16:30:46 joerg Exp $
+$NetBSD: distinfo,v 1.12 2009/05/10 11:24:26 hasso Exp $
 
-SHA1 (xerces-c-src_2_7_0.tar.gz) = 56f9587f33fca0a573a45f07762e3262a255d73f
-RMD160 (xerces-c-src_2_7_0.tar.gz) = 80914da4898c694bf0299d612164483f83857baf
-Size (xerces-c-src_2_7_0.tar.gz) = 7760004 bytes
-SHA1 (patch-aa) = 11485b77929a72c693bd9fa94c20dbbdd461fb3d
+SHA1 (xerces-c-src_2_8_0.tar.gz) = f0803b1330daec3f44b17dee64c3c99de6b3cd3e
+RMD160 (xerces-c-src_2_8_0.tar.gz) = d576df7870b043a338358834a0e1180dca39e838
+Size (xerces-c-src_2_8_0.tar.gz) = 7893039 bytes
+SHA1 (patch-aa) = fe4865a320c5a8690e41d8e4a6c8465bfc989b96
 SHA1 (patch-ab) = 581a7fb3faa93fd390af939d110c90d4b350910b
 SHA1 (patch-ac) = 8fe9f17f1a8be5e251885efe1bcf7466cbea7714
 SHA1 (patch-ad) = 4ba3a565455cbc5202f309b36365297396221f51
-SHA1 (patch-af) = d4456b93e3d867cc1275c8e5d0b33f0dc121083b
-SHA1 (patch-ag) = fac013068f8eae143995508352c0b0d8972ba0c9
+SHA1 (patch-af) = b67265ad5ad7b3a5eb1d6eadf53265dea28a03db
+SHA1 (patch-ag) = 778c1f35e20d98336c1aabe968cd673ee80f8c16
 SHA1 (patch-ah) = fe86675faa35e458e7729d12c1c343fc1976c9ba
 SHA1 (patch-ai) = 1259dc3f5f69a7a218199825cd085a80563c04f6
 SHA1 (patch-aj) = f3ebf6265573f93ff1b75eee55fb3698f7cdb841
@@ -19,6 +19,6 @@ SHA1 (patch-an) = 168ee08b79bba4cb5e0c8ec8567dbde09e8408f3
 SHA1 (patch-ao) = 6d72b85c9883797d80d469554817e5034a77b97b
 SHA1 (patch-ap) = ff9169b12d936c9ca093e7e3ee30aa84a1c8ae7f
 SHA1 (patch-aq) = 9e25a396655fe11a068ddb4a48c23902214273e6
-SHA1 (patch-ar) = 755c599abe9d28f1dac7fc53a61032debaede467
+SHA1 (patch-ar) = 8b8055056afdb0c3d8a556211bf44aec496727a1
 SHA1 (patch-as) = 3eaec415b91dcd129eaa7c5c6e0b5b417ad651bc
 SHA1 (patch-at) = 31682536fccb69cbf29872793b2eb798e15e3bda
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 =========================