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.

17 files changed, 17 insertions, 17 deletions

diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 41a269576924..943daf617ec7 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 3de8d5c07539..feec2df36883 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 41a269576924..943daf617ec7 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 3de8d5c07539..feec2df36883 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 4d74d7c41179..7308be24d915 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/palm/libmal/Makefile b/palm/libmal/Makefile
index 5df06c9b5475..822d5ac88c2f 100644
--- a/palm/libmal/Makefile
+++ b/palm/libmal/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library encapsulating malsync
 LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 USE_GMAKE=	YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-pilot-prefix=${LOCALBASE}
 INSTALLS_SHLIB=	YES
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 1f910acf9f08..8cbfd265e449 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 TCL_VER?=	8.4
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 1f910acf9f08..8cbfd265e449 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -18,7 +18,7 @@ COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 TCL_VER?=	8.4
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index f27a18653f98..46081fdb0aaf 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -26,7 +26,7 @@ COMMENT=	Collection of tools supporting C and C++ programming for Palm OS
 # but right now it does not.
 ONLY_FOR_ARCHS=	i386
 
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253:env
 USE_BZIP2=	YES
 USE_BISON=	YES
 USE_GMAKE=	YES
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index d1f29cdf147a..15cd56dc9528 100644
--- a/palm/synce-gnomevfs/Makefile
+++ b/palm/synce-gnomevfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE} \
 			--with-libsynce=${LOCALBASE}
 
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index d1f29cdf147a..15cd56dc9528 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE} \
 			--with-libsynce=${LOCALBASE}
 
diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile
index 4cc79f3869ee..846d049e6e13 100644
--- a/palm/synce-kde/Makefile
+++ b/palm/synce-kde/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS+=	synce-serial-start:${PORTSDIR}/palm/synce-serial \
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index 9691fed4b89c..4e92f8bdc618 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -21,7 +21,7 @@ MAN1=		pcp.1 pls.1 pmkdir.1 pmv.1 prm.1 prmdir.1 prun.1 pstatus.1 rapiconfig.1 s
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_ICONV=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile
index c4b2ffb8cb32..f2d8dc518d1b 100644
--- a/palm/synce-librra/Makefile
+++ b/palm/synce-librra/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
 MAN1=		synce-matchmaker.1
 
 USE_ICONV=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 460d8d256dba..f9f28741d7bb 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -17,7 +17,7 @@ MAN1=		synce.1
 
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
 
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index 28aa2bb98928..4343bf445b56 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	multisync:${PORTSDIR}/deskutils/multisync
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE} \
 			--with-libsynce=${LOCALBASE} \
 			--with-librra=${LOCALBASE} \
diff --git a/palm/synce-rra/Makefile b/palm/synce-rra/Makefile
index c4b2ffb8cb32..f2d8dc518d1b 100644
--- a/palm/synce-rra/Makefile
+++ b/palm/synce-rra/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
 MAN1=		synce-matchmaker.1
 
 USE_ICONV=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}