5 files changed, 32 insertions, 17 deletions

diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile
index 523434a61ff9..f2803055ee00 100644
--- a/textproc/xerces-c2/Makefile
+++ b/textproc/xerces-c2/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	xerces-c2
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.7.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	xerces-c/source
 DISTNAME=	xerces-c-src_${PORTVERSION:S/./_/g}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kenm@icarz.com
 COMMENT=	Validating XML parser from the Apache XML Project
 
 OPTIONS=	THREADS "Build a thread enabled shared library." on \
@@ -47,7 +46,7 @@ PLIST_SUB+=		TRANSICU="@comment "
 .else
 .if (${TRANSCODER} == "icu")
 PKGNAMESUFFIX+=		-icu
-LIB_DEPENDS+=		icuuc.32:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=		icuuc.34:${PORTSDIR}/devel/icu
 ICUROOT?=		${LOCALBASE}
 CONFIGURE_ENV+=		ICUROOT=${ICUROOT}
 MAKE_ENV+=		ICUROOT=${ICUROOT}
diff --git a/textproc/xerces-c2/distinfo b/textproc/xerces-c2/distinfo
index 2fe450df6031..b7bc120e8068 100644
--- a/textproc/xerces-c2/distinfo
+++ b/textproc/xerces-c2/distinfo
@@ -1,3 +1,3 @@
-MD5 (xerces-c-src_2_6_0.tar.gz) = 038b3614ae82d2878bcc820b9ccbe853
-SHA256 (xerces-c-src_2_6_0.tar.gz) = 2822d8c757e9533a7b2328b65a2e2485a329bfe50b88c0a5af5061e7e3d28cef
-SIZE (xerces-c-src_2_6_0.tar.gz) = 9324884
+MD5 (xerces-c-src_2_7_0.tar.gz) = 04169609449a8846bc1e6891c04cadf4
+SHA256 (xerces-c-src_2_7_0.tar.gz) = 77fae8a1e7aa58007115c939aa68fd5028da79c481fc457dfce546b50c9dfda5
+SIZE (xerces-c-src_2_7_0.tar.gz) = 7760004
diff --git a/textproc/xerces-c2/files/patch-ab b/textproc/xerces-c2/files/patch-ab
index 97af5e843c7f..baff3780692e 100644
--- a/textproc/xerces-c2/files/patch-ab
+++ b/textproc/xerces-c2/files/patch-ab
@@ -1,15 +1,15 @@
---- obj/Makefile.in.orig	Fri Oct 15 19:55:39 2004
-+++ obj/Makefile.in	Fri Oct 15 19:55:53 2004
-@@ -247,10 +247,10 @@
- 	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
+--- obj/Makefile.in.orig	Wed Sep  7 11:56:58 2005
++++ obj/Makefile.in	Wed Mar 29 11:50:22 2006
+@@ -235,10 +235,10 @@
+ 	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
  else
  	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
--	(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
-+	(cd ${DESTDIR}$(PREFIX)/lib; ln -sf ${REAL_NAME} ${SO_NAME}; ln -sf ${REAL_NAME} ${LINK_NAME})
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
++	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -sf ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -sf ${REAL_NAME} ${LINK_NAME})
  	
  	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
--	(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})	
-+	(cd ${DESTDIR}$(PREFIX)/lib; ln -sf ${REAL_DEPDOM} ${SO_DEPDOM}; ln -sf ${REAL_DEPDOM} ${LINK_DEPDOM})	
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})	
++	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -sf ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -sf ${REAL_DEPDOM} ${LINK_DEPDOM})	
  endif
  ifeq (${PLATFORM},OS390)
  	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
diff --git a/textproc/xerces-c2/files/patch-src-xercesc-Makefile.incl b/textproc/xerces-c2/files/patch-src-xercesc-Makefile.incl
new file mode 100644
index 000000000000..9b42675607ea
--- /dev/null
+++ b/textproc/xerces-c2/files/patch-src-xercesc-Makefile.incl
@@ -0,0 +1,11 @@
+--- src/xercesc/Makefile.incl.orig	Wed Sep  7 11:55:53 2005
++++ src/xercesc/Makefile.incl	Mon Apr 10 14:54:15 2006
+@@ -411,7 +411,7 @@
+ 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 -L${ICUROOT} -licuuc -licudata -lgcc
++    ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc_pic
+ else
+     PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
+     ALLLIBS = ${LIBS}
diff --git a/textproc/xerces-c2/pkg-plist b/textproc/xerces-c2/pkg-plist
index e9d869245593..91d5fc3a015d 100644
--- a/textproc/xerces-c2/pkg-plist
+++ b/textproc/xerces-c2/pkg-plist
@@ -159,18 +159,17 @@ include/xercesc/internal/XMLInternalErrorHandler.hpp
 include/xercesc/internal/XMLReader.hpp
 include/xercesc/internal/XMLScanner.hpp
 include/xercesc/internal/XMLScannerResolver.hpp
-include/xercesc/internal/XObjectComparator.hpp
 include/xercesc/internal/XProtoType.hpp
 include/xercesc/internal/XSAXMLScanner.hpp
 include/xercesc/internal/XSObjectFactory.hpp
 include/xercesc/internal/XSerializable.hpp
 include/xercesc/internal/XSerializationException.hpp
 include/xercesc/internal/XSerializeEngine.hpp
-include/xercesc/internal/XTemplateComparator.hpp
 include/xercesc/internal/XTemplateSerializer.hpp
 include/xercesc/parsers/AbstractDOMParser.hpp
 include/xercesc/parsers/DOMBuilderImpl.hpp
 include/xercesc/parsers/SAX2XMLReaderImpl.hpp
+include/xercesc/parsers/SAX2XMLFilterImpl.hpp
 include/xercesc/parsers/SAXParser.hpp
 include/xercesc/parsers/XercesDOMParser.hpp
 include/xercesc/sax/AttributeList.hpp
@@ -190,6 +189,7 @@ include/xercesc/sax2/DeclHandler.hpp
 include/xercesc/sax2/DefaultHandler.hpp
 include/xercesc/sax2/LexicalHandler.hpp
 include/xercesc/sax2/SAX2XMLReader.hpp
+include/xercesc/sax2/SAX2XMLFilter.hpp
 include/xercesc/sax2/XMLReaderFactory.hpp
 include/xercesc/util/ArrayIndexOutOfBoundsException.hpp
 include/xercesc/util/AutoSense.hpp
@@ -313,8 +313,11 @@ include/xercesc/util/XMLEnumerator.hpp
 include/xercesc/util/XMLExceptMsgs.hpp
 include/xercesc/util/XMLException.hpp
 include/xercesc/util/XMLFloat.hpp
+include/xercesc/util/XMLHolder.c
+include/xercesc/util/XMLHolder.hpp
 include/xercesc/util/XMLIBM1047Transcoder.hpp
 include/xercesc/util/XMLIBM1140Transcoder.hpp
+include/xercesc/util/XMLInitializer.hpp
 include/xercesc/util/XMLInteger.hpp
 include/xercesc/util/XMLMsgLoader.hpp
 include/xercesc/util/XMLNetAccessor.hpp
@@ -570,6 +573,8 @@ lib/%%XERCESC_DEPDOM_LIB%%
 %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2Print.hpp
 %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2PrintHandlers.cpp
 %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2PrintHandlers.hpp
+%%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2FilterHandlers.cpp
+%%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2FilterHandlers.hpp
 %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXCount/Makefile
 %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXCount/Makefile.in
 %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXCount/SAXCount.cpp