10 files changed, 10 insertions, 17 deletions

diff --git a/chinese/iiimf-le-chewing/Makefile b/chinese/iiimf-le-chewing/Makefile
index 0636f7dd3f0d..dc9ebff5424e 100644
--- a/chinese/iiimf-le-chewing/Makefile
+++ b/chinese/iiimf-le-chewing/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
 
 USE_XLIB=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index 20cad28e0c78..939a286541c6 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -24,10 +24,8 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index eae6759eae59..d5705a350a7f 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -24,10 +24,8 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=      yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
index 6e37b9ac5e99..f4cc094af894 100644
--- a/chinese/iiimf-le-xcin/Makefile
+++ b/chinese/iiimf-le-xcin/Makefile
@@ -23,11 +23,8 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GNOME=	libxml2
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
+USE_AUTOTOOLS=	automake:19 autoheader:259 autoconf:259 libtool:15
 AUTOMAKE_ARGS=	--add-missing
-USE_AUTOMAKE_VER=	19
-USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 do-extract:
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index fe8e2bd9fcec..2fc4190ef290 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	kcwu@csie.org
 COMMENT=	The Chewing intelligent phonetic input method library
 
 USE_GNOME=	gnomehack pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index edc97125c337..6b794ee0be44 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -18,7 +18,7 @@ COMMENT=	BBS client using GTK+ 2.x
 
 USE_GNOME=	gtk20 intlhack
 USE_GCC=	3.3+
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/chinese/scim-chewing/Makefile b/chinese/scim-chewing/Makefile
index 58b704941069..c92f8ef93b0f 100644
--- a/chinese/scim-chewing/Makefile
+++ b/chinese/scim-chewing/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="-D__STDC_ISO_10646__"
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index 178a0495ce9b..a7321d88787a 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=	gnomehack lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index fdf152692310..8a3d0b366012 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index 6181a5d49632..36305c61c0fc 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_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \