Mark USE_AUTOTOOLS deprecated and remove support for libtoolize.

Approved by:	portmgr (bapt)

3 files changed, 15 insertions, 46 deletions

diff --git a/CHANGES b/CHANGES
index 4d9898e1e02e..52781bd1a697 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,15 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20150419:
+AUTHOR: tijl@FreeBSD.org
+
+  USE_AUTOTOOLS has been deprecated.  It can be replaced with USES=autoreconf
+  and GNU_CONFIGURE=yes.
+
+  Support for USE_AUTOTOOLS=libtoolize has been removed.  It can be replaced
+  with "USES=autoreconf libtool".
+
 20150409:
 AUTHOR: bapt@FreeBSD.org
 
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index 963e0be502bc..a97047b0af25 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -15,7 +15,6 @@ Autotools_Include_MAINTAINER=	autotools@FreeBSD.org
 # 'tool' can currently be one of the following:
 #	autoconf, autoheader
 #	automake, aclocal
-#	libtoolize
 #
 # ':env' is used to specify that the environmental variables are needed
 #	but the relevant tool should NOT be run as part of the
@@ -36,9 +35,6 @@ Autotools_Include_MAINTAINER=	autotools@FreeBSD.org
 # AUTOHEADER_ARGS=...
 #	- Extra arguments passed to autoheader during configure step
 #
-# LIBTOOLIZE_ARGS=...
-#	- Extra arguments passed to libtoolize during configure step
-#
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
@@ -47,8 +43,7 @@ Autotools_Include_MAINTAINER=	autotools@FreeBSD.org
 
 # Known autotools components
 _AUTOTOOLS_ALL=	autoconf autoheader \
-		automake aclocal \
-		libtoolize
+		automake aclocal
 
 #---------------------------------------------------------------------------
 # Primary magic to break out the USE_AUTOTOOLS stanza into something
@@ -180,36 +175,10 @@ BUILD_DEPENDS+=		${AUTOCONF_DEPENDS}
 .endif
 
 #---------------------------------------------------------------------------
-# libtoolize
-#---------------------------------------------------------------------------
-
-.if defined(_AUTOTOOL_libtoolize)
-LIBTOOL_VERSION=	2.4
-LIBTOOL_PORT=		devel/libtool
-
-. if defined(_AUTOTOOL_libtoolize) && ${_AUTOTOOL_libtoolize} == "yes"
-_AUTOTOOL_rule_libtoolize=	yes
-GNU_CONFIGURE?=			yes
-. endif
-
-.endif
-
-.if defined(LIBTOOL_VERSION)
-LIBTOOLIZE=		${LOCALBASE}/bin/libtoolize
-
-LIBTOOL_VARS=		LIBTOOLIZE=${LIBTOOLIZE}
-
-LIBTOOLIZE_ARGS?=	-i -c -f
-
-LIBTOOL_DEPENDS=	libtool>=2.4:${PORTSDIR}/${LIBTOOL_PORT}
-BUILD_DEPENDS+=		${LIBTOOL_DEPENDS}
-.endif
-
-#---------------------------------------------------------------------------
 # Add to the environment
 #---------------------------------------------------------------------------
 
-AUTOTOOLS_VARS=		${AUTOMAKE_VARS} ${AUTOCONF_VARS} ${LIBTOOL_VARS}
+AUTOTOOLS_VARS=		${AUTOMAKE_VARS} ${AUTOCONF_VARS}
 
 .if defined(AUTOTOOLS_VARS) && !empty(AUTOTOOLS_VARS)
 . for var in AUTOTOOLS CONFIGURE MAKE SCRIPTS
@@ -222,11 +191,11 @@ ${var:tu}_ENV+=		${AUTOTOOLS_VARS}
 #---------------------------------------------------------------------------
 
 .if !target(run-autotools)
-.ORDER:		run-autotools run-autotools-libtoolize run-autotools-aclocal \
+.ORDER:		run-autotools run-autotools-aclocal \
 		run-autotools-autoconf run-autotools-autoheader \
 		run-autotools-automake
 
-run-autotools::	run-autotools-libtoolize run-autotools-aclocal \
+run-autotools::	run-autotools-aclocal \
 		run-autotools-autoconf run-autotools-autoheader \
 		run-autotools-automake
 .endif
@@ -270,13 +239,3 @@ run-autotools-autoheader:
 	@${DO_NADA}
 . endif
 .endif
-
-.if !target(run-autotools-libtoolize)
-run-autotools-libtoolize:
-. if defined(_AUTOTOOL_rule_libtoolize)
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} \
-		${LIBTOOLIZE_ARGS})
-. else
-	@${DO_NADA}
-. endif
-.endif
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index d28b59394718..17e16f959324 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -156,8 +156,9 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
 		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL
-SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX
+SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS
 
+USE_AUTOTOOLS_ALT=	USES=autoreconf and GNU_CONFIGURE=yes
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam
 USE_MAKESELF_ALT=	USES=makeself