svn commit: r369734 - in head: . Mk

[Tijl Coosemans]

Author: tijl
Date: Wed Oct  1 15:56:54 2014
New Revision: 369734
URL: https://svnweb.freebsd.org/changeset/ports/369734
QAT: https://qat.redports.org/buildarchive/r369734/

Log:
  Remove support for old autoconf and automake versions from USE_AUTOTOOLS:
  autoconf213, autoheader213, aclocal14 and automake14
  
  Approved by:	portmgr (bapt)

Modified:
  head/CHANGES
  head/Mk/bsd.autotools.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Wed Oct  1 15:50:33 2014	(r369733)
+++ head/CHANGES	Wed Oct  1 15:56:54 2014	(r369734)
@@ -10,6 +10,12 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20141001:
+AUTHOR: tijl at FreeBSD.org
+
+  Support for autoconf213, autoheader213, aclocal14 and automake14 has been
+  removed from USE_AUTOTOOLS.
+
 20140930:
 AUTHOR: bdrewery at FreeBSD.org
 

Modified: head/Mk/bsd.autotools.mk
==============================================================================
--- head/Mk/bsd.autotools.mk	Wed Oct  1 15:50:33 2014	(r369733)
+++ head/Mk/bsd.autotools.mk	Wed Oct  1 15:56:54 2014	(r369734)
@@ -14,9 +14,7 @@ Autotools_Include_MAINTAINER=	autotools@
 #
 # 'tool' can currently be one of the following:
 #	autoconf, autoheader
-#	autoconf213, autoheader213 (legacy version)
 #	automake, aclocal
-#	automake14, aclocal14 (legacy version)
 #	libtoolize
 #
 # ':env' is used to specify that the environmental variables are needed
@@ -52,20 +50,10 @@ Autotools_Include_MAINTAINER=	autotools@
 #---------------------------------------------------------------------------
 
 # Known autotools components
-_AUTOTOOLS_ALL=	autoconf autoheader autoconf213 autoheader213 \
-		automake aclocal automake14 aclocal14 \
+_AUTOTOOLS_ALL=	autoconf autoheader \
+		automake aclocal \
 		libtoolize
 
-# Incompatible autotools mixing
-_AUTOTOOLS_IGN_autoconf=	autoconf213 autoheader213
-_AUTOTOOLS_IGN_autoheader=	autoconf213 autoheader213
-_AUTOTOOLS_IGN_autoconf213=	autoconf autoheader
-_AUTOTOOLS_IGN_autoheader213=	autoconf autoheader
-_AUTOTOOLS_IGN_automake=	automake14 aclocal14
-_AUTOTOOLS_IGN_aclocal=		automake14 aclocal14
-_AUTOTOOLS_IGN_automake14=	automake aclocal
-_AUTOTOOLS_IGN_aclocal14=	automake aclocal
-
 #---------------------------------------------------------------------------
 # Primary magic to break out the USE_AUTOTOOLS stanza into something
 # more useful, along with substantial error checking to prevent
@@ -109,20 +97,6 @@ _AUTOTOOLS_BADCOMP+= ${component}:${_AUT
 IGNORE+=	Bad autotool stanza: ${_AUTOTOOLS_BADCOMP:O:u}
 .endif
 
-# Check for incompatible mixes of components
-#
-_AUTOTOOLS_IGN=
-.for component in ${_AUTOTOOLS_IMPL}
-. for ignore in ${_AUTOTOOLS_IGN_${component}}
-.  if defined(_AUTOTOOL_${ignore})
-_AUTOTOOLS_IGN+=	${component}
-.  endif
-. endfor
-.endfor
-.if !empty(_AUTOTOOLS_IGN)
-IGNORE+=	Incompatible autotools: ${_AUTOTOOLS_IGN:O:u}
-.endif
-
 #---------------------------------------------------------------------------
 # automake and aclocal
 #---------------------------------------------------------------------------
@@ -144,24 +118,6 @@ GNU_CONFIGURE?=			yes
 . endif
 .endif
 
-.if defined(_AUTOTOOL_aclocal14) && ${_AUTOTOOL_aclocal14} == "yes"
-_AUTOTOOL_automake14?=		env
-_AUTOTOOL_rule_aclocal14=	yes
-GNU_CONFIGURE?=			yes
-.endif
-
-.if defined(_AUTOTOOL_automake14)
-AUTOMAKE_VERSION=	1.4
-AUTOMAKE_APIVER=	1.4.6
-AUTOMAKE_PORT=		devel/automake14
-AUTOMAKE_ARGS+=		-i		# backwards compatibility shim
-
-. if ${_AUTOTOOL_automake14} == "yes"
-_AUTOTOOL_rule_automake=	yes
-GNU_CONFIGURE?=			yes
-. endif
-.endif
-
 .if defined(AUTOMAKE_VERSION)
 AUTOMAKE=		${LOCALBASE}/bin/automake-${AUTOMAKE_VERSION}
 AUTOMAKE_DIR=		${LOCALBASE}/share/automake-${AUTOMAKE_VERSION}
@@ -171,9 +127,6 @@ ACLOCAL_DIR=		${LOCALBASE}/share/aclocal
 . if defined(_AUTOTOOL_aclocal)
 ACLOCAL_ARGS?=		--automake-acdir=${ACLOCAL_DIR}
 . endif
-. if defined(_AUTOTOOL_aclocal14)
-ACLOCAL_ARGS?=		--acdir=${ACLOCAL_DIR}
-. endif
 
 AUTOMAKE_VARS=		AUTOMAKE=${AUTOMAKE} \
 			AUTOMAKE_DIR=${AUTOMAKE_DIR} \
@@ -206,23 +159,6 @@ GNU_CONFIGURE?=			yes
 . endif
 .endif
 
-.if defined(_AUTOTOOL_autoheader213) && ${_AUTOTOOL_autoheader213} == "yes"
-_AUTOTOOL_autoconf213=		yes
-_AUTOTOOL_rule_autoheader=	yes
-GNU_CONFIGURE?=			yes
-.endif
-
-.if defined(_AUTOTOOL_autoconf213)
-AUTOCONF_VERSION=	2.13
-AUTOCONF_PORT=		devel/autoconf213
-AUTOM4TE=		${FALSE}	# doesn't exist here
-
-. if ${_AUTOTOOL_autoconf213} == "yes"
-_AUTOTOOL_rule_autoconf=	yes
-GNU_CONFIGURE?=			yes
-. endif
-.endif
-
 .if defined(AUTOCONF_VERSION)
 AUTOCONF=		${LOCALBASE}/bin/autoconf-${AUTOCONF_VERSION}
 AUTOCONF_DIR=		${LOCALBASE}/share/autoconf-${AUTOCONF_VERSION}