Conversion to a single libtool environment.

Approved by:	portmgr (kris)

16 files changed, 29 insertions, 14 deletions

diff --git a/chinese/FreeWnn-lib/pkg-plist b/chinese/FreeWnn-lib/pkg-plist
index e08c4bfd8ecc..06900406759d 100644
--- a/chinese/FreeWnn-lib/pkg-plist
+++ b/chinese/FreeWnn-lib/pkg-plist
@@ -105,6 +105,7 @@ lib/wnn/zh_TW/wnnenvrc
 lib/wnn/zh_TW/wnnenvrc_R
 lib/wnn/zh_TW/wnnstat.msg
 lib/libcwnn.a
+lib/libcwnn.la
 lib/libcwnn.so
 lib/libcwnn.so.0
 @dirrm lib/wnn/zh_TW/rk_z
diff --git a/chinese/iiimf-le-chewing/Makefile b/chinese/iiimf-le-chewing/Makefile
index dc9ebff5424e..ab3946faeef5 100644
--- a/chinese/iiimf-le-chewing/Makefile
+++ b/chinese/iiimf-le-chewing/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iiimf-le-chewing
 PORTVERSION=	0.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://chewing.csie.net/download/iiimf/
@@ -21,7 +21,6 @@ RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
 
 USE_XLIB=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
diff --git a/chinese/iiimf-le-chewing/pkg-plist b/chinese/iiimf-le-chewing/pkg-plist
index 2207cebccf64..841717e9b3d0 100644
--- a/chinese/iiimf-le-chewing/pkg-plist
+++ b/chinese/iiimf-le-chewing/pkg-plist
@@ -1,3 +1,4 @@
+lib/im/leif/chewing.la
 lib/im/leif/chewing.so
 @dirrmtry lib/im/leif
 @dirrmtry lib/im
diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
index f4cc094af894..a84b085e2a52 100644
--- a/chinese/iiimf-le-xcin/Makefile
+++ b/chinese/iiimf-le-xcin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iiimf-le-xcin
 PORTVERSION=	0.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://people.redhat.com/llch/iiimf-xcin/${PORTVERSION}/
 EXTRACT_SUFX=	-11.src.rpm
diff --git a/chinese/iiimf-le-xcin/pkg-plist b/chinese/iiimf-le-xcin/pkg-plist
index cb305d174c0b..a5838c6f39ed 100644
--- a/chinese/iiimf-le-xcin/pkg-plist
+++ b/chinese/iiimf-le-xcin/pkg-plist
@@ -1,3 +1,5 @@
+lib/iiim/le/xcin/xcin.a
+lib/iiim/le/xcin/xcin.la
 lib/iiim/le/xcin/xcin.so
 lib/iiim/le/xcin/xcin.so.0
 lib/iiim/locale/zh_TW/xcin/cin2tab
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index fe4ef96bf485..f05dd49e203b 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libchewing
 PORTVERSION=	0.2.7
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://chewing.csie.net/download/libchewing/
 
@@ -14,7 +15,7 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	The Chewing intelligent phonetic input method library
 
 USE_GNOME=	gnomehack pkgconfig
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 DATADIR=	${PREFIX}/share/chewing
diff --git a/chinese/libchewing/pkg-plist b/chinese/libchewing/pkg-plist
index 356cb3d23d3a..853c9b4ccd58 100644
--- a/chinese/libchewing/pkg-plist
+++ b/chinese/libchewing/pkg-plist
@@ -9,6 +9,7 @@ include/chewing/hash.h
 include/chewing/userphrase.h
 include/chewing/zuin.h
 lib/libchewing.a
+lib/libchewing.la
 lib/libchewing.so
 lib/libchewing.so.2
 libdata/pkgconfig/chewing.pc
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 6b794ee0be44..0110174490ce 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcmanx
 PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese net gnome
 MASTER_SITES=	http://pcmanx.csie.net/release/ \
 		http://bbs.ilc.edu.tw/~chinsan/pcmanx/
@@ -18,7 +18,7 @@ COMMENT=	BBS client using GTK+ 2.x
 
 USE_GNOME=	gtk20 intlhack
 USE_GCC=	3.3+
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/chinese/pcmanx/pkg-plist b/chinese/pcmanx/pkg-plist
index c39c5bec73bb..16c196863396 100644
--- a/chinese/pcmanx/pkg-plist
+++ b/chinese/pcmanx/pkg-plist
@@ -1,5 +1,5 @@
 bin/pcmanx
-lib/libpcmanx_core.a
+lib/libpcmanx_core.la
 lib/libpcmanx_core.so
 lib/libpcmanx_core.so.0
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/pcmanx.mo
diff --git a/chinese/scim-chewing/Makefile b/chinese/scim-chewing/Makefile
index 1d8e43926934..179ad3cfdb12 100644
--- a/chinese/scim-chewing/Makefile
+++ b/chinese/scim-chewing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-chewing
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://chewing.csie.net/download/scim/
 
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="-D__STDC_ISO_10646__"
 
diff --git a/chinese/scim-chewing/pkg-plist b/chinese/scim-chewing/pkg-plist
index 6307ec0a3173..e0afee5a1fc5 100644
--- a/chinese/scim-chewing/pkg-plist
+++ b/chinese/scim-chewing/pkg-plist
@@ -1,4 +1,8 @@
+lib/scim-1.0/IMEngine/chewing.a
+lib/scim-1.0/IMEngine/chewing.la
 lib/scim-1.0/IMEngine/chewing.so
+lib/scim-1.0/SetupUI/chewing-imengine-setup.a
+lib/scim-1.0/SetupUI/chewing-imengine-setup.la
 lib/scim-1.0/SetupUI/chewing-imengine-setup.so
 share/scim/icons/scim-chewing.png
 @dirrmtry lib/scim-1.0/IMEngine
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index a6cfbb7e75fc..4095fd682e44 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-pinyin
 PORTVERSION=	0.5.91
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -21,7 +22,7 @@ USE_GNOME=	gnomehack 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/chinese/scim-pinyin/pkg-plist b/chinese/scim-pinyin/pkg-plist
index 9f11a0155656..7fa53251a374 100644
--- a/chinese/scim-pinyin/pkg-plist
+++ b/chinese/scim-pinyin/pkg-plist
@@ -1,4 +1,8 @@
+lib/scim-1.0/IMEngine/pinyin.a
+lib/scim-1.0/IMEngine/pinyin.la
 lib/scim-1.0/IMEngine/pinyin.so
+lib/scim-1.0/SetupUI/pinyin-imengine-setup.a
+lib/scim-1.0/SetupUI/pinyin-imengine-setup.la
 lib/scim-1.0/SetupUI/pinyin-imengine-setup.so
 share/locale/de/LC_MESSAGES/scim-pinyin.mo
 share/locale/fr/LC_MESSAGES/scim-pinyin.mo
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index 8a3d0b366012..817a9eb874a4 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wenju
 PORTVERSION=	1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wenju
@@ -16,11 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of writing tools in Chinese
 
 USE_GNOME=	gtk20
-GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_GETOPT_LONG=	yes
-USE_AUTOTOOLS=	libtool:13
+USE_GETOPT_LONG=yes
+USE_AUTOTOOLS=	libtool:15
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/chinese/wenju/pkg-plist b/chinese/wenju/pkg-plist
index 239e448504b7..0ce602165ed6 100644
--- a/chinese/wenju/pkg-plist
+++ b/chinese/wenju/pkg-plist
@@ -1,5 +1,6 @@
 bin/tim-config
 bin/wrap
+lib/gtk-2.0/2.4.0/immodules/im-tim.a
 lib/gtk-2.0/2.4.0/immodules/im-tim.la
 lib/gtk-2.0/2.4.0/immodules/im-tim.so
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wenju.mo
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index f4cb68ef08e9..96d08c7e7268 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -32,7 +32,7 @@ WRKSRC=		${WRKDIR}/xcin
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \