- Update to r12.0.1

PR:		ports/72645
Submitted by:	Kuang-che Wu <kcwu@csie.org> (maintainer)

7 files changed, 90 insertions, 39 deletions

diff --git a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
new file mode 100644
index 000000000000..974f159f9098
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
@@ -0,0 +1,36 @@
+--- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
++++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
+@@ -74,6 +74,11 @@
+ ## Checks for thread library.
+ 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
+ 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
++
++	case "${target}" in
++		*freebsd*) HAVE_LIBPTHREAD="yes";;
++	esac
++
+ 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
+ 		HAVE_THREAD="pthread"
+ 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
+@@ -210,8 +215,6 @@
+ 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
+ 		;;
+ 	    *freebsd*)
+-		THREAD_LDFLAGS="-pthread"
+-		PTHREAD_LIBS=""
+ 		;;
+ 	esac
+ 
+@@ -249,9 +252,9 @@
+ 		THREAD_CXX_CFLAGS="-mt"
+ 		HAVE_THREAD="uithread"
+ 		;;
+-	    *freebsd*@gcc:*)
+-		THREAD_LDFLAGS="-pthread"
+-		THREAD_LIBS=""
++	    *freebsd*)
++		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
++		THREAD_LIBS="${PTHREAD_LIBS}"
+ 		HAVE_THREAD="freebsd-pthread"
+ 		;;
+ 	    *linux*)
diff --git a/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am b/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am
new file mode 100644
index 000000000000..ef7a9f7c6d37
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am
@@ -0,0 +1,11 @@
+--- lib/iiimcf/Makefile.am.orig	Wed Aug 25 08:46:38 2004
++++ lib/iiimcf/Makefile.am	Sun Sep  5 02:30:16 2004
+@@ -2,7 +2,7 @@
+ SUBDIRS = . test
+ #libdir = /usr/local/lib
+ libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
+-                       -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
++                       -export-dynamic -export-symbols libiiimcf.sym -L$(LOCALBASE)/lib -liiimp
+ libiiimcf_la_CFLAGS = -DDEBUG
+ libiiimcf_la_SOURCES = iiimcf.c input-method.c attr.c commit.c context.c event.c \
+                        lookup_choice.c message.c preedit.c status.c trigger.c \
diff --git a/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am b/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am
new file mode 100644
index 000000000000..ca6083353dc2
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am
@@ -0,0 +1,20 @@
+--- lib/iiimcf/test/check/Makefile.am.orig	Wed Mar 26 02:24:03 2003
++++ lib/iiimcf/test/check/Makefile.am	Wed Sep  8 17:16:00 2004
+@@ -1,13 +1,13 @@
+ IIIMCF_DIR = ../..
+ TEST_LIBS = -L$(IIIMCF_DIR) -liiimcf \
+-            -L$(IIIMCF_DIR)/../iiimp -liiimp
++            -L$(LOCALBASE)/lib -liiimp
+ TEST_LIBPATH = $(IIIMCF_DIR)/.libs:$(IIIMCF_DIR)/../EIMIL/.libs:$(IIIMCF_DIR)/../iiimp/.libs
+ basic_SOURCES = basic.c common.c
+-basic_LDADD = $(TEST_LIBS)
++basic_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
+ sendkey1_SOURCES = sendkey1.c common.c
+-sendkey1_LDADD = $(TEST_LIBS)
++sendkey1_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
+ sendkey2_SOURCES = sendkey2.c common.c
+-sendkey2_LDADD = $(TEST_LIBS)
++sendkey2_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
+ noinst_PROGRAMS = basic sendkey1 sendkey2
+ 
+ TEST_SETLDPATH = env LD_LIBRARY_PATH=$(TEST_LIBPATH):$$LD_LIBRARY_PATH
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am
new file mode 100644
index 000000000000..49f751fa36cc
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am
@@ -0,0 +1,23 @@
+--- lib/EIMIL/test/Makefile.am.orig	Wed Sep  8 22:08:11 2004
++++ lib/EIMIL/test/Makefile.am	Wed Sep  8 22:09:19 2004
+@@ -1,14 +1,14 @@
+ TEST_CFLAGS = -ggdb -DDEBUG 
+ EIMILLIB = -L.. -lEIMIL
+-parsertest_CFLAGS = $(TEST_CFLAGS)
++parsertest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
+ parsertest_SOURCES = parsertest.c
+-parsertest_LDADD = $(EIMILLIB)
+-arithtest_CFLAGS = $(TEST_CFLAGS)
++parsertest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
++arithtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
+ arithtest_SOURCES = arithtest.c
+-arithtest_LDADD = $(EIMILLIB)
+-flowtest_CFLAGS = $(TEST_CFLAGS)
++arithtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
++flowtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
+ flowtest_SOURCES = flowtest.c
+-flowtest_LDADD = $(EIMILLIB)
++flowtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
+ bin_PROGRAMS = parsertest arithtest flowtest
+ 
+ test: parsertest arithtest flowtest
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in
deleted file mode 100644
index 5240be6477c1..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/EIMIL/test/Makefile.in.orig	Tue May 11 08:33:21 2004
-+++ lib/EIMIL/test/Makefile.in	Tue May 11 08:33:59 2004
-@@ -162,12 +162,12 @@
- @AMDEP_TRUE@	./$(DEPDIR)/flowtest-flowtest.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/parsertest-parsertest.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(THREAD_CXX_FLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) -o $@
- DIST_SOURCES = $(arithtest_SOURCES) $(flowtest_SOURCES) \
- 	$(parsertest_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.in b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.in
deleted file mode 100644
index 3a0036103396..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/iiimcf/Makefile.in.orig	Sun Dec  7 17:37:15 2003
-+++ lib/iiimcf/Makefile.in	Sun Dec  7 17:37:41 2003
-@@ -124,7 +124,7 @@
- SUBDIRS = . test
- #libdir = /usr/local/lib
- libiiimcf_la_LDFLAGS = -module -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
--                       -export-dynamic -export-symbols libiiimcf.sym -L../iiimp -liiimp
-+                       -export-dynamic -export-symbols libiiimcf.sym -L$(prefix)/lib -liiimp
- 
- libiiimcf_la_CFLAGS = -DDEBUG
- libiiimcf_la_SOURCES = iiimcf.c attr.c commit.c context.c event.c \
diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_test_check_Makefile.in b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_test_check_Makefile.in
deleted file mode 100644
index 943a775c7a3b..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_test_check_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/iiimcf/test/check/Makefile.in.orig	Sat Dec  6 05:07:37 2003
-+++ lib/iiimcf/test/check/Makefile.in	Sat Dec  6 05:08:00 2003
-@@ -96,7 +96,7 @@
- IM_LOCALEDIR = @IM_LOCALEDIR@
- IM_TOPDIR = @IM_TOPDIR@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ $(THREAD_LDFLAGS)
- LIBIIIMCF_MAJOR_VERSION = @LIBIIIMCF_MAJOR_VERSION@
- LIBIIIMCF_MINOR_VERSION = @LIBIIIMCF_MINOR_VERSION@
- LIBIIIMCF_VERSION = @LIBIIIMCF_VERSION@