Update to the autotools new world order.

Tested by:	numerous package build runs
Approved by:	portmgr
Thanks to:	des, kris, linimon, pav

6 files changed, 19 insertions, 21 deletions

diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index f0f007830c2b..663d3b732cd7 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-canna
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -28,7 +28,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_XLIB=	yes
 USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
-WANT_AUTOHEADER_VER=	259
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile
index c13173f534a8..a72a0f768306 100644
--- a/japanese/iiimf-le-canna/files/patch-Makefile
+++ b/japanese/iiimf-le-canna/files/patch-Makefile
@@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal19
-+AUTOMAKE = automake19 --add-missing --copy
-+LIBTOOLIZE = libtoolize15 --force --copy
-+AUTOHEADER = autoheader259
-+AUTOCONF = autoconf259
++ACLOCAL = aclocal-1.9
++AUTOMAKE = automake-1.9 --add-missing --copy
++LIBTOOLIZE = libtoolize --force --copy
++AUTOHEADER = autoheader-2.59
++AUTOCONF = autoconf-2.59
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf259
++AUTORECONF = autoreconf-2.59
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index f20b9530c32a..7b0c0f1b9e8f 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-freewnn
 PORTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -27,7 +27,6 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
-WANT_AUTOHEADER_VER=	259
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/japanese/iiimf-le-freewnn/files/patch-Makefile b/japanese/iiimf-le-freewnn/files/patch-Makefile
index c13173f534a8..a72a0f768306 100644
--- a/japanese/iiimf-le-freewnn/files/patch-Makefile
+++ b/japanese/iiimf-le-freewnn/files/patch-Makefile
@@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal19
-+AUTOMAKE = automake19 --add-missing --copy
-+LIBTOOLIZE = libtoolize15 --force --copy
-+AUTOHEADER = autoheader259
-+AUTOCONF = autoconf259
++ACLOCAL = aclocal-1.9
++AUTOMAKE = automake-1.9 --add-missing --copy
++LIBTOOLIZE = libtoolize --force --copy
++AUTOHEADER = autoheader-2.59
++AUTOCONF = autoconf-2.59
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf259
++AUTORECONF = autoreconf-2.59
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 451539fd173a..f805c4a9e20f 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.emaillab.org/mutt/${VERSION}/ \
 		http://www.emaillab.org/mutt/1.5/doc/:ja_doc \
@@ -70,7 +70,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -81,7 +81,7 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--without-wc-funcs \
 		--enable-flock --disable-fcntl \
 		--with-ssl \
-		--sysconfdir=${PREFIX}/etc \
+		--sysconfdir=${PREFIX}/etc --mandir=${PREFIX}/man \
 		--with-docdir=${DOCSDIR} \
 		--enable-pop --enable-imap \
 		--enable-default-japanese
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 784d7d7bb0ea..6de2703c5e15 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -34,7 +34,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -44,7 +44,7 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--without-wc-funcs \
 		--enable-flock --disable-fcntl \
 		--with-ssl \
-		--sysconfdir=${PREFIX}/etc \
+		--sysconfdir=${PREFIX}/etc --mandir=${PREFIX}/man \
 		--with-docdir=${DOCSDIR} \
 		--enable-pop --enable-imap \
 		--enable-default-japanese