aboutsummaryrefslogtreecommitdiff
path: root/textproc/xalan-c/files
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2004-03-03 22:26:42 +0000
committerGreg Lewis <glewis@FreeBSD.org>2004-03-03 22:26:42 +0000
commite634d55adc19a1223577a135db5899261366b0ed (patch)
tree178974e60ac6d71b9b52d96392eaae54d94e8f97 /textproc/xalan-c/files
parent3797b8eb17c09e84afa45a7d370c7f036ec16c59 (diff)
downloadports-e634d55adc19a1223577a135db5899261366b0ed.tar.gz
ports-e634d55adc19a1223577a135db5899261366b0ed.zip
. Update to 1.7.0.
. Respect PTHREAD_{CFLAGS,LIBS} . Fix dependency problems. PR: 63691 Submitted by: joern A. Zeeb <bzeeb+freebsdports@zabbadoz.net> (maintainer)
Notes
Notes: svn path=/head/; revision=102866
Diffstat (limited to 'textproc/xalan-c/files')
-rw-r--r--textproc/xalan-c/files/patch-aa46
-rw-r--r--textproc/xalan-c/files/patch-ab12
-rw-r--r--textproc/xalan-c/files/patch-ac16
-rw-r--r--textproc/xalan-c/files/patch-ad25
4 files changed, 99 insertions, 0 deletions
diff --git a/textproc/xalan-c/files/patch-aa b/textproc/xalan-c/files/patch-aa
new file mode 100644
index 000000000000..37cdd21c94f9
--- /dev/null
+++ b/textproc/xalan-c/files/patch-aa
@@ -0,0 +1,46 @@
+! 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
+
+--- 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
diff --git a/textproc/xalan-c/files/patch-ab b/textproc/xalan-c/files/patch-ab
new file mode 100644
index 000000000000..bb5104cbbc86
--- /dev/null
+++ b/textproc/xalan-c/files/patch-ab
@@ -0,0 +1,12 @@
+! 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
diff --git a/textproc/xalan-c/files/patch-ac b/textproc/xalan-c/files/patch-ac
new file mode 100644
index 000000000000..709f5a2f7a6d
--- /dev/null
+++ b/textproc/xalan-c/files/patch-ac
@@ -0,0 +1,16 @@
+! 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
new file mode 100644
index 000000000000..65d18e946a7c
--- /dev/null
+++ b/textproc/xalan-c/files/patch-ad
@@ -0,0 +1,25 @@
+! 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)
+
+
+