OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-re Date: 11-Feb-2003 10:35:19
Branch: HEAD Handle: 2003021109351601
Modified files:
openpkg-re/vcheck vc.xerces-c
openpkg-src/xerces-c xerces-c-pth.patch xerces-c.patch xerces-c.spec
Log:
upgrade 2.1.0 -> 2.2.0
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-re/vcheck/vc.xerces-c
1.2 +9 -9 openpkg-src/xerces-c/xerces-c-pth.patch
1.3 +255 -12 openpkg-src/xerces-c/xerces-c.patch
1.12 +9 -3 openpkg-src/xerces-c/xerces-c.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.xerces-c
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.xerces-c
--- openpkg-re/vcheck/vc.xerces-c 6 Dec 2002 18:28:47 -0000 1.2
+++ openpkg-re/vcheck/vc.xerces-c 11 Feb 2003 09:35:16 -0000 1.3
@@ -2,7 +2,7 @@
}
prog xerces-c = {
- version = 2.1.0
+ version = 2.2.0
url = http://xml.apache.org/dist/xerces-c/stable/
regex = \bxerces-c-src(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c-pth.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 xerces-c-pth.patch
--- openpkg-src/xerces-c/xerces-c-pth.patch 27 Dec 2002 10:31:51 -0000 1.1
+++ openpkg-src/xerces-c/xerces-c-pth.patch 11 Feb 2003 09:35:17 -0000 1.2
@@ -1,5 +1,5 @@
---- src/xercesc/runConfigure.dist Fri Dec 27 10:26:26 2002
-+++ src/xercesc/runConfigure Fri Dec 27 10:56:18 2002
+--- src/xercesc/runConfigure.dist Mon Feb 10 15:30:59 2003
++++ src/xercesc/runConfigure Mon Feb 10 15:36:55 2003
@@ -189,6 +189,7 @@
linkeroptions="$linkeroptions $2"; shift 2;;
@@ -27,9 +27,9 @@
elif test $platform = "aix"; then
aix_version=`./config.guess`;
echo Found host system to be $aix_version
---- src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp.dist Tue Aug 27
09:24:36 2002
-+++ src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp Fri Dec 27
10:35:29 2002
-@@ -86,8 +86,12 @@
+--- src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp.dist Mon Feb 10
15:31:14 2003
++++ src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp Mon Feb 10
15:36:55 2003
+@@ -95,8 +95,12 @@
// ---------------------------------------------------------------------------
#if !defined(APP_NO_THREADS)
@@ -42,7 +42,7 @@
#ifndef _GNU_SOURCE
#error _GNU_SOURCE is not defined in your compile settings
-@@ -584,6 +588,14 @@
+@@ -598,6 +602,14 @@
void* XMLPlatformUtils::makeMutex()
{
@@ -57,7 +57,7 @@
pthread_mutex_t* mutex = new pthread_mutex_t;
pthread_mutexattr_t* attr = new pthread_mutexattr_t;
pthread_mutexattr_init(attr);
-@@ -595,20 +607,24 @@
+@@ -609,20 +621,24 @@
}
pthread_mutexattr_destroy(attr);
delete attr;
@@ -83,7 +83,7 @@
}
}
-@@ -617,7 +633,11 @@
+@@ -631,7 +647,11 @@
{
if (mtxHandle != NULL)
{
@@ -95,7 +95,7 @@
{
ThrowXML(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock);
-@@ -630,7 +650,11 @@
+@@ -644,7 +664,11 @@
{
if (mtxHandle != NULL)
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xerces-c.patch
--- openpkg-src/xerces-c/xerces-c.patch 7 Dec 2002 10:35:56 -0000 1.2
+++ openpkg-src/xerces-c/xerces-c.patch 11 Feb 2003 09:35:17 -0000 1.3
@@ -1,6 +1,6 @@
---- obj/Makefile.in.dist Sat Dec 7 10:19:48 2002
-+++ obj/Makefile.in Sat Dec 7 10:21:05 2002
-@@ -82,6 +82,9 @@
+--- obj/Makefile.in.dist Mon Feb 10 15:35:07 2003
++++ obj/Makefile.in Mon Feb 10 15:36:50 2003
+@@ -83,6 +83,9 @@
include ../version.incl
include ../src/xercesc/Makefile.incl
@@ -10,7 +10,7 @@
LIB=${XERCESCROOT}/lib
## OS390BATCH
ifeq (${OS390BATCH},1)
-@@ -117,7 +120,7 @@
+@@ -121,7 +124,7 @@
\rm -f $(DUMMYEXE)
$(DUMMYEXE): $(ALL_OBJECTS)
@@ -19,8 +19,8 @@
###### End HP-UX CC compiler specific stuff #######
else
-@@ -146,12 +149,8 @@
- ########################################################
+@@ -164,12 +167,8 @@
+ endif
${FQ_REAL_NAME}: $(ALL_OBJECTS)
- @echo Building ${FQ_REAL_NAME}
@@ -34,12 +34,255 @@
## Start OS390 ##
ifeq (${PLATFORM},OS390)
-@@ -200,7 +199,7 @@
- ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/${LIBNAME}.dll.a
- ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/libxerces.dll.a
+@@ -224,7 +223,7 @@
+ $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${DESTDIR}${PREFIX}/lib
+ (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s
${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s
${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
else
-- $(CP) ${FQ_REAL_NAME} $(PREFIX)/lib
-+ $(CP) ${FQ_LINK_NAME:.so=.a} $(PREFIX)/lib
+- $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
++ $(CP) ${FQ_LINK_NAME:.so=.a} ${DESTDIR}$(PREFIX)/lib
+ (cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME}
${LINK_NAME})
endif
ifeq (${PLATFORM},OS390)
- $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} $(PREFIX)/lib
+--- samples/Makefile.incl.dist Mon Feb 10 16:47:03 2003
++++ samples/Makefile.incl Tue Feb 11 09:23:20 2003
+@@ -71,8 +71,8 @@
+ endif
+ THISLIB=${LIB_DIR}/${LIBNAME}
+
+-LIBRARY_NAMES=-l${LIBNAME}
+-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
++LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}.a
++LIBRARY_SEARCH_PATHS=
+
+ TO = o
+ ####################### PLATFORM DEPENDENCIES #####################
+@@ -83,11 +83,11 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+ LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ else
+ CMP= -c ${CXXFLAGS}
+- CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT
-I/usr/local/include
++ CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT
+ LINK = CC -D${PLATFORM} ${LDFLAGS}
+ PLATFORM_LIB_LINK_OPTIONS=
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+@@ -101,7 +101,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+ LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ else
+ CMP= -c ${CXXFLAGS}
+@@ -119,7 +119,7 @@
+ CMP=-c ${CXXFLAGS}
+ LINK=${CC} ${LDFLAGS}
+ EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.so
+ endif
+
+@@ -129,7 +129,7 @@
+ CC= ${COMPILER} -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
+ LINK = ${COMPILER} -D${PLATFORM} -fpic -pthread ${LDFLAGS}
+ EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.so
+ endif
+
+@@ -145,7 +145,7 @@
+ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
+ MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
+ MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX -G
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
++PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib
+ EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS}
+ SHLIBSUFFIX=.so
+ endif
+@@ -194,7 +194,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+ LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
++PLATFORM_LIB_LINK_OPTIONS=
+ EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ SHLIBSUFFIX=.so
+ endif
+@@ -204,7 +204,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D__${PLATFORM}__
+ LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+ SHLIBSUFFIX=.dll
+ endif
+@@ -214,7 +214,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -fPIC
+ LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
++ PLATFORM_LIB_LINK_OPTIONS=
+ ifdef ICUROOT
+ PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
+ EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
+@@ -299,7 +299,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC = ${COMPILER} -c -D${PLATFORM}
+ LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.so
+ endif
+
+@@ -309,6 +309,6 @@
+ CMP= -c ${CXXFLAGS}
+ CC= c++ -c -D${PLATFORM} -D_REENTRANT
+ LINK = c++ -D${PLATFORM} ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.dylib
+ endif
+--- tests/Makefile.incl.dist Mon Feb 10 16:46:44 2003
++++ tests/Makefile.incl Tue Feb 11 09:33:34 2003
+@@ -71,8 +71,8 @@
+ endif
+ THISLIB=${LIB_DIR}/${LIBNAME}
+
+-LIBRARY_NAMES=-l${LIBNAME}
+-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
++LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}.a
++LIBRARY_SEARCH_PATHS=
+
+ TO = o
+ ####################### PLATFORM DEPENDENCIES #####################
+@@ -83,11 +83,11 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+ LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ else
+ CMP= -c ${CXXFLAGS}
+- CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT
-I/usr/local/include
++ CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT
+ LINK = CC -D${PLATFORM} ${LDFLAGS}
+ PLATFORM_LIB_LINK_OPTIONS=
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+@@ -101,7 +101,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+ LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ else
+ CMP= -c ${CXXFLAGS}
+@@ -119,7 +119,7 @@
+ CMP=-c ${CXXFLAGS}
+ LINK=${CC} ${LDFLAGS}
+ EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.so
+ endif
+
+@@ -129,7 +129,7 @@
+ CC= ${COMPILER} -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
+ LINK = ${COMPILER} -D${PLATFORM} -fpic -pthread ${LDFLAGS}
+ EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.so
+ endif
+
+@@ -145,7 +145,7 @@
+ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
+ MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
+ MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX -G
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
++PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib
+ EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS}
+ SHLIBSUFFIX=.so
+ endif
+@@ -193,7 +193,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+ LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
++PLATFORM_LIB_LINK_OPTIONS=
+ EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ SHLIBSUFFIX=.so
+ endif
+@@ -203,7 +203,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D__${PLATFORM}__
+ LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+ SHLIBSUFFIX=.dll
+ endif
+@@ -213,7 +213,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -fPIC
+ LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
++ PLATFORM_LIB_LINK_OPTIONS=
+ ifdef ICUROOT
+ PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
+ EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
+@@ -298,7 +298,7 @@
+ CMP= -c ${CXXFLAGS}
+ CC = ${COMPILER} -c -D${PLATFORM}
+ LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
+-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.so
+ endif
+
+@@ -308,6 +308,6 @@
+ CMP= -c ${CXXFLAGS}
+ CC= c++ -c -D${PLATFORM} -D_REENTRANT
+ LINK = c++ -D${PLATFORM} ${LDFLAGS}
+- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
++ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ SHLIBSUFFIX=.dylib
+ endif
+--- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.dist Mon
Feb 10 15:31:26 2003
++++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp Mon Feb 10
15:37:22 2003
+@@ -103,8 +103,6 @@
+ # include <errno.h>
+ # include <machine/endian.h>
+
+-XERCES_CPP_NAMESPACE_BEGIN
+-
+ // ---------------------------------------------------------------------------
+ // Description of encoding schemas, supported by iconv()
+ // ---------------------------------------------------------------------------
+@@ -209,6 +207,8 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++XERCES_CPP_NAMESPACE_BEGIN
++
+ // ---------------------------------------------------------------------------
+ // Local, const data
+ // ---------------------------------------------------------------------------
+@@ -1563,6 +1563,7 @@
+ return (rc != (size_t)-1) && (len == 0);
+ }
+
++#endif /* XML_USE_LIBICONV */
++
+ XERCES_CPP_NAMESPACE_END
+
+-#endif /* XML_USE_LIBICONV */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 xerces-c.spec
--- openpkg-src/xerces-c/xerces-c.spec 2 Feb 2003 02:46:07 -0000 1.11
+++ openpkg-src/xerces-c/xerces-c.spec 11 Feb 2003 09:35:17 -0000 1.12
@@ -24,8 +24,8 @@
##
# package version
-%define V_opkg 2.1.0
-%define V_dist 2_1_0
+%define V_opkg 2.2.0
+%define V_dist 2_2_0
# package information
Name: xerces-c
@@ -37,7 +37,7 @@
Group: Web
License: Apache Software License 1.1
Version: %{V_opkg}
-Release: 20030202
+Release: 20030211
# package options
%option with_pth no
@@ -116,6 +116,8 @@
%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CXX="%{l_cxx}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
LDFLAGS="%{l_ldflags}" \
./runConfigure \
-P%{l_prefix} \
@@ -131,6 +133,8 @@
cd $XERCESCROOT/samples
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CXX="%{l_cxx}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
LDFLAGS="%{l_ldflags}" \
./runConfigure \
-p$os \
@@ -142,6 +146,8 @@
cd $XERCESCROOT/tests
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CXX="%{l_cxx}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
LDFLAGS="%{l_ldflags}" \
./runConfigure \
-p$os \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
