Mass-conversion to the USE_AUTOTOOLS New World Order. The code present

in bsd.autotools.mk essentially makes this a no-op given that all the
old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in
exactly the same way as USE_AUTOTOOLS itself.

Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME
team -- all GNOME 2.12.x ports use it.

Preliminary documentation can be found at:
	http://people.FreeBSD.org/~ade/autotools.txt

which is in the process of being SGMLized before introduction into the
Porters Handbook.

Light blue touch-paper.  Run.

50 files changed, 50 insertions, 65 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index c24da35eb50c..c2b359302fb7 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -20,8 +20,7 @@ WRKSRC=	${WRKDIR}/FreeWnn-1.10-pl020
 ALL_TARGET=	includes all
 INSTALL_TARGET=	install install.man
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	autoconf:213 libtool:15
 MAKE_ARGS=	CDEBUGFLAGS="${CFLAGS}"
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index e49478928bb3..53b386525820 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Another kana-kanji conversion system
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnometarget lthack pkgconfig
 
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index 8a73c3490907..d7cad69057b0 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -21,7 +21,7 @@ COMMENT=	A color vt102 terminal emulator with transparency support
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253:env
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile
index 2eb7c3b7e4ad..2a8c3a454b73 100644
--- a/japanese/balsa/Makefile
+++ b/japanese/balsa/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/balsa-0.8.0ja
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 LIBTOOLFILES=	configure libmutt/configure
diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile
index 92b086368da3..152f3bfcf1f2 100644
--- a/japanese/celrw/Makefile
+++ b/japanese/celrw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.nurs.or.jp/~kurati/celrw/
 MAINTAINER=	shuna@pop16.odn.ne.jp
 COMMENT=	Cellular phone-number read/write tool (in Japan only)
 
-WANT_AUTOMAKE_VER=15
+USE_AUTOTOOLS=	automake:15:env
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=
diff --git a/japanese/dvipdfm/Makefile b/japanese/dvipdfm/Makefile
index fcc34942a972..031a63ce7550 100644
--- a/japanese/dvipdfm/Makefile
+++ b/japanese/dvipdfm/Makefile
@@ -30,7 +30,7 @@ BROKEN=			Incorrect pkg-plist
 MAN1=			dvipdfm.1
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV+=		CPPFLAGS="${CXXFLAGS} -I${PREFIX}/include" \
 			CFLAGS="${CFLAGS} -I${PREFIX}/include" \
 			LDFLAGS=-L${PREFIX}/lib
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 777efea25272..1a35d90f52bf 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -61,7 +61,7 @@ DIST_SUBDIR=	eb
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 526ba5a241bf..63a153aba161 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -61,7 +61,7 @@ DIST_SUBDIR=	eb
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index bd7197b1f830..79185b733c01 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	ja-ebview-gtk2-*
 USE_GETOPT_LONG=	yes
 USE_GNOME=	imlib
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index b50ea1150465..6475d5321212 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs
 
 WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	YES
 EMACS_VER=	21.3
 
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
index 640a83a0d177..3f08593da63a 100644
--- a/japanese/emacs20-dl-canna/Makefile
+++ b/japanese/emacs20-dl-canna/Makefile
@@ -43,7 +43,7 @@ DLCANNA_VER=	1.4
 # hack to allow parallel build to work
 .if defined(PACKAGE_BUILDING)
 USE_GMAKE=	yes
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253:env
 .endif
 
 post-install:
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index 297bf2d766f7..0775311f9ab0 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
 		${NONEXISTENT}:${EMACSDL_DIR}:configure
 RUN_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR}
 
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253:env
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wnn6 \
@@ -38,7 +38,6 @@ EMACSDL_SRCDIR=	${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
 # hack to allow parallel build to work
 .if defined(PARALLEL_PACKAGE_BUILD)
 USE_GMAKE=	yes
-WANT_AUTOCONF_VER=253
 .endif
 
 post-install:
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index fbe86e2f4f1d..2419978a17d6 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -29,7 +29,7 @@ WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
 
 LATEST_LINK=	ja-emcws20
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	YES
 EMACS_VER=	20.7
 
diff --git a/japanese/epic4/Makefile b/japanese/epic4/Makefile
index b381fe46a2e5..27cb3d230f3b 100644
--- a/japanese/epic4/Makefile
+++ b/japanese/epic4/Makefile
@@ -27,7 +27,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The (E)nhanced (P)rogrammable (I)RC-II (C)lient with Japanese support
 
 USE_BZIP2=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 
 DISTFILE_HELP=	${PORTNAME}pre2-help.tar.gz
 
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index 0217d4799080..de0504452ae9 100644
--- a/japanese/esecanna-module-vje25/Makefile
+++ b/japanese/esecanna-module-vje25/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Esecanna module for VJE-Delta 2.5
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
 
 DIST_SUBDIR=    esecanna
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index 42909c094303..b460d8d12082 100644
--- a/japanese/esecanna-module-vje30/Makefile
+++ b/japanese/esecanna-module-vje30/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
 
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
 # VJE-Delta 3.0 is installed under /usr/local fixedly
 CONFIGURE_ARGS=	--with-vjecfgfile="/usr/local/etc/vje30/vje.cfg"
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 40849aab5e61..7fac385da09b 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Esecanna module for Wnn6
 LIB_DEPENDS=	wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
 RUN_DEPENDS=	${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${PREFIX}/include/wnn6" \
 		LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index 6f42147cae26..9cb1d93e1af4 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Pseudo cannaserver which wraps some other input engines
 USE_RC_SUBR=	yes
 
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-piddir="${PIDDIR}"
 
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index ea5ef372ab7e..3f9e166bf2fe 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A sophisticated scripter based on Japanized tcl/tk
 
 LIB_DEPENDS=	tk80jp.1:${PORTSDIR}/japanese/tk80
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 CONFIGURE_ARGS=	--enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
 		--with-tkconfig=${PREFIX}/lib/tk8.0jp \
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index 37f843549e52..f4ce059436d8 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -29,10 +29,8 @@ USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_XLIB=	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/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index 0a98be9bde13..3861e7c4e83a 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -28,10 +28,8 @@ USE_BZIP2=	yes
 USE_ICONV=	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/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index f972a853068d..a442e520bb71 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -21,7 +21,7 @@ OPTIONS+=	WNN	"Use FreeWnn" on
 USE_PERL5_BUILD=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix gnomehack gnomepanel lthack
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index e09cdeaa0d52..c63f521773e2 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	chasen:${PORTSDIR}/japanese/chasen-base
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-dicdir=${PREFIX}/share/chasen/dic
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/chasenrc \
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index eec5ea2924bb..91119422007e 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -26,7 +26,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	sf@FreeBSD.org
 COMMENT=	Less + zcat + ISO-2022 - a pager similar to more and pg
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cs-regex
 MAN1=		jless.1 jlesskey.1
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 398af93b0904..de5b9380733e 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/japanese/mecab-razil/Makefile b/japanese/mecab-razil/Makefile
index c424f5f06cbe..8d359a140a4a 100644
--- a/japanese/mecab-razil/Makefile
+++ b/japanese/mecab-razil/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	mecab.0:${MECAB_PORTDIR}
 
 USE_PERL5_BUILD=	yes
 USE_REINPLACE=		yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
 
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 9740dbc72903..087a47da69fa 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_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/japanese/mell/Makefile b/japanese/mell/Makefile
index 1e3cafa5f5b8..7891697dfdf1 100644
--- a/japanese/mell/Makefile
+++ b/japanese/mell/Makefile
@@ -14,9 +14,8 @@ MAINTAINER=	otsuji@users.sourceforge.jp
 COMMENT=	Emacs Lisp for taiyaki-elisp, especially for the prime
 
 GNU_CONFIGURE=		yes
-USE_AUTOMAKE_VER=	19
+USE_AUTOTOOLS=	automake:19 autoconf:259
 AUTOMAKE_ARGS=		-af
-USE_AUTOCONF_VER=	259
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index f9b083e467da..c0cb190f3c21 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -20,8 +20,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Japanese incremental search tool
 
 .if !defined(EMACS_PORT_NAME)
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.am ${FILESDIR}/extra-patch-configure.in
 PLIST_SUB=	MIGEMO="" ELISP="@comment "
 .endif
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index ca31ada2a139..7a8c8d77eb89 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -60,8 +60,7 @@ NO_LATEST_LINK=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 1909da65cf8d..f20ca4b07752 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -41,8 +41,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/japanese/prime-dict/Makefile b/japanese/prime-dict/Makefile
index ad2a6c54b608..1a7eeca99acf 100644
--- a/japanese/prime-dict/Makefile
+++ b/japanese/prime-dict/Makefile
@@ -19,8 +19,7 @@ USE_RUBY=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19 autoconf:259
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime-el/Makefile b/japanese/prime-el/Makefile
index e2a1b6fc72e9..ebd9f8559e32 100644
--- a/japanese/prime-el/Makefile
+++ b/japanese/prime-el/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/emacs/site-lisp/init-mell.el:${PORTSDIR}/japane
 		prime:${PORTSDIR}/japanese/prime
 
 GNU_CONFIGURE=	yes
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19 autoconf:259
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime/Makefile b/japanese/prime/Makefile
index 780370b2e813..73093ea90c58 100644
--- a/japanese/prime/Makefile
+++ b/japanese/prime/Makefile
@@ -25,8 +25,7 @@ RUBY_WITH_PTHREAD=	yes
 USE_GNOME=		pkgconfig
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19 autoconf:259
 
 PLIST_SUB=		X11BASE=${X11BASE}
 
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index edb5fd5d8d15..4a3e33587f16 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb
 .endif
 
 USE_RUBY=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
 USE_RC_SUBR=	rskkserv.sh
 
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index e8840b64706d..6b732defda9f 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -27,7 +27,7 @@ SAMBA_JA_VERSION=	1.0beta1
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253
 
 # directories
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 8b7d8ef8ce54..27a772545d52 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	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/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index eb57d1caf8f2..fafbb735cd68 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index b9db6ff7cd93..8d176bab7a20 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	lthack
 USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 6c21ac804f66..6818d0fb210b 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 3d5720e807f6..c7ea9f18279d 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	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/japanese/suikyo/Makefile b/japanese/suikyo/Makefile
index 74246bc6b1a6..2efc04163919 100644
--- a/japanese/suikyo/Makefile
+++ b/japanese/suikyo/Makefile
@@ -17,8 +17,7 @@ USE_RUBY=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19 autoconf:259
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 2c030cbfe7b2..2174bedc365b 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	taguchi@tohoku.iij.ad.jp
 COMMENT=	Japanized Tcl (Tool Command Language)
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 5f3f11770304..5a2deb4def96 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -26,7 +26,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
 .else
 PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ARGS=	--enable-shared
 RANLIB=		ranlib
 PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg-install.tclsh
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index 936f587066f5..1d32ddf5c7cf 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Japanized TK (Tcl Tool Kit)
 LIB_DEPENDS=	tcl76jp.1:${PORTSDIR}/japanese/tcl76
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 14ec51bffe22..69910c183808 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -28,7 +28,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
 .else
 PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index b0159eb7e43f..62bdb2aa4c28 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gcc --enable-shared --enable-step \
 		--with-tcl=${PREFIX}/lib/tcl${TCLVERSION}jp \
diff --git a/japanese/uim/Makefile b/japanese/uim/Makefile
index ee2add526e09..105f2e2f60d2 100644
--- a/japanese/uim/Makefile
+++ b/japanese/uim/Makefile
@@ -25,7 +25,7 @@ WANT_GNOME=	yes
 USE_GNOME=	lthack gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 07ebf8fa4166..3e350e6057c7 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
 USE_FREETYPE=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	autoconf:213
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-freetype \
 		--with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index bec1be8ee7dd..f679c68f178e 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	${EDICT_FILE}:${PORTSDIR}/japanese/edict \
 
 USE_X_PREFIX=	yes
 USE_RUBY=	yes
-USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	autoconf:213 libtool:13
 CONFIGURE_ARGS=	--with-edict="${EDICT_FILE}" \
 		--with-ruby="${RUBY}" \
 		--with-netscape="${LOCALBASE}/bin/netscape"