Sync to new bsd.autotools.mk

65 files changed, 66 insertions, 66 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index a8547efda3ac..47e136893a5d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -31,7 +31,7 @@ USE_OPENSSL=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \
 		libgnomeprintui
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libltdl:22
+USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--enable-threads \
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 830001d665da..871720b54d9e 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:268 autoheader:268
+USE_AUTOTOOLS=	aclocal automake autoconf autoheader
 ACLOCAL_ARGS=	-Im4
 
 .include <bsd.port.pre.mk>
diff --git a/mail/claws-mail-archiver/Makefile b/mail/claws-mail-archiver/Makefile
index 2e81816cbca0..9df395193299 100644
--- a/mail/claws-mail-archiver/Makefile
+++ b/mail/claws-mail-archiver/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index 482aae492cdc..95fe215d9088 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	lib/claws-mail/plugins/att_remover.a \
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index 0bd09bf3ae3d..4303114c41e5 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -22,7 +22,7 @@ LICENSE=	GPLv3
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index d451237c16e6..62447e979ac1 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -22,7 +22,7 @@ LICENSE=	GPLv3
 
 USE_GMAKE=	yes
 USE_XORG=	x11
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 2211bf6082f5..385a18fff245 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	lib/claws-mail/plugins/cachesaver.a \
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 9a3fbcd6bf87..1e6f898ed589 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_ICONV=	yes
 USE_GNOME=	gtk20
 MAKE_JOBS_SAFE=	yes
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 68d8e9656a71..b73bf521b858 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	lib/claws-mail/plugins/fetchinfo_plugin.a \
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 510e5dcd401b..b51d78dfc2a1 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_GNOME=	gtk20
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 520daee188a1..a61a9b83e025 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	lib/claws-mail/plugins/mailmbox.a \
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 25904f14cef3..db680300de41 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	lib/claws-mail/plugins/newmail.a \
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 839013be08f5..2c4f3599cb66 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 72cc214f5367..91cf53b0509b 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_PERL5=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index 439d1ada5fa0..a5a791521d13 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -23,7 +23,7 @@ LICENSE=	GPLv3
 USE_GNOME=	pygtk2
 USE_GMAKE=	yes
 USE_XORG=	x11
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 634d85bed774..2d5c5a3088c4 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 9c1259d1e0c4..e6a24dcc8a73 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -23,7 +23,7 @@ LICENSE=	GPLv3
 
 USE_GMAKE=	yes
 USE_XORG=	x11
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 81d7d790017c..749b542b650b 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE} \
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 112846e07c30..e1e2da26142f 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -23,7 +23,7 @@ LICENSE=	GPLv3
 
 USE_GMAKE=	yes
 USE_XORG=	x11
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 792f7cca75cf..bd381550482a 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -24,7 +24,7 @@ LICENSE=	GPLv3
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index c9378087fe1a..f18f5e46351c 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -61,7 +61,7 @@ CALENDIR=	/var/spool/calendar
 MIMETYPES=	${LOCALBASE}/etc/mime.types
 WITH_TRANSPORT=	local esmtp dsn
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_FAM=	yes
 USE_GETTEXT=	yes
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 42a6ebaf1135..5b13a623acb1 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -99,7 +99,7 @@ EXTRA_PATCHES+=	${FILESDIR}/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
 		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
 		${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS=	autoconf:268 autoheader:268
+USE_AUTOTOOLS=	autoconf autoheader
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index f782c2a12945..5e1078c1d633 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -150,7 +150,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.in \
 .if ${OSVERSION} >= 800037
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
 .endif
-USE_AUTOTOOLS=	autoconf:268 autoheader:268
+USE_AUTOTOOLS=	autoconf autoheader
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index d52c108169a0..0d38cf45b14e 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -143,7 +143,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.in
 .if ${OSVERSION} >= 800037
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
 .endif
-USE_AUTOTOOLS=	autoconf:268 autoheader:268
+USE_AUTOTOOLS=	autoconf autoheader
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 4106e1d5bb60..4d09f9193dd4 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -23,7 +23,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		SIEVE		"Build w. support for Sieve mail sorting language" off \
 		LDAP		"Build with support for LDAP authentication" off
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	YES
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 3ca5fffab8b6..7559930208b5 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -22,7 +22,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		SIEVE		"Build w. support for Sieve mail sorting language" off \
 		LDAP		"Build with support for LDAP authentication" off
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	YES
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 4106e1d5bb60..4d09f9193dd4 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -23,7 +23,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		SIEVE		"Build w. support for Sieve mail sorting language" off \
 		LDAP		"Build with support for LDAP authentication" off
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	YES
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile
index 124b8502358e..b8edbbe3d698 100644
--- a/mail/dbmail23/Makefile
+++ b/mail/dbmail23/Makefile
@@ -29,7 +29,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		LDAP		"Build with support for LDAP authentication" off \
 		MANPAGES	"Install man pages" on
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	YES
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index a770142888fa..0c45dccc6469 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -96,9 +96,9 @@ OPTIONS+=	CGI "Install CGI (pulls in Apache or see below)" off
 OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
 
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 .ifdef(SNAP_DATE)
-USE_AUTOTOOLS+=	autoconf:268:env automake:111
+USE_AUTOTOOLS+=	autoconf:env automake
 .endif
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 23a8a68c3b65..b7dcb3f67bef 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -77,7 +77,7 @@ OPTIONS+=	WebUI "Install WebUI, pulls in Apache or see below" off
 OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
 
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 2a62de92f565..379fb1678701 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 912bf7572277..e93fbccc5c50 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
 		desktopfileutils gnomedocutils ltasneededhack gnomedesktop
 GNOME_DESKTOP_VERSION=2
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index ebee57f010c2..9600b021f80a 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library (written in C) for parsing and creating messages using MIME
 
 CONFLICTS=	gmime-2.1.*
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	YES
 USE_GNOME=	glib12
 USE_ICONV=	yes
diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile
index cfe18852d52b..192002d24f73 100644
--- a/mail/jamlib/Makefile
+++ b/mail/jamlib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A JAM subroutine library
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 NO_INSTALL_MANPAGES=	yes
 USE_LDCONFIG=	yes
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index e6f37bfdff67..c148d3443b83 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mail notification utility for KDE with nice features
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-fast-perl
 
 MAN1=		kbiff.1
diff --git a/mail/kcheckgmail/Makefile b/mail/kcheckgmail/Makefile
index df102726a4ff..71d517fed36c 100644
--- a/mail/kcheckgmail/Makefile
+++ b/mail/kcheckgmail/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Gmail Notifier for KDE
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_KDELIBS_VER=3
 INSTALLS_ICONS=	yes
 
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index ae566040995e..12a22e249b57 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mimelib.1:${PORTSDIR}/deskutils/kdepim3
 USE_KDELIBS_VER=	3
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268:env automake:111:env libtool:22:env
+USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 5aee533be143..9d839edb85a4 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A library for posting electronic mail
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index d2ef7170b083..eb3459196eb3 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:22 autoconf:268
+USE_AUTOTOOLS=	libtool autoconf
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index f562f48c0525..8f428e60e2af 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Sender Policy Framework (SPF) library and client
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile
index d4ec239c7fdb..03de336a36fd 100644
--- a/mail/libspf2-10/Makefile
+++ b/mail/libspf2-10/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	${PORTNAME}-1.2.*
 
 LATEST_LINK=	${PORTNAME}-${PORTVERSION:S/.//:R}
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 0f16f13ccb0d..6a69c7fca72d 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Sender Rewriting Scheme 2 C Implementation
 
 CONFLICTS=	${PORTNAME}-1.0.*
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index 1fcb08d65054..4a52f9d41073 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	srs
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Sender Rewriting Scheme 2 C Implementation
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/mail/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile
index 428f91ddb2e9..95339e422354 100644
--- a/mail/libsrs_alt/Makefile
+++ b/mail/libsrs_alt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=		http://srs.mirtol.com/
 MAINTAINER=		simond@irrelevant.org
 COMMENT=		Sender Rewriting Scheme C Implementation
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=		yes
 USE_LDCONFIG=		yes
 SHLIB_MAJOR=		1
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index e95cfca989fd..a39c4bfb6b13 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -165,7 +165,7 @@ CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 
-USE_AUTOTOOLS=	automake:111 autoconf:268
+USE_AUTOTOOLS=	automake autoconf
 USE_OPENSSL=	yes
 
 .if !defined (MUTT_LITE)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index bb85f4a7727e..d3c5fd63be4d 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -93,7 +93,7 @@ RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
 DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:111 autoconf:268
+USE_AUTOTOOLS=	automake autoconf
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-pop --enable-imap --disable-fcntl \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index bb85f4a7727e..d3c5fd63be4d 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -93,7 +93,7 @@ RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
 DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:111 autoconf:268
+USE_AUTOTOOLS=	automake autoconf
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-pop --enable-imap --disable-fcntl \
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 623bb5a2d771..06ce621aaaff 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -63,7 +63,7 @@ COMMENT=	A cleaned up MH mailer suite
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec/nmh \
 		--sysconfdir=${PREFIX}/etc/nmh
 .ifdef NMH_EDITOR
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 63c9ea11e998..66f3faeac9b1 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -24,7 +24,7 @@ MAN8=		perdition.8
 
 MANCOMPRESSED=	no
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index d24a7dc60322..66c66156acf2 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index b7ae2445e7b8..bc5376c363fc 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A flexible, modular RFC-compliant POP3 daemon
 
-USE_AUTOTOOLS=	libtool:22 libltdl:22
+USE_AUTOTOOLS=	libtool libltdl
 USE_GNOME=	glib12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index 88771f954941..da691cd4a42a 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	POP3 Proxy Server derived from UP IMAP Proxy
 
 GNU_CONFIGURE=	YES
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 USE_RC_SUBR=	pop3proxyd
 
 SAMPLE_EXT=	sample
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 9c4889c93093..7fd6438670ae 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Suite of programs for setting up large POP3 server systems
 
 BUILD_DEPENDS=	${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index 9c0fe4ddeca0..6094b82d8155 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -26,7 +26,7 @@ SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/release-${PORTVERSION}
 
-USE_AUTOTOOLS=	automake:111 autoconf:268
+USE_AUTOTOOLS=	automake autoconf
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS=	--bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"	\
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 2393d460134c..844bd18f2fed 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	bc979@lafn.org
 COMMENT=	Berkeley POP 3 server (now maintained by Qualcomm)
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_OPENSSL=	yes
 CONFIGURE_ENV=	LIBS="-lcrypt -lmd -lutil -L${LOCALBASE}/lib" \
 		OS_DEFS="-DSETPROCTITLE ${OS_DEFS}"
diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index e988edbc3fad..a1cbc12ee6a3 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -22,7 +22,7 @@ GROUPS=	quickml
 
 LICENSE=	GPLv2
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_RUBY=	yes
 
diff --git a/mail/sccmilter/Makefile b/mail/sccmilter/Makefile
index d097a7f75b3c..e804d74ec148 100644
--- a/mail/sccmilter/Makefile
+++ b/mail/sccmilter/Makefile
@@ -21,7 +21,7 @@ IGNORE=		requires Sendmail 8.12; upgrade the base system
 
 USE_BZIP2=		yes
 USE_RC_SUBR=		yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=/var
diff --git a/mail/smtp-gated/Makefile b/mail/smtp-gated/Makefile
index 4a8a1aabe29a..3b5a3b2a440f 100644
--- a/mail/smtp-gated/Makefile
+++ b/mail/smtp-gated/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	This software block SMTP sessions used by e-mail worms and viruses
 
 HAS_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoheader:268
+USE_AUTOTOOLS=	autoheader
 
 OPTIONS=	NAT "NAT transparent proxy code" On \
 		CHUNKING "Enable support for SMTP CHUNKING extension" Off \
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index e87eec49f1df..10bb529dfbcb 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 CONFLICTS=	thunderbird-3.0*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index e87eec49f1df..10bb529dfbcb 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 CONFLICTS=	thunderbird-3.0*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 88260d3f7723..776c0c8760ae 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 LATEST_LINK=	thunderbird3
 USE_GECKO=	gecko
 CONFLICTS=	thunderbird-3.1*
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 62475d01cc4d..c8713b6fcda9 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	A caching IMAP proxy server
 
-USE_AUTOTOOLS=	autoheader:268
+USE_AUTOTOOLS=	autoheader
 
 USE_RC_SUBR=	imapproxyd.sh
 DOCS=		COPYING ChangeLog README README.debian \
diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile
index 30b693efe9de..ff114ac29626 100644
--- a/mail/vmailmgr/Makefile
+++ b/mail/vmailmgr/Makefile
@@ -25,7 +25,7 @@ MAN8=	vmailmgrd.8
 
 # get python paths (PYTHON_SITELIBDIR) in case we install the python API
 USE_GMAKE=			yes
-USE_AUTOTOOLS=		autoconf:268 autoheader:268 automake:111 aclocal:111
+USE_AUTOTOOLS=		autoconf autoheader automake aclocal
 USE_PYTHON=			yes
 USE_PERL5_BUILD=	yes
 AUTOMAKE_ARGS+=		--add-missing -Wno-portability
diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile
index e3048fa587dd..fd1c0262162b 100644
--- a/mail/whoson/Makefile
+++ b/mail/whoson/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Implementation of `WHO iS ONline' protocol
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=		--with-config=${PREFIX}/etc/whoson.conf
 USE_LDCONFIG=	yes
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index f10c107bbad1..d629d82214ba 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -20,7 +20,7 @@ COMMENT=	An X Window System application for receiving electronic mail
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	glib12
 USE_GMAKE=	yes