4 files changed, 22 insertions, 23 deletions

diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile
index 92a2bf9caeb0..ba80b86f5e6b 100644
--- a/textproc/xerces-c2-devel/Makefile
+++ b/textproc/xerces-c2-devel/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xerces-c2
-PORTVERSION=	2.7.0
-PORTREVISION=	1
+PORTNAME=	xerces-c2-devel
+PORTVERSION=	2.8.0
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_APACHE_XML}
-MASTER_SITE_SUBDIR=	xerces-c/source
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	xerces/c/sources
 DISTNAME=	xerces-c-src_${PORTVERSION:S/./_/g}
 
-MAINTAINER=	kenm@icarz.com
+MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Validating XML parser from the Apache XML Project
 
 OPTIONS=	THREADS "Build a thread enabled shared library." on \
diff --git a/textproc/xerces-c2-devel/distinfo b/textproc/xerces-c2-devel/distinfo
index b7bc120e8068..5ac5ffd2d899 100644
--- a/textproc/xerces-c2-devel/distinfo
+++ b/textproc/xerces-c2-devel/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (xerces-c-src_2_8_0.tar.gz) = 5daf514b73f3e0de9e3fce704387c0d2
+SHA256 (xerces-c-src_2_8_0.tar.gz) = 416eaf74bbe6ff3b3c64a282e886810cad6cbb48478d3c83344661504c09c8d6
+SIZE (xerces-c-src_2_8_0.tar.gz) = 7893039
diff --git a/textproc/xerces-c2-devel/files/patch-ab b/textproc/xerces-c2-devel/files/patch-ab
index baff3780692e..d1c8710f6bc8 100644
--- a/textproc/xerces-c2-devel/files/patch-ab
+++ b/textproc/xerces-c2-devel/files/patch-ab
@@ -1,8 +1,8 @@
---- 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 @@
+--- obj/Makefile.in.orig	Wed Aug 29 03:47:18 2007
++++ obj/Makefile.in	Fri Jan 11 13:33:07 2008
+@@ -266,10 +266,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
+   else
  	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
 -	(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})
@@ -10,6 +10,6 @@
  	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
 -	(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)
+   endif
+   ifeq (${PLATFORM},OS390)
  	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
diff --git a/textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl b/textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl
index 9b42675607ea..961f8f7233e8 100644
--- a/textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl
+++ b/textproc/xerces-c2-devel/files/patch-src-xercesc-Makefile.incl
@@ -1,11 +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
+--- src/xercesc/Makefile.incl.orig	Thu Aug 30 21:10:20 2007
++++ src/xercesc/Makefile.incl	Fri Jan 11 13:40:47 2008
+@@ -591,7 +591,7 @@
+ 
+   ifeq (${TRANSCODER}, ICU)
+     PLATFORM_COMPILE_OPTIONS += -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}
+   else
      ALLLIBS = ${LIBS}
+   endif