aboutsummaryrefslogtreecommitdiff
path: root/japanese/FreeWnn-lib
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2009-08-02 19:36:34 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2009-08-02 19:36:34 +0000
commit789d75c728ef23566a07bf5b9bc2190bf34ff4f1 (patch)
treedc7540d42fa2d5d7c1c74515e3bdbf6ab842cd17 /japanese/FreeWnn-lib
parentd1a9e827c98542eb35619dffa314cba50fb08b58 (diff)
downloadports-789d75c728ef23566a07bf5b9bc2190bf34ff4f1.tar.gz
ports-789d75c728ef23566a07bf5b9bc2190bf34ff4f1.zip
-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a. -Remove devel/libtool15 and devel/libltdl15. -Fix ports build with libtool22/libltdl22. -Bump ports that depend on libltdl22 due to shared library version change. -Explain what to do update in the UPDATING. It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop and applications in the runtime. With help: marcus and kwm Pointyhat-exp: a few times by pav Tested by: pgollucci, "Romain Tartière" <romain@blogreen.org>, and a few MarcusCom CVS users. Also, I might have missed a few. Repocopy by: marcus Approved by: portmgr
Notes
Notes: svn path=/head/; revision=238781
Diffstat (limited to 'japanese/FreeWnn-lib')
-rw-r--r--japanese/FreeWnn-lib/Makefile2
-rw-r--r--japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h2
-rw-r--r--japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc2
-rw-r--r--japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs2
-rw-r--r--japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c2
-rw-r--r--japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc2
-rw-r--r--japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc2
-rw-r--r--japanese/FreeWnn-lib/files/patch-config.h.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-configure2
-rw-r--r--japanese/FreeWnn-lib/files/patch-configure.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in2
-rw-r--r--japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc2
-rw-r--r--japanese/FreeWnn-lib/files/patch-libtool2276
19 files changed, 94 insertions, 18 deletions
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 5c6dc2931230..6182d8dc3706 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -21,7 +21,7 @@ COMMENT?= A Japanese/Chinese/Korean input method (Japanese client libraries)
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:262 libtool:15
+USE_AUTOTOOLS= autoconf:262 libtool:22
USE_LDCONFIG= yes
MAKE_ARGS= MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}"
ALL_TARGET= includes all
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h b/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h
index 9733e291b9b1..6999dc97c311 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h
@@ -3,7 +3,7 @@ Index: Wnn/include/wnn_os.h
RCS file: /home/cvs/private/hrs/freewnn/Wnn/include/wnn_os.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- Wnn/include/wnn_os.h 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ Wnn/include/wnn_os.h 2 Jan 2009 21:09:34 -0000 1.2
@@ -154,4 +154,5 @@
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc b/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc
index 0809bf3d2e41..734d3da3bb0e 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc
@@ -3,7 +3,7 @@ Index: Wnn/jd/jserverrc
RCS file: /home/cvs/private/hrs/freewnn/Wnn/jd/jserverrc,v
retrieving revision 1.1.1.1
retrieving revision 1.3
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.3
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3
--- Wnn/jd/jserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ Wnn/jd/jserverrc 2 Jan 2009 21:56:36 -0000 1.3
@@ -29,6 +29,9 @@
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs b/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs
index 6b49f3da5934..0ec577e0e87c 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs
@@ -3,7 +3,7 @@ Index: Wnn/jd/serverdefs
RCS file: /home/cvs/private/hrs/freewnn/Wnn/jd/serverdefs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- Wnn/jd/serverdefs 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ Wnn/jd/serverdefs 20 Dec 2008 07:23:09 -0000 1.2
@@ -30,12 +30,12 @@
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in
index 25ad913d023f..392a5a2b8cbd 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in
@@ -3,7 +3,7 @@ Index: Wnn/jlib/Makefile.in
RCS file: /home/cvs/private/hrs/freewnn/Wnn/jlib/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- Wnn/jlib/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ Wnn/jlib/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2
@@ -62,13 +62,15 @@
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c
index a0f5ed020b69..681038ceaeeb 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c
@@ -3,7 +3,7 @@ Index: Wnn/jlib/js.c
RCS file: /home/cvs/private/hrs/freewnn/Wnn/jlib/js.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- Wnn/jlib/js.c 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ Wnn/jlib/js.c 2 Jan 2009 21:55:55 -0000 1.2
@@ -132,9 +132,7 @@
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc b/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc
index fced54c3f816..513c78b506fe 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc
@@ -3,7 +3,7 @@ Index: cWnn/cd/cserverrc
RCS file: /home/cvs/private/hrs/freewnn/cWnn/cd/cserverrc,v
retrieving revision 1.1.1.1
retrieving revision 1.3
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.3
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3
--- cWnn/cd/cserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ cWnn/cd/cserverrc 2 Jan 2009 21:56:38 -0000 1.3
@@ -39,6 +39,9 @@
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in
index 297aaad704c6..c4942f151712 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in
@@ -3,7 +3,7 @@ Index: cWnn/etc/Makefile.in
RCS file: /home/cvs/private/hrs/freewnn/cWnn/etc/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- cWnn/etc/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ cWnn/etc/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2
@@ -36,11 +36,13 @@
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in
index 01079f8eb675..ca9990ae3be2 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in
@@ -3,7 +3,7 @@ Index: cWnn/include/Makefile.in
RCS file: /home/cvs/private/hrs/freewnn/cWnn/include/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- cWnn/include/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ cWnn/include/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2
@@ -36,7 +36,8 @@
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in
index 8766e5298939..6b1d61c1db7f 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in
@@ -3,7 +3,7 @@ Index: cWnn/jlib/Makefile.in
RCS file: /home/cvs/private/hrs/freewnn/cWnn/jlib/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- cWnn/jlib/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ cWnn/jlib/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2
@@ -57,6 +57,8 @@
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc b/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc
index ac30de98e904..014f33976a0b 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc
@@ -3,7 +3,7 @@ Index: cWnn/td/tserverrc
RCS file: /home/cvs/private/hrs/freewnn/cWnn/td/tserverrc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- cWnn/td/tserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ cWnn/td/tserverrc 20 Dec 2008 07:23:12 -0000 1.2
@@ -35,6 +35,8 @@
diff --git a/japanese/FreeWnn-lib/files/patch-config.h.in b/japanese/FreeWnn-lib/files/patch-config.h.in
index b19822271d21..2d6dc4a5fc4d 100644
--- a/japanese/FreeWnn-lib/files/patch-config.h.in
+++ b/japanese/FreeWnn-lib/files/patch-config.h.in
@@ -3,7 +3,7 @@ Index: config.h.in
RCS file: /home/cvs/private/hrs/freewnn/config.h.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- config.h.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ config.h.in 2 Jan 2009 21:09:32 -0000 1.2
@@ -33,12 +33,24 @@
diff --git a/japanese/FreeWnn-lib/files/patch-configure b/japanese/FreeWnn-lib/files/patch-configure
index e31ad18cad1f..9d68110df03e 100644
--- a/japanese/FreeWnn-lib/files/patch-configure
+++ b/japanese/FreeWnn-lib/files/patch-configure
@@ -3,7 +3,7 @@ Index: configure
RCS file: /home/cvs/private/hrs/freewnn/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- configure 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ configure 2 Jan 2009 21:09:32 -0000 1.2
@@ -1,11 +1,575 @@
diff --git a/japanese/FreeWnn-lib/files/patch-configure.in b/japanese/FreeWnn-lib/files/patch-configure.in
index 4e638f43f653..a42d80adb85f 100644
--- a/japanese/FreeWnn-lib/files/patch-configure.in
+++ b/japanese/FreeWnn-lib/files/patch-configure.in
@@ -3,7 +3,7 @@ Index: configure.in
RCS file: /home/cvs/private/hrs/freewnn/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- configure.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ configure.in 2 Jan 2009 21:09:32 -0000 1.2
@@ -422,6 +422,16 @@
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in
index ee79864db67a..5b11ec95acd8 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in
@@ -3,7 +3,7 @@ Index: kWnn/etc/Makefile.in
RCS file: /home/cvs/private/hrs/freewnn/kWnn/etc/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- kWnn/etc/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ kWnn/etc/Makefile.in 2 Jan 2009 21:09:35 -0000 1.2
@@ -35,10 +35,12 @@
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in
index 1196d53016f9..249c5a9f3fd9 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in
@@ -3,7 +3,7 @@ Index: kWnn/include/Makefile.in
RCS file: /home/cvs/private/hrs/freewnn/kWnn/include/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- kWnn/include/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ kWnn/include/Makefile.in 2 Jan 2009 21:09:35 -0000 1.2
@@ -36,7 +36,8 @@
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in
index 03c349d7bd94..6307c79abb96 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in
@@ -3,7 +3,7 @@ Index: kWnn/jlib/Makefile.in
RCS file: /home/cvs/private/hrs/freewnn/kWnn/jlib/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
--- kWnn/jlib/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ kWnn/jlib/Makefile.in 2 Jan 2009 21:09:35 -0000 1.2
@@ -61,13 +61,15 @@
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc b/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc
index e2ba41e7bed9..9849fdf099e8 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc
@@ -3,7 +3,7 @@ Index: kWnn/kd/kserverrc
RCS file: /home/cvs/private/hrs/freewnn/kWnn/kd/kserverrc,v
retrieving revision 1.1.1.1
retrieving revision 1.3
-diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.3
+diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3
--- kWnn/kd/kserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ kWnn/kd/kserverrc 2 Jan 2009 21:56:38 -0000 1.3
@@ -29,6 +29,9 @@
diff --git a/japanese/FreeWnn-lib/files/patch-libtool22 b/japanese/FreeWnn-lib/files/patch-libtool22
new file mode 100644
index 000000000000..dd599aa14b20
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-libtool22
@@ -0,0 +1,76 @@
+--- Wnn/romkan/Makefile.in.orig 2009-07-12 22:17:42.000000000 -0500
++++ Wnn/romkan/Makefile.in 2009-07-12 22:18:01.000000000 -0500
+@@ -46,7 +46,7 @@
+
+ .c.o:
+ $(RM) $@
+- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
+
+ clean::
+ $(RM) -r .libs
+--- Wnn/jlib.V3/Makefile.in.orig 2009-07-12 22:19:13.000000000 -0500
++++ Wnn/jlib.V3/Makefile.in 2009-07-12 22:21:06.000000000 -0500
+@@ -71,12 +71,12 @@
+
+ .c.o:
+ $(RM) $@
+- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+
+ all:: libjd.la
+
+ libjd.la: $(OBJS) $(EXTRALIBRARYDEPS)
+- $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
++ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
+
+ lintlib:: llib-ljd.ln
+
+@@ -87,7 +87,7 @@
+ install:: libjd.la
+ @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
+- $(LIBTOOL) $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
+
+ install:: jlib.h
+ @if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \
+@@ -109,13 +109,13 @@
+ done
+
+ $(OBJ2) : $(SRC2)
+- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
+
+ $(OBJ3) : $(SRC3)
+- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
+
+ $(OBJ4) : $(SRC4)
+- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
+
+ depend:: .depend
+
+--- kWnn/romkan/Makefile.in.orig 2009-07-12 22:26:37.000000000 -0500
++++ kWnn/romkan/Makefile.in 2009-07-12 22:26:55.000000000 -0500
+@@ -48,7 +48,7 @@
+
+ .c.o:
+ $(RM) $@
+- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
+
+ clean::
+ $(RM) -r .libs
+--- cWnn/romkan/Makefile.in.orig 2009-07-12 22:29:35.000000000 -0500
++++ cWnn/romkan/Makefile.in 2009-07-12 22:29:49.000000000 -0500
+@@ -48,7 +48,7 @@
+
+ .c.o:
+ $(RM) $@
+- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
+
+ clean::
+ $(RM) -r .libs