[Midnightbsd-cvs] mports [17602] trunk/Mk/extensions/autotools.mk: drop patch autotools

[laffer1 at midnightbsd.org]

Revision: 17602
          http://svnweb.midnightbsd.org/mports/?rev=17602
Author:   laffer1
Date:     2014-09-27 17:32:44 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
drop patch autotools

Modified Paths:
--------------
    trunk/Mk/extensions/autotools.mk

Modified: trunk/Mk/extensions/autotools.mk
===================================================================
--- trunk/Mk/extensions/autotools.mk	2014-09-27 21:31:08 UTC (rev 17601)
+++ trunk/Mk/extensions/autotools.mk	2014-09-27 21:32:44 UTC (rev 17602)
@@ -15,32 +15,14 @@
 Autotools_Include_MAINTAINER=	luke at MidnightBSD.org
 
 #---------------------------------------------------------------------------
-# IMPORTANT!  READ ME!  YES, THAT MEANS YOU!
+# USE_AUTOTOOLS= tool[:env] ...
 #
-# The "versioned" autotools referenced here are for BUILDING other ports
-# only.  THIS CANNOT BE STRESSED HIGHLY ENOUGH.  Things WILL BREAK if you
-# try to use them for anything other than ports/ work.  This particularly
-# includes use as a run-time dependency.
-#
-# If you need unmodified versions of autotools, such as for use in an
-# IDE, then you MUST use the devel/gnu-* equivalents, and NOT these.
-# See devel/anjuta and devel/kdevelop for examples.
-#
-# You have been WARNED!
-#---------------------------------------------------------------------------
-
-#---------------------------------------------------------------------------
-# Entry point into the autotools system
-#---------------------------------------------------------------------------
-#
-# USE_AUTOTOOLS= tool:version[:env]  ...
-#
 # 'tool' can currently be one of the following:
 #	autoconf, autoheader
 #	autoconf213, autoheader213 (legacy version)
 #	automake, aclocal
 #	automake14, aclocal14 (legacy version)
-#	libtool, libtoolize, libltdl
+#	libtoolize
 #
 # ':env' is used to specify that the environmental variables are needed
 #	but the relevant tool should NOT be run as part of the
@@ -64,12 +46,6 @@
 # LIBTOOLIZE_ARGS=...
 #	- Extra arguments passed to libtoolize during configure step
 #
-# LIBTOOLFLAGS=<value>
-#	- Arguments passed to libtool during configure step
-#
-# LIBTOOLFILES=<list-of-files>
-#	- A list of files to patch during libtool pre-configuration
-#
 # AUTOTOOLSFILES=<list-of-files>
 #	- A list of files to further patch with derived information
 #	  post-patching to reduce churn during component updates
@@ -83,7 +59,7 @@
 # Known autotools components
 _AUTOTOOLS_ALL=	autoconf autoheader autoconf213 autoheader213 \
 		automake aclocal automake14 aclocal14 \
-		libtool libtoolize libltdl
+		libtoolize
 
 # Incompatible autotools mixing
 _AUTOTOOLS_IGN_autoconf=	autoconf213 autoheader213
@@ -277,25 +253,13 @@
 .endif
 
 #---------------------------------------------------------------------------
-# libltdl
+# libtoolize
 #---------------------------------------------------------------------------
 
-.if defined(_AUTOTOOL_libltdl)
-LIB_DEPENDS+=		libltdl.so:${PORTSDIR}/devel/libltdl
-.endif
-
-#---------------------------------------------------------------------------
-# libtool/libtoolize
-#---------------------------------------------------------------------------
-
-.if defined(_AUTOTOOL_libtool) || defined(_AUTOTOOL_libtoolize)
+.if defined(_AUTOTOOL_libtoolize)
 LIBTOOL_VERSION=	2.4
 LIBTOOL_PORT=		devel/libtool
 
-. if defined(_AUTOTOOL_libtool) && ${_AUTOTOOL_libtool} == "yes"
-_AUTOTOOL_rule_libtool=		yes
-GNU_CONFIGURE?=			yes
-. endif
 . if defined(_AUTOTOOL_libtoolize) && ${_AUTOTOOL_libtoolize} == "yes"
 _AUTOTOOL_rule_libtoolize=	yes
 GNU_CONFIGURE?=			yes
@@ -304,7 +268,6 @@
 .endif
 
 .if defined(LIBTOOL_VERSION)
-LIBTOOL=		${LOCALBASE}/bin/libtool
 LIBTOOLIZE=		${LOCALBASE}/bin/libtoolize
 LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool
 LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool
@@ -311,21 +274,12 @@
 LIBTOOL_M4=		${LOCALBASE}/share/aclocal/libtool.m4
 LTMAIN=			${LOCALBASE}/share/libtool/config/ltmain.sh
 
-LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} \
-			LIBTOOLIZE=${LIBTOOLIZE} \
+LIBTOOL_VARS=		LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_LIBEXECDIR=${LIBTOOL_LIBEXECDIR} \
 			LIBTOOL_SHAREDIR=${LIBTOOL_SHAREDIR} \
 			LIBTOOL_M4=${LIBTOOL_M4} \
 			LTMAIN=${LTMAIN}
 
-LIBTOOLFLAGS?=		# default to empty
-
-. if defined(_AUTOTOOL_rule_autoconf) || defined(_AUTOTOOL_rule_autoconf213)
-LIBTOOLFILES?=		aclocal.m4
-. elif defined(_AUTOTOOL_rule_libtool)
-LIBTOOLFILES?=		${CONFIGURE_SCRIPT}
-. endif
-
 LIBTOOLIZE_ARGS?=	-i -c -f
 
 LIBTOOL_DEPENDS=	libtool>=2.4:${PORTSDIR}/${LIBTOOL_PORT}
@@ -350,12 +304,12 @@
 
 .if !target(run-autotools)
 .ORDER:		run-autotools run-autotools-libtoolize run-autotools-aclocal \
-		patch-autotools-libtool run-autotools-autoconf \
-		run-autotools-autoheader run-autotools-automake
+		run-autotools-autoconf run-autotools-autoheader \
+		run-autotools-automake
 
 run-autotools::	run-autotools-libtoolize run-autotools-aclocal \
-		patch-autotools-libtool run-autotools-autoconf \
-		run-autotools-autoheader run-autotools-automake
+		run-autotools-autoconf run-autotools-autoheader \
+		run-autotools-automake
 .endif
 
 .if !target(run-autotools-aclocal)
@@ -408,20 +362,6 @@
 . endif
 .endif
 
-.if !target(patch-autotools-libtool)
-patch-autotools-libtool::
-. if defined(_AUTOTOOL_rule_libtool)
-	@for file in ${LIBTOOLFILES}; do \
-		${REINPLACE_CMD} -e \
-			"/^ltmain=/!s|\$$ac_aux_dir/ltmain.sh|${LIBTOOLFLAGS} ${LTMAIN}|g; \
-			/^LIBTOOL=/s|\$$(top_builddir)/libtool|${LIBTOOL}|g" \
-			${PATCH_WRKSRC}/$$file; \
-	done;
-. else
-	@${DO_NADA}
-. endif
-.endif
-
 #---------------------------------------------------------------------------
 # Reduce patch churn by auto-substituting data from AUTOTOOLS_VARS
 # into the correct places.  Code shamelessly stolen from PLIST_SUB.