33 files changed, 34 insertions, 36 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 5aec50ec3db3..03ca3a08f988 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -21,7 +21,7 @@ ALL_TARGET=	includes all
 INSTALL_TARGET=	install install.man
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	213
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 MAKE_ARGS=	CDEBUGFLAGS="${CFLAGS}"
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 29ec84d58f61..ba10e3ff14fc 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Another kana-kanji conversion system
 
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile
index 7a66915ea1e2..29640f3d6a32 100644
--- a/japanese/balsa/Makefile
+++ b/japanese/balsa/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/balsa-0.8.0ja
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 LIBTOOLFILES=	configure libmutt/configure
diff --git a/japanese/dvipdfm/Makefile b/japanese/dvipdfm/Makefile
index 289557d9507b..ee9b839e86d8 100644
--- a/japanese/dvipdfm/Makefile
+++ b/japanese/dvipdfm/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=		kpsewhich:${PORTSDIR}/japanese/ptex-base \
 MAN1=			dvipdfm.1
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
-USE_AUTOCONF=		yes
+USE_AUTOCONF_VER=	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 1ab187f4ea68..97f97357fddf 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -60,7 +60,7 @@ DIST_SUBDIR=	eb
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 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 1ab187f4ea68..97f97357fddf 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -60,7 +60,7 @@ DIST_SUBDIR=	eb
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile
index d1ca964e34b1..9cf4f0352909 100644
--- a/japanese/eblook/Makefile
+++ b/japanese/eblook/Makefile
@@ -20,7 +20,7 @@ DOCDIR=		share/doc/eblook
 LIB_DEPENDS=    eb.7:${PORTSDIR}/japanese/eb
 
 GNU_CONFIGURE=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 CONFIGURE_ARGS=	--with-eb-includes=${PREFIX}/include \
 		--with-eb-libraries=${PREFIX}/lib
 
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 866fd38f32a3..db88ab789f40 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs21
 
 WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
 
-USE_AUTOCONF=	YES
+USE_AUTOCONF_VER=	213
 USE_GMAKE=	YES
 EMACS_VER=	21.3
 
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index 10fd06f16dff..70c538d6e682 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
 
 LATEST_LINK=	ja-emcws20
 
-USE_AUTOCONF=	YES
+USE_AUTOCONF_VER=	213
 USE_GMAKE=	YES
 EMACS_VER=	20.7
 
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index 866fd38f32a3..db88ab789f40 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs21
 
 WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
 
-USE_AUTOCONF=	YES
+USE_AUTOCONF_VER=	213
 USE_GMAKE=	YES
 EMACS_VER=	21.3
 
diff --git a/japanese/epic4/Makefile b/japanese/epic4/Makefile
index 04e305cbc2a9..49d60be7c89c 100644
--- a/japanese/epic4/Makefile
+++ b/japanese/epic4/Makefile
@@ -27,7 +27,7 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The (E)nhanced (P)rogrammable (I)RC-II (C)lient with Japanese support
 
 USE_BZIP2=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 
 DISTFILE_HELP=	${PORTNAME}pre2-help.tar.gz
 
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index 325bc0b5572b..8aefd808e426 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=	yes
+USE_AUTOCONF_VER=	213
 USE_GMAKE=	yes
 
 DIST_SUBDIR=    esecanna
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index 89fe867026fc..6e0288a77224 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=	yes
+USE_AUTOCONF_VER=	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 fd868187cbcf..4f66453de774 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=	yes
+USE_AUTOCONF_VER=	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 dce37bd54931..68a038b05a1d 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Pseudo cannaserver which wraps some other input engines
 
 USE_REINPLACE=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-piddir="${PIDDIR}"
 
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index 4a3871e21536..ed352ac55404 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-configure.in \
 		${.CURDIR}/files/extra-patch-src:feature.h \
 		${.CURDIR}/files/extra-patch-src:options.c
 
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 CONFIGURE_ARGS=	--enable-trans --enable-utmp \
 		--enable-xim --with-theme-update \
 		--with-backspace=bs --without-terminfo \
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index d50d5e1d97aa..17f9dadadc96 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=	yes
+USE_AUTOCONF_VER=	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/im-ja/Makefile b/japanese/im-ja/Makefile
index d75c659e76ec..6b83d3ac3629 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix gnomehack gnomepanel
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index ba0d4a0fbe5c..bf889dc803e6 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -22,7 +22,7 @@ PATCH_DIST_STRIP=	-p1
 BUILD_DEPENDS=	chasen:${PORTSDIR}/japanese/chasen-base
 
 GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
+USE_LIBTOOL_VER=13
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/chasenrc \
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 835e9d89db1c..b5552dcb7323 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=	yes
+USE_AUTOCONF_VER=	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 c92fc9156cc0..67b45276e97c 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	flathill@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/japanese/libimg/Makefile b/japanese/libimg/Makefile
index 19db7afcfc89..c227dadd56a9 100644
--- a/japanese/libimg/Makefile
+++ b/japanese/libimg/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Enhanced Tk adding support for many other Image formats
 BUILD_DEPENDS=	${LOCALBASE}/lib/tcl8.0jp/tclIndex:${PORTSDIR}/japanese/tcl80 \
 		${LOCALBASE}/lib/tk8.0jp/tk.tcl:${PORTSDIR}/japanese/tk80
 
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl${TCLVERSION}jp \
 		--with-tk=${PREFIX}/lib/tk${TKVERSION}jp \
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 99f7a2610594..b80fd3e6f910 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -20,7 +20,7 @@ IPADIC_PORTDIR=	${PORTSDIR}/japanese/ipadic
 
 USE_PERL5_BUILD=	yes
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index 72c764d72a7a..499ba903f05d 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Japanese incremental search tool
 
 .if !defined(EMACS_PORT_NAME)
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 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 12a276aa5680..2be83dee0094 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -45,7 +45,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 NO_LATEST_LINK=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 0eff14c8a675..4617e411f2ca 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -46,7 +46,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index 049d611d0d44..5e14464f6feb 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/tcpwrap.so:${PORTSDIR}/security/ruby-tcpwrap
 		${SKKJISYO_BASE}/${SKKJISYO}:${SKK_MASTERDIR}
 
 USE_RUBY=	yes
-
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS=	--with-ruby="${RUBY}" \
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 5b38f292ddd8..547f62622057 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=	yes
+USE_AUTOCONF_VER=	213
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index fcc059d5d41f..936f587066f5 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=	yes
+USE_AUTOCONF_VER=	213
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 61f47855e652..4f5a7e45dc42 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=	yes
+USE_AUTOCONF_VER=	213
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
 	--enable-xlibHack --enable-onTheSpot
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 637fc5d3ae3b..e35cae9c393b 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80
 
 USE_XLIB=	yes
 USE_XPM=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	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 96c2f9dd79d4..c9732a1c8ae7 100644
--- a/japanese/uim/Makefile
+++ b/japanese/uim/Makefile
@@ -23,7 +23,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
 
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index e34584f41a0c..ceb19876f3d8 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS=	${EDICT_FILE}:${PORTSDIR}/japanese/edict \
 
 USE_X_PREFIX=	yes
 USE_RUBY=	yes
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
+USE_AUTOCONF_VER=	213
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-edict="${EDICT_FILE}" \
 		--with-ruby="${RUBY}" \
 		--with-netscape="${LOCALBASE}/bin/netscape"