aboutsummaryrefslogtreecommitdiff
path: root/textproc/xalan-c/files
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-01-17 17:45:52 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-01-17 17:45:52 +0000
commitaf049c5ab8277876674dda58b0ff23cc6071c44a (patch)
tree0227dad3c532824a39701ab0fcf02aa87cfbd6cb /textproc/xalan-c/files
parent44af68883a459b2bef784fa7cee504de72499e73 (diff)
downloadports-af049c5ab8277876674dda58b0ff23cc6071c44a.tar.gz
ports-af049c5ab8277876674dda58b0ff23cc6071c44a.zip
Updated Xalan C++ to 1.8.0 and fixed to work with Xerces C++ 2.6.0
Based on PR: ports/73259 Submitted by: Douglas Thrift Heavily hacked on by: Bjoern A. Zeeb (maintainer)
Notes
Notes: svn path=/head/; revision=126659
Diffstat (limited to 'textproc/xalan-c/files')
-rw-r--r--textproc/xalan-c/files/patch-aa56
-rw-r--r--textproc/xalan-c/files/patch-ab23
-rw-r--r--textproc/xalan-c/files/patch-ac16
-rw-r--r--textproc/xalan-c/files/patch-ad25
4 files changed, 22 insertions, 98 deletions
diff --git a/textproc/xalan-c/files/patch-aa b/textproc/xalan-c/files/patch-aa
index 37cdd21c94f9..6a2fbce6e96a 100644
--- a/textproc/xalan-c/files/patch-aa
+++ b/textproc/xalan-c/files/patch-aa
@@ -1,46 +1,12 @@
-! fix FreeBSD specific threading and linking things
---- samples/runConfigure.orig Sun Feb 29 11:16:27 2004
-+++ samples/runConfigure Sun Feb 29 11:17:16 2004
-@@ -333,7 +333,13 @@
- elif test $platform = "aix"; then
- threadingLibs="-lpthreads"
- elif test $platform = "freebsd"; then
-- threadingLibs="-pthread -lc_r"
-+ if test -n "${PTHREAD_LIBS}" ; then
-+ threadingLibs="${PTHREAD_LIBS}"
-+ threadingDefines="${PTHREAD_CFLAGS}"
-+ else
-+ threadingLibs="-lpthread"
-+ threadingDefines=""
-+ fi
- elif test $platform = "netbsd"; then
- threadingLibs="-pthread -lpthread"
- elif test $platform = "hp-10"; then
---- Makefile.incl.in.orig Sun Feb 29 11:13:13 2004
-+++ Makefile.incl.in Sun Feb 29 11:13:41 2004
-@@ -200,7 +200,7 @@
- ifdef XALAN_USE_ICU
- LD_RPATH_PRE = -Wl,-rpath,
- PLATFORM_LIB_LINK_OPTIONS = $(LD_RPATH_PRE)${ICUROOT}/lib
-- PLATFORM_LIB_LINK_OPTIONS += -licuuc -licudata -lgcc
-+ PLATFORM_LIB_LINK_OPTIONS += -licuuc -licudata
- ALLLIBS += -L${ICUROOT}
- endif
+Xalan-C CVS: xml-xalan/c/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp?r1=1.6&r2=1.7
+--- src/xalanc/PlatformSupport/XalanArrayAllocator.hpp.orig Mon Dec 13 21:34:54 2004
++++ src/xalanc/PlatformSupport/XalanArrayAllocator.hpp Mon Dec 13 21:35:22 2004
+@@ -170,7 +170,7 @@
+ ListEntryType& theNewEntry = m_list.back();
---- runConfigure.orig Sun Feb 29 11:13:46 2004
-+++ runConfigure Sun Feb 29 11:16:14 2004
-@@ -470,7 +470,13 @@
- elif test $platform = "aix"; then
- threadingLibs="-lpthreads"
- elif test $platform = "freebsd"; then
-- threadingLibs="-pthread -lc_r"
-+ if test -n "${PTHREAD_LIBS}" ; then
-+ threadingLibs="${PTHREAD_LIBS}"
-+ threadingDefines="${PTHREAD_CFLAGS}"
-+ else
-+ threadingLibs="-lpthread"
-+ threadingDefines=""
-+ fi
- elif test $platform = "netbsd"; then
- threadingLibs="-pthread -lpthread"
- elif test $platform = "hp-10"; then
+ // Resize the vector to the appropriate size...
+- theNewEntry.second.resize(theBlockSize, VectorType::value_type(0));
++ theNewEntry.second.resize(theBlockSize, value_type(0));
+
+ // Set the number of free spaces accordingly...
+ theNewEntry.first = theBlockSize - theCount;
diff --git a/textproc/xalan-c/files/patch-ab b/textproc/xalan-c/files/patch-ab
index bb5104cbbc86..13175c5aec07 100644
--- a/textproc/xalan-c/files/patch-ab
+++ b/textproc/xalan-c/files/patch-ab
@@ -1,12 +1,11 @@
-! taken from xalan-c CVS
---- samples/ThreadSafe/ThreadSafe.cpp.orig Sun Feb 29 21:07:39 2004
-+++ samples/ThreadSafe/ThreadSafe.cpp Sun Feb 29 21:07:55 2004
-@@ -95,7 +95,7 @@
- #elif defined(XALAN_POSIX2_AVAILABLE)
- #include <pthread.h>
- #include <unistd.h>
-- typedef unsigned long theThreadIDType;
-+ typedef pthread_t theThreadIDType;
- typedef pthread_t theThreadType;
-
- #else
+--- src/xalanc/Makefile.in.orig Mon Dec 13 22:00:00 2004
++++ src/xalanc/Makefile.in Mon Dec 13 22:01:57 2004
+@@ -253,7 +253,7 @@
+ $(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc
+ for hdir in $(ALL_HEADERS_DIRS); do \
+ $(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc/$$hdir; \
+- cp $(XALANCROOT)/src/xalanc/$$hdir/*.h* \
++ $(INSTALL_DATA) $(XALANCROOT)/src/xalanc/$$hdir/*.h* \
+ $(DESTDIR)/$(includedir)/xalanc/$$hdir \
+ 2> /dev/null; \
+ done
diff --git a/textproc/xalan-c/files/patch-ac b/textproc/xalan-c/files/patch-ac
deleted file mode 100644
index 709f5a2f7a6d..000000000000
--- a/textproc/xalan-c/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-! taken from xalan-c CVS
---- ./src/xalanc/Utils/Makefile.in.orig Sun Feb 29 21:26:41 2004
-+++ ./src/xalanc/Utils/Makefile.in Sun Feb 29 21:28:01 2004
-@@ -95,10 +95,10 @@ ifeq ($(MESSAGELOADER),INMEM)
-
- locale: $(MESSAGELIB)
-
--$(MESSAGELIB): $(XALANMSGLIB_SRC)/LocalMsgData.hpp
-+$(MESSAGELIB): $(XALANMSGLIB_SRC)/include/LocalMsgData.hpp
- $(MAKE) -C XalanMsgLib
-
--$(XALANMSGLIB_SRC)/LocalMsgData.hpp : $(XSL_BIN_DIR)/MsgCreator $(XLIFF_FILE_NAME)
-+$(XALANMSGLIB_SRC)/include/LocalMsgData.hpp : $(XSL_BIN_DIR)/MsgCreator $(XLIFF_FILE_NAME)
- $(XSL_BIN_DIR)/MsgCreator $(XLIFF_FILE_NAME) -TYPE $(MESSAGELOADER) -LOCALE $(LOCALE)
- @$(MOVE) LocalMsgIndex.hpp $(XSL_NLS_DIR)/include
- @$(MOVE) LocalMsgData.hpp $(XSL_NLS_DIR)/include
diff --git a/textproc/xalan-c/files/patch-ad b/textproc/xalan-c/files/patch-ad
deleted file mode 100644
index 65d18e946a7c..000000000000
--- a/textproc/xalan-c/files/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-! fix INSTALL_{PROGRAM->DATA}
---- src/xalanc/Utils/Makefile.in.orig Sun Feb 29 21:26:41 2004
-+++ src/xalanc/Utils/Makefile.in Sun Feb 29 21:28:01 2004
-@@ -202,7 +202,7 @@
- -${MKDIR} -p $(XSL_NLS_DIR)/include
-
- doCommonInstall:
-- $(INSTALL_PROGRAM) $(XSL_NLS_DIR)/include/LocalMsgIndex.hpp $(XALANCROOT)/src/xalanc/PlatformSupport
-+ $(INSTALL_DATA) $(XSL_NLS_DIR)/include/LocalMsgIndex.hpp $(XALANCROOT)/src/xalanc/PlatformSupport
-
- doClean:
- $(MAKE) -C XalanMsgLib $@
---- Makefile.in.orig Sun Feb 29 21:30:03 2004
-+++ Makefile.in Sun Feb 29 21:30:17 2004
-@@ -85,8 +85,8 @@
-
- install-extras:
- $(MKINSTALLDIRS) $(DESTDIR)/$(prefix)
-- $(INSTALL_PROGRAM) $(XALANCROOT)/../KEYS.txt $(DESTDIR)/$(prefix)
-- $(INSTALL_PROGRAM) $(XALANCROOT)/License $(DESTDIR)/$(prefix)
-+ $(INSTALL_DATA) $(XALANCROOT)/../KEYS.txt $(DESTDIR)/$(prefix)
-+ $(INSTALL_DATA) $(XALANCROOT)/License $(DESTDIR)/$(prefix)
-
-
-