Conversion to a single libtool environment.

Approved by:	portmgr (kris)

26 files changed, 49 insertions, 25 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index ede59fccafc..3d44fc732d7 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist
index 1b2ea3222b7..919e5c6d2ce 100644
--- a/japanese/FreeWnn-lib/pkg-plist
+++ b/japanese/FreeWnn-lib/pkg-plist
@@ -73,9 +73,11 @@ lib/wnn/lt_LN/uumkey
 lib/wnn/lt_LN/uumkey_e
 lib/wnn/lt_LN/uumrc
 lib/libjd.a
+lib/libjd.la
 lib/libjd.so
 lib/libjd.so.0
 lib/libwnn.a
+lib/libwnn.la
 lib/libwnn.so
 lib/libwnn.so.0
 @dirrm lib/wnn/ja_JP/rk
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 53b38652582..c9d842f03f3 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	anthy
 PORTVERSION=	7100b
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}/17231
@@ -18,7 +19,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Another kana-kanji conversion system
 
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnometarget lthack pkgconfig
 
diff --git a/japanese/anthy/pkg-plist b/japanese/anthy/pkg-plist
index 34214a9d19e..13dfd8cb264 100644
--- a/japanese/anthy/pkg-plist
+++ b/japanese/anthy/pkg-plist
@@ -5,12 +5,15 @@ include/anthy/anthy.h
 include/anthy/dicutil.h
 include/anthy/input.h
 lib/libanthy.a
+lib/libanthy.la
 lib/libanthy.so
 lib/libanthy.so.1
 lib/libanthydic.a
+lib/libanthydic.la
 lib/libanthydic.so
 lib/libanthydic.so.1
 lib/libanthyinput.a
+lib/libanthyinput.la
 lib/libanthyinput.so
 lib/libanthyinput.so.0
 libdata/pkgconfig/anthy.pc
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index e11ff259bee..10d337958c7 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eb
 PORTVERSION=	4.2.2
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
 DISTFILES=	${EBFILES} \
@@ -56,7 +57,7 @@ DIST_SUBDIR=	eb
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/japanese/eb/pkg-plist b/japanese/eb/pkg-plist
index d92c350b2a0..22fa2618eb6 100644
--- a/japanese/eb/pkg-plist
+++ b/japanese/eb/pkg-plist
@@ -19,6 +19,7 @@ include/eb/text.h
 include/eb/zio.h
 @dirrm include/eb
 lib/libeb.a
+lib/libeb.la
 lib/libeb.so
 lib/libeb.so.10
 share/aclocal/eb4.m4
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 439f0486c9e..78bba1418c0 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eb
 PORTVERSION=	3.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/net/ndtp/eb/
@@ -61,7 +61,7 @@ DIST_SUBDIR=	eb
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/japanese/eb3/pkg-plist b/japanese/eb3/pkg-plist
index af8b47d9be7..58ac25055db 100644
--- a/japanese/eb3/pkg-plist
+++ b/japanese/eb3/pkg-plist
@@ -16,6 +16,7 @@ include/eb/text.h
 include/eb/zio.h
 @dirrm include/eb
 lib/libeb.a
+lib/libeb.la
 lib/libeb.so
 lib/libeb.so.7
 share/aclocal/eb3.m4
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index b1c0673deb8..3477abb37e4 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	im-ja
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
@@ -21,7 +21,6 @@ OPTIONS+=	WNN	"Use FreeWnn" on
 USE_PERL5_BUILD=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix gnomehack gnomepanel lthack intlhack
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index a489efd510c..4c006e9a754 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -1,5 +1,6 @@
 bin/im-ja-conf
 bin/im-ja-xim-server
+lib/gtk-2.0/2.4.0/immodules/im-ja.la
 lib/gtk-2.0/2.4.0/immodules/im-ja.so
 lib/im-ja/im-ja-applet
 lib/im-ja/kpengine
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index c63f521773e..de0f4d32d2a 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -16,9 +16,8 @@ COMMENT=	Japanese Morphological Dictionary for ChaSen
 
 BUILD_DEPENDS=	chasen:${PORTSDIR}/japanese/chasen-base
 
-GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-dicdir=${PREFIX}/share/chasen/dic
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/chasenrc \
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index de5b9380733..96b8807b5ff 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libicq
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	japanese net
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.korsoft.com/pub/gicq/
diff --git a/japanese/libicq/pkg-plist b/japanese/libicq/pkg-plist
index c5b2f94bc6b..8a7c3f64488 100644
--- a/japanese/libicq/pkg-plist
+++ b/japanese/libicq/pkg-plist
@@ -1,4 +1,5 @@
 include/libicq.h
 lib/libicq.a
+lib/libicq.la
 lib/libicq.so
 lib/libicq.so.0.3
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index d18ce0243f1..0f845a6bd9c 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe
 
 USE_X_PREFIX=	yes
 USE_GNOME=	lthack gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
@@ -27,7 +26,8 @@ PLIST_DIRS=	include/tomoe
 PLIST_FILES=	include/tomoe/tomoe_candidates_view.h \
 		include/tomoe/tomoe_canvas.h include/tomoe/tomoe-gtk.h \
 		include/tomoe/tomoe_window.h \
-		lib/libtomoe-gtk.a lib/libtomoe-gtk.so lib/libtomoe-gtk.so.0 \
+		lib/libtomoe-gtk.a lib/libtomoe-gtk.la \
+		lib/libtomoe-gtk.so lib/libtomoe-gtk.so.0 \
 		libdata/pkgconfig/libtomoe-gtk.pc
 
 .include <bsd.port.mk>
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 087a47da69f..430cf8f6d7d 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -21,7 +21,7 @@ IPADIC_DISTNAME=	ipadic-2.5.1
 USE_PERL5_BUILD=	yes
 USE_REINPLACE=		yes
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index da819c17e19..e872e26754a 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-anthy
 PORTVERSION=	0.9.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=scim-imengine/18697
@@ -24,7 +24,7 @@ USE_GNOME=	lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/japanese/scim-anthy/pkg-plist b/japanese/scim-anthy/pkg-plist
index 3d774dc4d4d..1a8c7369092 100644
--- a/japanese/scim-anthy/pkg-plist
+++ b/japanese/scim-anthy/pkg-plist
@@ -1,5 +1,11 @@
+lib/scim-1.0/1.4.0/Helper/anthy-imengine-helper.a
+lib/scim-1.0/1.4.0/Helper/anthy-imengine-helper.la
 lib/scim-1.0/1.4.0/Helper/anthy-imengine-helper.so
+lib/scim-1.0/IMEngine/anthy.a
+lib/scim-1.0/IMEngine/anthy.la
 lib/scim-1.0/IMEngine/anthy.so
+lib/scim-1.0/SetupUI/anthy-imengine-setup.a
+lib/scim-1.0/SetupUI/anthy-imengine-setup.la
 lib/scim-1.0/SetupUI/anthy-imengine-setup.so
 share/locale/ja/LC_MESSAGES/scim-anthy.mo
 share/scim/Anthy/style/101kana.sty
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 34685ef861e..cafcef02902 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-canna
 PORTVERSION=	1.0.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/18849
@@ -23,7 +23,7 @@ USE_GNOME=	lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/scim-canna/pkg-plist b/japanese/scim-canna/pkg-plist
index 4c7d92b126d..479952109a3 100644
--- a/japanese/scim-canna/pkg-plist
+++ b/japanese/scim-canna/pkg-plist
@@ -1,4 +1,8 @@
+lib/scim-1.0/IMEngine/canna.a
+lib/scim-1.0/IMEngine/canna.la
 lib/scim-1.0/IMEngine/canna.so
+lib/scim-1.0/SetupUI/canna-imengine-setup.a
+lib/scim-1.0/SetupUI/canna-imengine-setup.la
 lib/scim-1.0/SetupUI/canna-imengine-setup.so
 share/locale/ja/LC_MESSAGES/scim-canna.mo
 share/scim/icons/scim-canna.png
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 0c0646fc3bf..7fc9bacd6bf 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 91a07e7d6e2..df5ba90e04c 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index e11bcfad6c9..da248c309ba 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -23,12 +23,14 @@ USE_GNOME=	lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-PLIST_FILES=	lib/scim-1.0/1.4.0/Helper/tomoe.so \
+PLIST_FILES=	lib/scim-1.0/1.4.0/Helper/tomoe.a \
+		lib/scim-1.0/1.4.0/Helper/tomoe.la \
+		lib/scim-1.0/1.4.0/Helper/tomoe.so \
 		share/locale/ja/LC_MESSAGES/scim-tomoe.mo \
 		share/scim/icons/scim-tomoe.png
 
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 4030ad7906c..3ebe98657b3 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-uim
 PORTVERSION=	0.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freedesktop.org/~suzhe/sources/
@@ -24,7 +24,7 @@ USE_GNOME=	lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/japanese/scim-uim/pkg-plist b/japanese/scim-uim/pkg-plist
index a8f327a8331..841d226a783 100644
--- a/japanese/scim-uim/pkg-plist
+++ b/japanese/scim-uim/pkg-plist
@@ -1,3 +1,5 @@
+lib/scim-1.0/IMEngine/uim.a
+lib/scim-1.0/IMEngine/uim.la
 lib/scim-1.0/IMEngine/uim.so
 share/scim/icons/scim-uim.png
 @dirrmtry lib/scim-1.0/IMEngine
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index 6471b4e1847..0189faa340f 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -17,12 +17,12 @@ COMMENT=	Tegaki Online MOji-ninshiki Engine
 
 USE_GNOME=	lthack gnomehack
 USE_AUTOTOOLS=	libtool:15
-GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 PLIST_DIRS=	include/tomoe share/tomoe
 PLIST_FILES=	bin/tomoe bin/tomoe1 include/tomoe/tomoe.h \
-		lib/libtomoe.a lib/libtomoe.so lib/libtomoe.so.1 \
+		lib/libtomoe.a lib/libtomoe.la \
+		lib/libtomoe.so lib/libtomoe.so.1 \
 		libdata/pkgconfig/tomoe.pc \
 		share/tomoe/all.tdic share/tomoe/hiragana.tdic
 
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index f679c68f178..d0940043e10 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${EDICT_FILE}:${PORTSDIR}/japanese/edict \
 
 USE_X_PREFIX=	yes
 USE_RUBY=	yes
-USE_AUTOTOOLS=	autoconf:213 libtool:13
+USE_AUTOTOOLS=	autoconf:213 libtool:15
 CONFIGURE_ARGS=	--with-edict="${EDICT_FILE}" \
 		--with-ruby="${RUBY}" \
 		--with-netscape="${LOCALBASE}/bin/netscape"