36 files changed, 120 insertions, 56 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
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index e4a4e1ff4b84..67bf18e2aace 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -21,7 +21,7 @@ COMMENT?=	A Japanese/Chinese/Korean input method (Japanese server)
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	# defined below
 MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}"
diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile
index 502bcf12de0c..b8a921b1be8b 100644
--- a/japanese/chasen-base/Makefile
+++ b/japanese/chasen-base/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Japanese Morphological Analysis System
 
 BUILD_DEPENDS=	${LOCALBASE}/include/darts.h:${PORTSDIR}/devel/darts
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-darts=${LOCALBASE}/include --with-libiconv=${LOCALBASE}
 USE_ICONV=	yes
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index f0639e1ba421..8ad05c6a4d48 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -52,7 +52,7 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 
 DIST_SUBDIR=	eb
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index 192647aecdf2..622e25ae8ce0 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index e18d9c2a5c1a..586e0e71698a 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index e671728b7cbc..48147c551ae1 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A 2ch browser
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:262 automake:110 libtool:15
+USE_AUTOTOOLS=	autoconf:262 automake:110 libtool:22
 
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls \
 		gtkmm:${PORTSDIR}/x11-toolkits/gtkmm24
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index 25813b0bb7fc..fa8f4c7fb530 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://kakasi.namazu.org/stable/
 MAINTAINER=	ota@j.email.ne.jp
 COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 
 MANLANG=	ja
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index d1bca9c31818..75cf2d9c2f4d 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -23,7 +23,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 6c7329c18ec4..137a465388c3 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 USE_PERL5_BUILD=	5.8.0+
 GNU_CONFIGURE=	yes
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 58b01d195b87..7ad2b3d27ce4 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -22,29 +22,17 @@ USE_BZIP2=	yes
 USE_GNOME=	pkgconfig glib20 gtk20 libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:110 autoconf:262 aclocal:110 libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 DESKTOP_ENTRIES="Ochusha" "A GUI BBS browser for 2ch.net" \
 		"${LOCALBASE}/share/ochusha/ochusha32.xpm" \
 		"ochusha" "Application;Network;" \
 		false
 
-ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	-c -a
-
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-DG.*_DISABLE_DEPRECATED||g'
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure \
 		${WRKSRC}/libmodifiedghttp/configure ${WRKSRC}/libmodifiedgtk2/configure
 
-pre-configure:
-	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
-	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
-	@${RM} ${WRKSRC}/libmodifiedgtk2/Makefile.in
-	@(cd ${WRKSRC}/libmodifiedgtk2/ && \
-	${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF})
-
 .include <bsd.port.mk>
diff --git a/japanese/ochusha/files/patch-for-glib b/japanese/ochusha/files/patch-for-glib
index b428f66b78ac..b3aa39295eeb 100644
--- a/japanese/ochusha/files/patch-for-glib
+++ b/japanese/ochusha/files/patch-for-glib
@@ -1,11 +1,11 @@
---- libmodifiedgtk2/Makefile.am.orig	Sun Jul 16 23:43:53 2006
-+++ libmodifiedgtk2/Makefile.am	Sun Jul 16 23:44:27 2006
-@@ -21,7 +21,7 @@
+--- libmodifiedgtk2/Makefile.in.orig	2009-07-13 16:14:33.000000000 -0500
++++ libmodifiedgtk2/Makefile.in	2009-07-13 16:15:05.000000000 -0500
+@@ -222,7 +222,7 @@
+ libmodifiedgtk2_la_SOURCES = $(LIBSOURCES)
+ libmodifiedgtk2_la_LDFLAGS = -version-info $(SOVERSION)
+ localedir = $(datadir)/locale
+-AM_CPPFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
++AM_CPPFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DGTK_COMPILATION
+ all: $(BUILT_SOURCES) config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
  
- localedir		= $(datadir)/locale
- 
--AM_CPPFLAGS		= -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
-+AM_CPPFLAGS		= -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DGTK_COMPILATION
- #AM_CPPFLAGS		= -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -Wall $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -pg
- 
- marshal.h:	marshal.list
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index f055cb12cbc8..ba1abe8897fa 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/canna-lib
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	lthack
 USE_ICONV=	yes
 USE_GMAKE=	yes
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 92c27acc126a..60642635c626 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	lthack gnomehack
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index b7b1da05864f..047ede766857 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -26,7 +26,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	lthack gnomehack
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 16e3d932ed0f..bce4f2ac9157 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	lthack gnomehack
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 08ffdbe412f7..d0e8504b6119 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -18,7 +18,7 @@ COMMENT=	SCIM IMEngine module like SKK
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index 10fdf2a4afa1..b556a27516aa 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS+=	${EDICT_FILE}:${PORTSDIR}/japanese/edict
 .endif
 
 USE_RUBY=	yes
-USE_AUTOTOOLS=	autoconf:213 libtool:15
+USE_AUTOTOOLS=	autoconf:213 libtool:22
 CONFIGURE_ARGS=	--with-edict="${EDICT_FILE}" \
 		--with-ruby="${RUBY}"